diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index dc510b059..865aff0bf 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1010,7 +1010,12 @@ function rcmail_message_body($attrib)
         // $body = rcmail_print_body($part['body'], $part['ctype_primary'], $part['ctype_secondary'], $part['encoding'], $safe_mode);
         $body = rcmail_print_body($part, $safe_mode);
         $out .= '<div class="message-part">';
-        $out .= rcmail_mod_html_body($body, $attrib['id']);
+        
+        if ($part['ctype_secondary']!='plain')
+          $out .= rcmail_mod_html_body($body, $attrib['id']);
+        else
+          $out .= $body;
+
         $out .= "</div>\n";
         }
       }