Merge "Align web view content with sender image." into jb-ub-mail-ur10