Merge "Refactor ConversationMessage out of MessageCursor." into jb-ub-mail-ur10