diff --git a/server/plugins-available/mail_plugin.inc.php b/server/plugins-available/mail_plugin.inc.php
index f09a852c440b0fbab09dc6e697c82bf99928f923..6781fb63684655586d9168530cd498811f9809f6 100644
--- a/server/plugins-available/mail_plugin.inc.php
+++ b/server/plugins-available/mail_plugin.inc.php
@@ -185,7 +185,8 @@ class mail_plugin {
 		$mailHeaders     .= "From: $welcome_mail_from" . "\n";
 		$mailHeaders     .= "Reply-To: $welcome_mail_from" . "\n";
 		$mailTarget       = $data["new"]["email"];
-		$mailSubject = "=?utf-8?Q?" . imap_8bit($welcome_mail_subject) . "?=";
+		// $mailSubject = "=?utf-8?Q?" . imap_8bit($welcome_mail_subject) . "?=";
+		$mailSubject      = "=?utf-8?B?".base64_encode($welcome_mail_subject)."?=";
 
 		mail($mailTarget, $mailSubject, $welcome_mail_message, $mailHeaders);