From db644ab53fe599f1fd4f6ea93abbf302e4feff68 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 29 Jul 2009 00:02:55 -0600
Subject: [PATCH] Correctly set charset of Bcc header in sent mail copy (Bug
 #8362)

---
 imp/docs/CHANGES    | 1 +
 imp/lib/Compose.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
index 28ae622b8..c1ad3eede 100644
--- a/imp/docs/CHANGES
+++ b/imp/docs/CHANGES
@@ -94,6 +94,7 @@ v5.0-git
 v4.3.5-cvs
 ----------
 
+[mms] Correctly set charset of Bcc header in sent mail (Bug #8362).
 [mms] Fix spellcheck in text-mode for certain words in non-English locales
       (Bug #8330).
 [mms] Fix some javascript if using IE 8 (uses IE 7 compatibility mode) (Bug
diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
index e3dc3e06e..b6350e5cb 100644
--- a/imp/lib/Compose.php
+++ b/imp/lib/Compose.php
@@ -567,7 +567,7 @@ class IMP_Compose
 
             /* Keep Bcc: headers on saved messages. */
             if (!empty($header['bcc'])) {
-                $headers->addHeader('Bcc', $header['bcc']);
+                $headers->addHeader('Bcc', Horde_String::convertCharset($header['bcc'], $browser_charset, $charset));
             }
 
             /* Strip attachments if requested. */
-- 
2.11.0