Merge "Move attachments below compose body, above quoted text" into jb-ub-mail