Merge "Conversation View UI Refresh: more message header." into jb-ub-mail-ur10