15 files changed, 400 insertions, 55 deletions
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index 77fa706..faa6982 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -1,668 +1,693 @@
 #include "accountview.h"
 #include <libmailwrapper/mailtypes.h>
 #include <libmailwrapper/abstractmail.h>
 #include "defines.h"
 #include "newmaildir.h"
+#include "selectstore.h"
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 /**
 * POP3 Account stuff
 */
 POP3viewItem::POP3viewItem( POP3account *a, QListView *parent )
    : AccountViewItem( parent )
 {
    account = a;
    wrapper = AbstractMail::getWrapper( account );
    setPixmap( 0, PIXMAP_POP3FOLDER );
    setText( 0, account->getAccountName() );
    setOpen( true );
 }
 POP3viewItem::~POP3viewItem()
 {
    delete wrapper;
 }
 AbstractMail *POP3viewItem::getWrapper()
 {
    return wrapper;
 }
 void POP3viewItem::refresh( QList<RecMail> & )
 {
    QList<Folder> *folders = wrapper->listFolders();
    QListViewItem *child = firstChild();
    while ( child ) {
        QListViewItem *tmp = child;
        child = child->nextSibling();
        delete tmp;
    }
    Folder *it;
    QListViewItem*item = 0;
    for ( it = folders->first(); it; it = folders->next() ) {
        item = new POP3folderItem( it, this , item );
        item->setSelectable(it->may_select());
    }
    // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    folders->setAutoDelete(false);
    delete folders;
 }
 RecBody POP3viewItem::fetchBody( const RecMail &mail )
 {
    qDebug( "POP3 fetchBody" );
    return wrapper->fetchBody( mail );
 }
 POP3folderItem::~POP3folderItem()
 {
    delete folder;
 }
 POP3folderItem::POP3folderItem( Folder *folderInit, POP3viewItem *parent , QListViewItem*after  )
    : AccountViewItem( parent,after )
 {
    folder = folderInit;
    pop3 = parent;
    if (folder->getDisplayName().lower()!="inbox") {
        setPixmap( 0, PIXMAP_POP3FOLDER );
    } else {
        setPixmap( 0, PIXMAP_INBOXFOLDER);
    }
    setText( 0, folder->getDisplayName() );
 }
 void POP3folderItem::refresh(QList<RecMail>&target)
 {
    if (folder->may_select())
        pop3->getWrapper()->listMessages( folder->getName(),target );
 }
 RecBody POP3folderItem::fetchBody(const RecMail&aMail)
 {
    return pop3->getWrapper()->fetchBody(aMail);
 }
 QPopupMenu * POP3folderItem::getContextMenu()
 {
    QPopupMenu *m = new QPopupMenu(0);
    if (m) {
        m->insertItem(QObject::tr("Refresh header list",contextName),0);
        m->insertItem(QObject::tr("Delete all mails",contextName),1);
+        m->insertItem(QObject::tr("Download all mails",contextName),2);
    }
    return m;
 }
+void POP3folderItem::downloadMails()
+{
+    Selectstore sels;
+    sels.showMaximized();
+    sels.exec();
+}
 void POP3folderItem::contextMenuSelected(int which)
 {
    AccountView * view = (AccountView*)listView();
    switch (which) {
    case 0:
+        /* must be 'cause pop3 lists are cached */
+        pop3->getWrapper()->logout();
        view->refreshCurrent();
        break;
    case 1:
        deleteAllMail(pop3->getWrapper(),folder);
        break;
+    case 2:
+        downloadMails();
+        break;
    default:
        break;
    }
 }
 /**
 * IMAP Account stuff
 */
 IMAPviewItem::IMAPviewItem( IMAPaccount *a, QListView *parent )
    : AccountViewItem( parent )
 {
    account = a;
    wrapper = AbstractMail::getWrapper( account );
    setPixmap( 0, PIXMAP_IMAPFOLDER );
    setText( 0, account->getAccountName() );
    setOpen( true );
 }
 IMAPviewItem::~IMAPviewItem()
 {
    delete wrapper;
 }
 AbstractMail *IMAPviewItem::getWrapper()
 {
    return wrapper;
 }
 IMAPfolderItem*IMAPviewItem::findSubItem(const QString&path,IMAPfolderItem*start)
 {
    IMAPfolderItem*pitem,*sitem;
    if (!start) pitem = (IMAPfolderItem*)firstChild();
    else pitem = (IMAPfolderItem*)start->firstChild();
    while (pitem) {
        if (pitem->matchName(path)) {
            break;
        }
        if (pitem->childCount()>0) {
            sitem = findSubItem(path,pitem);
            if (sitem) {
                pitem = sitem;
                break;
            }
        }
        pitem=(IMAPfolderItem*)pitem->nextSibling();
    }
    return pitem;
 }
 void IMAPviewItem::refresh(QList<RecMail>&)
 {
    refreshFolders(false);
 }
-void IMAPviewItem::refreshFolders(bool force)
+void IMAPviewItem::removeChilds()
 {
-    if (childCount()>0 && force==false) return;
-    QList<Folder> *folders = wrapper->listFolders();
    QListViewItem *child = firstChild();
    while ( child ) {
        QListViewItem *tmp = child;
        child = child->nextSibling();
        delete tmp;
    }
+}
+void IMAPviewItem::refreshFolders(bool force)
+{
+    if (childCount()>0 && force==false) return;
+    
+    removeChilds();
+    QList<Folder> *folders = wrapper->listFolders();
    Folder *it;
    QListViewItem*item = 0;
    QListViewItem*titem = 0;
    QString fname,del,search;
    int pos;
    // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    folders->setAutoDelete(false);
    for ( it = folders->first(); it; it = folders->next() ) {
        if (it->getDisplayName().lower()=="inbox") {
            item = new IMAPfolderItem( it, this , item );
            folders->remove(it);
            qDebug("inbox found");
            break;
        }
    }
    for ( it = folders->first(); it; it = folders->next() ) {
        fname = it->getDisplayName();
        pos = fname.findRev(it->Separator());
        if (pos != -1) {
            fname = fname.left(pos);
        }
        IMAPfolderItem*pitem = findSubItem(fname);
        if (pitem) {
            titem = item;
            item = new IMAPfolderItem(it,pitem,pitem->firstChild(),this);
            /* setup the short name */
            item->setText(0,it->getDisplayName().right(it->getDisplayName().length()-pos-1));
            item = titem;
        } else {
            item = new IMAPfolderItem( it, this , item );
        }
    }
    delete folders;
 }
 QPopupMenu * IMAPviewItem::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);
        m->insertSeparator();
        m->insertItem(QObject::tr("Disconnect",contextName),2);
    }
    return m;
 }
 void IMAPviewItem::createNewFolder()
 {
    Newmdirdlg ndirdlg;
    ndirdlg.showMaximized();
    if (ndirdlg.exec()) {
        QString ndir = ndirdlg.Newdir();
        bool makesubs = ndirdlg.subpossible();
        QString delemiter = "/";
        IMAPfolderItem*item = (IMAPfolderItem*)firstChild();
        if (item) {
            delemiter = item->Delemiter();
        }
        if (wrapper->createMbox(ndir,0,delemiter,makesubs)) {
            refreshFolders(true);
        }
    }
 }
 void IMAPviewItem::contextMenuSelected(int id)
 {
    qDebug("Id selected: %i",id);
    switch (id) {
    case 0:
        refreshFolders(true);
        break;
    case 1:
        createNewFolder();
        break;
+    case 2:
+        removeChilds();
+        wrapper->logout();
+        break;
    default:
        break;
    }
 }
 RecBody IMAPviewItem::fetchBody(const RecMail&)
 {
    return RecBody();
 }
 IMAPfolderItem::~IMAPfolderItem()
 {
    delete folder;
 }
 IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPviewItem *parent , QListViewItem*after )
    : AccountViewItem( parent , after )
 {
    folder = folderInit;
    imap = parent;
    if (folder->getDisplayName().lower()!="inbox") {
        setPixmap( 0, PIXMAP_IMAPFOLDER );
    } else {
        setPixmap( 0, PIXMAP_INBOXFOLDER);
    }
    setText( 0, folder->getDisplayName() );
 }
 IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master  )
    : AccountViewItem( parent,after )
 {
    folder = folderInit;
    imap = master;
    if (folder->getDisplayName().lower()!="inbox") {
        setPixmap( 0, PIXMAP_IMAPFOLDER );
    } else {
        setPixmap( 0, PIXMAP_INBOXFOLDER);
    }
    setText( 0, folder->getDisplayName() );
 }
 const QString& IMAPfolderItem::Delemiter()const
 {
    return folder->Separator();
 }
 bool IMAPfolderItem::matchName(const QString&name)const
 {
    return folder->getDisplayName()==name;
 }
 void IMAPfolderItem::refresh(QList<RecMail>&target)
 {
    if (folder->may_select()) {
        imap->getWrapper()->listMessages( folder->getName(),target );
    } else {
        target.clear();
    }
 }
 RecBody IMAPfolderItem::fetchBody(const RecMail&aMail)
 {
    return imap->getWrapper()->fetchBody(aMail);
 }
 QPopupMenu * IMAPfolderItem::getContextMenu()
 {
    QPopupMenu *m = new QPopupMenu(0);
    if (m) {
        if (folder->may_select()) {
            m->insertItem(QObject::tr("Refresh header list",contextName),0);
            m->insertItem(QObject::tr("Delete all mails",contextName),1);
        }
        if (folder->no_inferior()==false) {
            m->insertItem(QObject::tr("Create new subfolder",contextName),2);
        }
        if (folder->getDisplayName().lower()!="inbox") {
            m->insertItem(QObject::tr("Delete folder",contextName),3);
        }
    }
    return m;
 }
 void IMAPfolderItem::createNewFolder()
 {
    Newmdirdlg ndirdlg;
    ndirdlg.showMaximized();
    if (ndirdlg.exec()) {
        QString ndir = ndirdlg.Newdir();
        bool makesubs = ndirdlg.subpossible();
        QString delemiter = Delemiter();
        if (imap->wrapper->createMbox(ndir,folder,delemiter,makesubs)) {
            imap->refreshFolders(true);
        }
    }
 }
 void IMAPfolderItem::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 (imap->getWrapper()->deleteMbox(folder)) {
            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)
 {
    qDebug("Selected id: %i",id);
    AccountView * view = (AccountView*)listView();
    switch(id) {
    case 0:
        view->refreshCurrent();
        break;
    case 1:
        deleteAllMail(imap->getWrapper(),folder);
        break;
    case 2:
        createNewFolder();
        break;
    case 3:
        deleteFolder();
        break;
    default:
        break;
    }
 }
 /**
 * Generic stuff
 */
 const QString AccountViewItem::contextName="AccountViewItem";
 void AccountViewItem::deleteAllMail(AbstractMail*wrapper,Folder*folder)
 {
    if (!wrapper) return;
    QString fname="";
    if (folder) fname = folder->getDisplayName();
    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(fname),
        QObject::tr("Yes",contextName),
        QObject::tr("No",contextName),QString::null,1,1);
    qDebug("Auswahl: %i",yesno);
    if (yesno == 0) {
        if (wrapper->deleteAllMail(folder)) {
            AccountView * view = (AccountView*)listView();
            if (view) view->refreshCurrent();
        }
    }
 }
 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,
            SLOT( slotHold( int, QListViewItem *,const QPoint&,int  ) ) );
    setSorting(0);
 }
 void AccountView::slotContextMenu(int id)
 {
    AccountViewItem *view = static_cast<AccountViewItem *>(currentItem());
    if (!view) return;
    view->contextMenuSelected(id);
 }
 void AccountView::slotHold(int button, QListViewItem * item,const QPoint&,int)
 {
    if (button==1) {return;}
    if (!item) return;
    AccountViewItem *view = static_cast<AccountViewItem *>(item);
    QPopupMenu*m = view->getContextMenu();
    if (!m) return;
    connect(m,SIGNAL(activated(int)),this,SLOT(slotContextMenu(int)));
    m->setFocus();
    m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
    delete m;
 }
 void AccountView::populate( QList<Account> list )
 {
    clear();
    (void) new MBOXviewItem(AbstractMail::defaultLocalfolder(),this);
    Account *it;
    for ( it = list.first(); it; it = list.next() ) {
        if ( it->getType().compare( "IMAP" ) == 0 ) {
            IMAPaccount *imap = static_cast<IMAPaccount *>(it);
            qDebug( "added IMAP " + imap->getAccountName() );
            (void) new IMAPviewItem( imap, this );
        } else if ( it->getType().compare( "POP3" ) == 0 ) {
            POP3account *pop3 = static_cast<POP3account *>(it);
            qDebug( "added POP3 " + pop3->getAccountName() );
            (void) new POP3viewItem( pop3, this );
        }
    }
 }
 void AccountView::refresh(QListViewItem *item) {
    qDebug("AccountView refresh...");
    if ( item ) {
        m_currentItem = item;
        QList<RecMail> headerlist;
        headerlist.setAutoDelete(true);
        AccountViewItem *view = static_cast<AccountViewItem *>(item);
        view->refresh(headerlist);
        emit refreshMailview(&headerlist);
    }
 }
 void AccountView::refreshCurrent()
 {
    m_currentItem = currentItem();
   if ( !m_currentItem ) return;
   QList<RecMail> headerlist;
   headerlist.setAutoDelete(true);
   AccountViewItem *view = static_cast<AccountViewItem *>(m_currentItem);
   view->refresh(headerlist);
   emit refreshMailview(&headerlist);
 }
 void AccountView::refreshAll()
 {
 }
 RecBody AccountView::fetchBody(const RecMail&aMail)
 {
    QListViewItem*item = selectedItem ();
    if (!item) return RecBody();
    AccountViewItem *view = static_cast<AccountViewItem *>(item);
    return view->fetchBody(aMail);
 }
 /**
 * MBOX Account stuff
 */
 MBOXviewItem::MBOXviewItem( const QString&aPath, QListView *parent )
    : AccountViewItem( parent )
 {
    m_Path = aPath;
    wrapper = AbstractMail::getWrapper( m_Path );
    setPixmap( 0, PIXMAP_LOCALFOLDER );
    setText( 0, " Local Folders" );
    setOpen( true );
 }
 MBOXviewItem::~MBOXviewItem()
 {
    delete wrapper;
 }
 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;
    }
    Folder *it;
    QListViewItem*item = 0;
    for ( it = folders->first(); it; it = folders->next() ) {
        item = new MBOXfolderItem( it, this , item );
        item->setSelectable(it->may_select());
    }
    // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    folders->setAutoDelete(false);
    delete folders;
 }
 RecBody MBOXviewItem::fetchBody( const RecMail &mail )
 {
    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  )
    : AccountViewItem( parent,after )
 {
    folder = folderInit;
    mbox = parent;
    if (folder->getDisplayName().lower() == "outgoing") {
        setPixmap( 0, PIXMAP_OUTBOXFOLDER );
    } else if (folder->getDisplayName().lower() == "inbox") {
        setPixmap( 0, PIXMAP_INBOXFOLDER);
    } else {
        setPixmap( 0, PIXMAP_MBOXFOLDER );
        }
    setText( 0, folder->getDisplayName() );
 }
 void MBOXfolderItem::refresh(QList<RecMail>&target)
 {
    if (folder->may_select())
        mbox->getWrapper()->listMessages( folder->getName(),target );
 }
 RecBody MBOXfolderItem::fetchBody(const RecMail&aMail)
 {
    return mbox->getWrapper()->fetchBody(aMail);
 }
 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:
        deleteAllMail(mbox->getWrapper(),folder);
        break;
    case 1:
        deleteFolder();
        break;
    default:
        break;
    }
 }
diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h
index 1d2bf19..7131192 100644
--- a/noncore/net/mail/accountview.h
+++ b/noncore/net/mail/accountview.h
@@ -1,175 +1,179 @@
 #ifndef ACCOUNTVIEW_H
 #define ACCOUNTVIEW_H
 #include <qlistview.h>
 #include <qlist.h>
 #include <libmailwrapper/settings.h>
 #include <libmailwrapper/mailwrapper.h>
 #include <libmailwrapper/abstractmail.h>
 class POP3wrapper;
 class RecMail;
 class RecBody;
 class QPopupMenu;
 class AccountViewItem : public QListViewItem
 {
        
 public:
    AccountViewItem( QListView *parent ) : QListViewItem( parent ) {}
    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:
    virtual void deleteAllMail(AbstractMail*wrapper,Folder*f);
    static const QString contextName;
 };
 class POP3viewItem : public AccountViewItem
 {
 public:
    POP3viewItem( POP3account *a, QListView *parent );
    ~POP3viewItem();
    virtual void refresh( QList<RecMail> &target );
    virtual RecBody fetchBody( const RecMail &mail );
    AbstractMail *getWrapper();
 private:
    POP3account *account;
    AbstractMail *wrapper;
 };
 class POP3folderItem : public AccountViewItem
 {
 public:
    POP3folderItem( Folder *folder, POP3viewItem *parent , QListViewItem*after  );
    ~POP3folderItem();
    virtual void refresh(QList<RecMail>&);
    virtual RecBody fetchBody(const RecMail&);
    virtual QPopupMenu * getContextMenu();
    virtual void contextMenuSelected(int);
+protected:
+    void downloadMails();
 private:
    Folder *folder;
    POP3viewItem *pop3;
 };
 class IMAPfolderItem;
 class IMAPviewItem : public AccountViewItem
 {
    friend class IMAPfolderItem;
 public:
    IMAPviewItem( IMAPaccount *a, QListView *parent );
    ~IMAPviewItem();
    virtual void refresh(QList<RecMail>&);
    virtual RecBody fetchBody(const RecMail&);
    AbstractMail *getWrapper();
    virtual QPopupMenu * getContextMenu();
    virtual void contextMenuSelected(int);
 protected:
    IMAPfolderItem*findSubItem(const QString&path,IMAPfolderItem*start=0);
    virtual void refreshFolders(bool force=false);
    virtual void createNewFolder();
+    virtual void removeChilds();
 private:
    IMAPaccount *account;
    AbstractMail *wrapper;
 };
 class IMAPfolderItem : public AccountViewItem
 {
 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 QPopupMenu * getContextMenu();
    virtual void contextMenuSelected(int);
    virtual const QString& Delemiter()const;
 protected:
    virtual void createNewFolder();
    virtual void deleteFolder();
    
 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;
 };
 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 deleteFolder();
 private:
    Folder *folder;
    MBOXviewItem *mbox;
 };
 class AccountView : public QListView
 {
    Q_OBJECT
 public:
    AccountView( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
    void populate( QList<Account> list );
    RecBody fetchBody(const RecMail&aMail);
 public slots:
    virtual void refreshAll();
    virtual void refresh(QListViewItem *item);
    virtual void refreshCurrent();
    virtual void slotHold(int, QListViewItem *,const QPoint&,int);
    virtual void slotContextMenu(int id);
 signals:
    void refreshMailview(QList<RecMail>*);  
 private: 
    QListViewItem* m_currentItem; 
 };
 #endif
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.h b/noncore/net/mail/libmailwrapper/abstractmail.h
index 7c060db..9770991 100644
--- a/noncore/net/mail/libmailwrapper/abstractmail.h
+++ b/noncore/net/mail/libmailwrapper/abstractmail.h
@@ -1,59 +1,60 @@
 #ifndef __abstract_mail_
 #define __abstract_mail_
 #include <qobject.h>
 #include "settings.h"
 class RecMail;
 class RecBody;
 class RecPart;
 class IMAPwrapper;
 class POP3wrapper;
 class Folder;
 class encodedString;
 struct folderStat;
 class AbstractMail:public QObject
 {
    Q_OBJECT
 public:
    AbstractMail(){};
    virtual ~AbstractMail(){}
    virtual QList<Folder>* listFolders()=0;
    virtual void listMessages(const QString & mailbox,QList<RecMail>&target )=0;
    virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX")=0;
    virtual RecBody fetchBody(const RecMail&mail)=0;
    virtual QString fetchTextPart(const RecMail&mail,const RecPart&part)=0;
    virtual encodedString* fetchDecodedPart(const RecMail&mail,const RecPart&part)=0;
    virtual encodedString* fetchRawPart(const RecMail&mail,const RecPart&part)=0;
+    virtual encodedString* fetchRawBody(const RecMail&mail)=0;
    virtual void deleteMail(const RecMail&mail)=0;
    virtual void answeredMail(const RecMail&mail)=0;
    virtual int deleteAllMail(const Folder*)=0;
    virtual int deleteMbox(const Folder*)=0;
    virtual void storeMessage(const char*msg,size_t length, const QString&folder)=0;
    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 Folder*parentfolder=0,const QString& delemiter="/",bool getsubfolder=false);
    virtual void logout()=0;
    
    static AbstractMail* getWrapper(IMAPaccount *a);
    static AbstractMail* getWrapper(POP3account *a);
    /* mbox only! */
    static AbstractMail* getWrapper(const QString&a);
    static QString defaultLocalfolder();
    
    virtual const QString&getType()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/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 95b317a..d252159 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -1,992 +1,1014 @@
 #include <stdlib.h>
 #include <libetpan/libetpan.h>
 #include <qpe/global.h>
 #include "imapwrapper.h"
 #include "mailtypes.h"
 #include "logindialog.h"
 IMAPwrapper::IMAPwrapper( IMAPaccount *a )
    : AbstractMail()
 {
    account = a;
    m_imap = 0;
 }
 IMAPwrapper::~IMAPwrapper()
 {
    logout();
 }
 void IMAPwrapper::imap_progress( size_t current, size_t maximum )
 {
    qDebug( "IMAP: %i of %i", current, maximum );
 }
 void IMAPwrapper::login()
 {
    const char *server, *user, *pass;
    uint16_t port;
    int err = MAILIMAP_NO_ERROR;
    /* we are connected this moment */
    /* TODO: setup a timer holding the line or if connection closed - delete the value */
    if (m_imap) {
        err = mailimap_noop(m_imap);
        if (err!=MAILIMAP_NO_ERROR) {
            logout();
        } else {
            mailstream_flush(m_imap->imap_stream);
            return;
        }
    }
    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
                qDebug( "IMAP: Login canceled" );
                return;
          }
        } else {
          user = account->getUser().latin1();
          pass = account->getPassword().latin1();
        }
    m_imap = mailimap_new( 20, &imap_progress );
    /* connect */
    if (account->getSSL()) {
        err = mailimap_ssl_connect( m_imap, (char*)server, port );
    } else {
        err = mailimap_socket_connect( m_imap, (char*)server, port );
    }
    if ( err != MAILIMAP_NO_ERROR &&
         err != MAILIMAP_NO_ERROR_AUTHENTICATED &&
         err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) {
         QString failure = "";
         if (err == MAILIMAP_ERROR_CONNECTION_REFUSED) {
            failure="Connection refused";
         } else {
            failure="Unknown failure";
         }
         Global::statusMessage(tr("error connecting imap server: %1").arg(failure));
         mailimap_free( m_imap );
         m_imap = 0;
         return;
    }
    /* login */
    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));
        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;
 }
 void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target )
 {
    const char *mb = 0;
    int err = MAILIMAP_NO_ERROR;
    clist *result = 0;
    clistcell *current;
 //    mailimap_fetch_att *fetchAtt,*fetchAttFlags,*fetchAttDate,*fetchAttSize;
    mailimap_fetch_type *fetchType = 0;
    mailimap_set *set = 0;
    mb = mailbox.latin1();
    login();
    if (!m_imap) {
        return;
    }
    /* select mailbox READONLY for operations */
    err = mailimap_examine( m_imap, (char*)mb);
    if ( err != MAILIMAP_NO_ERROR ) {
        Global::statusMessage(tr("error selecting mailbox: %1").arg(m_imap->imap_response));
        return;
    }
    int last = m_imap->imap_selection_info->sel_exists;
    if (last == 0) {
        Global::statusMessage(tr("Mailbox has no mails"));
        return;
    } else {
        Global::statusMessage(tr("Mailbox has %1 mails").arg(last));
    }
    /* 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);
                m->setMbox(mailbox);
                m->setWrapper(this);
                target.append(m);
            }
        }
    } else {
        Global::statusMessage(tr("Error fetching headers: %1").arg(m_imap->imap_response));
    }
    if (result) mailimap_fetch_list_free(result);
 }
 QList<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;
    QList<Folder> * folders = new QList<Folder>();
    folders->setAutoDelete( false );
    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;
    err = mailimap_list( m_imap, (char*)"", (char*)mask, &result );
    QString del;
    bool selectable = true;
    bool no_inferiors = false;
    if ( err == MAILIMAP_NO_ERROR ) {
        current = result->first;
        for ( int i = result->count; i > 0; i-- ) {
            list = (mailimap_mailbox_list *) current->data;
            // it is better use the deep copy mechanism of qt itself
            // instead of using strdup!
            temp = list->mb_name;
            del = list->mb_delimiter;
            current = current->next;
            if ( (bflags = list->mb_flag) ) {
                selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&&
                            bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT);
                for(cur_flag=clist_begin(bflags->mbf_oflags);cur_flag;cur_flag=clist_next(cur_flag)) {
                    if ( ((mailimap_mbx_list_oflag*)cur_flag->data)->of_type==MAILIMAP_MBX_LIST_OFLAG_NOINFERIORS) {
                        no_inferiors = true;
                    }
                }
            }
            folders->append( new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix()));
        }
    } else {
        qDebug("error fetching folders: %s",m_imap->imap_response);
    }
    mailimap_list_result_free( result );
 /*
 * second stage - get the other then inbox folders
 */
    mask = "*" ;
    path = account->getPrefix().latin1();
    if (!path) path = "";
    qDebug(path);
    err = mailimap_list( m_imap, (char*)path, (char*)mask, &result );
    if ( err == MAILIMAP_NO_ERROR ) {
        current = result->first;
        for ( current=clist_begin(result);current!=NULL;current=clist_next(current)) {
            no_inferiors = false;
            list = (mailimap_mailbox_list *) current->data;
            // it is better use the deep copy mechanism of qt itself
            // instead of using strdup!
            temp = list->mb_name;
            if (temp.lower()=="inbox")
                continue;
            if (temp.lower()==account->getPrefix().lower())
                continue;
            if ( (bflags = list->mb_flag) ) {
                selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&&
                            bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT);
                for(cur_flag=clist_begin(bflags->mbf_oflags);cur_flag;cur_flag=clist_next(cur_flag)) {
                    if ( ((mailimap_mbx_list_oflag*)cur_flag->data)->of_type==MAILIMAP_MBX_LIST_OFLAG_NOINFERIORS) {
                        no_inferiors = true;
                    }
                }
            }
            del = list->mb_delimiter;
            folders->append(new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix()));
        }
    } else {
        qDebug("error fetching folders %s",m_imap->imap_response);
    }
    if (result) mailimap_list_result_free( result );
    return folders;
 }
 RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
 {
    RecMail * m = 0;
    mailimap_msg_att_item *item=0;
    clistcell *current,*c,*cf;
    mailimap_msg_att_dynamic*flist;
    mailimap_flag_fetch*cflag;
    int size;
    QBitArray mFlags(7);
    QStringList addresslist;
    if (!m_att) {
        return m;
    }
    m = new RecMail();
    for (c = clist_begin(m_att->att_list); c!=NULL;c=clist_next(c) ) {
        current = c;
        size = 0;
        item = (mailimap_msg_att_item*)current->data;
        if (item->att_type!=MAILIMAP_MSG_ATT_ITEM_STATIC) {
            flist = (mailimap_msg_att_dynamic*)item->att_data.att_dyn;
            if (!flist->att_list) {
                continue;
            }
            cf = flist->att_list->first;
            for (cf = clist_begin(flist->att_list); cf!=NULL; cf = clist_next(cf)) {
                cflag = (mailimap_flag_fetch*)cf->data;
                if (cflag->fl_type==MAILIMAP_FLAG_FETCH_OTHER && cflag->fl_flag!=0) {
                    switch (cflag->fl_flag->fl_type) {
                    case MAILIMAP_FLAG_ANSWERED:  /* \Answered flag */
                        mFlags.setBit(FLAG_ANSWERED);
                        break;
                    case MAILIMAP_FLAG_FLAGGED:   /* \Flagged flag */
                        mFlags.setBit(FLAG_FLAGGED);
                        break;
                    case MAILIMAP_FLAG_DELETED:   /* \Deleted flag */
                        mFlags.setBit(FLAG_DELETED);
                        break;
                    case MAILIMAP_FLAG_SEEN:      /* \Seen flag */
                        mFlags.setBit(FLAG_SEEN);
                        break;
                    case MAILIMAP_FLAG_DRAFT:     /* \Draft flag */
                        mFlags.setBit(FLAG_DRAFT);
                        break;
                    case MAILIMAP_FLAG_KEYWORD:   /* keyword flag */
                        break;
                    case MAILIMAP_FLAG_EXTENSION: /* \extension flag */
                        break;
                    default:
                        break;
                    }
                } else if (cflag->fl_type==MAILIMAP_FLAG_FETCH_RECENT) {
                    mFlags.setBit(FLAG_RECENT);
                }
            }
            continue;
        }
        if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_ENVELOPE) {
            mailimap_envelope * head = item->att_data.att_static->att_data.att_env;
            m->setDate(head->env_date);
            m->setSubject(convert_String((const char*)head->env_subject));
            //m->setSubject(head->env_subject);
            if (head->env_from!=NULL) {
                addresslist = address_list_to_stringlist(head->env_from->frm_list);
                if (addresslist.count()) {
                    m->setFrom(addresslist.first());
                }
            }
            if (head->env_to!=NULL) {
                addresslist = address_list_to_stringlist(head->env_to->to_list);
                m->setTo(addresslist);
            }
            if (head->env_cc!=NULL) {
                addresslist = address_list_to_stringlist(head->env_cc->cc_list);
                m->setCC(addresslist);
            }
            if (head->env_bcc!=NULL) {
                addresslist = address_list_to_stringlist(head->env_bcc->bcc_list);
                m->setBcc(addresslist);
            }
            if (head->env_reply_to!=NULL) {
                addresslist = address_list_to_stringlist(head->env_reply_to->rt_list);
                if (addresslist.count()) {
                    m->setReplyto(addresslist.first());
                }
            }
            m->setMsgid(QString(head->env_message_id));
        } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_INTERNALDATE) {
 #if 0
            mailimap_date_time*d = item->att_data.att_static->att_data.att_internal_date;
            QDateTime da(QDate(d->dt_year,d->dt_month,d->dt_day),QTime(d->dt_hour,d->dt_min,d->dt_sec));
            qDebug("%i %i %i - %i %i %i",d->dt_year,d->dt_month,d->dt_day,d->dt_hour,d->dt_min,d->dt_sec);
            qDebug(da.toString());
 #endif            
        } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_RFC822_SIZE) {
            size = item->att_data.att_static->att_data.att_rfc822_size;
        }
    }
    /* msg is already deleted */
    if (mFlags.testBit(FLAG_DELETED) && m) {
        delete m;
        m = 0;
    }
    if (m) {
        m->setFlags(mFlags);
        m->setMsgsize(size);
    }
    return m;
 }
 RecBody IMAPwrapper::fetchBody(const RecMail&mail)
 {
    RecBody body;
    const char *mb;
    int err = MAILIMAP_NO_ERROR;
    clist *result = 0;
    clistcell *current;
    mailimap_fetch_att *fetchAtt = 0;
    mailimap_fetch_type *fetchType = 0;
    mailimap_set *set = 0;
    mailimap_body*body_desc = 0;
    mb = mail.getMbox().latin1();
    login();
    if (!m_imap) {
        return body;
    }
    
    err = mailimap_select( m_imap, (char*)mb);
    if ( err != MAILIMAP_NO_ERROR ) {
        qDebug("error selecting mailbox: %s",m_imap->imap_response);
        return body;
    }
 
    /* the range has to start at 1!!! not with 0!!!! */
    set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() );
    fetchAtt = mailimap_fetch_att_new_bodystructure();
    fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt);
    err = mailimap_fetch( m_imap, set, fetchType, &result );
    mailimap_set_free( set );
    mailimap_fetch_type_free( fetchType );
    if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
        mailimap_msg_att * msg_att;
        msg_att = (mailimap_msg_att*)current->data;
        mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->att_list->first->data;
        QValueList<int> path;
        body_desc = item->att_data.att_static->att_data.att_body;
        traverseBody(mail,body_desc,body,0,path);
    } else {
        qDebug("error fetching body: %s",m_imap->imap_response);
    }
    if (result) mailimap_fetch_list_free(result);
    return body;
 }
 QStringList IMAPwrapper::address_list_to_stringlist(clist*list)
 {
    QStringList l;
    QString from;
    bool named_from;
    clistcell *current = NULL;
    mailimap_address * current_address=NULL;
    if (!list) {
        return l;
    }
    unsigned int count = 0;
    for (current=clist_begin(list);current!= NULL;current=clist_next(current)) {
        from = "";
        named_from = false;
        current_address=(mailimap_address*)current->data;
        if (current_address->ad_personal_name){
            from+=convert_String((const char*)current_address->ad_personal_name);
            from+=" ";
            named_from = true;
        }
        if (named_from && (current_address->ad_mailbox_name || current_address->ad_host_name)) {
            from+="<";
        }
        if (current_address->ad_mailbox_name) {
            from+=QString(current_address->ad_mailbox_name);
            from+="@";
        }
        if (current_address->ad_host_name) {
             from+=QString(current_address->ad_host_name);
        }
        if (named_from && (current_address->ad_mailbox_name || current_address->ad_host_name)) {
           from+=">";
        }
        l.append(QString(from));
        if (++count > 99) {
            break;
        }
    }
    return l;
 }
 encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int>&path,bool internal_call)
 {
    encodedString*res=new encodedString;
    const char*mb;
    int err;
    mailimap_fetch_type *fetchType;
    mailimap_set *set;
    clistcell*current,*cur;
+    mailimap_section_part * section_part =  0;
+    mailimap_section_spec * section_spec =  0;
+    mailimap_section * section = 0;
+    mailimap_fetch_att * fetch_att = 0;
    login();
    if (!m_imap) {
        return res;
    }
    if (!internal_call) {
        mb = mail.getMbox().latin1();
        err = mailimap_select( m_imap, (char*)mb);
        if ( err != MAILIMAP_NO_ERROR ) {
            qDebug("error selecting mailbox: %s",m_imap->imap_response);
            return res;
        }
    }
    set = mailimap_set_new_single(mail.getNumber());
-    clist*id_list=clist_new();
-    for (unsigned j=0; j < path.count();++j) {
-        uint32_t * p_id = (uint32_t *)malloc(sizeof(*p_id));
-        *p_id = path[j];
-        clist_append(id_list,p_id);
-    }
-    mailimap_section_part * section_part =  mailimap_section_part_new(id_list);
-    mailimap_section_spec * section_spec =  mailimap_section_spec_new(MAILIMAP_SECTION_SPEC_SECTION_PART, NULL, section_part, NULL);
-    mailimap_section * section = mailimap_section_new(section_spec);
-    mailimap_fetch_att * fetch_att = mailimap_fetch_att_new_body_section(section);
    
+    clist*id_list = 0;
+    
+    /* if path == empty then its a request for the whole rfc822 mail and generates
+       a "fetch <id> (body[])" statement on imap server */
+    if (path.count()>0 ) {
+        id_list = clist_new();
+        for (unsigned j=0; j < path.count();++j) {
+            uint32_t * p_id = (uint32_t *)malloc(sizeof(*p_id));
+            *p_id = path[j];
+            clist_append(id_list,p_id);
+        }
+        section_part =  mailimap_section_part_new(id_list);
+        section_spec =  mailimap_section_spec_new(MAILIMAP_SECTION_SPEC_SECTION_PART, NULL, section_part, NULL);
+    }
+    
+    section =  mailimap_section_new(section_spec);
+    fetch_att = mailimap_fetch_att_new_body_section(section);
    fetchType = mailimap_fetch_type_new_fetch_att(fetch_att);
    
    clist*result = 0;
    
    err = mailimap_fetch( m_imap, set, fetchType, &result );
    mailimap_set_free( set );
    mailimap_fetch_type_free( fetchType );
    
    if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
        mailimap_msg_att * msg_att;
        msg_att = (mailimap_msg_att*)current->data;
        mailimap_msg_att_item*msg_att_item;
        for(cur = clist_begin(msg_att->att_list) ; cur != NULL ; cur = clist_next(cur)) {
            msg_att_item = (mailimap_msg_att_item*)clist_content(cur);
            if (msg_att_item->att_type == MAILIMAP_MSG_ATT_ITEM_STATIC) {
                if (msg_att_item->att_data.att_static->att_type == MAILIMAP_MSG_ATT_BODY_SECTION) {
                    char*text = msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part;
                    /* detach - we take over the content */
                    msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part = 0L;
                    res->setContent(text,msg_att_item->att_data.att_static->att_data.att_body_section->sec_length);
                }
            }
        }         
    } else {
        qDebug("error fetching text: %s",m_imap->imap_response);
    }
    if (result) mailimap_fetch_list_free(result);
    return res;
 }
 /* current_recursion is for recursive calls.
   current_count means the position inside the internal loop! */
 void IMAPwrapper::traverseBody(const RecMail&mail,mailimap_body*body,RecBody&target_body,
    int current_recursion,QValueList<int>recList,int current_count)
 {
    if (!body || current_recursion>=10) {
        return;
    }
    switch (body->bd_type) {
    case MAILIMAP_BODY_1PART:
    {
        QValueList<int>countlist = recList;
        countlist.append(current_count);
        RecPart currentPart;
        mailimap_body_type_1part*part1 = body->bd_data.bd_body_1part;
        QString id("");
        currentPart.setPositionlist(countlist);
        for (unsigned int j = 0; j < countlist.count();++j) {
            id+=(j>0?" ":"");
            id+=QString("%1").arg(countlist[j]);
        }
        qDebug("ID = %s",id.latin1());
        currentPart.setIdentifier(id);
        fillSinglePart(currentPart,part1);
        /* important: Check for is NULL 'cause a body can be empty!
           And we put it only into the mail if it is the FIRST part */
        if (part1->bd_type==MAILIMAP_BODY_TYPE_1PART_TEXT && target_body.Bodytext().isNull() && countlist[0]==1) {
            QString body_text = fetchTextPart(mail,countlist,true,currentPart.Encoding());
            target_body.setDescription(currentPart);
            target_body.setBodytext(body_text);
            if (countlist.count()>1) {
                target_body.addPart(currentPart);
            }
        } else {
            target_body.addPart(currentPart);
        }
        if (part1->bd_type==MAILIMAP_BODY_TYPE_1PART_MSG) {
            traverseBody(mail,part1->bd_data.bd_type_msg->bd_body,target_body,current_recursion+1,countlist);
        }
    }
    break;
    case MAILIMAP_BODY_MPART:
    {
        QValueList<int>countlist = recList;
        clistcell*current=0;
        mailimap_body*current_body=0;
        unsigned int ccount = 1;
        mailimap_body_type_mpart*mailDescription = body->bd_data.bd_body_mpart;
        for (current=clist_begin(mailDescription->bd_list);current!=0;current=clist_next(current)) {
            current_body = (mailimap_body*)current->data;
            if (current_body->bd_type==MAILIMAP_BODY_MPART) {
                RecPart targetPart;
                targetPart.setType("multipart");
                fillMultiPart(targetPart,mailDescription);
                countlist.append(current_count);
                targetPart.setPositionlist(countlist);
                target_body.addPart(targetPart);
                QString id("");
                for (unsigned int j = 0; j < countlist.count();++j) {
                    id+=(j>0?" ":"");
                    id+=QString("%1").arg(countlist[j]);
                }
                qDebug("ID(mpart) = %s",id.latin1());
            }
            traverseBody(mail,current_body,target_body,current_recursion+1,countlist,ccount);
            if (current_body->bd_type==MAILIMAP_BODY_MPART) {
                countlist = recList;
            }
            ++ccount;
        }
    }
    break;
    default:
    break;
    }
 }
 void IMAPwrapper::fillSinglePart(RecPart&target_part,mailimap_body_type_1part*Description)
 {
    if (!Description) {
        return;
    }
    switch (Description->bd_type) {
        case MAILIMAP_BODY_TYPE_1PART_TEXT:
            target_part.setType("text");
            fillSingleTextPart(target_part,Description->bd_data.bd_type_text);
            break;
        case MAILIMAP_BODY_TYPE_1PART_BASIC:
            fillSingleBasicPart(target_part,Description->bd_data.bd_type_basic);
            break;
        case MAILIMAP_BODY_TYPE_1PART_MSG:
            target_part.setType("message");
            fillSingleMsgPart(target_part,Description->bd_data.bd_type_msg);
            break;
        default:
            break;
    }
 }
 void IMAPwrapper::fillSingleTextPart(RecPart&target_part,mailimap_body_type_text*which)
 {
    if (!which) {
        return;
    }
    QString sub;
    sub = which->bd_media_text;
    qDebug("Type= text/%s",which->bd_media_text);
    target_part.setSubtype(sub.lower());
    target_part.setLines(which->bd_lines);
    fillBodyFields(target_part,which->bd_fields);
 }
 void IMAPwrapper::fillSingleMsgPart(RecPart&target_part,mailimap_body_type_msg*which)
 {
    if (!which) {
        return;
    }
    target_part.setSubtype("rfc822");
    qDebug("Message part");
    /* we set this type to text/plain */
    target_part.setLines(which->bd_lines);
    fillBodyFields(target_part,which->bd_fields);    
 }
 void IMAPwrapper::fillMultiPart(RecPart&target_part,mailimap_body_type_mpart*which)
 {       
    if (!which) return;
    QString sub = which->bd_media_subtype;
    target_part.setSubtype(sub.lower());
    if (which->bd_ext_mpart && which->bd_ext_mpart->bd_parameter && which->bd_ext_mpart->bd_parameter->pa_list) {
        clistcell*cur = 0;
        mailimap_single_body_fld_param*param=0;
        for (cur = clist_begin(which->bd_ext_mpart->bd_parameter->pa_list);cur!=NULL;cur=clist_next(cur)) {
            param = (mailimap_single_body_fld_param*)cur->data;
            if (param) {
                target_part.addParameter(QString(param->pa_name).lower(),QString(param->pa_value));
            }
        }        
    }
 }
 void IMAPwrapper::fillSingleBasicPart(RecPart&target_part,mailimap_body_type_basic*which)
 {
    if (!which) {
        return;
    }
    QString type,sub;
    switch (which->bd_media_basic->med_type) {
    case MAILIMAP_MEDIA_BASIC_APPLICATION:
        type = "application";
        break;
    case MAILIMAP_MEDIA_BASIC_AUDIO:
        type = "audio";
        break;
    case MAILIMAP_MEDIA_BASIC_IMAGE:
        type = "image";
        break;
    case MAILIMAP_MEDIA_BASIC_MESSAGE:
        type = "message";
        break;
    case MAILIMAP_MEDIA_BASIC_VIDEO:
        type = "video";
        break;
    case MAILIMAP_MEDIA_BASIC_OTHER:
    default:
        if (which->bd_media_basic->med_basic_type) {
            type = which->bd_media_basic->med_basic_type;
        } else {
            type = "";
        }
        break;
    }
    if (which->bd_media_basic->med_subtype) {
        sub = which->bd_media_basic->med_subtype;
    } else {
        sub = "";
    }
    qDebug("Type = %s/%s",type.latin1(),sub.latin1());
    target_part.setType(type.lower());
    target_part.setSubtype(sub.lower());
    fillBodyFields(target_part,which->bd_fields);
 }
 void IMAPwrapper::fillBodyFields(RecPart&target_part,mailimap_body_fields*which)
 {
    if (!which) return;
    if (which->bd_parameter && which->bd_parameter->pa_list && which->bd_parameter->pa_list->count>0) {
        clistcell*cur;
        mailimap_single_body_fld_param*param=0;
        for (cur = clist_begin(which->bd_parameter->pa_list);cur!=NULL;cur=clist_next(cur)) {
            param = (mailimap_single_body_fld_param*)cur->data;
            if (param) {
                target_part.addParameter(QString(param->pa_name).lower(),QString(param->pa_value));
            }
        }
    }
    mailimap_body_fld_enc*enc = which->bd_encoding;
    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::deleteMail(const RecMail&mail)
 {
    mailimap_flag_list*flist;
    mailimap_set *set;
    mailimap_store_att_flags * store_flags;
    int err;
    login();
    if (!m_imap) {
        return;
    }
    const char *mb = mail.getMbox().latin1();
    err = mailimap_select( m_imap, (char*)mb);
    if ( err != MAILIMAP_NO_ERROR ) {
        qDebug("error selecting mailbox for delete: %s",m_imap->imap_response);
        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) {
        qDebug("error deleting mail: %s",m_imap->imap_response);
        return;
    }
    qDebug("deleting mail: %s",m_imap->imap_response);
    /* should we realy do that at this moment? */
    err = mailimap_expunge(m_imap);
    if (err != MAILIMAP_NO_ERROR) {
        qDebug("error deleting mail: %s",m_imap->imap_response);
    }
    qDebug("Delete successfull %s",m_imap->imap_response);
 }
 void IMAPwrapper::answeredMail(const RecMail&mail)
 {
    mailimap_flag_list*flist;
    mailimap_set *set;
    mailimap_store_att_flags * store_flags;
    int err;
    login();
    if (!m_imap) {
        return;
    }
    const char *mb = mail.getMbox().latin1();
    err = mailimap_select( m_imap, (char*)mb);
    if ( err != MAILIMAP_NO_ERROR ) {
        qDebug("error selecting mailbox for mark: %s",m_imap->imap_response);
        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) {
        qDebug("error marking mail: %s",m_imap->imap_response);
        return;
    }
 }
 QString IMAPwrapper::fetchTextPart(const RecMail&mail,const QValueList<int>&path,bool internal_call,const QString&enc)
 {
    QString body("");
    encodedString*res = fetchRawPart(mail,path,internal_call);
    encodedString*r = decode_String(res,enc);
    delete res;
    if (r) {
        if (r->Length()>0) {
            body = r->Content();
        }
        delete r;
    }
    return body;
 }
 QString IMAPwrapper::fetchTextPart(const RecMail&mail,const RecPart&part)
 {
    return fetchTextPart(mail,part.Positionlist(),false,part.Encoding());
 }
 encodedString* IMAPwrapper::fetchDecodedPart(const RecMail&mail,const RecPart&part)
 {
    encodedString*res = fetchRawPart(mail,part.Positionlist(),false);
    encodedString*r = decode_String(res,part.Encoding());
    delete res;
    return r;
 }
 encodedString* IMAPwrapper::fetchRawPart(const RecMail&mail,const RecPart&part)
 {
    return fetchRawPart(mail,part.Positionlist(),false);
 }
 int IMAPwrapper::deleteAllMail(const Folder*folder)
 {
    login();
    if (!m_imap) {
        return 0;
    }
    mailimap_flag_list*flist;
    mailimap_set *set;
    mailimap_store_att_flags * store_flags;
    int err = mailimap_select( m_imap, folder->getName().latin1());
    if ( err != MAILIMAP_NO_ERROR ) {
        Global::statusMessage(tr("error selecting mailbox: %1").arg(m_imap->imap_response));
        return 0;
    }
    int last = m_imap->imap_selection_info->sel_exists;
    if (last == 0) {
        Global::statusMessage(tr("Mailbox has no mails!"));
        return 0;
    }
    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_interval( 1, last );
    err = mailimap_store(m_imap,set,store_flags);
    mailimap_set_free( set );
    mailimap_store_att_flags_free(store_flags);
    if (err != MAILIMAP_NO_ERROR) {
        Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response));
        return 0;
    }
    qDebug("deleting mail: %s",m_imap->imap_response);
    /* 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));
        return 0;
    }
    qDebug("Delete successfull %s",m_imap->imap_response);
    return 1;
 }
 int IMAPwrapper::createMbox(const QString&folder,const Folder*parentfolder,const QString& delemiter,bool getsubfolder)
 {
    if (folder.length()==0) return 0;
    login();
    if (!m_imap) {return 0;}
    QString pre = account->getPrefix();
    if (delemiter.length()>0 && pre.findRev(delemiter)!=pre.length()-1) {
        pre+=delemiter;
    }
    if (parentfolder) {
        pre += parentfolder->getDisplayName()+delemiter;
    }
    pre+=folder;
    if (getsubfolder) {
        if (delemiter.length()>0) {
            pre+=delemiter;
        } else {
            Global::statusMessage(tr("Cannot create folder %1 for holding subfolders").arg(pre));
            return 0;
        }
    }
    qDebug("Creating %s",pre.latin1());
    int res = mailimap_create(m_imap,pre.latin1());
    if (res != MAILIMAP_NO_ERROR) {
        Global::statusMessage(tr("%1").arg(m_imap->imap_response));
        return 0;
    }
    return 1;
 }
 int IMAPwrapper::deleteMbox(const Folder*folder)
 {
    if (!folder) return 0;
    login();
    if (!m_imap) {return 0;}
    int res = mailimap_delete(m_imap,folder->getName());
    if (res != MAILIMAP_NO_ERROR) {
        Global::statusMessage(tr("%1").arg(m_imap->imap_response));
        return 0;
    }
    return 1;
 }
 void IMAPwrapper::statusFolder(folderStat&target_stat,const QString & mailbox)
 {
    mailimap_status_att_list * att_list =0;
    mailimap_mailbox_data_status * status=0;
    clistiter * cur = 0;
    int r = 0;
    int res = 0;
    target_stat.message_count = 0;
    target_stat.message_unseen = 0;
    target_stat.message_recent = 0;
    login();
    if (!m_imap) {
        return;
    }
    att_list = mailimap_status_att_list_new_empty();
    if (!att_list) return;
    r = mailimap_status_att_list_add(att_list, MAILIMAP_STATUS_ATT_MESSAGES);
    r = mailimap_status_att_list_add(att_list, MAILIMAP_STATUS_ATT_RECENT);
    r = mailimap_status_att_list_add(att_list, MAILIMAP_STATUS_ATT_UNSEEN);
    r = mailimap_status(m_imap, mailbox.latin1(), att_list, &status);
-    for (cur = clist_begin(status->st_info_list);
+    if (r==MAILIMAP_NO_ERROR&&status->st_info_list!=0) {
-            cur != NULL ; cur = clist_next(cur)) {
+        for (cur = clist_begin(status->st_info_list);
-        mailimap_status_info * status_info;
+                cur != NULL ; cur = clist_next(cur)) {
-        status_info = (mailimap_status_info *)clist_content(cur);
+            mailimap_status_info * status_info;
-        switch (status_info->st_att) {
+            status_info = (mailimap_status_info *)clist_content(cur);
-        case MAILIMAP_STATUS_ATT_MESSAGES:
+            switch (status_info->st_att) {
-            target_stat.message_count = status_info->st_value;
+            case MAILIMAP_STATUS_ATT_MESSAGES:
-        break;
+                target_stat.message_count = status_info->st_value;
-        case MAILIMAP_STATUS_ATT_RECENT:
+            break;
-             target_stat.message_recent = status_info->st_value;
+            case MAILIMAP_STATUS_ATT_RECENT:
-        break;
+                target_stat.message_recent = status_info->st_value;
-        case MAILIMAP_STATUS_ATT_UNSEEN:
+            break;
-             target_stat.message_unseen = status_info->st_value;
+            case MAILIMAP_STATUS_ATT_UNSEEN:
-        break;
+                target_stat.message_unseen = status_info->st_value;
+            break;
+            }
        }
+    } else {
+        qDebug("Error retrieving status");
    }
-    mailimap_mailbox_data_status_free(status);
+    if (status) mailimap_mailbox_data_status_free(status);
-    mailimap_status_att_list_free(att_list);
+    if (att_list) mailimap_status_att_list_free(att_list);
 }
 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!");
    }
 }
 const QString&IMAPwrapper::getType()const
 {
    return account->getType();
 }
+encodedString* IMAPwrapper::fetchRawBody(const RecMail&mail)
+{
+    // dummy
+    QValueList<int> path;
+    return fetchRawPart(mail,path,false);
+}
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.h b/noncore/net/mail/libmailwrapper/imapwrapper.h
index 6a9c411..b246f58 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.h
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.h
@@ -1,70 +1,71 @@
 #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 QList<Folder>* listFolders();
    virtual void listMessages(const QString & mailbox,QList<RecMail>&target );
    virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
    
    virtual void deleteMail(const RecMail&mail);
    virtual void answeredMail(const RecMail&mail);
    virtual int deleteAllMail(const Folder*folder);
    virtual void storeMessage(const char*msg,size_t length, const QString&folder);
    virtual RecBody fetchBody(const RecMail&mail);
    virtual QString fetchTextPart(const RecMail&mail,const RecPart&part);
    virtual encodedString* fetchDecodedPart(const RecMail&mail,const RecPart&part);
    virtual encodedString* fetchRawPart(const RecMail&mail,const RecPart&part);
+    virtual encodedString* fetchRawBody(const RecMail&mail);
    virtual int createMbox(const QString&,const Folder*parentfolder=0,const QString& delemiter="/",bool getsubfolder=false);
    virtual int deleteMbox(const Folder*folder);
    
    static void imap_progress( size_t current, size_t maximum );
    
    virtual void logout();
    virtual const QString&getType()const;
 protected:
    RecMail*parse_list_result(mailimap_msg_att*);
    void login();
    virtual QString fetchTextPart(const RecMail&mail,const QValueList<int>&path,bool internal_call=false,const QString&enc="");
    virtual encodedString*fetchRawPart(const RecMail&mail,const QValueList<int>&path,bool internal_call);
    
    void fillSinglePart(RecPart&target_part,mailimap_body_type_1part*Description);
    void fillSingleTextPart(RecPart&target_part,mailimap_body_type_text*which);
    void fillSingleBasicPart(RecPart&target_part,mailimap_body_type_basic*which);
    void fillSingleMsgPart(RecPart&target_part,mailimap_body_type_msg*which);
    void fillMultiPart(RecPart&target_part,mailimap_body_type_mpart*which);
    void traverseBody(const RecMail&mail,mailimap_body*body,RecBody&target_body,int current_recursion,QValueList<int>recList,int current_count=1);
    
    /* just helpers */
    static void fillBodyFields(RecPart&target_part,mailimap_body_fields*which);
    static QStringList address_list_to_stringlist(clist*list);
    IMAPaccount *account;
    mailimap *m_imap;
 };
 #endif
diff --git a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
index 60f7507..3a0b30a 100644
--- a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
@@ -1,331 +1,332 @@
 #include "mboxwrapper.h"
 #include "mailtypes.h"
 #include "mailwrapper.h"
 #include <libetpan/libetpan.h>
 #include <qdir.h>
 #include <stdlib.h>
 #include <qpe/global.h>
 const QString MBOXwrapper::wrapperType="MBOX";
 MBOXwrapper::MBOXwrapper(const QString & mbox_dir)
    : Genericwrapper(),MBOXPath(mbox_dir)
 {
    QDir dir(MBOXPath);
    if (!dir.exists()) {
        dir.mkdir(MBOXPath);
    }
 }
    
 MBOXwrapper::~MBOXwrapper()
 {
 }
 void MBOXwrapper::listMessages(const QString & mailbox, QList<RecMail> &target )
 {
    mailstorage*storage = mailstorage_new(NULL);
    QString p = MBOXPath+"/";
    p+=mailbox;
    
    int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
    mailfolder*folder;
    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;
    }
    
    parseList(target,folder->fld_session,mailbox);
    
    mailfolder_disconnect(folder);
    mailfolder_free(folder);
    mailstorage_free(storage);
    Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(target.count()));
 }
 QList<Folder>* MBOXwrapper::listFolders()
 {
    QList<Folder> * folders = new QList<Folder>();
    folders->setAutoDelete( false );
    QDir dir(MBOXPath);
    if (!dir.exists()) return folders;
    dir.setFilter(QDir::Files|QDir::Writable|QDir::Readable);
    QStringList entries = dir.entryList();
    QStringList::ConstIterator it = entries.begin();
    for (;it!=entries.end();++it) {
        Folder*inb=new Folder(*it,"/");
        folders->append(inb);
    }
    return folders;
 }
 void MBOXwrapper::deleteMail(const RecMail&mail)
 {
    mailstorage*storage = mailstorage_new(NULL);
    QString p = MBOXPath+"/";
    p+=mail.getMbox();
    int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
    mailfolder*folder;
    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;
    }
    r = mailsession_remove_message(folder->fld_session,mail.getNumber());
    if (r != MAIL_NO_ERROR) {
        qDebug("error deleting mail");
    }
    mailfolder_free(folder);
    mailstorage_free(storage);
 }
 void MBOXwrapper::answeredMail(const RecMail&)
 {
 }
 RecBody MBOXwrapper::fetchBody( const RecMail &mail )
 {
    RecBody body;
    mailstorage*storage = mailstorage_new(NULL);
    QString p = MBOXPath+"/";
    p+=mail.getMbox();
    mailmessage * msg;
    char*data=0;
    size_t size;
    int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
    mailfolder*folder;
    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;
    }
    r = mailsession_get_message(folder->fld_session, mail.getNumber(), &msg);
    if (r != MAIL_NO_ERROR) {
        qDebug("Error fetching mail %i",mail.getNumber());
        mailfolder_free(folder);
        mailstorage_free(storage);
        return body;
    }
    r = mailmessage_fetch(msg,&data,&size);
    if (r != MAIL_NO_ERROR) {
        qDebug("Error fetching mail %i",mail.getNumber());
        mailfolder_free(folder);
        mailstorage_free(storage);
        mailmessage_free(msg);
        return body;
    }
    body = parseMail(msg);    
    mailmessage_fetch_result_free(msg,data);
    mailfolder_free(folder);
    mailstorage_free(storage);
    
    return body;
 }
 void MBOXwrapper::mbox_progress( size_t current, size_t maximum )
 {
    qDebug("MBOX %i von %i",current,maximum);
 }
 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) {
        Global::statusMessage(tr("Error init folder"));
        return;
    }
    r = mailmbox_append_message(f,msg,length);
    if (r != MAIL_NO_ERROR) {
        Global::statusMessage(tr("Error writing to message folder"));
    }
    mailmbox_done(f);
 }
-void MBOXwrapper::fetchRawBody(const RecMail&mail,char**target,size_t*length)
+encodedString* MBOXwrapper::fetchRawBody(const RecMail&mail)
 {
    RecBody body;
    mailstorage*storage = mailstorage_new(NULL);
    QString p = MBOXPath+"/";
    p+=mail.getMbox();
    mailmessage * msg;
    char*data=0;
    size_t size;
    int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
    mailfolder*folder;
    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);   
    r = mailfolder_connect(folder);
    if (r != MAIL_NO_ERROR) {
        Global::statusMessage(tr("Error initializing mbox"));
        mailfolder_free(folder);
        mailstorage_free(storage);
-        return;
+        return 0;
    }
    r = mailsession_get_message(folder->fld_session, mail.getNumber(), &msg);
    if (r != MAIL_NO_ERROR) {
        Global::statusMessage(tr("Error fetching mail %i").arg(mail.getNumber()));
        mailfolder_free(folder);
        mailstorage_free(storage);
-        return;
+        return 0;
    }
    r = mailmessage_fetch(msg,&data,&size);
    if (r != MAIL_NO_ERROR) {
        Global::statusMessage(tr("Error fetching mail %i").arg(mail.getNumber()));
        mailfolder_free(folder);
        mailstorage_free(storage);
        mailmessage_free(msg);
-        return;
+        return 0;
    }
-    *target = data;
+    encodedString*result = new encodedString(data,size);
-    *length = size;
    mailfolder_free(folder);
    mailstorage_free(storage);
    mailmessage_free(msg);
+    return result;
 }
 void MBOXwrapper::deleteMails(const QString & mailbox,QList<RecMail> &target)
 {
    QString p = MBOXPath+"/";
    p+=mailbox;
    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");
    }
 }
 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;
 }
 void MBOXwrapper::statusFolder(folderStat&target_stat,const QString & mailbox)
 {
    mailfolder*folder = 0;
    mailstorage*storage = mailstorage_new(NULL);
    target_stat.message_count = 0;
    target_stat.message_unseen = 0;
    target_stat.message_recent = 0;
    QString p = MBOXPath+"/"+mailbox;
    QFile fi(p);
    if (!fi.exists()) {
        Global::statusMessage(tr("Mailbox doesn't exist."));
        return;
    }
    int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);   
    r = mailfolder_connect(folder);
    r = mailsession_status_folder(folder->fld_session,(char*)mailbox.latin1(),&target_stat.message_count,
        &target_stat.message_recent,&target_stat.message_unseen);
    if (folder) mailfolder_free(folder);
    if (storage) mailstorage_free(storage);
 }
 const QString&MBOXwrapper::getType()const
 {
    return wrapperType;
 }
diff --git a/noncore/net/mail/libmailwrapper/mboxwrapper.h b/noncore/net/mail/libmailwrapper/mboxwrapper.h
index f97fce2..2794014 100644
--- a/noncore/net/mail/libmailwrapper/mboxwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mboxwrapper.h
@@ -1,44 +1,45 @@
 #ifndef __MBOX_WRAPPER_H
 #define __MBOX_WRAPPER_H
 #include "genericwrapper.h"
 #include <qstring.h>
 class RecMail;
 class RecBody;
+class encodedString;
 struct mailmbox_folder;
 class MBOXwrapper : public Genericwrapper
 {
    Q_OBJECT
 public:
    MBOXwrapper(const QString & dir);
    virtual ~MBOXwrapper();
    
    virtual void listMessages(const QString & mailbox, QList<RecMail> &target );
    virtual QList<Folder>* listFolders();
    virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
    virtual void deleteMail(const RecMail&mail);
    virtual void answeredMail(const RecMail&mail);
    
    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 encodedString* fetchRawBody(const RecMail&mail);
    virtual void deleteMails(const QString & mailbox,QList<RecMail> &target);
    virtual int deleteAllMail(const Folder*);
    virtual const QString&getType()const;
 protected:
    static void deleteMails(mailmbox_folder*f,QList<RecMail> &target);
    QString MBOXPath;
    static const QString wrapperType;
 };
 #endif
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index 45408dd..72c145b 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -1,242 +1,249 @@
 #include <stdlib.h>
 #include "pop3wrapper.h"
 #include "mailtypes.h"
 #include "logindialog.h"
 #include <libetpan/libetpan.h>
 #include <qpe/global.h>
 #include <qfile.h>
 #include <qstring.h>
 /* we don't fetch messages larger than 5 MB */
 #define HARD_MSG_SIZE_LIMIT 5242880
 POP3wrapper::POP3wrapper( POP3account *a )
    : Genericwrapper()
 {
    account = a;
    m_pop3 = NULL;
    m_folder = 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 )
 {
    qDebug( "POP3: %i of %i", current, maximum );
 }
 RecBody POP3wrapper::fetchBody( const RecMail &mail )
 {
    int err = MAILPOP3_NO_ERROR;
    char *message = 0;
    size_t length = 0;
    
    login();
    if ( !m_pop3 ) {
        return RecBody();
    }
    RecBody body;
    mailmessage * mailmsg;
    if (mail.Msgsize()>HARD_MSG_SIZE_LIMIT) {
        qDebug("Message to large: %i",mail.Msgsize());
        return body;
    }
    
    QFile msg_cache(msgTempName);
    cleanMimeCache();
    
    if (mail.getNumber()!=last_msg_id) {
        if (msg_cache.exists()) {
            msg_cache.remove();
        }
        msg_cache.open(IO_ReadWrite|IO_Truncate);
        last_msg_id = mail.getNumber();
        err = mailsession_get_message(m_folder->fld_session, mail.getNumber(), &mailmsg);
        err = mailmessage_fetch(mailmsg,&message,&length);
        msg_cache.writeBlock(message,length);
    } else {
        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 &, QList<RecMail> &target )
 {
    login();
    if (!m_pop3) return;
    uint32_t res_messages,res_recent,res_unseen;
    mailsession_status_folder(m_folder->fld_session,"INBOX",&res_messages,&res_recent,&res_unseen);
    parseList(target,m_folder->fld_session,"INBOX");
    Global::statusMessage( tr("Mailbox contains %1 mail(s)").arg(res_messages));
 }
 void POP3wrapper::login()
 {
    /* 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
                qDebug( "POP3: Login canceled" );
                return;
          }
        } else {
          user = account->getUser().latin1();
          pass = account->getPassword().latin1();
        }
    bool ssl = account->getSSL();
    m_pop3=mailstorage_new(NULL);
    pop3_mailstorage_init(m_pop3,(char*)server,port,NULL,CONNECTION_TYPE_TRY_STARTTLS,POP3_AUTH_TYPE_TRY_APOP,
        (char*)user,(char*)pass,0,0,0);
    m_folder = mailfolder_new(m_pop3, NULL, NULL);
    if (m_folder==0) {
        Global::statusMessage(tr("Error initializing folder"));
        mailstorage_free(m_pop3);
        m_pop3 = NULL;
        return;
    }
    err = mailfolder_connect(m_folder);
    if (err != MAIL_NO_ERROR) {
        Global::statusMessage(tr("Error initializing folder"));
        mailfolder_free(m_folder);
        m_folder = 0;
        mailstorage_free(m_pop3);
        m_pop3 = 0;
    }
    qDebug( "POP3: logged in!" );
 }
 void POP3wrapper::logout()
 {
    int err = MAILPOP3_NO_ERROR;
    if ( m_pop3 == NULL ) return;
    mailfolder_free(m_folder);
    m_folder = 0;
    mailstorage_free(m_pop3);
    m_pop3 = 0;
 }
 QList<Folder>* POP3wrapper::listFolders()
 {
    QList<Folder> * folders = new QList<Folder>();
    folders->setAutoDelete( false );
    Folder*inb=new Folder("INBOX","/");
    folders->append(inb);
    return folders;
 }
 void POP3wrapper::deleteMail(const RecMail&mail)
 {
    login();
    if (!m_pop3) return;
    int err = mailsession_remove_message(m_folder->fld_session,mail.getNumber());
    if (err != MAIL_NO_ERROR) {
        Global::statusMessage(tr("error deleting mail"));
    }
 }
 void POP3wrapper::answeredMail(const RecMail&)
 {
 }
 int POP3wrapper::deleteAllMail(const Folder*)
 {
    login();
    if (!m_pop3) return 0;
    int res = 1;
    uint32_t result = 0;
    int err = mailsession_messages_number(m_folder->fld_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_folder->fld_session,i+1);
        if (err != MAIL_NO_ERROR) {
            Global::statusMessage(tr("Error deleting mail %1").arg(i+1));
            res=0;
        }
        break;
    }           
    return res;
 }
 void POP3wrapper::statusFolder(folderStat&target_stat,const QString&)
 {
    login();
    target_stat.message_count = 0;
    target_stat.message_unseen = 0;
    target_stat.message_recent = 0;
    if (!m_pop3) return;
    int r = mailsession_status_folder(m_folder->fld_session,0,&target_stat.message_count,
        &target_stat.message_recent,&target_stat.message_unseen);
 }
-void POP3wrapper::fetchRawBody(const RecMail&mail,char**target,size_t*length)
+encodedString* POP3wrapper::fetchRawBody(const RecMail&mail)
 {
+    char*target=0;
+    size_t length=0;
+    encodedString*res = 0;
    mailmessage * mailmsg = 0;
    int err = mailsession_get_message(m_folder->fld_session, mail.getNumber(), &mailmsg);
-    err = mailmessage_fetch(mailmsg,target,length);
+    err = mailmessage_fetch(mailmsg,&target,&length);
    if (mailmsg) mailmessage_free(mailmsg);  
+    if (target) {
+        res = new encodedString(target,length);
+    }
+    return res;
 }
 const QString&POP3wrapper::getType()const
 {
    return account->getType();
 }
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.h b/noncore/net/mail/libmailwrapper/pop3wrapper.h
index b7e8f27..f0307b6 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.h
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.h
@@ -1,41 +1,42 @@
 #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, QList<RecMail> &target );
    virtual QList<Folder>* listFolders();
    /* mailbox will be ignored */
    virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
    virtual void deleteMail(const RecMail&mail);
    virtual void answeredMail(const RecMail&mail);
    virtual int deleteAllMail(const Folder*);
    virtual RecBody fetchBody( const RecMail &mail );
-    virtual void fetchRawBody(const RecMail&mail,char**target,size_t*length);
+    virtual encodedString* fetchRawBody(const RecMail&mail);
    virtual void logout();
    virtual const QString&getType()const;
    static void pop3_progress( size_t current, size_t maximum );
 protected:
    void login();
    POP3account *account;
    mailstorage*m_pop3;
    mailfolder*m_folder;
 };
 #endif
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index e054365..00181ff 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -1,734 +1,731 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <qdir.h>
 #include <qt.h>
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <libetpan/libetpan.h>
 #include "smtpwrapper.h"
 #include "mailwrapper.h"
 #include "mboxwrapper.h"
 #include "logindialog.h"
 #include "mailtypes.h"
 //#include "defines.h"
 #include "sendmailprogress.h"
 const char* SMTPwrapper::USER_AGENT="OpieMail v0.3";
 progressMailSend*SMTPwrapper::sendProgress = 0;
 SMTPwrapper::SMTPwrapper( Settings *s )
    : QObject()
 {
    settings = s;
    Config cfg( "mail" );
    cfg.setGroup( "Status" );
    m_queuedMail =  cfg.readNumEntry( "outgoing", 0 );
    emit queuedMails( m_queuedMail );
    connect( this, SIGNAL( queuedMails( int ) ), this, SLOT( emitQCop( int ) )  );
 }
 void SMTPwrapper::emitQCop( int queued ) {
    QCopEnvelope env( "QPE/Pim", "outgoingMails(int)" );
    env << queued;
 }
 QString SMTPwrapper::mailsmtpError( int errnum )
 {
    switch ( errnum ) {
        case MAILSMTP_NO_ERROR:
            return tr( "No error" );
        case MAILSMTP_ERROR_UNEXPECTED_CODE:
            return tr( "Unexpected error code" );
        case MAILSMTP_ERROR_SERVICE_NOT_AVAILABLE:
            return tr( "Service not available" );
        case MAILSMTP_ERROR_STREAM:
            return tr( "Stream error" );
        case MAILSMTP_ERROR_HOSTNAME:
            return tr( "gethostname() failed" );
        case MAILSMTP_ERROR_NOT_IMPLEMENTED:
            return tr( "Not implemented" );
        case MAILSMTP_ERROR_ACTION_NOT_TAKEN:
            return tr( "Error, action not taken" );
        case MAILSMTP_ERROR_EXCEED_STORAGE_ALLOCATION:
            return tr( "Data exceeds storage allocation" );
        case MAILSMTP_ERROR_IN_PROCESSING:
            return tr( "Error in processing" );
  //      case MAILSMTP_ERROR_INSUFFISANT_SYSTEM_STORAGE:
    //        return tr( "Insufficient system storage" );
        case MAILSMTP_ERROR_MAILBOX_UNAVAILABLE:
            return tr( "Mailbox unavailable" );
        case MAILSMTP_ERROR_MAILBOX_NAME_NOT_ALLOWED:
            return tr( "Mailbox name not allowed" );
        case MAILSMTP_ERROR_BAD_SEQUENCE_OF_COMMAND:
            return tr( "Bad command sequence" );
        case MAILSMTP_ERROR_USER_NOT_LOCAL:
            return tr( "User not local" );
        case MAILSMTP_ERROR_TRANSACTION_FAILED:
            return tr( "Transaction failed" );
        case MAILSMTP_ERROR_MEMORY:
            return tr( "Memory error" );
        case MAILSMTP_ERROR_CONNECTION_REFUSED:
            return tr( "Connection refused" );
        default:
            return tr( "Unknown error code" );
    }
 }
 mailimf_mailbox *SMTPwrapper::newMailbox(const QString&name, const QString&mail )
 {
    return mailimf_mailbox_new( strdup( name.latin1() ),
                                strdup( mail.latin1() ) );
 }
 mailimf_address_list *SMTPwrapper::parseAddresses(const QString&addr )
 {
    mailimf_address_list *addresses;
    if ( addr.isEmpty() ) return NULL;
    addresses = mailimf_address_list_new_empty();
    bool literal_open = false;
    unsigned int startpos = 0;
    QStringList list;
    QString s;
    unsigned int i = 0;
    for (; i < addr.length();++i) {
        switch (addr[i]) {
        case '\"':
            literal_open = !literal_open;
            break;
        case ',':
            if (!literal_open) {
                s = addr.mid(startpos,i-startpos);
                if (!s.isEmpty()) {
                    list.append(s);
                    qDebug("Appended %s",s.latin1());
                }
                // !!!! this is a MUST BE!
                startpos = ++i;
            }
            break;
        default:
            break;
        }
    }
    s = addr.mid(startpos,i-startpos);
    if (!s.isEmpty()) {
       list.append(s);
       qDebug("Appended %s",s.latin1());
    }
    QStringList::Iterator it;
    for ( it = list.begin(); it != list.end(); it++ ) {
        int err = mailimf_address_list_add_parse( addresses, (char*)(*it).latin1() );
        if ( err != MAILIMF_NO_ERROR ) {
            qDebug( "Error parsing" );
            qDebug( *it );
        } else {
            qDebug( "Parse success! %s",(*it).latin1());
        }
    }
    return addresses;
 }
 mailimf_fields *SMTPwrapper::createImfFields(const Mail&mail )
 {
    mailimf_fields *fields;
    mailimf_field *xmailer;
    mailimf_mailbox *sender=0,*fromBox=0;
    mailimf_mailbox_list *from=0;
    mailimf_address_list *to=0, *cc=0, *bcc=0, *reply=0;
    char *subject = strdup( mail.getSubject().latin1() );
    int err;
    sender = newMailbox( mail.getName(), mail.getMail() );
    if ( sender == NULL ) goto err_free;
    fromBox = newMailbox( mail.getName(), mail.getMail() );
    if ( fromBox == NULL ) goto err_free_sender;
    from = mailimf_mailbox_list_new_empty();
    if ( from == NULL ) goto err_free_fromBox;
    err = mailimf_mailbox_list_add( from, fromBox );
    if ( err != MAILIMF_NO_ERROR ) goto err_free_from;
    to = parseAddresses( mail.getTo() );
    if ( to == NULL ) goto err_free_from;
    cc = parseAddresses( mail.getCC() );
    bcc = parseAddresses( mail.getBCC() );
    reply = parseAddresses( mail.getReply() );
    fields = mailimf_fields_new_with_data( from, sender, reply, to, cc, bcc,
                                           NULL, NULL, subject );
    if ( fields == NULL ) goto err_free_reply;
    xmailer = mailimf_field_new_custom( strdup( "User-Agent" ),
                                        strdup( USER_AGENT ) );
    if ( xmailer == NULL ) goto err_free_fields;
    err = mailimf_fields_add( fields, xmailer );
    if ( err != MAILIMF_NO_ERROR ) goto err_free_xmailer;
    return fields;      // Success :)
 err_free_xmailer:
    if (xmailer) mailimf_field_free( xmailer );
 err_free_fields:
    if (fields) mailimf_fields_free( fields );
 err_free_reply:
    if (reply) mailimf_address_list_free( reply );
    if (bcc) mailimf_address_list_free( bcc );
    if (cc) mailimf_address_list_free( cc );
    if (to) mailimf_address_list_free( to );
 err_free_from:
    if (from) mailimf_mailbox_list_free( from );
 err_free_fromBox:
    mailimf_mailbox_free( fromBox );
 err_free_sender:
    if (sender) mailimf_mailbox_free( sender );
 err_free:
    if (subject) free( subject );
    qDebug( "createImfFields - error" );
    return NULL;        // Error :(
 }
 mailmime *SMTPwrapper::buildTxtPart(const QString&str )
 {
    mailmime *txtPart;
    mailmime_fields *fields;
    mailmime_content *content;
    mailmime_parameter *param;
    int err;
    param = mailmime_parameter_new( strdup( "charset" ),
                                    strdup( "iso-8859-1" ) );
    if ( param == NULL ) goto err_free;
    content = mailmime_content_new_with_str( "text/plain" );
    if ( content == NULL ) goto err_free_param;
    err = clist_append( content->ct_parameters, param );
    if ( err != MAILIMF_NO_ERROR ) goto err_free_content;
    fields = mailmime_fields_new_encoding(MAILMIME_MECHANISM_8BIT);
    if ( fields == NULL ) goto err_free_content;
    txtPart = mailmime_new_empty( content, fields );
    if ( txtPart == NULL ) goto err_free_fields;
    err = mailmime_set_body_text( txtPart, (char*)str.data(), str.length() );
    if ( err != MAILIMF_NO_ERROR ) goto err_free_txtPart;
    return txtPart;     // Success :)
 err_free_txtPart:
    mailmime_free( txtPart );
 err_free_fields:
    mailmime_fields_free( fields );
 err_free_content:
    mailmime_content_free( content );
 err_free_param:
    mailmime_parameter_free( param );
 err_free:
    qDebug( "buildTxtPart - error" );
    return NULL;        // Error :(
 }
 mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimetype,const QString&TextContent )
 {
    mailmime * filePart = 0;
    mailmime_fields * fields = 0;
    mailmime_content * content = 0;
    mailmime_parameter * param = 0;
    char*name = 0;
    char*file = 0;
    int err;
    int pos = filename.findRev( '/' );
    if (filename.length()>0) {
        QString tmp = filename.right( filename.length() - ( pos + 1 ) );
        name = strdup( tmp.latin1() );        // just filename
        file = strdup( filename.latin1() );   // full name with path
    }
    int disptype = MAILMIME_DISPOSITION_TYPE_ATTACHMENT;
    int mechanism = MAILMIME_MECHANISM_BASE64;
    if ( mimetype.startsWith( "text/" ) ) {
        param = mailmime_parameter_new( strdup( "charset" ),
                                        strdup( "iso-8859-1" ) );
        mechanism = MAILMIME_MECHANISM_QUOTED_PRINTABLE;
    }
    fields = mailmime_fields_new_filename(
                disptype, name,
                mechanism );
    content = mailmime_content_new_with_str( (char*)mimetype.latin1() );
    if (content!=0 && fields != 0) {
        if (param) {
            clist_append(content->ct_parameters,param);
            param = 0;
        }
        if (filename.length()>0) {
            QFileInfo f(filename);
            param = mailmime_parameter_new(strdup("name"),strdup(f.fileName().latin1()));
            clist_append(content->ct_parameters,param);
            param = 0;
        }
        filePart = mailmime_new_empty( content, fields );
    }
    if (filePart) {
        if (filename.length()>0) {
            err = mailmime_set_body_file( filePart, file );
        } else {
            err = mailmime_set_body_text(filePart,strdup(TextContent.data()),TextContent.length());
        }
        if (err != MAILIMF_NO_ERROR) {
            qDebug("Error setting body with file %s",file);
            mailmime_free( filePart );
            filePart = 0;
        }
    }
    if (!filePart) {
        if ( param != NULL ) {
            mailmime_parameter_free( param );
        }
        if (content) {
            mailmime_content_free( content );
        }
        if (fields) {
            mailmime_fields_free( fields );
        } else {
            if (name) {
                free( name );
            }
            if (file) {
                free( file );
            }
        }
    }
    return filePart;        // Success :)
 }
 void SMTPwrapper::addFileParts( mailmime *message,const QList<Attachment>&files )
 {
    const Attachment *it;
    unsigned int count = files.count();
    qDebug("List contains %i values",count);
    for ( unsigned int i = 0; i < count; ++i ) {
        qDebug( "Adding file" );
        mailmime *filePart;
        int err;
        it = ((QList<Attachment>)files).at(i);
        filePart = buildFilePart( it->getFileName(), it->getMimeType(),"" );
        if ( filePart == NULL ) {
            qDebug( "addFileParts: error adding file:" );
            qDebug( it->getFileName() );
            continue;
        }
        err = mailmime_smart_add_part( message, filePart );
        if ( err != MAILIMF_NO_ERROR ) {
            mailmime_free( filePart );
            qDebug("error smart add");
        }
    }
 }
 mailmime *SMTPwrapper::createMimeMail(const Mail &mail )
 {
    mailmime *message, *txtPart;
    mailimf_fields *fields;
    int err;
    fields = createImfFields( mail );
    if ( fields == NULL ) goto err_free;
    message = mailmime_new_message_data( NULL );
    if ( message == NULL ) goto err_free_fields;
    mailmime_set_imf_fields( message, fields );
    txtPart = buildTxtPart( mail.getMessage() );
    if ( txtPart == NULL ) goto err_free_message;
    err = mailmime_smart_add_part( message, txtPart );
    if ( err != MAILIMF_NO_ERROR ) goto err_free_txtPart;
    addFileParts( message, mail.getAttachments() );
    return message;         // Success :)
 err_free_txtPart:
    mailmime_free( txtPart );
 err_free_message:
    mailmime_free( message );
 err_free_fields:
    mailimf_fields_free( fields );
 err_free:
    qDebug( "createMimeMail: error" );
    return NULL;            // Error :(
 }
 mailimf_field *SMTPwrapper::getField( mailimf_fields *fields, int type )
 {
    mailimf_field *field;
    clistiter *it;
    it = clist_begin( fields->fld_list );
    while ( it ) {
        field = (mailimf_field *) it->data;
        if ( field->fld_type == type ) {
            return field;
        }
        it = it->next;
    }
    return NULL;
 }
 void SMTPwrapper::addRcpts( clist *list, mailimf_address_list *addr_list )
 {
    clistiter *it, *it2;
    for ( it = clist_begin( addr_list->ad_list ); it; it = it->next ) {
        mailimf_address *addr;
        addr = (mailimf_address *) it->data;
        if ( addr->ad_type == MAILIMF_ADDRESS_MAILBOX ) {
                esmtp_address_list_add( list, addr->ad_data.ad_mailbox->mb_addr_spec, 0, NULL );
        } else if ( addr->ad_type == MAILIMF_ADDRESS_GROUP ) {
            clist *l = addr->ad_data.ad_group->grp_mb_list->mb_list;
                for ( it2 = clist_begin( l ); it2; it2 = it2->next ) {
                mailimf_mailbox *mbox;
                    mbox = (mailimf_mailbox *) it2->data;
                    esmtp_address_list_add( list, mbox->mb_addr_spec, 0, NULL );
                }
            }
    }
 }
 clist *SMTPwrapper::createRcptList( mailimf_fields *fields )
 {
    clist *rcptList;
    mailimf_field *field;
    rcptList = esmtp_address_list_new();
    field = getField( fields, MAILIMF_FIELD_TO );
    if ( field && (field->fld_type == MAILIMF_FIELD_TO)
         && field->fld_data.fld_to->to_addr_list ) {
        addRcpts( rcptList, field->fld_data.fld_to->to_addr_list );
    }
    field = getField( fields, MAILIMF_FIELD_CC );
    if ( field && (field->fld_type == MAILIMF_FIELD_CC)
         && field->fld_data.fld_cc->cc_addr_list ) {
        addRcpts( rcptList, field->fld_data.fld_cc->cc_addr_list );
    }
    field = getField( fields, MAILIMF_FIELD_BCC );
    if ( field && (field->fld_type == MAILIMF_FIELD_BCC)
         && field->fld_data.fld_bcc->bcc_addr_list ) {
        addRcpts( rcptList, field->fld_data.fld_bcc->bcc_addr_list );
    }
    return rcptList;
 }
 char *SMTPwrapper::getFrom( mailimf_field *ffrom)
 {
    char *from = NULL;
    if ( ffrom && (ffrom->fld_type == MAILIMF_FIELD_FROM)
         && ffrom->fld_data.fld_from->frm_mb_list && ffrom->fld_data.fld_from->frm_mb_list->mb_list ) {
        clist *cl = ffrom->fld_data.fld_from->frm_mb_list->mb_list;
        clistiter *it;
        for ( it = clist_begin( cl ); it; it = it->next ) {
            mailimf_mailbox *mb = (mailimf_mailbox *) it->data;
            from = strdup( mb->mb_addr_spec );
        }
    }
    return from;
 }
 char *SMTPwrapper::getFrom( mailmime *mail )
 {
    /* no need to delete - its just a pointer to structure content */
    mailimf_field *ffrom = 0;
    ffrom = getField( mail->mm_data.mm_message.mm_fields, MAILIMF_FIELD_FROM );
    return getFrom(ffrom);
 }
 void SMTPwrapper::progress( size_t current, size_t maximum )
 {
    if (SMTPwrapper::sendProgress) {
        SMTPwrapper::sendProgress->setSingleMail(current, maximum );
        qApp->processEvents();
    }
 }
-void SMTPwrapper::storeMail(char*mail, size_t length, const QString&box)
+void SMTPwrapper::storeMail(const char*mail, size_t length, const QString&box)
 {
    if (!mail) return;
    QString localfolders = AbstractMail::defaultLocalfolder();
    MBOXwrapper*wrap = new MBOXwrapper(localfolders);
    wrap->storeMessage(mail,length,box);
    delete wrap;
 }
 void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
 {
    clist *rcpts = 0;
    char *from, *data;
    size_t size;
    if ( smtp == NULL ) {
        return;
    }
    from = data = 0;
    mailmessage * msg = 0;
    msg = mime_message_init(mail);
    mime_message_set_tmpdir(msg,getenv( "HOME" ));
    int r = mailmessage_fetch(msg,&data,&size);
    mime_message_detach_mime(msg);
    mailmessage_free(msg);
    if (r != MAIL_NO_ERROR || !data) {
        if (data) free(data);
        qDebug("Error fetching mime...");
        return;
    }
    QString tmp = data;
    tmp.replace(QRegExp("\r+",true,false),"");
    msg = 0;
    if (later) {
        storeMail((char*)tmp.data(),tmp.length(),"Outgoing");
        if (data) free( data );
        Config cfg( "mail" );
        cfg.setGroup( "Status" );
        cfg.writeEntry( "outgoing", ++m_queuedMail );
        emit queuedMails( m_queuedMail );
        return;
    }
    from = getFrom( mail );
    rcpts = createRcptList( mail->mm_data.mm_message.mm_fields );
    smtpSend(from,rcpts,data,size,smtp);
    if (data) {free(data);}
    if (from) {free(from);}
    if (rcpts) smtp_address_list_free( rcpts );
 }
-int SMTPwrapper::smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccount *smtp )
+int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size, SMTPaccount *smtp )
 {
    char *server, *user, *pass;
    bool ssl;
    uint16_t port;
    mailsmtp *session;
    int err,result;
    result = 1;
    server = user = pass = 0;
    server = strdup( smtp->getServer().latin1() );
    ssl = smtp->getSSL();
    port = smtp->getPort().toUInt();
    session = mailsmtp_new( 20, &progress );
    if ( session == NULL ) goto free_mem;
    qDebug( "Servername %s at port %i", server, port );
    if ( ssl ) {
        qDebug( "SSL session" );
        err = mailsmtp_ssl_connect( session, server, port );
    } else {
        qDebug( "No SSL session" );
        err = mailsmtp_socket_connect( session, server, port );
    }
    if ( err != MAILSMTP_NO_ERROR ) {result = 0;goto free_mem_session;}
    err = mailsmtp_init( session );
    if ( err != MAILSMTP_NO_ERROR ) {result = 0; goto free_con_session;}
    qDebug( "INIT OK" );
    if ( smtp->getLogin() ) {
        if ( smtp->getUser().isEmpty() || smtp->getPassword().isEmpty() ) {
            // get'em
            LoginDialog login( smtp->getUser(), smtp->getPassword(), NULL, 0, true );
            login.show();
            if ( QDialog::Accepted == login.exec() ) {
                // ok
                user = strdup( login.getUser().latin1() );
                pass = strdup( login.getPassword().latin1() );
            } else {
                result = 0; goto free_con_session;
            }
        } else {
            user = strdup( smtp->getUser().latin1() );
            pass = strdup( smtp->getPassword().latin1() );
        }
        qDebug( "session->auth: %i", session->auth);
        err = mailsmtp_auth( session, user, pass );
        if ( err == MAILSMTP_NO_ERROR ) qDebug("auth ok");
        qDebug( "Done auth!" );
    }
    err = mailsmtp_send( session, from, rcpts, data, size );
    if ( err != MAILSMTP_NO_ERROR ) {
        qDebug("Error sending mail: %s",mailsmtpError(err).latin1());
        result = 0; goto free_con_session;
    }
    qDebug( "Mail sent." );
    storeMail(data,size,"Sent");
 free_con_session:
    mailsmtp_quit( session );
 free_mem_session:
    mailsmtp_free( session );
 free_mem:
    if (server) free( server );
    if ( smtp->getLogin() ) {
        free( user );
        free( pass );
    }
    return result;
 }
 void SMTPwrapper::sendMail(const Mail&mail,SMTPaccount*aSmtp,bool later )
 {
    mailmime * mimeMail;
    SMTPaccount *smtp = aSmtp;
    if (!later && !smtp) {
        qDebug("Didn't get any send method - giving up");
        return;
    }
    mimeMail = createMimeMail(mail );
    if ( mimeMail == NULL ) {
        qDebug( "sendMail: error creating mime mail" );
    } else {
        sendProgress = new progressMailSend();
        sendProgress->show();
        sendProgress->setMaxMails(1);
        smtpSend( mimeMail,later,smtp);
        qDebug("Clean up done");
        sendProgress->hide();
        delete sendProgress;
        sendProgress = 0;
        mailmime_free( mimeMail );
    }
 }
 int SMTPwrapper::sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which)
 {
-    char*data = 0;
-    size_t length = 0;
    size_t curTok = 0;
    mailimf_fields *fields = 0;
    mailimf_field*ffrom = 0;
    clist *rcpts = 0;
    char*from = 0;
    int res = 0;
-    wrap->fetchRawBody(*which,&data,&length);
+    encodedString * data = wrap->fetchRawBody(*which);
    if (!data) return 0;
-    int err = mailimf_fields_parse( data, length, &curTok, &fields );
+    int err = mailimf_fields_parse( data->Content(), data->Length(), &curTok, &fields );
    if (err != MAILIMF_NO_ERROR) {
-        free(data);
+        delete data;
        delete wrap;
        return 0;
    }
    rcpts = createRcptList( fields );
    ffrom = getField(fields, MAILIMF_FIELD_FROM );
    from = getFrom(ffrom);
-    qDebug("Size: %i vs. %i",length,strlen(data));
    if (rcpts && from) {
-        res = smtpSend(from,rcpts,data,length,smtp );
+        res = smtpSend(from,rcpts,data->Content(),data->Length(),smtp );
    }
    if (fields) {
        mailimf_fields_free(fields);
        fields = 0;
    }
    if (data) {
-        free(data);
+        delete data;
    }
    if (from) {
        free(from);
    }
    if (rcpts) {
        smtp_address_list_free( rcpts );
    }
    return res;
 }
 /* this is a special fun */
 bool SMTPwrapper::flushOutbox(SMTPaccount*smtp)
 {
    bool returnValue = true;
    if (!smtp) return false;
    QString localfolders = AbstractMail::defaultLocalfolder();
    MBOXwrapper*wrap = new MBOXwrapper(localfolders);
    if (!wrap) {
        qDebug("memory error");
        return false;
    }
    QList<RecMail> mailsToSend;
    QList<RecMail> mailsToRemove;
    QString mbox("Outgoing");
    wrap->listMessages(mbox,mailsToSend);
    if (mailsToSend.count()==0) {
        delete wrap;
        return false;
    }
    mailsToSend.setAutoDelete(false);
    sendProgress = new progressMailSend();
    sendProgress->show();
    sendProgress->setMaxMails(mailsToSend.count());
    while (mailsToSend.count()>0) {
        if (sendQueuedMail(wrap,smtp,mailsToSend.at(0))==0) {
            QMessageBox::critical(0,tr("Error sending mail"),
                tr("Error sending queued mail - breaking"));
            returnValue = false;
            break;
        }
        mailsToRemove.append(mailsToSend.at(0));
        mailsToSend.removeFirst();
        sendProgress->setCurrentMails(mailsToRemove.count());
    }
    Config cfg( "mail" );
    cfg.setGroup( "Status" );
    m_queuedMail = 0;
    cfg.writeEntry( "outgoing", m_queuedMail );
    emit queuedMails( m_queuedMail );
    sendProgress->hide();
    delete sendProgress;
    sendProgress = 0;
    wrap->deleteMails(mbox,mailsToRemove);
    mailsToSend.setAutoDelete(true);
    delete wrap;
    return returnValue;
 }
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.h b/noncore/net/mail/libmailwrapper/smtpwrapper.h
index 4a4352f..04fc4b0 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.h
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.h
@@ -1,72 +1,72 @@
 #ifndef SMTPwrapper_H
 #define SMTPwrapper_H
 #include <qpe/applnk.h>
 #include <qbitarray.h>
 #include <qdatetime.h>
 #include <libetpan/clist.h>
 #include "settings.h"
 class Mail;
 class MBOXwrapper;
 class RecMail;
 class Attachment;
 struct mailimf_fields;
 struct mailimf_field;
 struct mailimf_mailbox;
 struct mailmime;
 struct mailimf_address_list;
 class progressMailSend;
 class SMTPwrapper : public QObject
 {
    Q_OBJECT
 public:
    SMTPwrapper( Settings *s ); 
    virtual ~SMTPwrapper(){}
    void sendMail(const Mail& mail,SMTPaccount*smtp,bool later=false );
    bool flushOutbox(SMTPaccount*smtp);
    static progressMailSend*sendProgress;
 signals:
    void queuedMails( int );  
 protected:
    mailimf_mailbox *newMailbox(const QString&name,const QString&mail );
    mailimf_fields *createImfFields(const Mail &mail );
    mailmime *createMimeMail(const Mail&mail );
    
    mailimf_address_list *parseAddresses(const QString&addr );
    void addFileParts( mailmime *message,const QList<Attachment>&files );
    mailmime *buildTxtPart(const QString&str );
    mailmime *buildFilePart(const QString&filename,const QString&mimetype,const QString&content);
    void smtpSend( mailmime *mail,bool later, SMTPaccount *smtp );
    clist *createRcptList( mailimf_fields *fields );
    
-    static void storeMail(char*mail, size_t length, const QString&box);
+    static void storeMail(const char*mail, size_t length, const QString&box);
    static QString mailsmtpError( int err );
    static void progress( size_t current, size_t maximum );
    static void addRcpts( clist *list, mailimf_address_list *addr_list );
    static char *getFrom( mailmime *mail );
    static char *getFrom( mailimf_field *ffrom);
    static mailimf_field *getField( mailimf_fields *fields, int type );
-    int smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccount *smtp );
+    int smtpSend(char*from,clist*rcpts,const char*data,size_t size, SMTPaccount *smtp );
    void storeMail(mailmime*mail, const QString&box);
    Settings *settings;
    
    int sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which);
    int m_queuedMail;
    static const char* USER_AGENT;
 protected slots:
   void emitQCop( int queued );
 };
 #endif
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index 96ffaa8..1abd2e8 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -1,53 +1,56 @@
 CONFIG        += qt warn_on debug quick-app
 HEADERS         = defines.h \
               editaccounts.h \
               composemail.h \
               accountview.h \
               mainwindow.h \
               viewmail.h \
               viewmailbase.h \
               opiemail.h \
               mailistviewitem.h \
               settingsdialog.h \
               statuswidget.h \
-               newmaildir.h
+               newmaildir.h \
+               selectstore.h
               
 SOURCES         = main.cpp \
               opiemail.cpp \
               mainwindow.cpp \
               accountview.cpp \
               composemail.cpp \
               addresspicker.cpp \
               editaccounts.cpp \
               viewmail.cpp \
               viewmailbase.cpp \
               settingsdialog.cpp \
               statuswidget.cpp \
-               newmaildir.cpp
+               newmaildir.cpp \
+               selectstore.cpp
               
 INTERFACES     = editaccountsui.ui \
               selectmailtypeui.ui \
               imapconfigui.ui \
               pop3configui.ui \
               nntpconfigui.ui \
               smtpconfigui.ui \
               addresspickerui.ui \
               composemailui.ui \
               settingsdialogui.ui \
               statuswidgetui.ui \
-               newmaildirui.ui 
+               newmaildirui.ui \
+               selectstoreui.ui
        
 INCLUDEPATH += $(OPIEDIR)/include
 CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
 contains( CONFTEST, y ){
    LIBS        += -lqpe -lopie -lmailwrapper -liconv
 }else{
    LIBS        += -lqpe -lopie -lmailwrapper
 }
 TARGET       = opiemail
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/mail/selectstore.cpp b/noncore/net/mail/selectstore.cpp
new file mode 100644
index 0000000..28ab5a8
--- a/dev/null
+++ b/noncore/net/mail/selectstore.cpp
@@ -0,0 +1,19 @@
+#include "selectstore.h"
+Selectstore::Selectstore(QWidget* parent, const char* name)
+    :selectstoreui(parent,name,true)
+{
+}
+Selectstore::~Selectstore()
+{
+}
+void Selectstore::slotCreateNewFolder()
+{
+}
+void Selectstore::slotMoveMail()
+{
+}
diff --git a/noncore/net/mail/selectstore.h b/noncore/net/mail/selectstore.h
new file mode 100644
index 0000000..8b8e8ee
--- a/dev/null
+++ b/noncore/net/mail/selectstore.h
@@ -0,0 +1,19 @@
+#ifndef _SELECTSTORE_H
+#define _SELECTSTORE_H
+#include "selectstoreui.h"
+class Selectstore:public selectstoreui
+{
+    Q_OBJECT
+public:
+    Selectstore(QWidget* parent = 0, const char* name = 0);
+    virtual ~Selectstore();
+protected:
+    virtual void slotCreateNewFolder();
+    virtual void slotMoveMail();
+protected slots:
+};
+#endif
diff --git a/noncore/net/mail/selectstoreui.ui b/noncore/net/mail/selectstoreui.ui
new file mode 100644
index 0000000..3741b71
--- a/dev/null
+++ b/noncore/net/mail/selectstoreui.ui
@@ -0,0 +1,244 @@
+<!DOCTYPE UI><UI>
+<class>selectstoreui</class>
+<widget>
+    <class>QDialog</class>
+    <property stdset="1">
+        <name>name</name>
+        <cstring>selectstoreui</cstring>
+    </property>
+    <property stdset="1">
+        <name>geometry</name>
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>190</width>
+            <height>273</height>
+        </rect>
+    </property>
+    <property stdset="1">
+        <name>caption</name>
+        <string>Select target box</string>
+    </property>
+    <property>
+        <name>layoutMargin</name>
+    </property>
+    <property>
+        <name>layoutSpacing</name>
+    </property>
+    <vbox>
+        <property stdset="1">
+            <name>margin</name>
+            <number>2</number>
+        </property>
+        <property stdset="1">
+            <name>spacing</name>
+            <number>2</number>
+        </property>
+        <widget>
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>headlabel</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>&lt;b&gt;Store mail(s) to&lt;/b&gt;</string>
+            </property>
+            <property stdset="1">
+                <name>alignment</name>
+                <set>AlignCenter</set>
+            </property>
+            <property>
+                <name>hAlign</name>
+            </property>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout2</cstring>
+            </property>
+            <grid>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget row="1"  column="1" >
+                    <class>QComboBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>folderSelection</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>3</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
+                    </property>
+                </widget>
+                <widget row="1"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>folderLabel</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Folder:</string>
+                    </property>
+                    <property stdset="1">
+                        <name>alignment</name>
+                        <set>AlignVCenter|AlignRight</set>
+                    </property>
+                    <property>
+                        <name>hAlign</name>
+                    </property>
+                </widget>
+                <widget row="0"  column="1" >
+                    <class>QComboBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>accountSelection</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>3</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
+                    </property>
+                </widget>
+                <widget row="0"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>accountlabel</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>1</hsizetype>
+                            <vsizetype>1</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Account:</string>
+                    </property>
+                    <property stdset="1">
+                        <name>alignment</name>
+                        <set>AlignVCenter|AlignRight</set>
+                    </property>
+                    <property>
+                        <name>hAlign</name>
+                    </property>
+                </widget>
+            </grid>
+        </widget>
+        <widget>
+            <class>Line</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Line1</cstring>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Horizontal</enum>
+            </property>
+        </widget>
+        <widget>
+            <class>QCheckBox</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>newFoldersel</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Create new folder</string>
+            </property>
+        </widget>
+        <widget>
+            <class>QLineEdit</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>newFolderedit</cstring>
+            </property>
+            <property stdset="1">
+                <name>enabled</name>
+                <bool>false</bool>
+            </property>
+        </widget>
+        <widget>
+            <class>Line</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Line2</cstring>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Horizontal</enum>
+            </property>
+        </widget>
+        <widget>
+            <class>QCheckBox</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>selMove</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Move mail(s)</string>
+            </property>
+        </widget>
+        <spacer>
+            <property>
+                <name>name</name>
+                <cstring>Spacer2</cstring>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Vertical</enum>
+            </property>
+            <property stdset="1">
+                <name>sizeType</name>
+                <enum>Expanding</enum>
+            </property>
+            <property>
+                <name>sizeHint</name>
+                <size>
+                    <width>20</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+    </vbox>
+</widget>
+<connections>
+    <connection>
+        <sender>selMove</sender>
+        <signal>clicked()</signal>
+        <receiver>selectstoreui</receiver>
+        <slot>slotMoveMail()</slot>
+    </connection>
+    <connection>
+        <sender>newFoldersel</sender>
+        <signal>clicked()</signal>
+        <receiver>selectstoreui</receiver>
+        <slot>slotCreateNewFolder()</slot>
+    </connection>
+    <slot access="protected">slotMoveMail()</slot>
+    <slot access="protected">slotCreateNewFolder()</slot>
+</connections>
+<tabstops>
+    <tabstop>accountSelection</tabstop>
+    <tabstop>folderSelection</tabstop>
+    <tabstop>newFoldersel</tabstop>
+    <tabstop>newFolderedit</tabstop>
+    <tabstop>selMove</tabstop>
+</tabstops>
+</UI>