4 files changed, 44 insertions, 12 deletions

diff --git a/noncore/net/mail/genericwrapper.cpp b/noncore/net/mail/genericwrapper.cpp
index 62116ba..714396b 100644
--- a/noncore/net/mail/genericwrapper.cpp
+++ b/noncore/net/mail/genericwrapper.cpp
@@ -125,65 +125,81 @@ QString Genericwrapper::getencoding(mailmime_mechanism*aEnc)
 
 void Genericwrapper::traverseBody(RecBody&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rec,int current_count)
 {
     if (current_rec >= 10) {
         qDebug("too deep recursion!");
     }
     if (!message || !mime) {
         return;
     }
     int r;
     char*data = 0;
     size_t len;
     clistiter * cur = 0;
     QString b;
     RecPart part;
     
-    //current_count;
-    
     switch (mime->mm_type) {
     case MAILMIME_SINGLE:
     {
         QValueList<int>countlist = recList;
         countlist.append(current_count);
         r = mailmessage_fetch_section(message,mime,&data,&len);
         part.setSize(len);
         part.setPositionlist(countlist);
         b = gen_attachment_id();
         part.setIdentifier(b);
         fillSingleBody(part,message,mime);
         if (part.Type()=="text" && target.Bodytext().isNull()) {
             encodedString*r = new encodedString();
             r->setContent(data,len);
             encodedString*res = decode_String(r,part.Encoding());
+            if (countlist.count()>2) {
+                bodyCache[b]=r;
+                target.addPart(part);
+            } else {
+                delete r;
+            }
             b = QString(res->Content());
-            delete r;
             delete res;
             target.setBodytext(b);
             target.setDescription(part);
         } else {
             bodyCache[b]=new encodedString(data,len);
             target.addPart(part);
         }
     }
     break;
     case MAILMIME_MULTIPLE:
     {
-        unsigned int ccount = current_count;
+        unsigned int ccount = 1;
+        mailmime*cbody=0;
+        QValueList<int>countlist = recList;
         for (cur = clist_begin(mime->mm_data.mm_multipart.mm_mp_list) ; cur != NULL ; cur = clist_next(cur)) {
-            traverseBody(target,message, (mailmime*)clist_content(cur),recList,current_rec+1,ccount);
+            cbody = (mailmime*)clist_content(cur);
+            if (cbody->mm_type==MAILMIME_MULTIPLE) {
+                RecPart targetPart;
+                targetPart.setType("multipart");
+                countlist.append(current_count);
+                targetPart.setPositionlist(countlist);
+                target.addPart(targetPart);
+            }
+            traverseBody(target,message, cbody,countlist,current_rec+1,ccount);
+            if (cbody->mm_type==MAILMIME_MULTIPLE) {
+                countlist = recList;
+            }
             ++ccount;
         }
     }
     break;
     case MAILMIME_MESSAGE:
     {
         QValueList<int>countlist = recList;
         countlist.append(current_count);
         /* the own header is always at recursion 0 - we don't need that */
         if (current_rec > 0) {
             part.setPositionlist(countlist);
             r = mailmessage_fetch_section(message,mime,&data,&len);
             part.setSize(len);
             part.setPositionlist(countlist);
             b = gen_attachment_id();
             part.setIdentifier(b);
diff --git a/noncore/net/mail/genericwrapper.h b/noncore/net/mail/genericwrapper.h
index c00d864..32b75c8 100644
--- a/noncore/net/mail/genericwrapper.h
+++ b/noncore/net/mail/genericwrapper.h
@@ -32,28 +32,28 @@ public:
     virtual ~Genericwrapper();
 
     virtual encodedString* fetchDecodedPart(const RecMail&mail,const RecPart&part);
     virtual encodedString* fetchRawPart(const RecMail&mail,const RecPart&part);
     virtual QString fetchTextPart(const RecMail&mail,const RecPart&part);
     virtual void cleanMimeCache();
 
 protected:
     RecMail *parseHeader( const char *header );
     RecBody parseMail( mailmessage * msg );
     QString parseMailboxList( mailimf_mailbox_list *list );
     QString parseMailbox( mailimf_mailbox *box );
     QString parseGroup( mailimf_group *group );
     QString parseAddressList( mailimf_address_list *list );
     QString parseDateTime( mailimf_date_time *date );
     
-    void traverseBody(RecBody&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rek=0,int current_count=0);
+    void traverseBody(RecBody&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rek=0,int current_count=1);
     static void fillSingleBody(RecPart&target,mailmessage*message,mailmime*mime);
     static void fillParameters(RecPart&target,clist*parameters);
     static QString getencoding(mailmime_mechanism*aEnc);
     virtual void parseList(QList<RecMail> &target,mailsession*session,const QString&mailbox);
 
     QString msgTempName;
     unsigned int last_msg_id;
     QMap<QString,encodedString*> bodyCache;
 };
 
 #endif
diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.cpp b/noncore/net/mail/libmailwrapper/genericwrapper.cpp
index 62116ba..714396b 100644
--- a/noncore/net/mail/libmailwrapper/genericwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/genericwrapper.cpp
@@ -125,65 +125,81 @@ QString Genericwrapper::getencoding(mailmime_mechanism*aEnc)
 
 void Genericwrapper::traverseBody(RecBody&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rec,int current_count)
 {
     if (current_rec >= 10) {
         qDebug("too deep recursion!");
     }
     if (!message || !mime) {
         return;
     }
     int r;
     char*data = 0;
     size_t len;
     clistiter * cur = 0;
     QString b;
     RecPart part;
     
-    //current_count;
-    
     switch (mime->mm_type) {
     case MAILMIME_SINGLE:
     {
         QValueList<int>countlist = recList;
         countlist.append(current_count);
         r = mailmessage_fetch_section(message,mime,&data,&len);
         part.setSize(len);
         part.setPositionlist(countlist);
         b = gen_attachment_id();
         part.setIdentifier(b);
         fillSingleBody(part,message,mime);
         if (part.Type()=="text" && target.Bodytext().isNull()) {
             encodedString*r = new encodedString();
             r->setContent(data,len);
             encodedString*res = decode_String(r,part.Encoding());
+            if (countlist.count()>2) {
+                bodyCache[b]=r;
+                target.addPart(part);
+            } else {
+                delete r;
+            }
             b = QString(res->Content());
-            delete r;
             delete res;
             target.setBodytext(b);
             target.setDescription(part);
         } else {
             bodyCache[b]=new encodedString(data,len);
             target.addPart(part);
         }
     }
     break;
     case MAILMIME_MULTIPLE:
     {
-        unsigned int ccount = current_count;
+        unsigned int ccount = 1;
+        mailmime*cbody=0;
+        QValueList<int>countlist = recList;
         for (cur = clist_begin(mime->mm_data.mm_multipart.mm_mp_list) ; cur != NULL ; cur = clist_next(cur)) {
-            traverseBody(target,message, (mailmime*)clist_content(cur),recList,current_rec+1,ccount);
+            cbody = (mailmime*)clist_content(cur);
+            if (cbody->mm_type==MAILMIME_MULTIPLE) {
+                RecPart targetPart;
+                targetPart.setType("multipart");
+                countlist.append(current_count);
+                targetPart.setPositionlist(countlist);
+                target.addPart(targetPart);
+            }
+            traverseBody(target,message, cbody,countlist,current_rec+1,ccount);
+            if (cbody->mm_type==MAILMIME_MULTIPLE) {
+                countlist = recList;
+            }
             ++ccount;
         }
     }
     break;
     case MAILMIME_MESSAGE:
     {
         QValueList<int>countlist = recList;
         countlist.append(current_count);
         /* the own header is always at recursion 0 - we don't need that */
         if (current_rec > 0) {
             part.setPositionlist(countlist);
             r = mailmessage_fetch_section(message,mime,&data,&len);
             part.setSize(len);
             part.setPositionlist(countlist);
             b = gen_attachment_id();
             part.setIdentifier(b);
diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.h b/noncore/net/mail/libmailwrapper/genericwrapper.h
index c00d864..32b75c8 100644
--- a/noncore/net/mail/libmailwrapper/genericwrapper.h
+++ b/noncore/net/mail/libmailwrapper/genericwrapper.h
@@ -32,28 +32,28 @@ public:
     virtual ~Genericwrapper();
 
     virtual encodedString* fetchDecodedPart(const RecMail&mail,const RecPart&part);
     virtual encodedString* fetchRawPart(const RecMail&mail,const RecPart&part);
     virtual QString fetchTextPart(const RecMail&mail,const RecPart&part);
     virtual void cleanMimeCache();
 
 protected:
     RecMail *parseHeader( const char *header );
     RecBody parseMail( mailmessage * msg );
     QString parseMailboxList( mailimf_mailbox_list *list );
     QString parseMailbox( mailimf_mailbox *box );
     QString parseGroup( mailimf_group *group );
     QString parseAddressList( mailimf_address_list *list );
     QString parseDateTime( mailimf_date_time *date );
     
-    void traverseBody(RecBody&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rek=0,int current_count=0);
+    void traverseBody(RecBody&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rek=0,int current_count=1);
     static void fillSingleBody(RecPart&target,mailmessage*message,mailmime*mime);
     static void fillParameters(RecPart&target,clist*parameters);
     static QString getencoding(mailmime_mechanism*aEnc);
     virtual void parseList(QList<RecMail> &target,mailsession*session,const QString&mailbox);
 
     QString msgTempName;
     unsigned int last_msg_id;
     QMap<QString,encodedString*> bodyCache;
 };
 
 #endif