Merge "Fix preview for attachments" into jb-ub-mail