Merge "Pressing old style attachments now shows feedback." into jb-ub-mail