diff --git a/dev/tests/integration/testsuite/Magento/Framework/Mail/MessageTest.php b/dev/tests/integration/testsuite/Magento/Framework/Mail/MessageTest.php
new file mode 100644
index 0000000000000..d2b220b38f695
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Mail/MessageTest.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Mail;
+
+class MessageTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Message
+     */
+    private $message;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->message = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(Message::class);
+    }
+
+    public function testGetHeaderEncodingDefaultValue()
+    {
+        $this->assertEquals(\Zend_Mime::ENCODING_BASE64, $this->message->getHeaderEncoding());
+    }
+
+    public function testGetCharsetDefaultValue()
+    {
+        $this->assertEquals('utf-8', $this->message->getCharset());
+    }
+}
diff --git a/lib/internal/Magento/Framework/Mail/Message.php b/lib/internal/Magento/Framework/Mail/Message.php
index 9a99f7d8f11ef..f9511a260da1a 100644
--- a/lib/internal/Magento/Framework/Mail/Message.php
+++ b/lib/internal/Magento/Framework/Mail/Message.php
@@ -15,6 +15,7 @@ class Message extends \Zend_Mail implements MessageInterface
     public function __construct($charset = 'utf-8')
     {
         parent::__construct($charset);
+        $this->setHeaderEncoding(\Zend_Mime::ENCODING_BASE64);
     }
 
     /**