From 8fdaee245f6923468039b82fc804fea46bb45bbd Mon Sep 17 00:00:00 2001
From: Till Adam <adam@kde.org>
Date: Fri, 16 Dec 2005 16:21:27 +0000
Subject: [PATCH] Backport of:

SVN commit 488973 by tilladam:

Properly parse encoded message attachments by making sure the decoded
body part is used to construct a new message from. proko2 issue 963

svn path=/branches/kdepim/proko2/kdepim/; revision=488974
---
 objecttreeparser.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/objecttreeparser.cpp b/objecttreeparser.cpp
index 19758b1bb..cfeedb6a3 100644
--- a/objecttreeparser.cpp
+++ b/objecttreeparser.cpp
@@ -1258,15 +1258,9 @@ namespace KMail {
     }
     QCString rfc822messageStr( node->msgPart().bodyDecoded() );
     // display the headers of the encapsulated message
-    DwMessage* rfc822DwMessage = 0; // will be deleted by c'tor of rfc822headers
-    if ( node->dwPart()->Body().Message() )
-      rfc822DwMessage = new DwMessage( *(node->dwPart()->Body().Message()) );
-    else
-    {
-      rfc822DwMessage = new DwMessage();
-      rfc822DwMessage->FromString( rfc822messageStr );
-      rfc822DwMessage->Parse();
-    }
+    DwMessage* rfc822DwMessage = new DwMessage(); // will be deleted by c'tor of rfc822headers
+    rfc822DwMessage->FromString( rfc822messageStr );
+    rfc822DwMessage->Parse();
     KMMessage rfc822message( rfc822DwMessage );
     node->setFromAddress( rfc822message.from() );
     kdDebug(5006) << "\n----->  Store RfC 822 message header \"From: " << rfc822message.from() << "\"\n" << endl;