diff --git a/email/Mailer.php b/email/Mailer.php
index 588bf944e..d3df7ad72 100644
--- a/email/Mailer.php
+++ b/email/Mailer.php
@@ -72,7 +72,7 @@ function htmlEmail($to, $from, $subject, $htmlContent, $attachedFiles = false, $
$headers["Content-Type"] = "text/plain; charset=\"utf-8\"";
$headers["Content-Transfer-Encoding"] = $plainEncoding ? $plainEncoding : "quoted-printable";
- $plainPart = processHeaders($headers, ($plainEncoding == "base64") ? chunk_split(base64_encode($plainContent),60) : wordwrap($plainContent,120));
+ $plainPart = processHeaders($headers, ($plainEncoding == "base64") ? chunk_split(base64_encode($plainContent),60) : wordwrap(QuotedPrintable_encode($plainContent),120));
// Make the HTML part
$headers["Content-Type"] = "text/html; charset=\"utf-8\"";
@@ -83,10 +83,10 @@ function htmlEmail($to, $from, $subject, $htmlContent, $attachedFiles = false, $
$htmlContent =
"\n" .
"\n" .
- "\n" .
- "\n\n".
+ "\n" .
+ "\n\n".
"\n" .
- "\n" .
+ "\n" .
$htmlContent .
"\n\n" .
"";