Merge "Refactoring of AbstractConversationViewFragment." into jb-ub-mail-ur10