From bb6002f1a8913108e868ffdfbc19cff0ba96961f Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 14 Dec 2015 12:17:03 +0100 Subject: [PATCH] Fix also charset encoding of message/rfc822 part bodies (#1490606) --- program/steps/mail/func.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 988c61de6..5b927933b 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1236,12 +1236,12 @@ function rcmail_message_body($attrib) // extract headers from message/rfc822 parts if ($part->mimetype == 'message/rfc822') { $msgpart = rcube_mime::parse_message($body); - if (!empty($msgpart->headers)) { + $body = rcube_message::format_part_body($msgpart->body, $msgpart); + + if (!empty($msgpart->headers) && !empty($body)) { $part = $msgpart; $out .= html::div('message-partheaders', rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : null, $part->headers)); } - - $body = $part->body; } // message is cached but not exists (#1485443), or other error