From 4013e8fd41d4b0c04712c6d04f4c7939d9175703 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 14 Oct 2016 19:23:13 +0200
Subject: [PATCH] Fix To: header encoding in mail sent with mail() method
 (#5475)

---
 CHANGELOG                       | 1 +
 program/lib/Roundcube/rcube.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 91fd4887537..35378561460 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix To: header encoding in mail sent with mail() method (#5475)
 - Fix flickering of header topline in min-mode (#5426)
 - Fix bug where folders list would scroll to top when clicking on subscription checkbox (#5447)
 - Fix decoding of GB2312/GBK text when iconv is not installed (#5448)
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
index 8394ea16e77..3acda9d0aab 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -1676,7 +1676,7 @@ public function deliver_message(&$message, $from, $mailto, &$error, &$body_file
             }
             else {
                 $delim      = $this->config->header_delimiter();
-                $to         = $mailto;
+                $to         = $message->encodeHeader('To', $mailto, RCUBE_CHARSET, 'quoted-printable');
                 $subject    = $headers['Subject'];
                 $header_str = rtrim($header_str);