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

1 files changed, 4 insertions, 1 deletions

diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 6ce683aa0..5e56eedb3 100644
--- a/program/include/rcube_imap.php
+++ b/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);
     }