 	
 	func didSelectContact(recipient: XMPPUserCoreDataStorageObject) {
 		self.recipient = recipient
-		navigationItem.title = recipient.displayName
+		if userDetails == nil {
+            navigationItem.title = recipient.displayName
+        }
 		
 		if !OneChats.knownUserForJid(jidStr: recipient.jidStr) {
 			OneChats.addUserToChatList(jidStr: recipient.jidStr)

	override func viewWillAppear(animated: Bool) {
		if let recipient = recipient {
			self.navigationItem.rightBarButtonItems = []
			navigationItem.title = recipient.displayName
			
			dispatch_async(dispatch_get_main_queue(), { () -> Void in
				self.messages = OneMessage.sharedInstance.loadArchivedMessagesFrom(jid: recipient.jidStr)
				self.finishReceivingMessageAnimated(true)
			})
		} else {
			navigationItem.title = "New message"
			
			self.inputToolbar!.contentView!.rightBarButtonItem!.enabled = false
			self.navigationItem.setRightBarButtonItem(UIBarButtonItem(barButtonSystemItem: .Add, target: self, action: "addRecipient"), animated: true)

		self.scrollToBottomAnimated(true)
	}
	
	override func viewWillDisappear(animated: Bool) {
        userDetails?.removeFromSuperview()
    }
	
	// Mark: Private methods
	
	func addRecipient() {
