UX suggestion: "Save" button by adding attachments drives me crazy

It would be nice if we change the “save” button, with “done” while adding attachment in order to return to “edit” screen.
what happens now: you add an attachment, then you push the save button (of course since you havent been informed that your attachment is already saved) then you get an error: no attachment found or sth
then you realize ah attachment is already there and I have to push the back button

correction: “back” button → Close