Bringing back ConversationViewController changes to the master repo