Editor's drafts for madrid branch of arnt/mailmaint-smtputf8