From 4b57b72cc69bc47c96c0eb05c22d36a92e1522f2 Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Thu, 5 Jun 2008 10:33:29 +0000
Subject: 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
---
 roundcubemail/program/include/rcube_imap.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'roundcubemail/program/include')

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);
     }
 
 
-- 
cgit v1.2.3