Index: program/steps/mail/get.inc
===================================================================
--- program/steps/mail/get.inc	(revision 8fa58e72a333d753ec406d0725ac9c1b40ab6d9a)
+++ program/steps/mail/get.inc	(revision 21e724153e80249d0b0f0aaa2f730ad2c045532c)
@@ -66,4 +66,6 @@
       header("Content-Type: application/octet-stream");
     }
+    else if ($ctype_primary == 'text')
+      header("Content-Type: text/$ctype_secondary; charset=" . RCMAIL_CHARSET);
     else
       header("Content-Type: $mimetype");
@@ -96,5 +98,5 @@
 
       $OUTPUT = new rcube_html_page();
-      $OUTPUT->write(rcmail_print_body($part, $MESSAGE->is_safe));
+      $OUTPUT->write(rcmail_print_body($part, array('safe' => $MESSAGE->is_safe, 'inline_html' => false)));
     }
     else {