diff --git a/NEWS b/NEWS
index e0eb5a2ee..fbfe661fd 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ New features
 Bug fixes
  - [web] use the organizer's alarm by default when accepting IMIP messages (#3934)
  - [eas] don't include task folders if we hide them in SOGo (#4164)
+ - [core] not using cleaned data when sending mails (#4199)
 
 2.3.21 (2017-06-01)
 -------------------
diff --git a/SoObjects/SOGo/SOGoMailer.m b/SoObjects/SOGo/SOGoMailer.m
index 95a06d874..03dcf6de9 100644
--- a/SoObjects/SOGo/SOGoMailer.m
+++ b/SoObjects/SOGo/SOGoMailer.m
@@ -397,11 +397,11 @@
 	    }
 
 	  if ([mailingMechanism isEqualToString: @"sendmail"])
-	    result = [self _sendmailSendData: data
+	    result = [self _sendmailSendData: cleaned_message
 			   toRecipients: recipients
 			   sender: [sender pureEMailAddress]];
 	  else
-	    result = [self _smtpSendData: data
+	    result = [self _smtpSendData: cleaned_message
                             toRecipients: recipients
                                   sender: [sender pureEMailAddress]
                        withAuthenticator: authenticator