all header stuff will be parsed now

RecMail got the unique message id for reply reference

9 files changed, 228 insertions, 210 deletions

diff --git a/noncore/net/mail/ProgrammersDoc/ReceivingMails.dia b/noncore/net/mail/ProgrammersDoc/ReceivingMails.dia
index dcef8c8..08c6434 100644
--- a/noncore/net/mail/ProgrammersDoc/ReceivingMails.dia
+++ b/noncore/net/mail/ProgrammersDoc/ReceivingMails.dia
diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index 725dcc9..5ce140e 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/imapwrapper.cpp
@@ -196,57 +196,54 @@ QList<IMAPFolder>* IMAPwrapper::listFolders()
             if (temp.lower()=="inbox")
                 continue;
             folders->append(new IMAPFolder(temp));
             
         }
     } else {
         qDebug("error fetching folders %s",m_imap->response);
     }
     mailimap_list_result_free( result );
     return folders;
 }
 
 RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
 {
     RecMail * m = 0;
     mailimap_msg_att_item *item=0;
     bool named_from = false;
     QString from,date,subject;
     date = from = subject = "";
     clistcell *current,*c,*cf, *current_from = NULL;
     mailimap_address * current_address = NULL;
     mailimap_msg_att_dynamic*flist;
     mailimap_flag_fetch*cflag;
     QBitArray mFlags(7);
+    QStringList addresslist;
     
     if (!m_att) {
         return m;
     }
 
-#if 0
-   MAILIMAP_FLAG_KEYWORD,   /* keyword flag */
-   MAILIMAP_FLAG_EXTENSION, /* \extension flag */
-#endif
     c = clist_begin(m_att->list);
     while ( c ) {
         current = c;
         c = c->next;
         item = (mailimap_msg_att_item*)current->data;
         if (item->type!=MAILIMAP_MSG_ATT_ITEM_STATIC) {
             flist = (mailimap_msg_att_dynamic*)item->msg_att_dyn;
             if (!flist->list) {
                 continue;
             }
             cf = flist->list->first;
             while (cf) {
                 cflag = (mailimap_flag_fetch*)cf->data;
                 if (cflag->type==MAILIMAP_FLAG_FETCH_OTHER && cflag->flag!=0) {
                     switch (cflag->flag->type) {
                     case MAILIMAP_FLAG_ANSWERED:  /* \Answered flag */
                         mFlags.setBit(FLAG_ANSWERED);
                         break;
                     case MAILIMAP_FLAG_FLAGGED:   /* \Flagged flag */
                         mFlags.setBit(FLAG_FLAGGED);
                         break;
                     case MAILIMAP_FLAG_DELETED:   /* \Deleted flag */
                         mFlags.setBit(FLAG_DELETED);
                         break;
@@ -255,240 +252,217 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
                         break;
                     case MAILIMAP_FLAG_DRAFT:     /* \Draft flag */
                         mFlags.setBit(FLAG_DRAFT);
                         break;
                     case MAILIMAP_FLAG_KEYWORD:   /* keyword flag */
                         break;
                     case MAILIMAP_FLAG_EXTENSION: /* \extension flag */
                         break;
                     default:
                         break;
                     }
                 } else if (cflag->type==MAILIMAP_FLAG_FETCH_RECENT) {
                     mFlags.setBit(FLAG_RECENT);
                 }
                 cf = cf->next;
             }
             continue;
         }
         if ( item->msg_att_static->type == MAILIMAP_MSG_ATT_RFC822_HEADER ) {
             qDebug( "header: \n%s", item->msg_att_static->rfc822_header );
         } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_ENVELOPE) {
             mailimap_envelope * head = item->msg_att_static->env;
             date = head->date;
             subject = head->subject;
-            if (head->from!=NULL)
-                current_from = head->from->list->first;
-            while (current_from != NULL) {
-                from = "";
-                named_from = false;
-                current_address=(mailimap_address*)current_from->data;
-                current_from = current_from->next;
-                if (current_address->personal_name){
-                    from+=QString(current_address->personal_name);
-                    from+=" ";
-                    named_from = true;
-                }
-                if (named_from && (current_address->mailbox_name || current_address->host_name)) {
-                    from+="<";
-                }
-                if (current_address->mailbox_name) {
-                    from+=QString(current_address->mailbox_name);
-                    from+="@";
-                }
-                if (current_address->host_name) {
-                    from+=QString(current_address->host_name);
-                }
-                if (named_from && (current_address->mailbox_name || current_address->host_name)) {
-                    from+=">";
+            m = new RecMail();
+            if (head->from!=NULL) {
+                addresslist = address_list_to_stringlist(head->from->list);
+                if (addresslist.count()) {
+                    from = addresslist.first();
                 }
             }
-            qDebug("header: \nFrom: %s\nSubject: %s\nDate: %s",
-                   from.latin1(),
-                   subject.latin1(),date.latin1());
-            m = new RecMail();
+            if (head->to!=NULL) {
+                addresslist = address_list_to_stringlist(head->to->list);
+                m->setTo(addresslist);
+            }
+            if (head->cc!=NULL) {
+                addresslist = address_list_to_stringlist(head->cc->list);
+                m->setCC(addresslist);
+            }
+            if (head->bcc!=NULL) {
+                addresslist = address_list_to_stringlist(head->bcc->list);
+                m->setBcc(addresslist);
+            }
             m->setSubject(subject);
             m->setFrom(from);
             m->setDate(date);
+            m->setMsgid(QString(head->message_id));
+            qDebug("header: \nFrom: %s\nSubject: %s\nDate: %s\nMsgid: %s",
+                   from.latin1(),
+                   subject.latin1(),date.latin1(),m->Msgid().latin1());
         } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_INTERNALDATE) {
             mailimap_date_time*d = item->msg_att_static->internal_date;
             QDateTime da(QDate(d->year,d->month,d->day),QTime(d->hour,d->min,d->sec));
             qDebug("%i %i %i - %i %i %i",d->year,d->month,d->day,d->hour,d->min,d->sec);
             qDebug(da.toString());
         } else {
             qDebug("Another type");
         }
     }
     /* msg is already deleted */
     if (mFlags.testBit(FLAG_DELETED) && m) {
         delete m;
         m = 0;
     }
     if (m) {
         m->setFlags(mFlags);
     }
     return m;
 }
 
-#if 1
 RecBody IMAPwrapper::fetchBody(const RecMail&mail)
 {
     RecBody body;
-    QString body_text;
-
-    const char *mb;
-    int err = MAILIMAP_NO_ERROR;
-    clist *result;
-    clistcell *current;
-    mailimap_fetch_att *fetchAtt;
-    mailimap_fetch_type *fetchType;
-    mailimap_set *set;
-    
-    mb = mail.getMbox().latin1();
-    
-    login();
-    if (!m_imap) {
-        return body;
-    }
-    /* select mailbox READONLY for operations */
-    err = mailimap_examine( m_imap, (char*)mb);
-    if ( err != MAILIMAP_NO_ERROR ) {
-        qDebug("error selecting mailbox: %s",m_imap->response);
-        logout();
-        return body;
-    }
-    result = clist_new();  
-    /* the range has to start at 1!!! not with 0!!!! */
-    set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() );
-    fetchAtt = mailimap_fetch_att_new_rfc822_text();
-    fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt);
-    err = mailimap_fetch( m_imap, set, fetchType, &result );
-    mailimap_set_free( set );
-    mailimap_fetch_type_free( fetchType );
-    
-    if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
-        mailimap_msg_att * msg_att;
-        msg_att = (mailimap_msg_att*)current->data;
-        mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->list->first->data;
-
-        if (item->msg_att_static && item->msg_att_static->rfc822_text) {
-            body_text = item->msg_att_static->rfc822_text;
-            body.setBodytext(body_text);
-        }
-    } else {
-        qDebug("error fetching text: %s",m_imap->response);
-    }
-    
-    clist_free(result);
-    logout();
-    return body;
-}
-
-#else
-QString IMAPwrapper::fetchBody(const RecMail&mail)
-{
-    QString body = "";
     const char *mb;
     int err = MAILIMAP_NO_ERROR;
     clist *result;
     clistcell *current;
     mailimap_fetch_att *fetchAtt;
     mailimap_fetch_type *fetchType;
     mailimap_set *set;
     mailimap_body*body_desc;
     
     mb = mail.getMbox().latin1();
     
     login();
     if (!m_imap) {
         return body;
     }
     /* select mailbox READONLY for operations */
     err = mailimap_examine( m_imap, (char*)mb);
     if ( err != MAILIMAP_NO_ERROR ) {
         qDebug("error selecting mailbox: %s",m_imap->response);
         logout();
         return body;
     }
     result = clist_new();  
     /* the range has to start at 1!!! not with 0!!!! */
     set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() );
     fetchAtt = mailimap_fetch_att_new_body();    
     fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt);
     err = mailimap_fetch( m_imap, set, fetchType, &result );
     mailimap_set_free( set );
     mailimap_fetch_type_free( fetchType );
 
     if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
         mailimap_msg_att * msg_att;
         msg_att = (mailimap_msg_att*)current->data;
         mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->list->first->data;
         body_desc = item->msg_att_static->body;
         if (body_desc->type==MAILIMAP_BODY_1PART) {
-            body = searchBodyText(mail,body_desc->body_1part);
+            searchBodyText(mail,body_desc->body_1part,body);
         } else {
         }
     
     } else {
         qDebug("error fetching body: %s",m_imap->response);
     }
 
     clist_free(result);
     logout(); 
     return body;
 }
-#endif
 
-QString IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription)
+void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body)
 {
-    QString Body="";
     if (!mailDescription) {
-        return Body;
+        return;
     }
     switch (mailDescription->type) {
     case MAILIMAP_BODY_TYPE_1PART_TEXT:
-        return getPlainBody(mail);
+            fillPlainBody(mail,target_body,mailDescription->body_type_text);
         break;
     default:
         break;
     }
-    return Body;
+    return;
 }
 
-QString IMAPwrapper::getPlainBody(const RecMail&mail)
+void IMAPwrapper::fillPlainBody(const RecMail&mail,RecBody&target_body, mailimap_body_type_text * text_body)
 {
-    QString body = "";
     const char *mb;
+    QString body="";
     int err = MAILIMAP_NO_ERROR;
     clist *result;
     clistcell *current;
     mailimap_fetch_att *fetchAtt;
     mailimap_fetch_type *fetchType;
     mailimap_set *set;
     
     mb = mail.getMbox().latin1();
     
     if (!m_imap) {
-        return body;
+        return;
     }
+
     result = clist_new();  
     /* the range has to start at 1!!! not with 0!!!! */
     set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() );
     fetchAtt = mailimap_fetch_att_new_rfc822_text();
     fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt);
     err = mailimap_fetch( m_imap, set, fetchType, &result );
     mailimap_set_free( set );
     mailimap_fetch_type_free( fetchType );
     
     if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
         mailimap_msg_att * msg_att;
         msg_att = (mailimap_msg_att*)current->data;
         mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->list->first->data;
         if (item->msg_att_static && item->msg_att_static->rfc822_text) {
             body = item->msg_att_static->rfc822_text;
         }
     } else {
         qDebug("error fetching text: %s",m_imap->response);
     }
     clist_free(result);
-    return body;
+    target_body.setBodytext(body);
+    return;
+}
+
+QStringList IMAPwrapper::address_list_to_stringlist(clist*list)
+{
+    QStringList l;
+    QString from;
+    bool named_from;
+    clistcell *current = NULL;
+    mailimap_address * current_address=NULL;
+    if (!list) {
+        return l;
+    }
+    current = clist_begin(list);
+    while (current!= NULL) {
+        from = "";
+        named_from = false;
+        current_address=(mailimap_address*)current->data;
+        current = current->next;
+        if (current_address->personal_name){
+            from+=QString(current_address->personal_name);
+            from+=" ";
+            named_from = true;
+        }
+        if (named_from && (current_address->mailbox_name || current_address->host_name)) {
+            from+="<";
+        }
+        if (current_address->mailbox_name) {
+            from+=QString(current_address->mailbox_name);
+            from+="@";
+        }
+        if (current_address->host_name) {
+             from+=QString(current_address->host_name);
+        }
+        if (named_from && (current_address->mailbox_name || current_address->host_name)) {
+           from+=">";
+        }
+        l.append(QString(from));
+    }
+    return l;
 }
diff --git a/noncore/net/mail/imapwrapper.h b/noncore/net/mail/imapwrapper.h
index 1423faf..6565896 100644
--- a/noncore/net/mail/imapwrapper.h
+++ b/noncore/net/mail/imapwrapper.h
@@ -1,36 +1,38 @@
 #ifndef __IMAPWRAPPER
 #define __IMAPWRAPPER
 
 #include <qlist.h>
 #include "mailwrapper.h"
 
 struct mailimap;
 struct mailimap_body_type_1part;
+struct mailimap_body_type_text;
 class RecMail;
 class RecBody;
 
 class IMAPwrapper : public QObject
 {
     Q_OBJECT
 
 public:
     IMAPwrapper( IMAPaccount *a );
     virtual ~IMAPwrapper();
     QList<IMAPFolder>* listFolders();
     void listMessages(const QString & mailbox,QList<RecMail>&target );
     RecBody fetchBody(const RecMail&mail);
     static void imap_progress( size_t current, size_t maximum );
 
 protected:
     RecMail*parse_list_result(mailimap_msg_att*);
     void login();
     void logout();
-    QString searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription);
-    QString getPlainBody(const RecMail&mail);
+    void searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body);
+    void fillPlainBody(const RecMail&mail,RecBody&target_body, mailimap_body_type_text * text_body);
+    QStringList address_list_to_stringlist(clist*list);
 
 private:
     IMAPaccount *account;
     mailimap *m_imap;
 };
 
 #endif
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 725dcc9..5ce140e 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -196,57 +196,54 @@ QList<IMAPFolder>* IMAPwrapper::listFolders()
             if (temp.lower()=="inbox")
                 continue;
             folders->append(new IMAPFolder(temp));
             
         }
     } else {
         qDebug("error fetching folders %s",m_imap->response);
     }
     mailimap_list_result_free( result );
     return folders;
 }
 
 RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
 {
     RecMail * m = 0;
     mailimap_msg_att_item *item=0;
     bool named_from = false;
     QString from,date,subject;
     date = from = subject = "";
     clistcell *current,*c,*cf, *current_from = NULL;
     mailimap_address * current_address = NULL;
     mailimap_msg_att_dynamic*flist;
     mailimap_flag_fetch*cflag;
     QBitArray mFlags(7);
+    QStringList addresslist;
     
     if (!m_att) {
         return m;
     }
 
-#if 0
-   MAILIMAP_FLAG_KEYWORD,   /* keyword flag */
-   MAILIMAP_FLAG_EXTENSION, /* \extension flag */
-#endif
     c = clist_begin(m_att->list);
     while ( c ) {
         current = c;
         c = c->next;
         item = (mailimap_msg_att_item*)current->data;
         if (item->type!=MAILIMAP_MSG_ATT_ITEM_STATIC) {
             flist = (mailimap_msg_att_dynamic*)item->msg_att_dyn;
             if (!flist->list) {
                 continue;
             }
             cf = flist->list->first;
             while (cf) {
                 cflag = (mailimap_flag_fetch*)cf->data;
                 if (cflag->type==MAILIMAP_FLAG_FETCH_OTHER && cflag->flag!=0) {
                     switch (cflag->flag->type) {
                     case MAILIMAP_FLAG_ANSWERED:  /* \Answered flag */
                         mFlags.setBit(FLAG_ANSWERED);
                         break;
                     case MAILIMAP_FLAG_FLAGGED:   /* \Flagged flag */
                         mFlags.setBit(FLAG_FLAGGED);
                         break;
                     case MAILIMAP_FLAG_DELETED:   /* \Deleted flag */
                         mFlags.setBit(FLAG_DELETED);
                         break;
@@ -255,240 +252,217 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
                         break;
                     case MAILIMAP_FLAG_DRAFT:     /* \Draft flag */
                         mFlags.setBit(FLAG_DRAFT);
                         break;
                     case MAILIMAP_FLAG_KEYWORD:   /* keyword flag */
                         break;
                     case MAILIMAP_FLAG_EXTENSION: /* \extension flag */
                         break;
                     default:
                         break;
                     }
                 } else if (cflag->type==MAILIMAP_FLAG_FETCH_RECENT) {
                     mFlags.setBit(FLAG_RECENT);
                 }
                 cf = cf->next;
             }
             continue;
         }
         if ( item->msg_att_static->type == MAILIMAP_MSG_ATT_RFC822_HEADER ) {
             qDebug( "header: \n%s", item->msg_att_static->rfc822_header );
         } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_ENVELOPE) {
             mailimap_envelope * head = item->msg_att_static->env;
             date = head->date;
             subject = head->subject;
-            if (head->from!=NULL)
-                current_from = head->from->list->first;
-            while (current_from != NULL) {
-                from = "";
-                named_from = false;
-                current_address=(mailimap_address*)current_from->data;
-                current_from = current_from->next;
-                if (current_address->personal_name){
-                    from+=QString(current_address->personal_name);
-                    from+=" ";
-                    named_from = true;
-                }
-                if (named_from && (current_address->mailbox_name || current_address->host_name)) {
-                    from+="<";
-                }
-                if (current_address->mailbox_name) {
-                    from+=QString(current_address->mailbox_name);
-                    from+="@";
-                }
-                if (current_address->host_name) {
-                    from+=QString(current_address->host_name);
-                }
-                if (named_from && (current_address->mailbox_name || current_address->host_name)) {
-                    from+=">";
+            m = new RecMail();
+            if (head->from!=NULL) {
+                addresslist = address_list_to_stringlist(head->from->list);
+                if (addresslist.count()) {
+                    from = addresslist.first();
                 }
             }
-            qDebug("header: \nFrom: %s\nSubject: %s\nDate: %s",
-                   from.latin1(),
-                   subject.latin1(),date.latin1());
-            m = new RecMail();
+            if (head->to!=NULL) {
+                addresslist = address_list_to_stringlist(head->to->list);
+                m->setTo(addresslist);
+            }
+            if (head->cc!=NULL) {
+                addresslist = address_list_to_stringlist(head->cc->list);
+                m->setCC(addresslist);
+            }
+            if (head->bcc!=NULL) {
+                addresslist = address_list_to_stringlist(head->bcc->list);
+                m->setBcc(addresslist);
+            }
             m->setSubject(subject);
             m->setFrom(from);
             m->setDate(date);
+            m->setMsgid(QString(head->message_id));
+            qDebug("header: \nFrom: %s\nSubject: %s\nDate: %s\nMsgid: %s",
+                   from.latin1(),
+                   subject.latin1(),date.latin1(),m->Msgid().latin1());
         } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_INTERNALDATE) {
             mailimap_date_time*d = item->msg_att_static->internal_date;
             QDateTime da(QDate(d->year,d->month,d->day),QTime(d->hour,d->min,d->sec));
             qDebug("%i %i %i - %i %i %i",d->year,d->month,d->day,d->hour,d->min,d->sec);
             qDebug(da.toString());
         } else {
             qDebug("Another type");
         }
     }
     /* msg is already deleted */
     if (mFlags.testBit(FLAG_DELETED) && m) {
         delete m;
         m = 0;
     }
     if (m) {
         m->setFlags(mFlags);
     }
     return m;
 }
 
-#if 1
 RecBody IMAPwrapper::fetchBody(const RecMail&mail)
 {
     RecBody body;
-    QString body_text;
-
-    const char *mb;
-    int err = MAILIMAP_NO_ERROR;
-    clist *result;
-    clistcell *current;
-    mailimap_fetch_att *fetchAtt;
-    mailimap_fetch_type *fetchType;
-    mailimap_set *set;
-    
-    mb = mail.getMbox().latin1();
-    
-    login();
-    if (!m_imap) {
-        return body;
-    }
-    /* select mailbox READONLY for operations */
-    err = mailimap_examine( m_imap, (char*)mb);
-    if ( err != MAILIMAP_NO_ERROR ) {
-        qDebug("error selecting mailbox: %s",m_imap->response);
-        logout();
-        return body;
-    }
-    result = clist_new();  
-    /* the range has to start at 1!!! not with 0!!!! */
-    set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() );
-    fetchAtt = mailimap_fetch_att_new_rfc822_text();
-    fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt);
-    err = mailimap_fetch( m_imap, set, fetchType, &result );
-    mailimap_set_free( set );
-    mailimap_fetch_type_free( fetchType );
-    
-    if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
-        mailimap_msg_att * msg_att;
-        msg_att = (mailimap_msg_att*)current->data;
-        mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->list->first->data;
-
-        if (item->msg_att_static && item->msg_att_static->rfc822_text) {
-            body_text = item->msg_att_static->rfc822_text;
-            body.setBodytext(body_text);
-        }
-    } else {
-        qDebug("error fetching text: %s",m_imap->response);
-    }
-    
-    clist_free(result);
-    logout();
-    return body;
-}
-
-#else
-QString IMAPwrapper::fetchBody(const RecMail&mail)
-{
-    QString body = "";
     const char *mb;
     int err = MAILIMAP_NO_ERROR;
     clist *result;
     clistcell *current;
     mailimap_fetch_att *fetchAtt;
     mailimap_fetch_type *fetchType;
     mailimap_set *set;
     mailimap_body*body_desc;
     
     mb = mail.getMbox().latin1();
     
     login();
     if (!m_imap) {
         return body;
     }
     /* select mailbox READONLY for operations */
     err = mailimap_examine( m_imap, (char*)mb);
     if ( err != MAILIMAP_NO_ERROR ) {
         qDebug("error selecting mailbox: %s",m_imap->response);
         logout();
         return body;
     }
     result = clist_new();  
     /* the range has to start at 1!!! not with 0!!!! */
     set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() );
     fetchAtt = mailimap_fetch_att_new_body();    
     fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt);
     err = mailimap_fetch( m_imap, set, fetchType, &result );
     mailimap_set_free( set );
     mailimap_fetch_type_free( fetchType );
 
     if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
         mailimap_msg_att * msg_att;
         msg_att = (mailimap_msg_att*)current->data;
         mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->list->first->data;
         body_desc = item->msg_att_static->body;
         if (body_desc->type==MAILIMAP_BODY_1PART) {
-            body = searchBodyText(mail,body_desc->body_1part);
+            searchBodyText(mail,body_desc->body_1part,body);
         } else {
         }
     
     } else {
         qDebug("error fetching body: %s",m_imap->response);
     }
 
     clist_free(result);
     logout(); 
     return body;
 }
-#endif
 
-QString IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription)
+void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body)
 {
-    QString Body="";
     if (!mailDescription) {
-        return Body;
+        return;
     }
     switch (mailDescription->type) {
     case MAILIMAP_BODY_TYPE_1PART_TEXT:
-        return getPlainBody(mail);
+            fillPlainBody(mail,target_body,mailDescription->body_type_text);
         break;
     default:
         break;
     }
-    return Body;
+    return;
 }
 
-QString IMAPwrapper::getPlainBody(const RecMail&mail)
+void IMAPwrapper::fillPlainBody(const RecMail&mail,RecBody&target_body, mailimap_body_type_text * text_body)
 {
-    QString body = "";
     const char *mb;
+    QString body="";
     int err = MAILIMAP_NO_ERROR;
     clist *result;
     clistcell *current;
     mailimap_fetch_att *fetchAtt;
     mailimap_fetch_type *fetchType;
     mailimap_set *set;
     
     mb = mail.getMbox().latin1();
     
     if (!m_imap) {
-        return body;
+        return;
     }
+
     result = clist_new();  
     /* the range has to start at 1!!! not with 0!!!! */
     set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() );
     fetchAtt = mailimap_fetch_att_new_rfc822_text();
     fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt);
     err = mailimap_fetch( m_imap, set, fetchType, &result );
     mailimap_set_free( set );
     mailimap_fetch_type_free( fetchType );
     
     if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
         mailimap_msg_att * msg_att;
         msg_att = (mailimap_msg_att*)current->data;
         mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->list->first->data;
         if (item->msg_att_static && item->msg_att_static->rfc822_text) {
             body = item->msg_att_static->rfc822_text;
         }
     } else {
         qDebug("error fetching text: %s",m_imap->response);
     }
     clist_free(result);
-    return body;
+    target_body.setBodytext(body);
+    return;
+}
+
+QStringList IMAPwrapper::address_list_to_stringlist(clist*list)
+{
+    QStringList l;
+    QString from;
+    bool named_from;
+    clistcell *current = NULL;
+    mailimap_address * current_address=NULL;
+    if (!list) {
+        return l;
+    }
+    current = clist_begin(list);
+    while (current!= NULL) {
+        from = "";
+        named_from = false;
+        current_address=(mailimap_address*)current->data;
+        current = current->next;
+        if (current_address->personal_name){
+            from+=QString(current_address->personal_name);
+            from+=" ";
+            named_from = true;
+        }
+        if (named_from && (current_address->mailbox_name || current_address->host_name)) {
+            from+="<";
+        }
+        if (current_address->mailbox_name) {
+            from+=QString(current_address->mailbox_name);
+            from+="@";
+        }
+        if (current_address->host_name) {
+             from+=QString(current_address->host_name);
+        }
+        if (named_from && (current_address->mailbox_name || current_address->host_name)) {
+           from+=">";
+        }
+        l.append(QString(from));
+    }
+    return l;
 }
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.h b/noncore/net/mail/libmailwrapper/imapwrapper.h
index 1423faf..6565896 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.h
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.h
@@ -1,36 +1,38 @@
 #ifndef __IMAPWRAPPER
 #define __IMAPWRAPPER
 
 #include <qlist.h>
 #include "mailwrapper.h"
 
 struct mailimap;
 struct mailimap_body_type_1part;
+struct mailimap_body_type_text;
 class RecMail;
 class RecBody;
 
 class IMAPwrapper : public QObject
 {
     Q_OBJECT
 
 public:
     IMAPwrapper( IMAPaccount *a );
     virtual ~IMAPwrapper();
     QList<IMAPFolder>* listFolders();
     void listMessages(const QString & mailbox,QList<RecMail>&target );
     RecBody fetchBody(const RecMail&mail);
     static void imap_progress( size_t current, size_t maximum );
 
 protected:
     RecMail*parse_list_result(mailimap_msg_att*);
     void login();
     void logout();
-    QString searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription);
-    QString getPlainBody(const RecMail&mail);
+    void searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body);
+    void fillPlainBody(const RecMail&mail,RecBody&target_body, mailimap_body_type_text * text_body);
+    QStringList address_list_to_stringlist(clist*list);
 
 private:
     IMAPaccount *account;
     mailimap *m_imap;
 };
 
 #endif
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.cpp b/noncore/net/mail/libmailwrapper/mailtypes.cpp
index 9f2c9e3..f9e5794 100644
--- a/noncore/net/mail/libmailwrapper/mailtypes.cpp
+++ b/noncore/net/mail/libmailwrapper/mailtypes.cpp
@@ -1,63 +1,92 @@
 #include "mailtypes.h"
 
 
 RecMail::RecMail()
-    :subject(""),date(""),mbox(""),msg_number(0),msg_flags(7)
+    :subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7)
 {
+    init();
+}
+
+RecMail::RecMail(const RecMail&old)
+    :subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7)
+{
+    init();
+    copy_old(old);
+    qDebug("Copy constructor RecMail");
+}
+
+void RecMail::copy_old(const RecMail&old)
+{
+    subject = old.subject;
+    date = old.date;
+    mbox = old.mbox;
+    msg_id = old.msg_id;
+    msg_number = old.msg_number;
+    from = old.from;
+    msg_flags = old.msg_flags;
+    to = old.to;
+    cc = old.cc;
+    bcc = old.bcc;
+}
+
+void RecMail::init()
+{
+    to.clear();
+    cc.clear();
+    bcc.clear();
 }
 
 void RecMail::setTo(const QStringList&list)
 {
     to = list;
 }
 
 const QStringList&RecMail::To()const
 {
     return to;
 }
 
 void RecMail::setCC(const QStringList&list)
 {
     cc = list;
 }
 
 const QStringList&RecMail::CC()const
 {
     return cc;
 }
 
 void RecMail::setBcc(const QStringList&list)
 {
     bcc = list;
 }
 
 const QStringList& RecMail::Bcc()const
 {
     return bcc;
 }
 
-
 RecPart::RecPart()
     : m_type(""),m_subtype(""),m_identifier(""),m_encoding("")
 {
 }
 
 RecPart::RecPart(const QString&identifier,const QString&type,const QString&subtype,const QString&encoding)
     : m_type(type),m_subtype(subtype),m_identifier(identifier),m_encoding(encoding)
 {
 }
 
 RecPart::~RecPart()
 {
 }
 
 const QString& RecPart::Type()const
 {
     return m_type;
 }
 
 void RecPart::setType(const QString&type)
 {
     m_type = type;
 }
 
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.h b/noncore/net/mail/libmailwrapper/mailtypes.h
index bb6a483..c8d533a 100644
--- a/noncore/net/mail/libmailwrapper/mailtypes.h
+++ b/noncore/net/mail/libmailwrapper/mailtypes.h
@@ -8,76 +8,80 @@
 #define FLAG_DRAFT    4
 #define FLAG_RECENT   5
 
 #include <qlist.h>
 #include <qbitarray.h>
 #include <qstring.h>
 #include <qstringlist.h>
 
 /* a class to describe mails in a mailbox */
 /* Attention!
    From programmers point of view it would make sense to
    store the mail body into this class, too.
    But: not from the point of view of the device. 
    Mailbodies can be real large. So we request them when 
    needed from the mail-wrapper class direct from the server itself
    (imap) or from a file-based cache (pop3?)
    So there is no interface "const QString&body()" but you should
    make a request to the mailwrapper with this class as parameter to
    get the body. Same words for the attachments.
 */
 class RecMail
 {
 public:
     RecMail();
+    RecMail(const RecMail&old);
     virtual ~RecMail(){}
 
     const int getNumber()const{return msg_number;}
     void setNumber(int number){msg_number=number;}
     const QString&getDate()const{ return date; }
     void setDate( const QString&a ) { date = a; }
     const QString&getFrom()const{ return from; }
     void setFrom( const QString&a ) { from = a; }
     const QString&getSubject()const { return subject; }
     void setSubject( const QString&s ) { subject = s; }
     const QString&getMbox()const{return mbox;}
     void setMbox(const QString&box){mbox = box;}
-    
+    void setMsgid(const QString&id){msg_id=id;}
+    const QString&Msgid()const{return msg_id;}
+
     void setTo(const QStringList&list);
     const QStringList&To()const;
     void setCC(const QStringList&list);
     const QStringList&CC()const;
     void setBcc(const QStringList&list);
     const QStringList&Bcc()const;
-
     const QBitArray&getFlags()const{return msg_flags;}
     void setFlags(const QBitArray&flags){msg_flags = flags;}
 
 protected:
-    QString subject,date,from,mbox;
+    QString subject,date,from,mbox,msg_id;
     int msg_number;
     QBitArray msg_flags;
     QStringList to,cc,bcc;
+    void init();
+    void copy_old(const RecMail&old);
 };
 
 class RecPart
 {
 protected:
     QString m_type,m_subtype,m_identifier,m_encoding;
 public:
     RecPart();
     RecPart(const QString&identifier,const QString&type="",const QString&subtype="",const QString&encoding="BASE64");
     virtual ~RecPart();
     
     const QString&Type()const;
     void setType(const QString&type);
     const QString&Subtype()const;
     void setSubtype(const QString&subtype);
     const QString&Identifier()const;
     void setIdentifier(const QString&identifier);
     const QString&Encoding()const;
     void setEncoding(const QString&encoding);
 };
 
 class RecBody
 {
 protected:
diff --git a/noncore/net/mail/mailtypes.cpp b/noncore/net/mail/mailtypes.cpp
index 9f2c9e3..f9e5794 100644
--- a/noncore/net/mail/mailtypes.cpp
+++ b/noncore/net/mail/mailtypes.cpp
@@ -1,63 +1,92 @@
 #include "mailtypes.h"
 
 
 RecMail::RecMail()
-    :subject(""),date(""),mbox(""),msg_number(0),msg_flags(7)
+    :subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7)
 {
+    init();
+}
+
+RecMail::RecMail(const RecMail&old)
+    :subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7)
+{
+    init();
+    copy_old(old);
+    qDebug("Copy constructor RecMail");
+}
+
+void RecMail::copy_old(const RecMail&old)
+{
+    subject = old.subject;
+    date = old.date;
+    mbox = old.mbox;
+    msg_id = old.msg_id;
+    msg_number = old.msg_number;
+    from = old.from;
+    msg_flags = old.msg_flags;
+    to = old.to;
+    cc = old.cc;
+    bcc = old.bcc;
+}
+
+void RecMail::init()
+{
+    to.clear();
+    cc.clear();
+    bcc.clear();
 }
 
 void RecMail::setTo(const QStringList&list)
 {
     to = list;
 }
 
 const QStringList&RecMail::To()const
 {
     return to;
 }
 
 void RecMail::setCC(const QStringList&list)
 {
     cc = list;
 }
 
 const QStringList&RecMail::CC()const
 {
     return cc;
 }
 
 void RecMail::setBcc(const QStringList&list)
 {
     bcc = list;
 }
 
 const QStringList& RecMail::Bcc()const
 {
     return bcc;
 }
 
-
 RecPart::RecPart()
     : m_type(""),m_subtype(""),m_identifier(""),m_encoding("")
 {
 }
 
 RecPart::RecPart(const QString&identifier,const QString&type,const QString&subtype,const QString&encoding)
     : m_type(type),m_subtype(subtype),m_identifier(identifier),m_encoding(encoding)
 {
 }
 
 RecPart::~RecPart()
 {
 }
 
 const QString& RecPart::Type()const
 {
     return m_type;
 }
 
 void RecPart::setType(const QString&type)
 {
     m_type = type;
 }
 
diff --git a/noncore/net/mail/mailtypes.h b/noncore/net/mail/mailtypes.h
index bb6a483..c8d533a 100644
--- a/noncore/net/mail/mailtypes.h
+++ b/noncore/net/mail/mailtypes.h
@@ -8,76 +8,80 @@
 #define FLAG_DRAFT    4
 #define FLAG_RECENT   5
 
 #include <qlist.h>
 #include <qbitarray.h>
 #include <qstring.h>
 #include <qstringlist.h>
 
 /* a class to describe mails in a mailbox */
 /* Attention!
    From programmers point of view it would make sense to
    store the mail body into this class, too.
    But: not from the point of view of the device. 
    Mailbodies can be real large. So we request them when 
    needed from the mail-wrapper class direct from the server itself
    (imap) or from a file-based cache (pop3?)
    So there is no interface "const QString&body()" but you should
    make a request to the mailwrapper with this class as parameter to
    get the body. Same words for the attachments.
 */
 class RecMail
 {
 public:
     RecMail();
+    RecMail(const RecMail&old);
     virtual ~RecMail(){}
 
     const int getNumber()const{return msg_number;}
     void setNumber(int number){msg_number=number;}
     const QString&getDate()const{ return date; }
     void setDate( const QString&a ) { date = a; }
     const QString&getFrom()const{ return from; }
     void setFrom( const QString&a ) { from = a; }
     const QString&getSubject()const { return subject; }
     void setSubject( const QString&s ) { subject = s; }
     const QString&getMbox()const{return mbox;}
     void setMbox(const QString&box){mbox = box;}
-    
+    void setMsgid(const QString&id){msg_id=id;}
+    const QString&Msgid()const{return msg_id;}
+
     void setTo(const QStringList&list);
     const QStringList&To()const;
     void setCC(const QStringList&list);
     const QStringList&CC()const;
     void setBcc(const QStringList&list);
     const QStringList&Bcc()const;
-
     const QBitArray&getFlags()const{return msg_flags;}
     void setFlags(const QBitArray&flags){msg_flags = flags;}
 
 protected:
-    QString subject,date,from,mbox;
+    QString subject,date,from,mbox,msg_id;
     int msg_number;
     QBitArray msg_flags;
     QStringList to,cc,bcc;
+    void init();
+    void copy_old(const RecMail&old);
 };
 
 class RecPart
 {
 protected:
     QString m_type,m_subtype,m_identifier,m_encoding;
 public:
     RecPart();
     RecPart(const QString&identifier,const QString&type="",const QString&subtype="",const QString&encoding="BASE64");
     virtual ~RecPart();
     
     const QString&Type()const;
     void setType(const QString&type);
     const QString&Subtype()const;
     void setSubtype(const QString&subtype);
     const QString&Identifier()const;
     void setIdentifier(const QString&identifier);
     const QString&Encoding()const;
     void setEncoding(const QString&encoding);
 };
 
 class RecBody
 {
 protected: