Add remove attachment button to Emails
Fixes to Emails attachments