Cleanups and minor fix on ConversationActivity.