1 files changed, 7 insertions, 9 deletions

diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index c7b1eeb..1069b9f 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -1,4 +1,2 @@
 #include "accountview.h"
-#include "imapwrapper.h"
-#include "pop3wrapper.h"
 #include "mailtypes.h"
@@ -15,3 +13,3 @@ POP3viewItem::POP3viewItem( POP3account *a, QListView *parent )
     account = a;
-    wrapper = new POP3wrapper( account );
+    wrapper = AbstractMail::getWrapper( account );
     setPixmap( 0, PIXMAP_POP3FOLDER );
@@ -28,3 +26,3 @@ void POP3viewItem::refresh( QList<RecMail> &target )
     qDebug( "POP3: refresh" );
-    wrapper->listMessages( target );
+    wrapper->listMessages("INBOX", target );
 }
@@ -46,3 +44,3 @@ IMAPviewItem::IMAPviewItem( IMAPaccount *a, QListView *parent )
     account = a;
-    wrapper = new IMAPwrapper( account );
+    wrapper = AbstractMail::getWrapper( account );
     setPixmap( 0, PIXMAP_IMAPFOLDER );
@@ -57,3 +55,3 @@ IMAPviewItem::~IMAPviewItem()
 
-IMAPwrapper *IMAPviewItem::getWrapper()
+AbstractMail *IMAPviewItem::getWrapper()
 {
@@ -64,3 +62,3 @@ void IMAPviewItem::refresh(QList<RecMail>&)
 {
-    QList<IMAPFolder> *folders = wrapper->listFolders();
+    QList<Folder> *folders = wrapper->listFolders();
     
@@ -73,3 +71,3 @@ void IMAPviewItem::refresh(QList<RecMail>&)
     
-    IMAPFolder *it;
+    Folder *it;
     for ( it = folders->first(); it; it = folders->next() ) {
@@ -89,3 +87,3 @@ IMAPfolderItem::~IMAPfolderItem()
 
-IMAPfolderItem::IMAPfolderItem( IMAPFolder *folderInit, IMAPviewItem *parent )
+IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPviewItem *parent )
     : AccountViewItem( parent )