     }
 
     private func setMessage(message: String?) {
-        if let message = message {
-            let messageStyle = OEXTextStyle(weight: .light, size: .xSmall, color: OEXStyles.shared().primaryXLightColor())
-
-            messageLabel.isHidden = false
-            messageLabel.snp_remakeConstraints { (make) -> Void in
-                make.top.equalTo(usernameLabel.snp_bottom).offset(margin).priorityHigh()
-                make.centerX.equalTo(scrollView)
-            }
-            countryLabel.isHidden = true
-            languageLabel.isHidden = true
-
-            messageLabel.attributedText = messageStyle.attributedString(withText: message)
-        } else {
-            messageLabel.isHidden = true
-            messageLabel.snp_updateConstraints(closure: { (make) -> Void in
-                make.height.equalTo(0)
-            })
-
-            countryLabel.isHidden = false
-            languageLabel.isHidden = false
-
-        }
+        
+        guard let message = message else {
+            messageLabel.text = nil
+            return
+        }
+        
+        let messageStyle = OEXTextStyle(weight: .light, size: .xSmall, color: OEXStyles.shared().primaryXLightColor())
+        messageLabel.attributedText = messageStyle.attributedString(withText: message)
     }
 
     private func messageForProfile(profile : UserProfile, editable : Bool) -> String? {

                bioSystemMessage.isHidden = false
            }
        } else {
            self.bioText.text = ""
            if let language = profile.language {
                let icon = Icon.Comment.attributedTextWithStyle(style: infoStyle)
                let langText = infoStyle.attributedString(withText: language)

        bioSystemMessage.isHidden = true

        avatarImage.remoteImage = profile.image(networkManager: networkManager)
        setDefaultValues()
        setMessage(message: messageForProfile(profile: profile, editable: editable))
        if profile.sharingLimitedProfile {
            if (profile.parentalConsent ?? false) && editable {
                let message = NSMutableAttributedString(attributedString: messageStyle.attributedString(withText: Strings.Profile.ageLimit))
