diff --git a/src/Plugin/Mail/SMTPMailSystem.php b/src/Plugin/Mail/SMTPMailSystem.php
index bd3b335..b097761 100644
--- a/src/Plugin/Mail/SMTPMailSystem.php
+++ b/src/Plugin/Mail/SMTPMailSystem.php
@@ -127,7 +127,7 @@ class SMTPMailSystem implements MailInterface, ContainerFactoryPluginInterface {
 
     // Defines the From value to what we expect.
     $mailer->From = $from;
-    $mailer->FromName = $from_name;
+    $mailer->FromName = substr(iconv_mime_encode("", $from_name), 2);
     $mailer->Sender = $from;
 
     $hostname = $this->smtpConfig->get('smtp_client_hostname');
@@ -287,7 +287,7 @@ class SMTPMailSystem implements MailInterface, ContainerFactoryPluginInterface {
      * }
      */
     // Add the message's subject.
-    $mailer->Subject = $subject;
+    $mailer->Subject = substr(iconv_mime_encode("", $subject), 2);
 
     // Processes the message's body.
     switch ($content_type) {