Index: program/steps/mail/compose.inc
===================================================================
--- program/steps/mail/compose.inc	(revision 4591de7018414267311b421ef42ef1b4a2f6aa89)
+++ program/steps/mail/compose.inc	(revision fc072bfdb38f3b6dccaf9c9c3c309b36e604d4e6)
@@ -313,4 +313,5 @@
 foreach ($parts as $header) {
   $fvalue = '';
+  $decode_header = true;
 
   // we have a set of recipients stored is session
@@ -319,4 +320,5 @@
   ) {
     $fvalue = urldecode($_SESSION['mailto'][$mailto_id]);
+    $decode_header = false;
   }
   else if (!empty($_POST['_'.$header])) {
@@ -372,5 +374,5 @@
   // split recipients and put them back together in a unique way
   if (!empty($fvalue) && in_array($header, array('to', 'cc', 'bcc'))) {
-    $to_addresses = $IMAP->decode_address_list($fvalue);
+    $to_addresses = $IMAP->decode_address_list($fvalue, null, $decode_header);
     $fvalue = array();