master:
1) ConversationViewController improvements