Aleksander Machniak
2016-04-15 ead084693499934c467ca6a9c396367ac661dd61
program/steps/mail/func.inc
@@ -884,8 +884,7 @@
            $data['body'] = rcube_enriched::to_html($data['body']);
        }
        $txt  = new rcube_html2text($data['body'], false, true);
        $body = $txt->get_text();
        $body = $RCMAIL->html2text($data['body']);
        $part->ctype_secondary = 'plain';
    }
    // text/html
@@ -1217,17 +1216,6 @@
                // fetch part body
                $body = $MESSAGE->get_part_body($part->mime_id, true);
                // extract headers from message/rfc822 parts
                if ($part->mimetype == 'message/rfc822') {
                    $msgpart = rcube_mime::parse_message($body);
                    if (!empty($msgpart->headers)) {
                        $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
                if ($body === false) {