1 files changed, 16 insertions, 13 deletions

diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 5ce140e..eae85a7 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -200,29 +200,25 @@ QList<IMAPFolder>* IMAPwrapper::listFolders()
         }
     } 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;
+    clistcell *current,*c,*cf;
     mailimap_msg_att_dynamic*flist;
     mailimap_flag_fetch*cflag;
     QBitArray mFlags(7);
     QStringList addresslist;
     
     if (!m_att) {
         return m;
     }
 
     c = clist_begin(m_att->list);
     while ( c ) {
         current = c;
@@ -262,52 +258,55 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
                     }
                 } 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;
             m = new RecMail();
+            m->setDate(head->date);
+            m->setSubject(head->subject);
             if (head->from!=NULL) {
                 addresslist = address_list_to_stringlist(head->from->list);
                 if (addresslist.count()) {
-                    from = addresslist.first();
+                    m->setFrom(addresslist.first());
                 }
             }
             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);
+            if (head->reply_to!=NULL) {
+                addresslist = address_list_to_stringlist(head->bcc->list);
+                if (addresslist.count()) {
+                    m->setReplyto(addresslist.first());
+                }
+            }
             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());
+                   m->getFrom().latin1(),
+                   m->getSubject().latin1(),m->getDate().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;
@@ -430,39 +429,43 @@ void IMAPwrapper::fillPlainBody(const RecMail&mail,RecBody&target_body, mailimap
 
 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);
+    unsigned int count = 0;
     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));
+        if (++count > 99) {
+            break;
+        }
     }
     return l;
 }