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,32 +1,33 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #include "abstractmail.h"
 #include "imapwrapper.h"
 #include "pop3wrapper.h"
 #include "nntpwrapper.h"
 #include "mhwrapper.h"
 #include "mailtypes.h"
 #include <kdecore/kstandarddirs.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <stdlib.h>
 #include <libetpan/mailmime_content.h>
 #include <libetpan/mailmime.h>
 using namespace Opie::Core;
 AbstractMail* AbstractMail::getWrapper(IMAPaccount *a)
 {
    return new IMAPwrapper(a);
 }
 AbstractMail* AbstractMail::getWrapper(POP3account *a)
 {
    return new POP3wrapper(a);
 }
 AbstractMail* AbstractMail::getWrapper(NNTPaccount *a)
 {
    return new NNTPwrapper(a);
 }
@@ -108,65 +109,79 @@ QString AbstractMail::gen_attachment_id()
 {
    QFile file( "/proc/sys/kernel/random/uuid" );
    if (!file.open(IO_ReadOnly ) )
        return QString::null;
    QTextStream stream(&file);
    return "{" + stream.read().stripWhiteSpace() + "}";
 }
 int AbstractMail::createMbox(const QString&,const FolderP&,const QString& ,bool)
 {
    return 0;
 }
 QString AbstractMail::defaultLocalfolder()
 {
    //  QString f = getenv( "HOME" );
    QString f = locateLocal( "data", "kmicromail/localmail");
    //  f += "/Applications/opiemail/localmail";
    return f;
 }
 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) {
        targetWrapper->storeMessage(st->Content(),st->Length(),targetFolder);
        delete st;
    }
    if (moveit) {
        deleteMail(mail);
    }
 }
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,72 +1,76 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #ifndef __abstract_mail_
 #define __abstract_mail_
 #include "maildefines.h"
 #include "settings.h"
 #include <qobject.h>
 #include <opie2/osmartpointer.h>
 #include "mailtypes.h"
 class IMAPwrapper;
 class POP3wrapper;
 class Folder;
 class encodedString;
 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.
     */
    virtual int createMbox(const QString&,const Opie::Core::OSmartPointer<Folder>&parentfolder=0,
        const QString& delemiter="/",bool getsubfolder=false);
    virtual void logout()=0;
    static AbstractMail* getWrapper(IMAPaccount *a);
    static AbstractMail* getWrapper(POP3account *a);
    static AbstractMail* getWrapper(NNTPaccount *a);
    /* mbox only! */
    static AbstractMail* getWrapper(const QString&a,const QString&name="Local Folders");
    static AbstractMail* getWrapper(Account*a);
    static QString defaultLocalfolder();
    static QString draftFolder();
    virtual MAILLIB::ATYPE getType()const=0;
    virtual const QString&getName()const=0;
 protected:
    static encodedString*decode_String(const encodedString*text,const QString&enc);
    static QString convert_String(const char*text);
    static QString gen_attachment_id();
 };
 #endif
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,32 +1,33 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #include "genericwrapper.h"
 #include <libetpan/libetpan.h>
 #include "mailtypes.h"
 using namespace Opie::Core;
 Genericwrapper::Genericwrapper()
    : AbstractMail()
 {
    bodyCache.clear();
    m_storage = 0;
    m_folder = 0;
 }
 Genericwrapper::~Genericwrapper()
 {
    if (m_folder) {
        mailfolder_free(m_folder);
    }
    if (m_storage) {
        mailstorage_free(m_storage);
    }
    cleanMimeCache();
 }
 void Genericwrapper::fillSingleBody(RecPartP&target,mailmessage*,mailmime*mime)
 {
    if (!mime) {
        return;
    }
    mailmime_field*field = 0;
@@ -363,65 +364,65 @@ QString Genericwrapper::fetchTextPart(const RecMailP&mail,const RecPartP&part)
 void Genericwrapper::cleanMimeCache()
 {
    QMap<QString,encodedString*>::Iterator it = bodyCache.begin();
    for (;it!=bodyCache.end();++it) {
        encodedString*t = it.data();
        //it.setValue(0);
        if (t) delete t;
    }
    bodyCache.clear();
    ; // odebug << "Genericwrapper: cache cleaned" << oendl; 
 }
 QStringList Genericwrapper::parseInreplies(mailimf_in_reply_to * in_replies)
 {
    QStringList res;
    if (!in_replies || !in_replies->mid_list) return res;
    clistiter * current = 0;
    for ( current = clist_begin( in_replies->mid_list ); current != NULL; current = current->next ) {
        QString h((char*)current->data);
        while (h.length()>0 && h[0]=='<') {
            h.remove(0,1);
        }
        while (h.length()>0 && h[h.length()-1]=='>') {
            h.remove(h.length()-1,1);
        }
        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;
    }
    r = mailsession_get_envelopes_list(session, env_list);
    if (r != MAIL_NO_ERROR) {
        ; // odebug << "Error filling message list" << oendl; 
        if (env_list) {
            mailmessage_list_free(env_list);
        }
        return;
    }
    mailimf_references * refs = 0;
    mailimf_in_reply_to * in_replies = 0;
    uint32_t i = 0;
    for(; i < carray_count(env_list->msg_tab) ; ++i) {
        mailmessage * msg;
        QBitArray mFlags(7);
        msg = (mailmessage*)carray_get(env_list->msg_tab, i);
        if (msg->msg_fields == NULL) {
            //; // odebug << "could not fetch envelope of message " << i << "" << oendl; 
            continue;
        }
        RecMailP mail = new RecMail();
        mail->setWrapper(this);
        mail_flags * flag_result = 0;
        r = mailmessage_get_flags(msg,&flag_result);
        if (r == MAIL_ERROR_NOT_IMPLEMENTED) {
@@ -443,38 +444,39 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &
        } else {
            mail->setTo(mailbox);
        }
        if (single_fields.fld_cc)
            mail->setCC( parseAddressList( single_fields.fld_cc->cc_addr_list ) );
        if (single_fields.fld_bcc)
            mail->setBcc( parseAddressList( single_fields.fld_bcc->bcc_addr_list ) );
        if (single_fields.fld_orig_date)
            mail->setDate( parseDateTime( single_fields.fld_orig_date->dt_date_time ) );
        // crashes when accessing pop3 account?
        if (single_fields.fld_message_id->mid_value) {
            mail->setMsgid(QString(single_fields.fld_message_id->mid_value));
            ; // odebug << "Msgid == " << mail->Msgid().latin1() << "" << oendl; 
        }
        if (single_fields.fld_reply_to) {
            QStringList t = parseAddressList(single_fields.fld_reply_to->rt_addr_list);
            if (t.count()>0) {
                mail->setReplyto(t[0]);
            }
        }
 #if 0
        refs = single_fields.fld_references;
        if (refs && refs->mid_list && clist_count(refs->mid_list)) {
            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,67 +1,68 @@
+// 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>
 class RecMail;
 class RecBody;
 class encodedString;
 struct mailpop3;
 struct mailmessage;
 struct mailmime;
 struct mailmime_mechanism;
 struct mailimf_mailbox_list;
 struct mailimf_mailbox;
 struct mailimf_date_time;
 struct mailimf_group;
 struct mailimf_address_list;
 struct mailsession;
 struct mailstorage;
 struct mailfolder;
 struct mailimf_in_reply_to;
 /* this class hold just the funs shared between
 * mbox and pop3 (later mh, too) mail access.
 * it is not desigend to make a instance of it!
 */
 class Genericwrapper : public AbstractMail
 {
    Q_OBJECT
 public:
    Genericwrapper();
    virtual ~Genericwrapper();
    virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPartP&part);
    virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPartP&part);
    virtual QString fetchTextPart(const RecMailP&mail,const RecPartP&part);
    virtual void cleanMimeCache();
    virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&){return 1;}
    virtual void logout(){};
    virtual void storeMessage(const char*msg,size_t length, const QString&folder){};
 protected:
    RecBodyP parseMail( mailmessage * msg );
    QString parseMailboxList( mailimf_mailbox_list *list );
    QString parseMailbox( mailimf_mailbox *box );
    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;
 };
 #endif
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,32 +1,33 @@
+// 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"
 using namespace Opie::Core;
 IMAPwrapper::IMAPwrapper( IMAPaccount *a )
    : AbstractMail()
 {
    account = a;
    m_imap = 0;
    m_Lastmbox = "";
 }
 IMAPwrapper::~IMAPwrapper()
 {
    logout();
 }
 /* to avoid to often select statements in loops etc.
   we trust that we are logged in and connection is established!*/
 int IMAPwrapper::selectMbox(const QString&mbox)
 {
    if (mbox == m_Lastmbox) {
        return MAILIMAP_NO_ERROR;
    }
    int err = mailimap_select( m_imap, (char*)mbox.latin1());
    if ( err != MAILIMAP_NO_ERROR ) {
        m_Lastmbox = "";
@@ -173,116 +174,118 @@ void IMAPwrapper::login()
        Global::statusMessage(tr("Server has no TLS support!"));
        ok = false;
    }
    /* login */
    if (ok) {
        err = mailimap_login_simple( m_imap, (char*)user, (char*)pass );
        if ( err != MAILIMAP_NO_ERROR ) {
            Global::statusMessage(tr("error logging in imap server: %1").arg(m_imap->imap_response));
            ok = false;
        }
    }
    if (!ok) {
        err = mailimap_close( m_imap );
        mailimap_free( m_imap );
        m_imap = 0;
    }
 }
 void IMAPwrapper::logout()
 {
    int err = MAILIMAP_NO_ERROR;
    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();
    if (!m_imap) {
        return;
    }
    /* select mailbox READONLY for operations */
    err = selectMbox(mailbox);
    if ( err != MAILIMAP_NO_ERROR ) {
        return;
    }
    int last = m_imap->imap_selection_info->sel_exists;
    if (last == 0) {
        Global::statusMessage(tr("Mailbox has no mails"));
        return;
    } else {
    }
    /* the range has to start at 1!!! not with 0!!!! */
    set = mailimap_set_new_interval( 1, last );
    fetchType = mailimap_fetch_type_new_fetch_att_list_empty();
    mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_envelope());
    mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_flags());
    mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_internaldate());
    mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_rfc822_size());
    err = mailimap_fetch( m_imap, set, fetchType, &result );
    mailimap_set_free( set );
    mailimap_fetch_type_free( fetchType );
    QString date,subject,from;
    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);
 }
 QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
 {
    const char *path, *mask;
    int err = MAILIMAP_NO_ERROR;
    clist *result = 0;
    clistcell *current = 0;
    clistcell*cur_flag = 0;
    mailimap_mbx_list_flags*bflags = 0;
    QValueList<FolderP>* folders = new QValueList<FolderP>();
    login();
    if (!m_imap) {
        return folders;
    }
 /*
 * First we have to check for INBOX 'cause it sometimes it's not inside the path.
 * We must not forget to filter them out in next loop!
 * it seems like ugly code. and yes - it is ugly code. but the best way.
 */
    QString temp;
    mask = "INBOX" ;
    mailimap_mailbox_list *list;
@@ -837,98 +840,142 @@ void IMAPwrapper::fillBodyFields(RecPartP&target_part,mailimap_body_fields*which
    QString encoding("");
    switch (enc->enc_type) {
    case MAILIMAP_BODY_FLD_ENC_7BIT:
        encoding = "7bit";
        break;
    case MAILIMAP_BODY_FLD_ENC_8BIT:
        encoding = "8bit";
        break;
    case MAILIMAP_BODY_FLD_ENC_BINARY:
        encoding="binary";
        break;
    case MAILIMAP_BODY_FLD_ENC_BASE64:
        encoding="base64";
        break;
    case MAILIMAP_BODY_FLD_ENC_QUOTED_PRINTABLE:
        encoding="quoted-printable";
        break;
    case MAILIMAP_BODY_FLD_ENC_OTHER:
    default:
        if (enc->enc_value) {
            char*t=enc->enc_value;
            encoding=QString(enc->enc_value);
            enc->enc_value=0L;
            free(t);
        }
    }
    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) {
        return;
    }
    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) {
-        // 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;
    login();
    if (!m_imap) {
        return;
    }
    err = selectMbox(mail->getMbox());
    if ( err != MAILIMAP_NO_ERROR ) {
        return;
    }
    flist = mailimap_flag_list_new_empty();
    mailimap_flag_list_add(flist,mailimap_flag_new_answered());
    store_flags = mailimap_store_att_flags_new_add_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 marking mail: " << m_imap->imap_response << "" << oendl; 
        return;
    }
 }
 QString IMAPwrapper::fetchTextPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call,const QString&enc)
 {
@@ -1091,68 +1138,69 @@ void IMAPwrapper::statusFolder(folderStat&target_stat,const QString & mailbox)
 }
 void IMAPwrapper::storeMessage(const char*msg,size_t length, const QString&folder)
 {
    login();
    if (!m_imap) return;
    if (!msg) return;
    int r = mailimap_append(m_imap,(char*)folder.latin1(),0,0,msg,length);
    if (r != MAILIMAP_NO_ERROR) {
        Global::statusMessage("Error storing mail!");
    }
 }
 MAILLIB::ATYPE IMAPwrapper::getType()const
 {
    return account->getType();
 }
 const QString&IMAPwrapper::getName()const
 {
    // odebug << "Get name: " << account->getAccountName().latin1() << "" << oendl; 
    return account->getAccountName();
 }
 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;
    }
    int err = selectMbox(fromFolder->getName());
    if ( err != MAILIMAP_NO_ERROR ) {
        return;
    }
    int last = m_imap->imap_selection_info->sel_exists;
    set = mailimap_set_new_interval( 1, last );
    err = mailimap_copy(m_imap,set,targetFolder.latin1());
    mailimap_set_free( set );
    if ( err != MAILIMAP_NO_ERROR ) {
        QString error_msg = tr("error copy mails: %1").arg(m_imap->imap_response);
        Global::statusMessage(error_msg);
        // odebug << error_msg << oendl; 
        return;
    }
    if (moveit) {
        deleteAllMail(fromFolder);
    }
 }
 void IMAPwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
 {
    if (targetWrapper != this) {
        // odebug << "Using generic" << oendl; 
        AbstractMail::mvcpMail(mail,targetFolder,targetWrapper,moveit);
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,67 +1,69 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #ifndef __IMAPWRAPPER
 #define __IMAPWRAPPER
 #include <qlist.h>
 #include "mailwrapper.h"
 #include "abstractmail.h"
 #include <libetpan/clist.h>
 struct mailimap;
 struct mailimap_body;
 struct mailimap_body_type_1part;
 struct mailimap_body_type_text;
 struct mailimap_body_type_basic;
 struct mailimap_body_type_msg;
 struct mailimap_body_type_mpart;
 struct mailimap_body_fields;
 struct mailimap_msg_att;
 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);
    virtual int createMbox(const QString&,const Opie::Core::OSmartPointer<Folder>&parentfolder=0,
        const QString& delemiter="/",bool getsubfolder=false);
    virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&folder);
    static void imap_progress( size_t current, size_t maximum );
    virtual void logout();
    virtual MAILLIB::ATYPE getType()const;
    virtual const QString&getName()const;
 protected:
    RecMail*parse_list_result(mailimap_msg_att*);
    void login();
    bool start_tls(bool force=true);
    virtual QString fetchTextPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call=false,const QString&enc="");
    virtual encodedString*fetchRawPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call);
    int selectMbox(const QString&mbox);
    void fillSinglePart(RecPartP&target_part,mailimap_body_type_1part*Description);
    void fillSingleTextPart(RecPartP&target_part,mailimap_body_type_text*which);
    void fillSingleBasicPart(RecPartP&target_part,mailimap_body_type_basic*which);
    void fillSingleMsgPart(RecPartP&target_part,mailimap_body_type_msg*which);
    void fillMultiPart(RecPartP&target_part,mailimap_body_type_mpart*which);
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,109 +1,110 @@
+// 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>
 #include <oprocess.h>
 //#include <opie2/odebug.h>
 using namespace Opie::Core;
 MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name)
    : Genericwrapper(),MHPath(mbox_dir),MHName(mbox_name)
 {
    if (MHPath.length()>0) {
        if (MHPath[MHPath.length()-1]=='/') {
            MHPath=MHPath.left(MHPath.length()-1);
        }
        //odebug << MHPath << oendl; 
        QDir dir(MHPath);
        if (!dir.exists()) {
            dir.mkdir(MHPath);
        }
        init_storage();
    }
 }
 void MHwrapper::init_storage()
 {
    int r;
    QString pre = MHPath;
    if (!m_storage) {
        m_storage = mailstorage_new(NULL);
        r = mh_mailstorage_init(m_storage,(char*)pre.latin1(),0,0,0);
        if (r != MAIL_NO_ERROR) {
            qDebug(" error init storage  ");
            mailstorage_free(m_storage);
            m_storage = 0;
            return;
        }
    }
    r = mailstorage_connect(m_storage);
    if (r!=MAIL_NO_ERROR) {
        qDebug("error connecting storage ");
        mailstorage_free(m_storage);
        m_storage = 0;
    }
 }
 void MHwrapper::clean_storage()
 {
    if (m_storage) {
        mailstorage_disconnect(m_storage);
        mailstorage_free(m_storage);
        m_storage = 0;
    }
 }
 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);
    init_storage();
    if (!m_storage) {
        return folders;
    }
    mail_list*flist = 0;
    clistcell*current=0;
    int r = mailsession_list_folders(m_storage->sto_session,NULL,&flist);
    if (r != MAIL_NO_ERROR || !flist) {
        qDebug("error getting folder list ");
        return folders;
    }
    for (current=clist_begin(flist->mb_list);current!=0;current=clist_next(current)) {
        QString t = (char*)current->data;
        t.replace(0,MHPath.length(),"");
        folders->append(new MHFolder(t,MHPath));
    }
    mail_list_free(flist);
    return folders;
 }
 void MHwrapper::deleteMail(const RecMailP&mail)
 {
    init_storage();
    if (!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,52 +1,53 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #ifndef __MH_WRAPPER_H
 #define __MH_WRAPPER_H
 #include "maildefines.h"
 #include "genericwrapper.h"
 #include <qstring.h>
 class encodedString;
 struct mailmbox_folder;
 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);
    virtual int createMbox(const QString&folder,const Opie::Core::OSmartPointer<Folder>&f=0,
        const QString&d="",bool s=false);
    virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&);
    virtual void storeMessage(const char*msg,size_t length, const QString&folder);
    virtual RecBodyP fetchBody( const RecMailP &mail );
    static void mbox_progress( size_t current, size_t maximum );
    virtual encodedString* fetchRawBody(const RecMailP&mail);
    virtual void deleteMails(const QString & FolderName,const QValueList<Opie::Core::OSmartPointer<RecMail> > &target);
    virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&);
    virtual MAILLIB::ATYPE getType()const;
    virtual const QString&getName()const;
 public slots:
    /* for deleting maildirs we are using a system call */
    virtual void oprocessStderr(Opie::Core::OProcess*, char *buffer, int );
    virtual void processEnded(Opie::Core::OProcess *);
 protected:
    QString buildPath(const QString&p);
    QString MHPath;
    QString MHName;
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,32 +1,33 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #include "nntpwrapper.h"
 #include "logindialog.h"
 #include "mailtypes.h"
 #include <qfile.h>
 #include <stdlib.h>
 #include <libetpan/libetpan.h>
 #define HARD_MSG_SIZE_LIMIT 5242880
 using namespace Opie::Core;
 NNTPwrapper::NNTPwrapper( NNTPaccount *a )
 : Genericwrapper() {
    account = a;
    m_nntp = NULL;
    msgTempName = a->getFileName()+"_msg_cache";
    last_msg_id = 0;
 }
 NNTPwrapper::~NNTPwrapper() {
    logout();
    QFile msg_cache(msgTempName);
    if (msg_cache.exists()) {
        msg_cache.remove();
    }
 }
 void NNTPwrapper::nntp_progress( size_t current, size_t maximum ) {
@@ -69,72 +70,72 @@ RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) {
        msg_cache.open(IO_ReadOnly);
        message = new char[4096];
        memset(message,0,4096);
        while (msg_cache.readBlock(message,4095)>0) {
            msg+=message;
            memset(message,0,4096);
        }
        delete message;
        message = (char*)malloc(msg.length()+1*sizeof(char));
        memset(message,0,msg.length()+1);
        memcpy(message,msg.latin1(),msg.length());
        /* transform to libetpan stuff */
        mailmsg = mailmessage_new();
        mailmessage_init(mailmsg, NULL, data_message_driver, 0, strlen(message));
        generic_message_t * msg_data;
        msg_data = (generic_message_t *)mailmsg->msg_data;
        msg_data->msg_fetched = 1;
        msg_data->msg_message = message;
        msg_data->msg_length = strlen(message);
    }
    body = parseMail(mailmsg);
    /* clean up */
    if (mailmsg)
        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 )
        return;
    const char *server, *user, *pass;
    QString User,Pass;
    uint16_t port;
    int err = NEWSNNTP_NO_ERROR;
    server = account->getServer().latin1();
    port = account->getPort().toUInt();
    user = pass = 0;
    if ( ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) && account->getLogin() ) {
        LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true );
        login.show();
        if ( QDialog::Accepted == login.exec() ) {
            // ok
            User = login.getUser().latin1();
            Pass = login.getPassword().latin1();
        } else {
            // cancel
            ; // << "NNTP: Login canceled" << oendl; 
            return;
        }
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,48 +1,49 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #ifndef __NNTPWRAPPER
 #define __NNTPWRAPPER
 #include "mailwrapper.h"
 #include "genericwrapper.h"
 #include <qstring.h>
 #include <libetpan/clist.h>
 class encodedString;
 struct mailstorage;
 struct mailfolder;
 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>&);
    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 nntp_progress( size_t current, size_t maximum );
 protected:
    void login();
    NNTPaccount *account;
    mailstorage* m_nntp;
 };
 #endif
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,32 +1,33 @@
+// 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>
 #include <qfile.h>
 /* we don't fetch messages larger than 5 MB */
 #define HARD_MSG_SIZE_LIMIT 5242880
 using namespace Opie::Core;
 POP3wrapper::POP3wrapper( POP3account *a )
 : Genericwrapper() {
    account = a;
    m_pop3 = NULL;
    msgTempName = a->getFileName()+"_msg_cache";
    last_msg_id = 0;
 }
 POP3wrapper::~POP3wrapper() {
    logout();
    QFile msg_cache(msgTempName);
    if (msg_cache.exists()) {
        msg_cache.remove();
    }
 }
 void POP3wrapper::pop3_progress( size_t current, size_t maximum ) {
    ; // odebug << "POP3: " << current << " of " << maximum << "" << oendl; 
@@ -67,72 +68,72 @@ RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) {
        QString msg="";
        msg_cache.open(IO_ReadOnly);
        message = new char[4096];
        memset(message,0,4096);
        while (msg_cache.readBlock(message,4095)>0) {
            msg+=message;
            memset(message,0,4096);
        }
        delete message;
        message = (char*)malloc(msg.length()+1*sizeof(char));
        memset(message,0,msg.length()+1);
        memcpy(message,msg.latin1(),msg.length());
        /* transform to libetpan stuff */
        mailmsg = mailmessage_new();
        mailmessage_init(mailmsg, NULL, data_message_driver, 0, strlen(message));
        generic_message_t * msg_data;
        msg_data = (generic_message_t *)mailmsg->msg_data;
        msg_data->msg_fetched = 1;
        msg_data->msg_message = message;
        msg_data->msg_length = strlen(message);
    }
    body = parseMail(mailmsg);
    /* clean up */
    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 */
    if ( m_pop3 != NULL )
        return;
    const char *server, *user, *pass;
    uint16_t port;
    int err = MAILPOP3_NO_ERROR;
    server = account->getServer().latin1();
    port = account->getPort().toUInt();
    if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) {
        LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true );
        login.show();
        if ( QDialog::Accepted == login.exec() ) {
            // ok
            user = login.getUser().latin1();
            pass = login.getPassword().latin1();
        } else {
            // cancel
            ; // odebug << "POP3: Login canceled" << oendl; 
            return;
        }
    } else {
        user = account->getUser().latin1();
@@ -163,64 +164,80 @@ void POP3wrapper::login()
    err = mailstorage_connect(m_pop3);
    if (err != MAIL_NO_ERROR) {
        ; // odebug << QString( "FEHLERNUMMER %1" ).arg(  err ) << oendl; 
        Global::statusMessage(tr("Error initializing folder"));
        mailstorage_free(m_pop3);
        m_pop3 = 0;
    } else {
        mailsession * session = m_pop3->sto_session;
        mailpop3 * mail =  ( (  pop3_session_state_data * )session->sess_data )->pop3_session;
        if (mail) {
            mail->pop3_progr_fun = &pop3_progress;
        }
    }
 }
 void POP3wrapper::logout()
 {
    if ( m_pop3 == NULL )
        return;
    mailstorage_free(m_pop3);
    m_pop3 = 0;
 }
 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"));
    }
 }
 void POP3wrapper::answeredMail(const RecMailP&) {}
 int POP3wrapper::deleteAllMail(const FolderP&) {
    login();
    if (!m_pop3)
        return 0;
    int res = 1;
    uint32_t result = 0;
    int err = mailsession_messages_number(m_pop3->sto_session,NULL,&result);
    if (err != MAIL_NO_ERROR) {
        Global::statusMessage(tr("Error getting folder info"));
        return 0;
    }
    for (unsigned int i = 0; i < result; ++i) {
        err = mailsession_remove_message(m_pop3->sto_session,i+1);
        if (err != MAIL_NO_ERROR) {
            Global::statusMessage(tr("Error deleting mail %1").arg(i+1));
            res=0;
        }
        break;
    }
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,42 +1,44 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #ifndef __POP3WRAPPER
 #define __POP3WRAPPER
 #include "mailwrapper.h"
 #include "genericwrapper.h"
 #include <qstring.h>
 class encodedString;
 struct mailstorage;
 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 );
 protected:
    void login();
    POP3account *account;
    mailstorage*m_pop3;
 };
 #endif