diff --git a/docs/NEWS b/docs/NEWS
index 8a2b6a4b5..f0930a89e 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -1,6 +1,11 @@
 Version 2.3.2-beta1 ()
 ------------------------------------------------------------------------
 
+   * Fix: Auto-generated mails submitted to qmail as MTA will get
+          mangled if encoded to quoted-printable due to qmail
+          changing "\r\n" linebreaks to "\r\r\n". Submit just "\n"
+          as linebreaks; other MTAs should cope with that.
+
    * fix: Rotating an image did not rotate all responsive thumbnails
    
    * fix: The wysiwyg editor stripped the figcaption element used
diff --git a/include/functions.inc.php b/include/functions.inc.php
index eb72a6076..545484e79 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -538,7 +538,7 @@ function serendipity_sendMail($to, $subject, $message, $fromMail, $headers = NUL
         if (LANG_CHARSET == 'UTF-8') {
             if (function_exists('imap_8bit') && !$serendipity['forceBase64']) {
                 $maildata['headers'][] = 'Content-Transfer-Encoding: quoted-printable';
-                $maildata['message']   = imap_8bit($maildata['message']);
+                $maildata['message']   = str_replace("\r\n","\n",imap_8bit($maildata['message']));
             } else {
                 $maildata['headers'][] = 'Content-Transfer-Encoding: base64';
                 $maildata['message']   = chunk_split(base64_encode($maildata['message']));