fixes for attachments, Save button instead OK