Merge "Final eml viewer cleanup." into jb-ub-mail-ur10