14 files changed, 375 insertions, 86 deletions
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index 8aac14b..30765cf 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -182,16 +182,16 @@ void IMAPviewItem::refreshFolders(bool force)
 }
 QPopupMenu * IMAPviewItem::getContextMenu()
 {
    QPopupMenu *m = new QPopupMenu(0);
    if (m) {
-        m->insertItem(QObject::tr("Refresh folder list","IMAPviewItem"),0);
+        m->insertItem(QObject::tr("Refresh folder list",contextName),0);
-        m->insertItem(QObject::tr("Create new folder","IMAPviewItem"),1);
+        m->insertItem(QObject::tr("Create new folder",contextName),1);
        m->insertSeparator();
-        m->insertItem(QObject::tr("Disconnect","IMAPviewItem"),2);
+        m->insertItem(QObject::tr("Disconnect",contextName),2);
    }
    return m;
 }
 void IMAPviewItem::createNewFolder()
 {
@@ -288,31 +288,31 @@ RecBody IMAPfolderItem::fetchBody(const RecMail&aMail)
 QPopupMenu * IMAPfolderItem::getContextMenu()
 {
    QPopupMenu *m = new QPopupMenu(0);
    if (m) {
        if (folder->may_select()) {
-            m->insertItem(QObject::tr("Refresh header list","IMAPfolderItem"),0);
+            m->insertItem(QObject::tr("Refresh header list",contextName),0);
-            m->insertItem(QObject::tr("Delete all mails","IMAPfolderItem"),1);
+            m->insertItem(QObject::tr("Delete all mails",contextName),1);
        }
        if (folder->no_inferior()==false) {
-            m->insertItem(QObject::tr("Create new subfolder","IMAPfolderItem"),2);
+            m->insertItem(QObject::tr("Create new subfolder",contextName),2);
        }
        if (folder->getDisplayName().lower()!="inbox") {
-            m->insertItem(QObject::tr("Delete folder","IMAPfolderItem"),3);
+            m->insertItem(QObject::tr("Delete folder",contextName),3);
        }
    }
    return m;
 }
 void IMAPfolderItem::deleteAllMails()
 {
-    int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails","IMAPfolderItem"),
+    int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails",contextName),
-        QObject::tr("<center>Realy delete all mails in box <br>%1</center>","IMAPfolderItem").arg(folder->getDisplayName()),
+        QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName).arg(folder->getDisplayName()),
-        QObject::tr("Yes","IMAPfolderItem"),
+        QObject::tr("Yes",contextName),
-        QObject::tr("No","IMAPfolderItem"),QString::null,1,1);
+        QObject::tr("No",contextName),QString::null,1,1);
    qDebug("Auswahl: %i",yesno);
    if (yesno == 0) {
        if (imap->getWrapper()->deleteAllMail(folder)) {
            AccountView * view = (AccountView*)listView();
            if (view) view->refreshCurrent();
        }
@@ -332,22 +332,27 @@ void IMAPfolderItem::createNewFolder()
        }
    }
 }
 void IMAPfolderItem::deleteFolder()
 {
-    int yesno = QMessageBox::warning(0,QObject::tr("Delete folder","IMAPfolderItem"),
+    int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName),
-        QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>","IMAPfolderItem").arg(folder->getDisplayName()),
+        QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()),
-        QObject::tr("Yes","IMAPfolderItem"),
+        QObject::tr("Yes",contextName),
-        QObject::tr("No","IMAPfolderItem"),QString::null,1,1);
+        QObject::tr("No",contextName),QString::null,1,1);
    qDebug("Auswahl: %i",yesno);
    if (yesno == 0) {
        if (imap->getWrapper()->deleteMbox(folder)) {
-            /* be carefull - after that this object is destroyd so don't call 
+            QListView*v=listView();
+            IMAPviewItem * box = imap;
+            /* be carefull - after that this object is destroyd so don't use
             * any member of it after that call!!*/
            imap->refreshFolders(true);
+            if (v) {
+                v->setSelected(box,true);
+            }
        }
    }
 }
 void IMAPfolderItem::contextMenuSelected(int id)
 {
@@ -372,12 +377,14 @@ void IMAPfolderItem::contextMenuSelected(int id)
 }
 /**
 * Generic stuff
 */
+const QString AccountViewItem::contextName="AccountViewItem";
 AccountView::AccountView( QWidget *parent, const char *name, WFlags flags )
    : QListView( parent, name, flags )
 {
    connect( this, SIGNAL( selectionChanged( QListViewItem * ) ),
            SLOT( refresh( QListViewItem * ) ) );
    connect( this, SIGNAL( mouseButtonPressed(int, QListViewItem *,const QPoint&,int  ) ),this,
@@ -487,12 +494,18 @@ AbstractMail *MBOXviewItem::getWrapper()
 {
    return wrapper;
 }
 void MBOXviewItem::refresh( QList<RecMail> & )
 {
+    refresh(false);
+}
+void MBOXviewItem::refresh(bool force)
+{
+    if (childCount()>0 && force==false) return;
    QList<Folder> *folders = wrapper->listFolders();
    QListViewItem *child = firstChild();
    while ( child ) {
        QListViewItem *tmp = child;
        child = child->nextSibling();
        delete tmp;
@@ -507,16 +520,52 @@ void MBOXviewItem::refresh( QList<RecMail> & )
    folders->setAutoDelete(false);
    delete folders;
 }
 RecBody MBOXviewItem::fetchBody( const RecMail &mail )
 {
-    qDebug( "POP3 fetchBody" );
+    qDebug( "MBOX fetchBody" );
    return wrapper->fetchBody( mail );
 }
+QPopupMenu * MBOXviewItem::getContextMenu()
+{
+    QPopupMenu *m = new QPopupMenu(0);
+    if (m) {
+        m->insertItem(QObject::tr("Refresh folder list",contextName),0);
+        m->insertItem(QObject::tr("Create new folder",contextName),1);
+    }
+    return m;
+}
+void MBOXviewItem::createFolder()
+{
+    Newmdirdlg ndirdlg(0,0,true);
+    ndirdlg.showMaximized();
+    if (ndirdlg.exec()) {
+        QString ndir = ndirdlg.Newdir();
+        if (wrapper->createMbox(ndir)) {
+            refresh(true);
+        }
+    }
+}
+void MBOXviewItem::contextMenuSelected(int which)
+{
+    switch (which) {
+    case 0:
+        refresh(true);
+        break;
+    case 1:
+        createFolder();
+        break;
+    default:
+        break;
+    }
+}
 MBOXfolderItem::~MBOXfolderItem()
 {
    delete folder;
 }
 MBOXfolderItem::MBOXfolderItem( Folder *folderInit, MBOXviewItem *parent , QListViewItem*after  )
@@ -541,6 +590,66 @@ void MBOXfolderItem::refresh(QList<RecMail>&target)
 }
 RecBody MBOXfolderItem::fetchBody(const RecMail&aMail)
 {
    return mbox->getWrapper()->fetchBody(aMail);
 }
+void MBOXfolderItem::deleteAllMails()
+{
+    int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails",contextName),
+        QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName).arg(folder->getDisplayName()),
+        QObject::tr("Yes",contextName),
+        QObject::tr("No",contextName),QString::null,1,1);
+    qDebug("Auswahl: %i",yesno);
+    if (yesno == 0) {
+        if (mbox->getWrapper()->deleteAllMail(folder)) {
+            AccountView * view = (AccountView*)listView();
+            if (view) view->refreshCurrent();
+        }
+    }
+}
+void MBOXfolderItem::deleteFolder()
+{
+    int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName),
+        QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()),
+        QObject::tr("Yes",contextName),
+        QObject::tr("No",contextName),QString::null,1,1);
+    qDebug("Auswahl: %i",yesno);
+    if (yesno == 0) {
+        if (mbox->getWrapper()->deleteMbox(folder)) {
+            QListView*v=listView();
+            MBOXviewItem * box = mbox;
+            /* be carefull - after that this object is destroyd so don't use
+             * any member of it after that call!!*/
+            mbox->refresh(true);
+            if (v) {
+                v->setSelected(box,true);
+            }
+        }
+    }
+}
+QPopupMenu * MBOXfolderItem::getContextMenu()
+{
+    QPopupMenu *m = new QPopupMenu(0);
+    if (m) {
+        m->insertItem(QObject::tr("Delete all mails",contextName),0);
+        m->insertItem(QObject::tr("Delete folder",contextName),1);
+    }
+    return m;
+}
+void MBOXfolderItem::contextMenuSelected(int which)
+{
+    switch(which) {
+    case 0:
+        deleteAllMails();
+        break;
+    case 1:
+        deleteFolder();
+        break;
+    default:
+        break;
+    }
+}
diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h
index e7fe038..98abf44 100644
--- a/noncore/net/mail/accountview.h
+++ b/noncore/net/mail/accountview.h
@@ -21,12 +21,14 @@ public:
    AccountViewItem( QListViewItem *parent) : QListViewItem( parent) {}
    AccountViewItem( QListViewItem *parent , QListViewItem*after  ) : QListViewItem( parent,after ) {}
    virtual void refresh(QList<RecMail>&)=0;
    virtual RecBody fetchBody(const RecMail&)=0;
    virtual QPopupMenu * getContextMenu(){return 0;};
    virtual void contextMenuSelected(int){}
+protected:
+    static const QString contextName;
 };
 class POP3viewItem : public AccountViewItem
 {
 public:
@@ -85,35 +87,43 @@ public:
    IMAPfolderItem( Folder *folder, IMAPviewItem *parent , QListViewItem*after  );
    IMAPfolderItem( Folder *folder, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master  );
    ~IMAPfolderItem();
    virtual void refresh(QList<RecMail>&);
    virtual RecBody fetchBody(const RecMail&);
    bool matchName(const QString&name)const;
-    virtual void deleteAllMails();    
    virtual QPopupMenu * getContextMenu();
    virtual void contextMenuSelected(int);
    virtual const QString& Delemiter()const;
 protected:
    virtual void createNewFolder();
    virtual void deleteFolder();
+    virtual void deleteAllMails();    
    
 private:
    Folder *folder;
    IMAPviewItem *imap;
 };
 class MBOXviewItem : public AccountViewItem
 {
+    friend class MBOXfolderItem;
 public:
 //    MBOXviewItem( MBOXaccount *a, QListView *parent );
    MBOXviewItem( const QString&aMboxPath, QListView *parent );
    ~MBOXviewItem();
    virtual void refresh( QList<RecMail> &target );
    virtual RecBody fetchBody( const RecMail &mail );
    AbstractMail *getWrapper();
+    virtual QPopupMenu * getContextMenu();
+    virtual void contextMenuSelected(int);
+protected:
+    virtual void refresh(bool force=false);
+    virtual void createFolder();
 private:
 //    MBOXaccount *account;
    QString m_Path;
    AbstractMail *wrapper;
 };
@@ -123,12 +133,18 @@ class MBOXfolderItem : public AccountViewItem
 public:
    MBOXfolderItem( Folder *folder, MBOXviewItem *parent , QListViewItem*after  );
    ~MBOXfolderItem();
    virtual void refresh(QList<RecMail>&);
    virtual RecBody fetchBody(const RecMail&);
+    virtual QPopupMenu * getContextMenu();
+    virtual void contextMenuSelected(int);
+protected:
+    virtual void deleteAllMails();
+    virtual void deleteFolder();
 private:
    Folder *folder;
    MBOXviewItem *mbox;
 };
 class AccountView : public QListView
diff --git a/noncore/net/mail/genericwrapper.h b/noncore/net/mail/genericwrapper.h
index 12f6928..90c4b50 100644
--- a/noncore/net/mail/genericwrapper.h
+++ b/noncore/net/mail/genericwrapper.h
@@ -46,14 +46,12 @@ protected:
    
    void traverseBody(RecBody&target,mailmessage*message,mailmime*mime,unsigned int current_rek=0);
    static void fillSingleBody(RecPart&target,mailmessage*message,mailmime*mime);
    static void fillParameters(RecPart&target,clist*parameters);
    static QString getencoding(mailmime_mechanism*aEnc);
-    POP3account *account;
-    mailpop3 *m_pop3;
    QString msgTempName;
    unsigned int last_msg_id;
    QMap<QString,encodedString*> bodyCache;
 };
 #endif
diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.h b/noncore/net/mail/libmailwrapper/genericwrapper.h
index 12f6928..90c4b50 100644
--- a/noncore/net/mail/libmailwrapper/genericwrapper.h
+++ b/noncore/net/mail/libmailwrapper/genericwrapper.h
@@ -46,14 +46,12 @@ protected:
    
    void traverseBody(RecBody&target,mailmessage*message,mailmime*mime,unsigned int current_rek=0);
    static void fillSingleBody(RecPart&target,mailmessage*message,mailmime*mime);
    static void fillParameters(RecPart&target,clist*parameters);
    static QString getencoding(mailmime_mechanism*aEnc);
-    POP3account *account;
-    mailpop3 *m_pop3;
    QString msgTempName;
    unsigned int last_msg_id;
    QMap<QString,encodedString*> bodyCache;
 };
 #endif
diff --git a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
index 6d69263..162a0c9 100644
--- a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
@@ -1,13 +1,13 @@
 #include "mboxwrapper.h"
 #include "mailtypes.h"
 #include "mailwrapper.h"
 #include <libetpan/libetpan.h>
-#include <libetpan/mailstorage.h>
 #include <qdir.h>
 #include <stdlib.h>
+#include <qpe/global.h>
 MBOXwrapper::MBOXwrapper(const QString & mbox_dir)
    : Genericwrapper(),MBOXPath(mbox_dir)
 {
    QDir dir(MBOXPath);
    if (!dir.exists()) {
@@ -21,50 +21,45 @@ MBOXwrapper::~MBOXwrapper()
 void MBOXwrapper::listMessages(const QString & mailbox, QList<RecMail> &target )
 {
    mailstorage*storage = mailstorage_new(NULL);
    QString p = MBOXPath+"/";
    p+=mailbox;
-    char*fname = 0;
+    
+    int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
-    fname = strdup(p.latin1());
-    int r = mbox_mailstorage_init(storage,fname,0,0,0);
    mailfolder*folder;
-    folder = mailfolder_new( storage,fname,NULL);   
+    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);   
    r = mailfolder_connect(folder);
    if (r != MAIL_NO_ERROR) {
        qDebug("Error initializing mbox");
        mailfolder_free(folder);
        mailstorage_free(storage);
-        free(fname);
        return;
    }
    mailmessage_list * env_list = 0;
    r = mailsession_get_messages_list(folder->fld_session,&env_list);
    if (r != MAIL_NO_ERROR) {
        qDebug("Error message list");
        mailfolder_free(folder);
        mailstorage_free(storage);
-        free(fname);
        return;
    }
    r = mailsession_get_envelopes_list(folder->fld_session, env_list);
    if (r != MAIL_NO_ERROR) {
        qDebug("Error filling message list");
        if (env_list) {
            mailmessage_list_free(env_list);
        }
        mailfolder_free(folder);
        mailstorage_free(storage);
-        free(fname);
        return;
    }
    mailimf_references * refs;
-    for(int i = 0 ; i < carray_count(env_list->msg_tab) ; ++i) {
+    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) {
            qDebug("could not fetch envelope of message %i", i);
            continue;
@@ -107,13 +102,13 @@ void MBOXwrapper::listMessages(const QString & mailbox, QList<RecMail> &target )
    if (env_list) {
        mailmessage_list_free(env_list);
    }
    mailfolder_disconnect(folder);
    mailfolder_free(folder);
    mailstorage_free(storage);
-    free(fname);
+    Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(i));
 }
 QList<Folder>* MBOXwrapper::listFolders()
 {
    QList<Folder> * folders = new QList<Folder>();
    folders->setAutoDelete( false );
@@ -131,16 +126,15 @@ QList<Folder>* MBOXwrapper::listFolders()
 void MBOXwrapper::deleteMail(const RecMail&mail)
 {
    mailstorage*storage = mailstorage_new(NULL);
    QString p = MBOXPath+"/";
    p+=mail.getMbox();
-    mailmessage * msg;
+    int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
-    int r = mbox_mailstorage_init(storage,strdup(p.latin1()),0,0,0);
    mailfolder*folder;
-    folder = mailfolder_new( storage,strdup(p.latin1()),NULL);   
+    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);   
    r = mailfolder_connect(folder);
    if (r != MAIL_NO_ERROR) {
        qDebug("Error initializing mbox");
        mailfolder_free(folder);
        mailstorage_free(storage);
        return;
@@ -164,15 +158,15 @@ RecBody MBOXwrapper::fetchBody( const RecMail &mail )
    QString p = MBOXPath+"/";
    p+=mail.getMbox();
    mailmessage * msg;
    char*data=0;
    size_t size;
-    int r = mbox_mailstorage_init(storage,strdup(p.latin1()),0,0,0);
+    int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
    mailfolder*folder;
-    folder = mailfolder_new( storage,strdup(p.latin1()),NULL);   
+    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);   
    r = mailfolder_connect(folder);
    if (r != MAIL_NO_ERROR) {
        qDebug("Error initializing mbox");
        mailfolder_free(folder);
        mailstorage_free(storage);
        return body;
@@ -202,29 +196,43 @@ RecBody MBOXwrapper::fetchBody( const RecMail &mail )
 void MBOXwrapper::mbox_progress( size_t current, size_t maximum )
 {
    qDebug("MBOX %i von %i",current,maximum);
 }
-void MBOXwrapper::createFolder(const QString&)
+int MBOXwrapper::createMbox(const QString&folder,const Folder*,const QString&,bool )
 {
+    QString p = MBOXPath+"/";
+    p+=folder;
+    QFileInfo fi(p);
+    if (fi.exists()) {
+        Global::statusMessage(tr("Mailbox exists."));
+        return 0;
+    }
+    mailmbox_folder*f = 0;
+    if (mailmbox_init(p.latin1(),0,1,0,&f) != MAIL_NO_ERROR) {
+        Global::statusMessage(tr("Error init folder"));
+        return 0;
+    }
+    if (f) mailmbox_done(f);
+    return 1;
 }
 void MBOXwrapper::storeMessage(const char*msg,size_t length, const QString&folder)
 {
    QString p = MBOXPath+"/";
    p+=folder;
    mailmbox_folder*f = 0;
    int r = mailmbox_init(p.latin1(),0,1,0,&f);
    if (r != MAIL_NO_ERROR) {
-        qDebug("Error init folder");
+        Global::statusMessage(tr("Error init folder"));
        return;
    }
    r = mailmbox_append_message(f,msg,length);
    if (r != MAIL_NO_ERROR) {
-        qDebug("Error writing message folder");
+        Global::statusMessage(tr("Error writing to message folder"));
    }
    mailmbox_done(f);
 }
 void MBOXwrapper::fetchRawBody(const RecMail&mail,char**target,size_t*length)
 {
@@ -233,32 +241,32 @@ void MBOXwrapper::fetchRawBody(const RecMail&mail,char**target,size_t*length)
    QString p = MBOXPath+"/";
    p+=mail.getMbox();
    mailmessage * msg;
    char*data=0;
    size_t size;
-    int r = mbox_mailstorage_init(storage,strdup(p.latin1()),0,0,0);
+    int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
    mailfolder*folder;
-    folder = mailfolder_new( storage,strdup(p.latin1()),NULL);   
+    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);   
    r = mailfolder_connect(folder);
    if (r != MAIL_NO_ERROR) {
-        qDebug("Error initializing mbox");
+        Global::statusMessage(tr("Error initializing mbox"));
        mailfolder_free(folder);
        mailstorage_free(storage);
        return;
    }
    r = mailsession_get_message(folder->fld_session, mail.getNumber(), &msg);
    if (r != MAIL_NO_ERROR) {
-        qDebug("Error fetching mail %i",mail.getNumber());
+        Global::statusMessage(tr("Error fetching mail %i").arg(mail.getNumber()));
        mailfolder_free(folder);
        mailstorage_free(storage);
        return;
    }
    r = mailmessage_fetch(msg,&data,&size);
    if (r != MAIL_NO_ERROR) {
-        qDebug("Error fetching mail %i",mail.getNumber());
+        Global::statusMessage(tr("Error fetching mail %i").arg(mail.getNumber()));
        mailfolder_free(folder);
        mailstorage_free(storage);
        mailmessage_free(msg);
        return;
    }
    *target = data;
@@ -275,19 +283,85 @@ void MBOXwrapper::deleteMails(const QString & mailbox,QList<RecMail> &target)
    mailmbox_folder*f = 0;
    int r = mailmbox_init(p.latin1(),0,1,0,&f);
    if (r != MAIL_NO_ERROR) {
        qDebug("Error init folder");
        return;
    }
+    deleteMails(f,target);
+    mailmbox_done(f);
+}
+void MBOXwrapper::deleteMails(mailmbox_folder*f,QList<RecMail> &target)
+{
+    if (!f) return;
+    int r;
    for (unsigned int i=0; i < target.count();++i) {
        r = mailmbox_delete_msg(f,target.at(i)->getNumber());
        if (r!=MAILMBOX_NO_ERROR) {
            qDebug("error delete mail");
        }
    }
    r = mailmbox_expunge(f);
    if (r != MAILMBOX_NO_ERROR) {
        qDebug("error expunge mailbox");
    }
-    mailmbox_done(f);
+}
+int MBOXwrapper::deleteAllMail(const Folder*tfolder)
+{
+    if (!tfolder) return 0;
+    QString p = MBOXPath+tfolder->getDisplayName();
+    int res = 1;
+    
+    mailfolder*folder = 0;
+    mailmessage_list*l=0;
+    mailstorage*storage = mailstorage_new(NULL);
+    int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
+    if (r != MAIL_NO_ERROR) {
+        Global::statusMessage(tr("Error initializing mbox"));
+        res = 0;
+    }
+    if (res) {
+        folder = mailfolder_new( storage,(char*)p.latin1(),NULL);   
+        r = mailfolder_connect(folder);
+        if (r != MAIL_NO_ERROR) {
+            Global::statusMessage(tr("Error initializing mbox"));
+            res = 0;
+        }
+    }
+    if (res) {
+        r = mailsession_get_messages_list(folder->fld_session,&l);
+        if (r != MAIL_NO_ERROR) {
+            qDebug("Error message list");
+            res=0;
+        }
+    }
+    for(unsigned int i = 0 ; l!= 0 && res==1 && i < carray_count(l->msg_tab) ; ++i) {
+        r = mailsession_remove_message(folder->fld_session,i+1);
+        if (r != MAIL_NO_ERROR) {
+            Global::statusMessage(tr("Error deleting mail %1").arg(i+1));
+            res = 0;
+            break;
+        }
+    }
+    if (l) mailmessage_list_free(l);
+    if (folder) mailfolder_free(folder);
+    if (storage) mailstorage_free(storage);
+    return res;
+}
+int MBOXwrapper::deleteMbox(const Folder*tfolder)
+{
+    if (!tfolder) return 0;
+    QString p = MBOXPath+tfolder->getDisplayName();
+    QFile fi(p);
+    if (!fi.exists()) {
+        Global::statusMessage(tr("Mailbox doesn't exist."));
+        return 0;
+    }
+    if (!fi.remove()) {
+        Global::statusMessage(tr("Error deleting Mailbox."));
+        return 0;
+    }
+    return 1;
 }
diff --git a/noncore/net/mail/libmailwrapper/mboxwrapper.h b/noncore/net/mail/libmailwrapper/mboxwrapper.h
index f64ad52..226a544 100644
--- a/noncore/net/mail/libmailwrapper/mboxwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mboxwrapper.h
@@ -3,12 +3,13 @@
 #include "genericwrapper.h"
 #include <qstring.h>
 class RecMail;
 class RecBody;
+struct mailmbox_folder;
 class MBOXwrapper : public Genericwrapper
 {
    Q_OBJECT
 public:
    MBOXwrapper(const QString & dir);
@@ -16,20 +17,25 @@ public:
    
    virtual void listMessages(const QString & mailbox, QList<RecMail> &target );
    virtual QList<Folder>* listFolders();
    virtual void deleteMail(const RecMail&mail);
    virtual void answeredMail(const RecMail&mail);
-    virtual void createFolder(const QString&aFolder);
+    
+    virtual int createMbox(const QString&folder,const Folder*f=0,const QString&d="",bool s=false);
+    virtual int deleteMbox(const Folder*);
    virtual void storeMessage(const char*msg,size_t length, const QString&folder);
    virtual RecBody fetchBody( const RecMail &mail );
    static void mbox_progress( size_t current, size_t maximum );
    virtual void fetchRawBody(const RecMail&mail,char**target,size_t*length);
    virtual void deleteMails(const QString & mailbox,QList<RecMail> &target);
+    virtual int deleteAllMail(const Folder*);
 protected:
+    static void deleteMails(mailmbox_folder*f,QList<RecMail> &target);
    QString MBOXPath;
 };
 #endif
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index efd83ba..b85fbf6 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -1,13 +1,12 @@
 #include <stdlib.h>
 #include "pop3wrapper.h"
 #include "mailtypes.h"
 #include "logindialog.h"
-#include <libetpan/mailpop3.h>
+#include <libetpan/libetpan.h>
-#include <libetpan/mailmime.h>
+#include <qpe/global.h>
-#include <libetpan/data_message_driver.h>
 #include <qfile.h>
 /* we don't fetch messages larger than 5 MB */
 #define HARD_MSG_SIZE_LIMIT 5242880
 POP3wrapper::POP3wrapper( POP3account *a )
@@ -109,12 +108,13 @@ void POP3wrapper::listMessages(const QString &, QList<RecMail> &target )
    /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */
    size_t length = 0;
    carray * messages = 0;
    login();
    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)
@@ -129,12 +129,13 @@ void POP3wrapper::listMessages(const QString &, QList<RecMail> &target )
        mail->setNumber( info->msg_index );
        mail->setWrapper(this);
        mail->setMsgsize(info->msg_size);
        target.append( mail );
        free(header);
    }
+    Global::statusMessage( tr("Mailbox contains %1 mail(s)").arg(carray_count(messages)-m_pop3->pop3_deleted_count));
 }
 void POP3wrapper::login()
 {
    /* we'll hold the line */
    if ( m_pop3 != NULL ) return;
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.h b/noncore/net/mail/libmailwrapper/pop3wrapper.h
index b738cca..7502720 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.h
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.h
@@ -23,10 +23,11 @@ public:
    virtual RecBody fetchBody( const RecMail &mail );
    static void pop3_progress( size_t current, size_t maximum );
 protected:
    void login();
    void logout();
-    
+    POP3account *account;
+    mailpop3 *m_pop3;    
 };
 #endif
diff --git a/noncore/net/mail/mboxwrapper.cpp b/noncore/net/mail/mboxwrapper.cpp
index 6d69263..162a0c9 100644
--- a/noncore/net/mail/mboxwrapper.cpp
+++ b/noncore/net/mail/mboxwrapper.cpp
@@ -1,13 +1,13 @@
 #include "mboxwrapper.h"
 #include "mailtypes.h"
 #include "mailwrapper.h"
 #include <libetpan/libetpan.h>
-#include <libetpan/mailstorage.h>
 #include <qdir.h>
 #include <stdlib.h>
+#include <qpe/global.h>
 MBOXwrapper::MBOXwrapper(const QString & mbox_dir)
    : Genericwrapper(),MBOXPath(mbox_dir)
 {
    QDir dir(MBOXPath);
    if (!dir.exists()) {
@@ -21,50 +21,45 @@ MBOXwrapper::~MBOXwrapper()
 void MBOXwrapper::listMessages(const QString & mailbox, QList<RecMail> &target )
 {
    mailstorage*storage = mailstorage_new(NULL);
    QString p = MBOXPath+"/";
    p+=mailbox;
-    char*fname = 0;
+    
+    int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
-    fname = strdup(p.latin1());
-    int r = mbox_mailstorage_init(storage,fname,0,0,0);
    mailfolder*folder;
-    folder = mailfolder_new( storage,fname,NULL);   
+    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);   
    r = mailfolder_connect(folder);
    if (r != MAIL_NO_ERROR) {
        qDebug("Error initializing mbox");
        mailfolder_free(folder);
        mailstorage_free(storage);
-        free(fname);
        return;
    }
    mailmessage_list * env_list = 0;
    r = mailsession_get_messages_list(folder->fld_session,&env_list);
    if (r != MAIL_NO_ERROR) {
        qDebug("Error message list");
        mailfolder_free(folder);
        mailstorage_free(storage);
-        free(fname);
        return;
    }
    r = mailsession_get_envelopes_list(folder->fld_session, env_list);
    if (r != MAIL_NO_ERROR) {
        qDebug("Error filling message list");
        if (env_list) {
            mailmessage_list_free(env_list);
        }
        mailfolder_free(folder);
        mailstorage_free(storage);
-        free(fname);
        return;
    }
    mailimf_references * refs;
-    for(int i = 0 ; i < carray_count(env_list->msg_tab) ; ++i) {
+    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) {
            qDebug("could not fetch envelope of message %i", i);
            continue;
@@ -107,13 +102,13 @@ void MBOXwrapper::listMessages(const QString & mailbox, QList<RecMail> &target )
    if (env_list) {
        mailmessage_list_free(env_list);
    }
    mailfolder_disconnect(folder);
    mailfolder_free(folder);
    mailstorage_free(storage);
-    free(fname);
+    Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(i));
 }
 QList<Folder>* MBOXwrapper::listFolders()
 {
    QList<Folder> * folders = new QList<Folder>();
    folders->setAutoDelete( false );
@@ -131,16 +126,15 @@ QList<Folder>* MBOXwrapper::listFolders()
 void MBOXwrapper::deleteMail(const RecMail&mail)
 {
    mailstorage*storage = mailstorage_new(NULL);
    QString p = MBOXPath+"/";
    p+=mail.getMbox();
-    mailmessage * msg;
+    int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
-    int r = mbox_mailstorage_init(storage,strdup(p.latin1()),0,0,0);
    mailfolder*folder;
-    folder = mailfolder_new( storage,strdup(p.latin1()),NULL);   
+    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);   
    r = mailfolder_connect(folder);
    if (r != MAIL_NO_ERROR) {
        qDebug("Error initializing mbox");
        mailfolder_free(folder);
        mailstorage_free(storage);
        return;
@@ -164,15 +158,15 @@ RecBody MBOXwrapper::fetchBody( const RecMail &mail )
    QString p = MBOXPath+"/";
    p+=mail.getMbox();
    mailmessage * msg;
    char*data=0;
    size_t size;
-    int r = mbox_mailstorage_init(storage,strdup(p.latin1()),0,0,0);
+    int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
    mailfolder*folder;
-    folder = mailfolder_new( storage,strdup(p.latin1()),NULL);   
+    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);   
    r = mailfolder_connect(folder);
    if (r != MAIL_NO_ERROR) {
        qDebug("Error initializing mbox");
        mailfolder_free(folder);
        mailstorage_free(storage);
        return body;
@@ -202,29 +196,43 @@ RecBody MBOXwrapper::fetchBody( const RecMail &mail )
 void MBOXwrapper::mbox_progress( size_t current, size_t maximum )
 {
    qDebug("MBOX %i von %i",current,maximum);
 }
-void MBOXwrapper::createFolder(const QString&)
+int MBOXwrapper::createMbox(const QString&folder,const Folder*,const QString&,bool )
 {
+    QString p = MBOXPath+"/";
+    p+=folder;
+    QFileInfo fi(p);
+    if (fi.exists()) {
+        Global::statusMessage(tr("Mailbox exists."));
+        return 0;
+    }
+    mailmbox_folder*f = 0;
+    if (mailmbox_init(p.latin1(),0,1,0,&f) != MAIL_NO_ERROR) {
+        Global::statusMessage(tr("Error init folder"));
+        return 0;
+    }
+    if (f) mailmbox_done(f);
+    return 1;
 }
 void MBOXwrapper::storeMessage(const char*msg,size_t length, const QString&folder)
 {
    QString p = MBOXPath+"/";
    p+=folder;
    mailmbox_folder*f = 0;
    int r = mailmbox_init(p.latin1(),0,1,0,&f);
    if (r != MAIL_NO_ERROR) {
-        qDebug("Error init folder");
+        Global::statusMessage(tr("Error init folder"));
        return;
    }
    r = mailmbox_append_message(f,msg,length);
    if (r != MAIL_NO_ERROR) {
-        qDebug("Error writing message folder");
+        Global::statusMessage(tr("Error writing to message folder"));
    }
    mailmbox_done(f);
 }
 void MBOXwrapper::fetchRawBody(const RecMail&mail,char**target,size_t*length)
 {
@@ -233,32 +241,32 @@ void MBOXwrapper::fetchRawBody(const RecMail&mail,char**target,size_t*length)
    QString p = MBOXPath+"/";
    p+=mail.getMbox();
    mailmessage * msg;
    char*data=0;
    size_t size;
-    int r = mbox_mailstorage_init(storage,strdup(p.latin1()),0,0,0);
+    int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
    mailfolder*folder;
-    folder = mailfolder_new( storage,strdup(p.latin1()),NULL);   
+    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);   
    r = mailfolder_connect(folder);
    if (r != MAIL_NO_ERROR) {
-        qDebug("Error initializing mbox");
+        Global::statusMessage(tr("Error initializing mbox"));
        mailfolder_free(folder);
        mailstorage_free(storage);
        return;
    }
    r = mailsession_get_message(folder->fld_session, mail.getNumber(), &msg);
    if (r != MAIL_NO_ERROR) {
-        qDebug("Error fetching mail %i",mail.getNumber());
+        Global::statusMessage(tr("Error fetching mail %i").arg(mail.getNumber()));
        mailfolder_free(folder);
        mailstorage_free(storage);
        return;
    }
    r = mailmessage_fetch(msg,&data,&size);
    if (r != MAIL_NO_ERROR) {
-        qDebug("Error fetching mail %i",mail.getNumber());
+        Global::statusMessage(tr("Error fetching mail %i").arg(mail.getNumber()));
        mailfolder_free(folder);
        mailstorage_free(storage);
        mailmessage_free(msg);
        return;
    }
    *target = data;
@@ -275,19 +283,85 @@ void MBOXwrapper::deleteMails(const QString & mailbox,QList<RecMail> &target)
    mailmbox_folder*f = 0;
    int r = mailmbox_init(p.latin1(),0,1,0,&f);
    if (r != MAIL_NO_ERROR) {
        qDebug("Error init folder");
        return;
    }
+    deleteMails(f,target);
+    mailmbox_done(f);
+}
+void MBOXwrapper::deleteMails(mailmbox_folder*f,QList<RecMail> &target)
+{
+    if (!f) return;
+    int r;
    for (unsigned int i=0; i < target.count();++i) {
        r = mailmbox_delete_msg(f,target.at(i)->getNumber());
        if (r!=MAILMBOX_NO_ERROR) {
            qDebug("error delete mail");
        }
    }
    r = mailmbox_expunge(f);
    if (r != MAILMBOX_NO_ERROR) {
        qDebug("error expunge mailbox");
    }
-    mailmbox_done(f);
+}
+int MBOXwrapper::deleteAllMail(const Folder*tfolder)
+{
+    if (!tfolder) return 0;
+    QString p = MBOXPath+tfolder->getDisplayName();
+    int res = 1;
+    
+    mailfolder*folder = 0;
+    mailmessage_list*l=0;
+    mailstorage*storage = mailstorage_new(NULL);
+    int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
+    if (r != MAIL_NO_ERROR) {
+        Global::statusMessage(tr("Error initializing mbox"));
+        res = 0;
+    }
+    if (res) {
+        folder = mailfolder_new( storage,(char*)p.latin1(),NULL);   
+        r = mailfolder_connect(folder);
+        if (r != MAIL_NO_ERROR) {
+            Global::statusMessage(tr("Error initializing mbox"));
+            res = 0;
+        }
+    }
+    if (res) {
+        r = mailsession_get_messages_list(folder->fld_session,&l);
+        if (r != MAIL_NO_ERROR) {
+            qDebug("Error message list");
+            res=0;
+        }
+    }
+    for(unsigned int i = 0 ; l!= 0 && res==1 && i < carray_count(l->msg_tab) ; ++i) {
+        r = mailsession_remove_message(folder->fld_session,i+1);
+        if (r != MAIL_NO_ERROR) {
+            Global::statusMessage(tr("Error deleting mail %1").arg(i+1));
+            res = 0;
+            break;
+        }
+    }
+    if (l) mailmessage_list_free(l);
+    if (folder) mailfolder_free(folder);
+    if (storage) mailstorage_free(storage);
+    return res;
+}
+int MBOXwrapper::deleteMbox(const Folder*tfolder)
+{
+    if (!tfolder) return 0;
+    QString p = MBOXPath+tfolder->getDisplayName();
+    QFile fi(p);
+    if (!fi.exists()) {
+        Global::statusMessage(tr("Mailbox doesn't exist."));
+        return 0;
+    }
+    if (!fi.remove()) {
+        Global::statusMessage(tr("Error deleting Mailbox."));
+        return 0;
+    }
+    return 1;
 }
diff --git a/noncore/net/mail/mboxwrapper.h b/noncore/net/mail/mboxwrapper.h
index f64ad52..226a544 100644
--- a/noncore/net/mail/mboxwrapper.h
+++ b/noncore/net/mail/mboxwrapper.h
@@ -3,12 +3,13 @@
 #include "genericwrapper.h"
 #include <qstring.h>
 class RecMail;
 class RecBody;
+struct mailmbox_folder;
 class MBOXwrapper : public Genericwrapper
 {
    Q_OBJECT
 public:
    MBOXwrapper(const QString & dir);
@@ -16,20 +17,25 @@ public:
    
    virtual void listMessages(const QString & mailbox, QList<RecMail> &target );
    virtual QList<Folder>* listFolders();
    virtual void deleteMail(const RecMail&mail);
    virtual void answeredMail(const RecMail&mail);
-    virtual void createFolder(const QString&aFolder);
+    
+    virtual int createMbox(const QString&folder,const Folder*f=0,const QString&d="",bool s=false);
+    virtual int deleteMbox(const Folder*);
    virtual void storeMessage(const char*msg,size_t length, const QString&folder);
    virtual RecBody fetchBody( const RecMail &mail );
    static void mbox_progress( size_t current, size_t maximum );
    virtual void fetchRawBody(const RecMail&mail,char**target,size_t*length);
    virtual void deleteMails(const QString & mailbox,QList<RecMail> &target);
+    virtual int deleteAllMail(const Folder*);
 protected:
+    static void deleteMails(mailmbox_folder*f,QList<RecMail> &target);
    QString MBOXPath;
 };
 #endif
diff --git a/noncore/net/mail/newmaildir.cpp b/noncore/net/mail/newmaildir.cpp
index 3fc66f4..ab0d4e3 100644
--- a/noncore/net/mail/newmaildir.cpp
+++ b/noncore/net/mail/newmaildir.cpp
@@ -1,15 +1,19 @@
 #include "newmaildir.h"
 #include <qdialog.h>
 #include <qvariant.h>
 #include <qlineedit.h>
 #include <qcheckbox.h>
-Newmdirdlg::Newmdirdlg( QWidget* parent, const char* name)
+Newmdirdlg::Newmdirdlg( QWidget* parent, const char* name,bool no_sub)
    : Newmdirdlgui(parent,name,true),ndir(""),possible_subs(false)
 {
+    if (no_sub) {
+        subdirsPossibleBox->setChecked(false);
+        subdirsPossibleBox->hide();
+    }
 }
 Newmdirdlg::~Newmdirdlg()
 {
 }
diff --git a/noncore/net/mail/newmaildir.h b/noncore/net/mail/newmaildir.h
index 1eb904e..496eaf4 100644
--- a/noncore/net/mail/newmaildir.h
+++ b/noncore/net/mail/newmaildir.h
@@ -2,13 +2,13 @@
 #include <qvariant.h>
 class Newmdirdlg : public Newmdirdlgui
 {
    Q_OBJECT
 public:
-    Newmdirdlg( QWidget* parent = 0, const char* name = 0);
+    Newmdirdlg( QWidget* parent = 0, const char* name = 0,bool no_sub=false);
    ~Newmdirdlg();
    
    const QString&Newdir()const;
    const bool subpossible()const;
 protected slots:
diff --git a/noncore/net/mail/pop3wrapper.cpp b/noncore/net/mail/pop3wrapper.cpp
index efd83ba..b85fbf6 100644
--- a/noncore/net/mail/pop3wrapper.cpp
+++ b/noncore/net/mail/pop3wrapper.cpp
@@ -1,13 +1,12 @@
 #include <stdlib.h>
 #include "pop3wrapper.h"
 #include "mailtypes.h"
 #include "logindialog.h"
-#include <libetpan/mailpop3.h>
+#include <libetpan/libetpan.h>
-#include <libetpan/mailmime.h>
+#include <qpe/global.h>
-#include <libetpan/data_message_driver.h>
 #include <qfile.h>
 /* we don't fetch messages larger than 5 MB */
 #define HARD_MSG_SIZE_LIMIT 5242880
 POP3wrapper::POP3wrapper( POP3account *a )
@@ -109,12 +108,13 @@ void POP3wrapper::listMessages(const QString &, QList<RecMail> &target )
    /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */
    size_t length = 0;
    carray * messages = 0;
    login();
    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)
@@ -129,12 +129,13 @@ void POP3wrapper::listMessages(const QString &, QList<RecMail> &target )
        mail->setNumber( info->msg_index );
        mail->setWrapper(this);
        mail->setMsgsize(info->msg_size);
        target.append( mail );
        free(header);
    }
+    Global::statusMessage( tr("Mailbox contains %1 mail(s)").arg(carray_count(messages)-m_pop3->pop3_deleted_count));
 }
 void POP3wrapper::login()
 {
    /* we'll hold the line */
    if ( m_pop3 != NULL ) return;
diff --git a/noncore/net/mail/pop3wrapper.h b/noncore/net/mail/pop3wrapper.h
index b738cca..7502720 100644
--- a/noncore/net/mail/pop3wrapper.h
+++ b/noncore/net/mail/pop3wrapper.h
@@ -23,10 +23,11 @@ public:
    virtual RecBody fetchBody( const RecMail &mail );
    static void pop3_progress( size_t current, size_t maximum );
 protected:
    void login();
    void logout();
-    
+    POP3account *account;
+    mailpop3 *m_pop3;    
 };
 #endif