Fix behaviour of SOGoMailKeepDraftsAfterSend

Fixes #4830
Alinto · Sep 27, 2019 · 5b818e8 · 5b818e8
1 parent 482728c
commit 5b818e8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -21,6 +21,7 @@ Bug fixes
  - [web] fixed search results in Calendar module when targeting all events
  - [web] properly encode URL of cards from exteral sources
  - [web] restore cards selection after automatic refresh (#4809)
+ - [web] don't mark draft as deleted when SOGoMailKeepDraftsAfterSend is enabled (#4830)
  - [core] honor IMAPLoginFieldName also when setting IMAP ACLs
  - [core] honor groups when setting IMAP ACLs
  - [core] honor "any authenticated user" when setting IMAP ACLs

diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
@@ -2068,7 +2068,7 @@ - (NSException *) sendMailAndCopyToSent: (BOOL) copyToSent
           if (!error)
             {
               [self imap4Connection];
-              if (IMAP4ID > -1)
+              if (IMAP4ID > -1 && ![dd mailKeepDraftsAfterSend])
                 [imap4 markURLDeleted: [self imap4URL]];
               if (sourceURL && sourceFlag)
                 {