Drafts are being created for sent emails

Drafts are not being removed when mails are sent.

To reproduce: Create a mail and save as a draft. Go back to the app and send. The draft remains even though the mail was sent.