Fixed encoding issues and delete-on-reply problem

program/steps/mail/compose.inc

@@ -171,18 +171,18 @@ function rcmail_compose_headers($attrib)
     {
     // get recipent address(es) out of the message headers
     if ($header=='to' && !empty($MESSAGE['headers']->replyto))
-      $fvalue = $IMAP->decode_header($MESSAGE['headers']->replyto);
+      $fvalue = $MESSAGE['headers']->replyto;
 
     else if ($header=='to' && !empty($MESSAGE['headers']->from))
-      $fvalue = $IMAP->decode_header($MESSAGE['headers']->from);
+      $fvalue = $MESSAGE['headers']->from;
 
     // add recipent of original message if reply to all
     else if ($header=='cc' && !empty($MESSAGE['reply_all']))
       {
-      if ($v = $IMAP->decode_header($MESSAGE['headers']->to))
+      if ($v = $MESSAGE['headers']->to)
         $fvalue .= $v;
 
-      if ($v = $IMAP->decode_header($MESSAGE['headers']->cc))
+      if ($v = $MESSAGE['headers']->cc)
         $fvalue .= (!empty($fvalue) ? ', ' : '') . $v;
       }
 
@@ -212,7 +212,6 @@ function rcmail_compose_headers($attrib)
 
     if ($header=='bcc' && !empty($MESSAGE['headers']->bcc))
       $fvalue = $IMAP->decode_header($MESSAGE['headers']->bcc);
-
     }
 
         
@@ -414,7 +413,7 @@ function rcmail_compose_body($attrib)
 
   $out = $form_start ? "$form_start\n" : '';
 
-  $saveid = new hiddenfield(array('name' => '_draft_saveid', 'value' => str_replace(array('<','>'),"",$MESSAGE['headers']->messageID) ));
+  $saveid = new hiddenfield(array('name' => '_draft_saveid', 'value' => $compose_mode==RCUBE_COMPOSE_DRAFT ? str_replace(array('<','>'), "", $MESSAGE['headers']->messageID) : ''));
   $out .= $saveid->show();
 
   $drafttoggle = new hiddenfield(array('name' => '_draft', 'value' => 'yes'));