2 files changed, 20 insertions, 2 deletions

diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index 16f4565..fc12947 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/imapwrapper.cpp
@@ -18,13 +18,13 @@ void IMAPwrapper::listMessages(const QString&mailbox,Maillist&target )
 {
     const char *server, *user, *pass, *mb;
     uint16_t port;
     int err = MAILIMAP_NO_ERROR;
     clist *result;
     clistcell *current;
-    mailimap_fetch_att *fetchAtt,*fetchAttFlags;
+    mailimap_fetch_att *fetchAtt,*fetchAttFlags,*fetchAttDate;
     mailimap_fetch_type *fetchType;
     mailimap_set *set;
     
     mb = mailbox.latin1();
     server = account->getServer().latin1();
     port = account->getPort().toUInt();
@@ -78,20 +78,23 @@ void IMAPwrapper::listMessages(const QString&mailbox,Maillist&target )
     
     result = clist_new();  
     /* the range has to start at 1!!! not with 0!!!! */
     set = mailimap_set_new_interval( 1, last );
     fetchAtt = mailimap_fetch_att_new_envelope();
     fetchAttFlags = mailimap_fetch_att_new_flags();
+    fetchAttDate = mailimap_fetch_att_new_internaldate();
     
     //fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt);
     fetchType = mailimap_fetch_type_new_fetch_att_list_empty();
     mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAtt);
     mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAttFlags);
+    mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAttDate);
     
     err = mailimap_fetch( imap, set, fetchType, &result );
     mailimap_set_free( set );
+    /* cleans up the fetch_att's too! */
     mailimap_fetch_type_free( fetchType );
 
     QString date,subject,from;
 
     if ( err == MAILIMAP_NO_ERROR ) {
         current = clist_begin(result);
@@ -311,12 +314,17 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
                    from.latin1(),
                    subject.latin1(),date.latin1());
             m = new RecMail();
             m->setSubject(subject);
             m->setFrom(from);
             m->setDate(date);
+        } 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) {
@@ -406,6 +414,7 @@ QString IMAPwrapper::fetchBody(const QString & mailbox,const RecMail&mail)
     err = mailimap_close( imap );
     mailimap_free( imap );
     clist_free(result);
     
     return body;
 }
+
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 16f4565..fc12947 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -18,13 +18,13 @@ void IMAPwrapper::listMessages(const QString&mailbox,Maillist&target )
 {
     const char *server, *user, *pass, *mb;
     uint16_t port;
     int err = MAILIMAP_NO_ERROR;
     clist *result;
     clistcell *current;
-    mailimap_fetch_att *fetchAtt,*fetchAttFlags;
+    mailimap_fetch_att *fetchAtt,*fetchAttFlags,*fetchAttDate;
     mailimap_fetch_type *fetchType;
     mailimap_set *set;
     
     mb = mailbox.latin1();
     server = account->getServer().latin1();
     port = account->getPort().toUInt();
@@ -78,20 +78,23 @@ void IMAPwrapper::listMessages(const QString&mailbox,Maillist&target )
     
     result = clist_new();  
     /* the range has to start at 1!!! not with 0!!!! */
     set = mailimap_set_new_interval( 1, last );
     fetchAtt = mailimap_fetch_att_new_envelope();
     fetchAttFlags = mailimap_fetch_att_new_flags();
+    fetchAttDate = mailimap_fetch_att_new_internaldate();
     
     //fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt);
     fetchType = mailimap_fetch_type_new_fetch_att_list_empty();
     mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAtt);
     mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAttFlags);
+    mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAttDate);
     
     err = mailimap_fetch( imap, set, fetchType, &result );
     mailimap_set_free( set );
+    /* cleans up the fetch_att's too! */
     mailimap_fetch_type_free( fetchType );
 
     QString date,subject,from;
 
     if ( err == MAILIMAP_NO_ERROR ) {
         current = clist_begin(result);
@@ -311,12 +314,17 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
                    from.latin1(),
                    subject.latin1(),date.latin1());
             m = new RecMail();
             m->setSubject(subject);
             m->setFrom(from);
             m->setDate(date);
+        } 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) {
@@ -406,6 +414,7 @@ QString IMAPwrapper::fetchBody(const QString & mailbox,const RecMail&mail)
     err = mailimap_close( imap );
     mailimap_free( imap );
     clist_free(result);
     
     return body;
 }
+