master:
1) ConversationViewController fixed