12 files changed, 128 insertions, 33 deletions
diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp
index 128a7c0..3998abd 100644
--- a/kmicromail/libmailwrapper/abstractmail.cpp
+++ b/kmicromail/libmailwrapper/abstractmail.cpp
@@ -1,8 +1,9 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #include "abstractmail.h"
 #include "imapwrapper.h"
 #include "pop3wrapper.h"
 #include "nntpwrapper.h"
 #include "mhwrapper.h"
 #include "mailtypes.h"
@@ -132,34 +133,48 @@ QString AbstractMail::draftFolder()
 {
    return QString("Drafts");
 }
 /* temporary - will be removed when implemented in all classes */
 void AbstractMail::deleteMails(const QString &,const QValueList<Opie::Core::OSmartPointer<RecMail> > &)
 {
 }
+void AbstractMail::deleteMailList(const QValueList<RecMailP>&target)
+{
+    qDebug("AbstractMail::deleteMailList:: Please reimplement! ");
+}
 void AbstractMail::mvcpAllMails(const FolderP&fromFolder,
-    const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
+    const QString&targetFolder,AbstractMail*targetWrapper,bool moveit, int maxSizeInKb)
+{
+ QValueList<RecMailP> t;
+ listMessages(fromFolder->getName(),t, maxSizeInKb);
+ mvcpMailList( t,targetFolder,targetWrapper,moveit);
+}
+void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t,
+                                const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
 {
-    QValueList<RecMailP> t;
+   
-    listMessages(fromFolder->getName(),t);
    encodedString*st = 0;
-    while (t.count()>0) {
+    int iii = 0;
-        RecMailP r = (*t.begin());
+    int count = t.count();
+    while (iii < count ) {
+        RecMailP r = (*t.at( iii ));
        st = fetchRawBody(r);
        if (st) {
            targetWrapper->storeMessage(st->Content(),st->Length(),targetFolder);
            delete st;
        }
-        t.remove(t.begin());
+        ++iii;
    }
    if (moveit) {
-        deleteAllMail(fromFolder);
+        deleteMailList( t );
+        //deleteAllMail(fromFolder);
    }
 }
 void AbstractMail::mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
 {
    encodedString*st = 0;
    st = fetchRawBody(mail);
    if (st) {
diff --git a/kmicromail/libmailwrapper/abstractmail.h b/kmicromail/libmailwrapper/abstractmail.h
index e5d64a6..cae83f4 100644
--- a/kmicromail/libmailwrapper/abstractmail.h
+++ b/kmicromail/libmailwrapper/abstractmail.h
@@ -1,8 +1,9 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #ifndef __abstract_mail_
 #define __abstract_mail_
 #include "maildefines.h"
 #include "settings.h"
 #include <qobject.h>
@@ -17,33 +18,36 @@ struct folderStat;
 class AbstractMail:public QObject
 {
    Q_OBJECT
 public:
    AbstractMail(){};
    virtual ~AbstractMail(){}
    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders()=0;
-    virtual void listMessages(const QString & mailbox,QValueList<RecMailP>&target )=0;
+    virtual void listMessages(const QString & mailbox,QValueList<RecMailP>&target, int sizeInKb = 0 )=0;
    virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX")=0;
    virtual RecBodyP fetchBody(const RecMailP&mail)=0;
    virtual QString fetchTextPart(const RecMailP&mail,const RecPartP&part)=0;
    virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPartP&part)=0;
    virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPartP&part)=0;
    virtual encodedString* fetchRawBody(const RecMailP&mail)=0;
    virtual void deleteMail(const RecMailP&mail)=0;
+    virtual void deleteMailList(const QValueList<RecMailP>&target);
    virtual void answeredMail(const RecMailP&mail)=0;
    virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&)=0;
    virtual void deleteMails(const QString & FolderName,const QValueList<Opie::Core::OSmartPointer<RecMail> >&target);
    virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&)=0;
    virtual void storeMessage(const char*msg,size_t length, const QString&folder)=0;
    virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,
-        const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
+                              const QString&targetFolder,AbstractMail*targetWrapper,bool moveit, int sizeInKb = 0);
+    virtual void mvcpMailList(const QValueList<RecMailP>& t,
+                      const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
    virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
    virtual void cleanMimeCache(){};
    /* mail box methods */
    /* parameter is the box to create.
     * if the implementing subclass has prefixes,
     * them has to be appended automatic.
     */
diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp
index f804e44..1fd4bb1 100644
--- a/kmicromail/libmailwrapper/genericwrapper.cpp
+++ b/kmicromail/libmailwrapper/genericwrapper.cpp
@@ -1,8 +1,9 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #include "genericwrapper.h"
 #include <libetpan/libetpan.h>
 #include "mailtypes.h"
 using namespace Opie::Core;
 Genericwrapper::Genericwrapper()
@@ -387,17 +388,17 @@ QStringList Genericwrapper::parseInreplies(mailimf_in_reply_to * in_replies)
        }
        if (h.length()>0) {
            res.append(h);
        }
    }
    return res;
 }
-void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to)
+void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to, int maxSizeInKb)
 {
    int r;
    mailmessage_list * env_list = 0;
    r = mailsession_get_messages_list(session,&env_list);
    if (r != MAIL_NO_ERROR) {
        ; // odebug << "Error message list" << oendl; 
        return;
    }
@@ -467,14 +468,15 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &
            char * text = (char*)refs->mid_list->first->data;
            mail->setReplyto(QString(text));
        }
 #endif
        if (single_fields.fld_in_reply_to && single_fields.fld_in_reply_to->mid_list &&
                clist_count(single_fields.fld_in_reply_to->mid_list)) {
            mail->setInreply(parseInreplies(single_fields.fld_in_reply_to));
        }
-        target.append(mail);
+        if ( maxSizeInKb == 0 || mail->Msgsize()<=maxSizeInKb*1024 ) 
+                target.append(mail);
    }
    if (env_list) {
        mailmessage_list_free(env_list);
    }
 }
diff --git a/kmicromail/libmailwrapper/genericwrapper.h b/kmicromail/libmailwrapper/genericwrapper.h
index 8be9212..235e116 100644
--- a/kmicromail/libmailwrapper/genericwrapper.h
+++ b/kmicromail/libmailwrapper/genericwrapper.h
@@ -1,8 +1,9 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #ifndef __GENERIC_WRAPPER_H
 #define __GENERIC_WRAPPER_H
 #include "abstractmail.h"
 #include <qmap.h>
 #include <qstring.h>
 #include <libetpan/clist.h>
@@ -49,17 +50,17 @@ protected:
    QString parseGroup( mailimf_group *group );
    QString parseAddressList( mailimf_address_list *list );
    QString parseDateTime( mailimf_date_time *date );
    void traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rek=0,int current_count=1);
    static void fillSingleBody(RecPartP&target,mailmessage*message,mailmime*mime);
    static void fillParameters(RecPartP&target,clist*parameters);
    static QString getencoding(mailmime_mechanism*aEnc);
-    virtual void parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to=false);
+    virtual void parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to=false, int maxSizeInKb = 0);
    QStringList parseInreplies(mailimf_in_reply_to * in_replies);
    QString msgTempName;
    unsigned int last_msg_id;
    QMap<QString,encodedString*> bodyCache;
    mailstorage * m_storage;
    mailfolder*m_folder;
 };
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp
index e0fb6f9..bb8bbfc 100644
--- a/kmicromail/libmailwrapper/imapwrapper.cpp
+++ b/kmicromail/libmailwrapper/imapwrapper.cpp
@@ -1,8 +1,9 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #include <stdlib.h>
 #include <libetpan/libetpan.h>
 #include <qpe/global.h>
 #include <qapplication.h>
 #include "imapwrapper.h"
 #include "mailtypes.h"
 #include "logindialog.h"
@@ -197,17 +198,17 @@ void IMAPwrapper::logout()
    if (!m_imap) return;
    err = mailimap_logout( m_imap );
    err = mailimap_close( m_imap );
    mailimap_free( m_imap );
    m_imap = 0;
    m_Lastmbox = "";
 }
-void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSmartPointer<RecMail> > &target )
+void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSmartPointer<RecMail> > &target , int maxSizeInKb)
 {
    int err = MAILIMAP_NO_ERROR;
    clist *result = 0;
    clistcell *current;
    mailimap_fetch_type *fetchType = 0;
    mailimap_set *set = 0;
    login();
@@ -245,20 +246,22 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSma
    if ( err == MAILIMAP_NO_ERROR ) {
        mailimap_msg_att * msg_att;
        int i = 0;
        for (current = clist_begin(result); current != 0; current=clist_next(current)) {
            ++i;
            msg_att = (mailimap_msg_att*)current->data;
            RecMail*m = parse_list_result(msg_att);
            if (m) {
-                m->setNumber(i);
+                if ( maxSizeInKb == 0 || m->Msgsize()<=maxSizeInKb*1024 ) {
-                m->setMbox(mailbox);
+                    m->setNumber(i);
-                m->setWrapper(this);
+                    m->setMbox(mailbox);
-                target.append(m);
+                    m->setWrapper(this);
+                    target.append(m);
+                }
            }
        }
        Global::statusMessage(tr("Mailbox has %1 mails").arg(target.count()));
    } else {
        Global::statusMessage(tr("Error fetching headers: %1").arg(m_imap->imap_response));
    }
    if (result) mailimap_fetch_list_free(result);
 }
@@ -861,17 +864,59 @@ void IMAPwrapper::fillBodyFields(RecPartP&target_part,mailimap_body_fields*which
        }
    }
    if (which->bd_description) {
        target_part->setDescription(QString(which->bd_description));
    }
    target_part->setEncoding(encoding);
    target_part->setSize(which->bd_size);
 }
+void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
+{
+    mailimap_flag_list*flist;
+    mailimap_set *set;
+    mailimap_store_att_flags * store_flags;
+    int err;
+    login();
+    if (!m_imap) {
+        return;
+    }
+    int iii = 0;
+    int count = target.count();
+    qDebug("imap remove count %d ", count);
+    while (iii < count ) {
+        qDebug("IMAP remove %d ", iii);
+        RecMailP mail = (*target.at( iii ));
+        err = selectMbox(mail->getMbox());
+        if ( err != MAILIMAP_NO_ERROR ) {
+            return;
+        }
+        flist = mailimap_flag_list_new_empty();
+        mailimap_flag_list_add(flist,mailimap_flag_new_deleted());
+        store_flags = mailimap_store_att_flags_new_set_flags(flist);
+        set = mailimap_set_new_single(mail->getNumber());
+        err = mailimap_store(m_imap,set,store_flags);
+        mailimap_set_free( set );
+        mailimap_store_att_flags_free(store_flags);
+        if (err != MAILIMAP_NO_ERROR) {
+            // odebug << "error deleting mail: " << m_imap->imap_response << "" << oendl; 
+            return;
+        }
+        // odebug << "deleting mail: " << m_imap->imap_response << "" << oendl; 
+        /* should we realy do that at this moment? */
+   
+        err = mailimap_expunge(m_imap);
+        if (err != MAILIMAP_NO_ERROR) {
+            Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response));
+        }
+        ++iii;
+    }
+}
 void IMAPwrapper::deleteMail(const RecMailP&mail)
 {
    mailimap_flag_list*flist;
    mailimap_set *set;
    mailimap_store_att_flags * store_flags;
    int err;
    login();
    if (!m_imap) {
@@ -890,21 +935,23 @@ void IMAPwrapper::deleteMail(const RecMailP&mail)
    mailimap_store_att_flags_free(store_flags);
    if (err != MAILIMAP_NO_ERROR) {
        // odebug << "error deleting mail: " << m_imap->imap_response << "" << oendl; 
        return;
    }
    // odebug << "deleting mail: " << m_imap->imap_response << "" << oendl; 
    /* should we realy do that at this moment? */
+  
    err = mailimap_expunge(m_imap);
    if (err != MAILIMAP_NO_ERROR) {
-        // odebug << "error deleting mail: " << m_imap->imap_response << "" << oendl; 
+        Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response));
    }
-    // odebug << "Delete successfull " << m_imap->imap_response << "" << oendl; 
+    qDebug("IMAPwrapper::deleteMail ");
+    
 }
 void IMAPwrapper::answeredMail(const RecMailP&mail)
 {
    mailimap_flag_list*flist;
    mailimap_set *set;
    mailimap_store_att_flags * store_flags;
    int err;
@@ -1115,20 +1162,21 @@ const QString&IMAPwrapper::getName()const
 encodedString* IMAPwrapper::fetchRawBody(const RecMailP&mail)
 {
    // dummy
    QValueList<int> path;
    return fetchRawPart(mail,path,false);
 }
 void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder,
-    const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
+                               const QString&targetFolder,AbstractMail*targetWrapper,bool moveit, int maxSizeInKb)
 {
-    if (targetWrapper != this) {
+    if (targetWrapper != this || maxSizeInKb > 0 ) {
-        AbstractMail::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit);
+        AbstractMail::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit, maxSizeInKb);
+        qDebug("IMAPwrapper::mvcpAllMails::Using generic");
        // odebug << "Using generic" << oendl; 
        return;
    }
    mailimap_set *set = 0;
    login();
    if (!m_imap) {
        return;
    }
diff --git a/kmicromail/libmailwrapper/imapwrapper.h b/kmicromail/libmailwrapper/imapwrapper.h
index e56605a..222fe95 100644
--- a/kmicromail/libmailwrapper/imapwrapper.h
+++ b/kmicromail/libmailwrapper/imapwrapper.h
@@ -1,8 +1,9 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #ifndef __IMAPWRAPPER
 #define __IMAPWRAPPER
 #include <qlist.h>
 #include "mailwrapper.h"
 #include "abstractmail.h"
 #include <libetpan/clist.h>
@@ -19,25 +20,26 @@ class encodedString;
 class IMAPwrapper : public AbstractMail
 {
    Q_OBJECT
 public:
    IMAPwrapper( IMAPaccount *a );
    virtual ~IMAPwrapper();
    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
-    virtual void listMessages(const QString & mailbox,QValueList<Opie::Core::OSmartPointer<RecMail> >&target );
+    virtual void listMessages(const QString & mailbox,QValueList<Opie::Core::OSmartPointer<RecMail> >&target , int sizeInKb = 0);
    virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
    virtual void deleteMail(const RecMailP&mail);
+    void deleteMailList(const QValueList<RecMailP>&target);
    virtual void answeredMail(const RecMailP&mail);
    virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&folder);
    virtual void storeMessage(const char*msg,size_t length, const QString&folder);
    virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,
-        const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
+                              const QString&targetFolder,AbstractMail*targetWrapper,bool moveit,int sizeInKb = 0);
    virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
    virtual RecBodyP fetchBody(const RecMailP&mail);
    virtual QString fetchTextPart(const RecMailP&mail,const RecPartP&part);
    virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPartP&part);
    virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPartP&part);
    virtual encodedString* fetchRawBody(const RecMailP&mail);
diff --git a/kmicromail/libmailwrapper/mhwrapper.cpp b/kmicromail/libmailwrapper/mhwrapper.cpp
index 7ef9b32..cbc52d9 100644
--- a/kmicromail/libmailwrapper/mhwrapper.cpp
+++ b/kmicromail/libmailwrapper/mhwrapper.cpp
@@ -1,8 +1,9 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #include "mhwrapper.h"
 #include "mailtypes.h"
 #include "mailwrapper.h"
 #include <libetpan/libetpan.h>
 #include <qdir.h>
 #include <qmessagebox.h>
 #include <stdlib.h>
 #include <qpe/global.h>
@@ -57,29 +58,29 @@ void MHwrapper::clean_storage()
    }
 }
 MHwrapper::~MHwrapper()
 {
    clean_storage();
 }
-void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target )
+void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb  )
 {
    init_storage();
    if (!m_storage) {
        return;
    }
    QString f = buildPath(mailbox);
    int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1());
    if (r!=MAIL_NO_ERROR) {
        qDebug("listMessages: error selecting folder! ");
        return;
    }
-    parseList(target,m_storage->sto_session,f);
+    parseList(target,m_storage->sto_session,f, false, maxSizeInKb );
    Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(target.count()));
 }
 QValueList<Opie::Core::OSmartPointer<Folder> >* MHwrapper::listFolders()
 {
    QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >();
    /* this is needed! */
    if (m_storage) mailstorage_disconnect(m_storage);
diff --git a/kmicromail/libmailwrapper/mhwrapper.h b/kmicromail/libmailwrapper/mhwrapper.h
index 4310c84..550824d 100644
--- a/kmicromail/libmailwrapper/mhwrapper.h
+++ b/kmicromail/libmailwrapper/mhwrapper.h
@@ -1,8 +1,9 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #ifndef __MH_WRAPPER_H
 #define __MH_WRAPPER_H
 #include "maildefines.h"
 #include "genericwrapper.h"
 #include <qstring.h>
@@ -12,17 +13,17 @@ namespace Opie {namespace Core {class OProcess;}}
 class MHwrapper : public Genericwrapper
 {
    Q_OBJECT
 public:
    MHwrapper(const QString & dir,const QString&name);
    virtual ~MHwrapper();
-    virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target );
+    virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb = 0 );
    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
    virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
    virtual void deleteMail(const RecMailP&mail);
    virtual void answeredMail(const RecMailP&mail);
    virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
    virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,
        const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
diff --git a/kmicromail/libmailwrapper/nntpwrapper.cpp b/kmicromail/libmailwrapper/nntpwrapper.cpp
index daa128e..f5d7f16 100644
--- a/kmicromail/libmailwrapper/nntpwrapper.cpp
+++ b/kmicromail/libmailwrapper/nntpwrapper.cpp
@@ -1,8 +1,9 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #include "nntpwrapper.h"
 #include "logindialog.h"
 #include "mailtypes.h"
 #include <qfile.h>
 #include <stdlib.h>
@@ -93,24 +94,24 @@ RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) {
        mailmessage_free(mailmsg);
    if (message)
        free(message);
    return body;
 }
-void NNTPwrapper::listMessages(const QString & which, QValueList<Opie::Core::OSmartPointer<RecMail> > &target )
+void NNTPwrapper::listMessages(const QString & which, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb)
 {
    login();
    if (!m_nntp)
        return;
    uint32_t res_messages,res_recent,res_unseen;
    mailsession_status_folder(m_nntp->sto_session,(char*)which.latin1(),&res_messages,&res_recent,&res_unseen);
-    parseList(target,m_nntp->sto_session,which,true);
+    parseList(target,m_nntp->sto_session,which,true, maxSizeInKb);
 }
 void NNTPwrapper::login()
 {
    if (account->getOffline())
        return;
    /* we'll hold the line */
    if ( m_nntp != NULL )
diff --git a/kmicromail/libmailwrapper/nntpwrapper.h b/kmicromail/libmailwrapper/nntpwrapper.h
index 2fb82f2..5d4e5ce 100644
--- a/kmicromail/libmailwrapper/nntpwrapper.h
+++ b/kmicromail/libmailwrapper/nntpwrapper.h
@@ -1,8 +1,9 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #ifndef __NNTPWRAPPER
 #define __NNTPWRAPPER
 #include "mailwrapper.h"
 #include "genericwrapper.h"
 #include <qstring.h>
 #include <libetpan/clist.h>
@@ -15,17 +16,17 @@ class NNTPwrapper : public Genericwrapper
 Q_OBJECT
 public:
    NNTPwrapper( NNTPaccount *a );
    virtual ~NNTPwrapper();
   /* mailbox will be ignored */
-    virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target );
+    virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb = 0 );
    /* should only get the subscribed one */
    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
    /* mailbox will be ignored */
    virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
    QStringList listAllNewsgroups(const QString&mask = QString::null);
    virtual void deleteMail(const RecMailP&mail);
    virtual void answeredMail(const RecMailP&mail);
    virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&);
diff --git a/kmicromail/libmailwrapper/pop3wrapper.cpp b/kmicromail/libmailwrapper/pop3wrapper.cpp
index e5d083a..7a84b30 100644
--- a/kmicromail/libmailwrapper/pop3wrapper.cpp
+++ b/kmicromail/libmailwrapper/pop3wrapper.cpp
@@ -1,8 +1,9 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #include <stdlib.h>
 #include "pop3wrapper.h"
 #include "mailtypes.h"
 #include "logindialog.h"
 #include <libetpan/libetpan.h>
 #include <qpe/global.h>
@@ -91,24 +92,24 @@ RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) {
    if (mailmsg)
        mailmessage_free(mailmsg);
    if (message)
        free(message);
    return body;
 }
-void POP3wrapper::listMessages(const QString &, QValueList<Opie::Core::OSmartPointer<RecMail> > &target )
+void POP3wrapper::listMessages(const QString &, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb )
 {
    login();
    if (!m_pop3)
        return;
    uint32_t res_messages,res_recent,res_unseen;
    mailsession_status_folder(m_pop3->sto_session,"INBOX",&res_messages,&res_recent,&res_unseen);
-    parseList(target,m_pop3->sto_session,"INBOX");
+    parseList(target,m_pop3->sto_session,"INBOX", false, maxSizeInKb);
    Global::statusMessage( tr("Mailbox contains %1 mail(s)").arg(res_messages));
 }
 void POP3wrapper::login()
 {
    if (account->getOffline())
        return;
    /* we'll hold the line */
@@ -187,16 +188,32 @@ void POP3wrapper::logout()
 QValueList<Opie::Core::OSmartPointer<Folder> >* POP3wrapper::listFolders() {
    QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<FolderP>();
    FolderP inb=new Folder("INBOX","/");
    folders->append(inb);
    return folders;
 }
+void POP3wrapper::deleteMailList(QValueList<RecMailP>&target)
+{
+    login();
+    if (!m_pop3)
+        return;
+    int iii = 0;
+    int count = target.count();
+    while (iii < count ) {
+        RecMailP mail = (*target.at( iii ));
+        int err = mailsession_remove_message(m_pop3->sto_session,mail->getNumber());
+        if (err != MAIL_NO_ERROR) {
+            Global::statusMessage(tr("error deleting mail"));
+        }
+        ++iii;
+    }
+}
 void POP3wrapper::deleteMail(const RecMailP&mail) {
    login();
    if (!m_pop3)
        return;
    int err = mailsession_remove_message(m_pop3->sto_session,mail->getNumber());
    if (err != MAIL_NO_ERROR) {
        Global::statusMessage(tr("error deleting mail"));
    }
diff --git a/kmicromail/libmailwrapper/pop3wrapper.h b/kmicromail/libmailwrapper/pop3wrapper.h
index 5101fa5..ee754a4 100644
--- a/kmicromail/libmailwrapper/pop3wrapper.h
+++ b/kmicromail/libmailwrapper/pop3wrapper.h
@@ -1,8 +1,9 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #ifndef __POP3WRAPPER
 #define __POP3WRAPPER
 #include "mailwrapper.h"
 #include "genericwrapper.h"
 #include <qstring.h>
 class encodedString;
@@ -12,23 +13,24 @@ struct mailfolder;
 class POP3wrapper : public Genericwrapper
 {
    Q_OBJECT
 public:
    POP3wrapper( POP3account *a );
    virtual ~POP3wrapper();
    /* mailbox will be ignored */
-    virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target );
+    virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb = 0 );
    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
    /* mailbox will be ignored */
    virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
    virtual void deleteMail(const RecMailP&mail);
    virtual void answeredMail(const RecMailP&mail);
+    virtual void deleteMailList(QValueList<RecMailP>&target);
    virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&);
    virtual RecBodyP fetchBody( const RecMailP &mail );
    virtual encodedString* fetchRawBody(const RecMailP&mail);
    virtual void logout();
    virtual MAILLIB::ATYPE getType()const;
    virtual const QString&getName()const;
    static void pop3_progress( size_t current, size_t maximum );