Fall back to $part->body when no mime_id is set for the message part

Thomas Bruederli

2015-01-15 f4154d91080fcd2404102e8d57679f42af96ef2e

 program/steps/mail/func.inc

@@ -815,7 +815,7 @@
    $wash_opts = array(
        'show_washed'   => false,
        'allow_remote'  => $p['safe'],
        'blocked_src'   => "./program/resources/blocked.gif",
        'blocked_src'   => 'program/resources/blocked.gif',
        'charset'       => RCUBE_CHARSET,
        'cid_map'       => $cid_replaces,
        'html_elements' => array('body'),
@@ -1205,7 +1205,7 @@
                }

                // fetch part body
                $body = $MESSAGE->get_part_body($part->mime_id, true);
                $body = $part->mime_id ? $MESSAGE->get_part_body($part->mime_id, true) : $part->body;

                // extract headers from message/rfc822 parts
                if ($part->mimetype == 'message/rfc822') {