diff --git a/include/functions.inc.php b/include/functions.inc.php
index eb72a607..545484e7 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']));