diff --git a/INSTALL b/INSTALL
index a894370aa..0f1e864de 100644
--- a/INSTALL
+++ b/INSTALL
@@ -16,7 +16,7 @@ REQUIREMENTS
    - PHP Data Objects (PDO) with driver for either MySQL, PostgreSQL or SQLite (required)
    - Libiconv, Zip, Fileinfo (recommended)
 * PEAR packages distributed with Roundcube or external:
-   - Mail_Mime 1.8.1 or newer
+   - Mail_Mime 1.9.0 or newer
    - Net_SMTP (latest from https://github.com/pear/Net_SMTP/)
    - Net_IDNA2 0.1.1 or newer
    - Auth_SASL 1.0.6 or newer
diff --git a/composer.json-dist b/composer.json-dist
index 235a3ee10..8f2b7d2d5 100644
--- a/composer.json-dist
+++ b/composer.json-dist
@@ -22,7 +22,7 @@
         "pear-pear.php.net/auth_sasl": ">=1.0.6",
         "pear-pear.php.net/net_idna2": ">=0.1.1",
         "pear-pear.php.net/net_sieve": ">=1.3.2",
-        "pear/mail_mime": ">=1.8.9",
+        "pear/mail_mime": ">=1.9.0",
         "pear/net_smtp": "dev-master"
     },
     "require-dev": {
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
index 8f75f8c7e..7452287c3 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -1559,12 +1559,8 @@ class rcube
             if (strlen($headers['Bcc']))
                 $a_recipients[] = $headers['Bcc'];
 
-            // clean Bcc from header for recipients
-            $send_headers = $headers;
-            unset($send_headers['Bcc']);
-            // here too, it because txtHeaders() below use $message->_headers not only $send_headers
-            unset($message->_headers['Bcc']);
-
+            // remove Bcc header and get the whole head of the message as string
+            $send_headers = array('Bcc' => null);
             $smtp_headers = $message->txtHeaders($send_headers, true);
 
             if ($message->getParam('delay_file_io')) {
@@ -1606,13 +1602,9 @@ class rcube
         // send mail using PHP's mail() function
         else {
             // unset some headers because they will be added by the mail() function
-            $headers_enc = $message->headers($headers);
-            $headers_php = $message->_headers;
-            unset($headers_php['To'], $headers_php['Subject']);
-
-            // reset stored headers and overwrite
-            $message->_headers = array();
-            $header_str = $message->txtHeaders($headers_php);
+            $headers_enc = $headers;
+            $headers_res = array('To' => null, 'Subject' => null);
+            $header_str  = $message->txtHeaders($headers_res, true);
 
             // #1485779
             if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
@@ -1685,8 +1677,7 @@ class rcube
             fclose($msg_body);
         }
 
-        $message->_headers = array();
-        $message->headers($headers);
+        $message->headers($headers, true);
 
         return $sent;
     }