diff --git a/source/static/lib/email.lib.php b/source/static/lib/email.lib.php
index 162c1f4..31db83f 100644
--- a/source/static/lib/email.lib.php
+++ b/source/static/lib/email.lib.php
@@ -90,13 +90,14 @@ class Email {
         }
         $mail->Port = $this->smtpport;
 
+
+        $mail->CharSet = "UTF-8";
+        $mail->Encoding = 'base64';
         if (empty($this->html)) {
             $mail->isHTML(false);
-            $mail->CharSet = "text/plain; charset=UTF-8;";
             $mail->Body = $this->body;
         } else {
             $mail->isHTML(true);
-            $mail->CharSet = "text/html; charset=UTF-8;";
             $mail->Body = $this->html;
             $mail->AltBody = $this->body;
         }