More work on the imap-submit draft