Enriched content should be also converted to text if html is disabled

program/steps/mail/compose.inc

@@ -675,9 +675,6 @@ function rcmail_compose_part_body($part, $isHtml = false)
             $txt = new rcube_html2text($body, false, true, $len);
             $body = $txt->get_text();
         }
-        else if ($part->ctype_secondary == 'enriched') {
-            $body = rcube_enriched::to_html($body);
-        }
         else {
             if ($part->ctype_secondary == 'plain' && $part->ctype_parameters['format'] == 'flowed') {
                 $body = rcube_mime::unfold_flowed($body);

program/steps/mail/func.inc

@@ -707,7 +707,10 @@ function rcmail_print_body($part, $p = array())
         + $p + array('safe' => false, 'plain' => false, 'inline_html' => true));
 
   // convert html to text/plain
-  if ($data['type'] == 'html' && $data['plain']) {
+  if ($data['plain'] && ($data['type'] == 'html' || $data['type'] == 'enriched')) {
+    if ($data['type'] == 'enriched') {
+      $data['body'] = rcube_enriched::to_html($data['body']);
+    }
     $txt = new rcube_html2text($data['body'], false, true);
     $body = $txt->get_text();
     $part->ctype_secondary = 'plain';