diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-10-15 14:24:30 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-10-15 14:24:30 +0200 |
| commit | 27be4e7644637255d7adbf5386ec883d9c2c64cd (patch) | |
| tree | d1bb55eb191221271c9c93c654f263046bdc9406 | |
| parent | 5f409583008dfbfa4b5e160f7ec9b1cc7a4766d2 (diff) | |
Fix header charset decoding when opening a draft message
| -rw-r--r-- | program/steps/mail/compose.inc | 2 | ||||
| -rw-r--r-- | program/steps/mail/sendmail.inc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 04efe7df5..fd34ee098 100644 --- a/program/steps/mail/compose.inc +++ b/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 diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index ee6a3d3a7..a0c049682 100644 --- a/program/steps/mail/sendmail.inc +++ b/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; |