diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index d41eebf4a8..651e6b378f 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -2405,9 +2405,9 @@ - (NSException *) sendMailAndCopyToSent: (BOOL) copyToSent
   //  - SOGoMailKeepDraftsAfterSend is not set;
   //  - draft is successfully deleted;
   //  - drafts mailbox exists.
+  [self delete];
   if (!error &&
       ![dd mailKeepDraftsAfterSend] &&
-      ![self delete] &&
       [imap4 doesMailboxExistAtURL: [container imap4URL]])
     [(SOGoDraftsFolder *) container expunge];