diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index a3d3e529409..5c5a31efcde 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -818,6 +818,7 @@ function email_to_user($user, $from, $subject, $messagetext, $messagehtml="", $a
 
     if ($messagehtml) {
         $mail->IsHTML(true);
+        $mail->Encoding = "quoted-printable";           // Encoding to use
         $mail->Body    =  $messagehtml;
         $mail->AltBody =  "\n$messagetext\n";
     } else {
diff --git a/lib/phpmailer/class.phpmailer.php b/lib/phpmailer/class.phpmailer.php
index b423a3c0676..6fba6f31922 100644
--- a/lib/phpmailer/class.phpmailer.php
+++ b/lib/phpmailer/class.phpmailer.php
@@ -750,6 +750,7 @@ class PHPMailer
               // fall through
            case "alt_attachment":
               $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
+              break;
            default:
               $this->Body = $this->WrapText($this->Body, $this->WordWrap);
               break;