2 files changed, 8 insertions, 2 deletions

diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index b4a8f4b..a33a16b 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -72,12 +72,14 @@ void POP3wrapper::listMessages(const QString &, QList<RecMail> &target )
     if (!m_pop3) return;
     mailpop3_list( m_pop3, &messages );
 
     for (unsigned int i = 0; i < carray_count(messages);++i) {
         mailpop3_msg_info *info;
         err = mailpop3_get_msg_info(m_pop3,i+1,&info);
+        if (info->msg_deleted)
+            continue;
         err = mailpop3_header( m_pop3, info->msg_index, &header, &length );
         if ( err != MAILPOP3_NO_ERROR ) {
             qDebug( "POP3: error retrieving header msgid: %i", info->msg_index );
             free(header);
             return;
         }
@@ -314,13 +316,13 @@ void POP3wrapper::logout()
 }
 
 
 QList<Folder>* POP3wrapper::listFolders()
 {
     /* TODO: integrate MH directories 
-       but not vor version 0.1 ;)
+       but not before version 0.1 ;)
     */
     QList<Folder> * folders = new QList<Folder>();
     folders->setAutoDelete( false );
     Folder*inb=new Folder("INBOX");
     folders->append(inb);
     return folders;
@@ -341,6 +343,7 @@ void POP3wrapper::deleteMail(const RecMail&mail)
     }
 }
 
 void POP3wrapper::answeredMail(const RecMail&)
 {
 }
+
diff --git a/noncore/net/mail/pop3wrapper.cpp b/noncore/net/mail/pop3wrapper.cpp
index b4a8f4b..a33a16b 100644
--- a/noncore/net/mail/pop3wrapper.cpp
+++ b/noncore/net/mail/pop3wrapper.cpp
@@ -72,12 +72,14 @@ void POP3wrapper::listMessages(const QString &, QList<RecMail> &target )
     if (!m_pop3) return;
     mailpop3_list( m_pop3, &messages );
 
     for (unsigned int i = 0; i < carray_count(messages);++i) {
         mailpop3_msg_info *info;
         err = mailpop3_get_msg_info(m_pop3,i+1,&info);
+        if (info->msg_deleted)
+            continue;
         err = mailpop3_header( m_pop3, info->msg_index, &header, &length );
         if ( err != MAILPOP3_NO_ERROR ) {
             qDebug( "POP3: error retrieving header msgid: %i", info->msg_index );
             free(header);
             return;
         }
@@ -314,13 +316,13 @@ void POP3wrapper::logout()
 }
 
 
 QList<Folder>* POP3wrapper::listFolders()
 {
     /* TODO: integrate MH directories 
-       but not vor version 0.1 ;)
+       but not before version 0.1 ;)
     */
     QList<Folder> * folders = new QList<Folder>();
     folders->setAutoDelete( false );
     Folder*inb=new Folder("INBOX");
     folders->append(inb);
     return folders;
@@ -341,6 +343,7 @@ void POP3wrapper::deleteMail(const RecMail&mail)
     }
 }
 
 void POP3wrapper::answeredMail(const RecMail&)
 {
 }
+