Restore adding and saving of HTML & file attachments
Test for HTML & file attachment ordering interface