Fix header charset decoding when opening a draft message

program/steps/mail/compose.inc

@@ -423,6 +423,8 @@ foreach ($parts as $header) {
       $fvalue = $MESSAGE->get_header('reply-to');
     else if ($header=='followupto' && !empty($MESSAGE->headers->others['mail-followup-to']))
       $fvalue = $MESSAGE->get_header('mail-followup-to');
+
+    $decode_header = false;  // $MESSAGE->get_header() returns already decoded header values
   }
 
   // split recipients and put them back together in a unique way

program/steps/mail/sendmail.inc

@@ -256,8 +256,7 @@ if (strlen($_POST['_draft_saveid']) > 3)
 $message_id = rcmail_gen_message_id();
 
 // set default charset
-$input_charset = $OUTPUT->get_charset();
-$message_charset = isset($_POST['_charset']) ? $_POST['_charset'] : $input_charset;
+$message_charset = isset($_POST['_charset']) ? $_POST['_charset'] : $OUTPUT->get_charset();
 
 $EMAIL_FORMAT_ERROR = NULL;
 $RECIPIENT_COUNT = 0;