1 files changed, 14 insertions, 4 deletions

diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index ad95384..a4e6228 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/imapwrapper.cpp
@@ -393,4 +393,7 @@ void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_1part*mai
         path.append(1);
         body_text = fetchPart(mail,path,true);
+        if (singlePart.Encoding()=="quoted-printable") {
+            body_text = decode_quoted_printable(body_text.latin1());
+        }
         target_body.setBodytext(body_text);
         target_body.setDescription(singlePart);
@@ -400,4 +403,7 @@ void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_1part*mai
         path.append(1);
         body_text = fetchPart(mail,path,true);
+        if (singlePart.Encoding()=="quoted-printable") {
+            body_text = decode_quoted_printable(body_text.latin1());
+        }
         target_body.setBodytext(body_text);
         target_body.setDescription(singlePart);
@@ -456,5 +462,5 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list)
 }
 
-QString IMAPwrapper::fetchPart(const RecMail&mail,const QValueList<int>&path,bool internal_call)
+QString IMAPwrapper::fetchPart(const RecMail&mail,const QValueList<int>&path,bool internal_call,const QString&enc)
 {
     QString body("");
@@ -508,5 +514,9 @@ QString IMAPwrapper::fetchPart(const RecMail&mail,const QValueList<int>&path,boo
                     msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part = 0L;
                     if (text) {
-                        body = QString(text);
+                        if (enc=="quoted-printable") {
+                            body = decode_quoted_printable(text);
+                        } else {
+                            body = QString(text);
+                        }
                         free(text);
                     } else {
@@ -548,5 +558,5 @@ void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mai
             /* important: Check for is NULL 'cause a body can be empty! */
             if (currentPart.Type()=="text" && target_body.Bodytext().isNull() ) {
-                QString body_text = fetchPart(mail,clist,true);
+                QString body_text = fetchPart(mail,clist,true,currentPart.Encoding());
                 target_body.setDescription(currentPart);
                 target_body.setBodytext(body_text);
@@ -706,5 +716,5 @@ void IMAPwrapper::fillBodyFields(RecPart&target_part,mailimap_body_fields*which)
 QString IMAPwrapper::fetchPart(const RecMail&mail,const RecPart&part)
 {
-    return fetchPart(mail,part.Positionlist(),false);
+    return fetchPart(mail,part.Positionlist(),false,part.Encoding());
 }