diff --git a/NEWS b/NEWS
index ba6f47a61..041ba56e9 100644
--- 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
index 4238f3aae..2cbd0e346 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -2068,7 +2068,7 @@ static NSString    *userAgent      = nil;
           if (!error)
             {
               [self imap4Connection];
-              if (IMAP4ID > -1)
+              if (IMAP4ID > -1 && ![dd mailKeepDraftsAfterSend])
                 [imap4 markURLDeleted: [self imap4URL]];
               if (sourceURL && sourceFlag)
                 {