From 6e71c958fcc89a002816f28397776f4a633b96a5 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 14 Dec 2015 06:18:16 -0500
Subject: [PATCH] Fix also charset encoding of message/rfc822 part bodies (#1490606)
---
program/steps/mail/func.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index d4fed14..7c30673 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1221,12 +1221,12 @@
// 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
--
Gitblit v1.9.1