diff --git a/src/FusionDirectory/Mail/MailLib.php b/src/FusionDirectory/Mail/MailLib.php
index b6ab1e13d85b1515ef8649a832bb0d0b6a485c66..476a3aa54fa4c1e7d26f554074e2a2d934c03f37 100644
--- a/src/FusionDirectory/Mail/MailLib.php
+++ b/src/FusionDirectory/Mail/MailLib.php
@@ -50,12 +50,16 @@ class MailLib
     $this->mail->isSMTP();
     $this->mail->Host = $_ENV["MAIL_HOST"];
 
+    // Set UTF-8 character encoding
+    $this->mail->CharSet  = 'UTF-8';
+    // Set base64 for non UTF-8 char
+    $this->mail->Encoding = 'base64';
+
     /*
      * In case there are FQDN errors responses by the SMTP server, try below.
      * $this->mail->Helo = '['.$_SERVER['SERVER_ADDR'].']';
      */
 
-
     // Authentication mechanism
     if ($_ENV["MAIL_AUTH"] == "TRUE") {
       $this->mail->SMTPAuth = TRUE;