Fix fallback if no message strucutre is provided by the imap server

git-svn-id: https://svn.roundcube.net/trunk@1476 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 5 insertions, 2 deletions

diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php
index 6ce683aa0..5e56eedb3 100644
--- a/roundcubemail/program/include/rcube_imap.php
+++ b/roundcubemail/program/include/rcube_imap.php
@@ -1248,7 +1248,10 @@ class rcube_imap
    */
   function &get_body($uid, $part=1)
     {
-    return $this->get_message_part($uid, $part);
+    $headers = $this->get_headers($uid);
+    return rcube_charset_convert(
+      $this->mime_decode($this->get_message_part($uid, $part), 'quoted-printable'),
+      $headers->charset ? $headers->charset : $this->default_charset);
     }
 
 
diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc
index ac4eb6b01..ddaf29063 100644
--- a/roundcubemail/program/steps/mail/func.inc
+++ b/roundcubemail/program/steps/mail/func.inc
@@ -728,7 +728,7 @@ function rcmail_message_body($attrib)
       }
     }
   else
-    $out .= $MESSAGE->body;
+    $out .= html::div('message-part', html::div('pre', $MESSAGE->body));
 
 
   $ctype_primary = strtolower($MESSAGE->structure->ctype_primary);