Fix #1532 "Save draft action fails with invalid attachment"
Minor: remove unneeded elements