ISSUE 1: Nickname overlaps the display name

Steps:

1. User A sets a nickname for User B
2. User A checks the following places
3. User B sends a message to User A
4. User A checks in the following places:

• In first line of message
• In the chat preview
• Contacts tab
• 'new chat' overlay

Actual result:

Nickname overlaps the display name in the following places:

• In first line of message
  
• In the chat preview
• Contacts tab
  
• 'new chat' overlay
  

Expected result:

The display name should be shown in the right part after the nickname.