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
@@ -211,7 +211,3 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
     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;
@@ -273,5 +269,5 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
             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) {
@@ -279,3 +275,3 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
                 if (addresslist.count()) {
-                    from = addresslist.first();
+                    m->setFrom(addresslist.first());
                 }
@@ -294,9 +290,12 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
             }
-            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) {
@@ -441,2 +440,3 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list)
     current = clist_begin(list);
+    unsigned int count = 0;
     while (current!= NULL) {
@@ -465,2 +465,5 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list)
         l.append(QString(from));
+        if (++count > 99) {
+            break;
+        }
     }