1 files changed, 6 insertions, 9 deletions

diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h
index 4cac673..83d49af 100644
--- a/noncore/net/mail/accountview.h
+++ b/noncore/net/mail/accountview.h
@@ -8,4 +8,4 @@
 #include "mailwrapper.h"
+#include "abstractmail.h"
 
-class IMAPwrapper;
 class POP3wrapper;
@@ -35,3 +35,3 @@ private:
     POP3account *account;
-    POP3wrapper *wrapper;
+    AbstractMail *wrapper;
 
@@ -47,8 +47,6 @@ public:
     virtual RecBody fetchBody(const RecMail&);
-    IMAPwrapper *getWrapper();
-
+    AbstractMail *getWrapper();
 private:
     IMAPaccount *account;
-    IMAPwrapper *wrapper;
-    
+    AbstractMail *wrapper;
 };
@@ -59,3 +57,3 @@ class IMAPfolderItem : public AccountViewItem
 public:
-    IMAPfolderItem( IMAPFolder *folder, IMAPviewItem *parent );
+    IMAPfolderItem( Folder *folder, IMAPviewItem *parent );
     ~IMAPfolderItem();
@@ -63,5 +61,4 @@ public:
     virtual RecBody fetchBody(const RecMail&);
-
 private:
-    IMAPFolder *folder;
+    Folder *folder;
     IMAPviewItem *imap;