Merge "Applied redlines for some of the attachment views." into jb-ub-mail