5 files changed, 14 insertions, 15 deletions

diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.cpp b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
index 17bed65..13a3fd9 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
@@ -7,13 +7,13 @@
 #include <string.h>
 #include <qdir.h>
 #include <qtextstream.h>
 
 #include "mailwrapper.h"
 #include "logindialog.h"
-#include "mail.h"
+//#include "mail.h"
 #include "defines.h"
 
 Attachment::Attachment( DocLnk lnk )
 { 
     doc = lnk; 
     size = QFileInfo( doc.file() ).size(); 
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.h b/noncore/net/mail/libmailwrapper/mailwrapper.h
index 3de28a0..f45eab7 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.h
@@ -1,17 +1,17 @@
 #ifndef MAILWRAPPER_H
 #define MAILWRAPPER_H
 
 #include <qpe/applnk.h>
 
-#include <mailmime.h>
-#include <mailimf.h>
-#include <mailsmtp.h>
-#include <mailimap.h>
-#include <mailstorage.h>
-#include <maildriver.h>
+#include <libetpan/mailmime.h>
+#include <libetpan/mailimf.h>
+#include <libetpan/mailsmtp.h>
+#include <libetpan/mailimap.h>
+#include <libetpan/mailstorage.h>
+#include <libetpan/maildriver.h>
 #include <qbitarray.h>
 #include <qdatetime.h>
 
 #include "settings.h"
 
 class Attachment
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index c913826..46a476d 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -30,11 +30,10 @@ INTERFACES	 = editaccountsui.ui \
                smtpconfigui.ui \
                addresspickerui.ui \
                logindialogui.ui \
                composemailui.ui
 
 INCLUDEPATH += $(OPIEDIR)/include
-INCLUDEPATH += $(OPIEDIR)/include/libetpan
         LIBS    += -lqpe -lopie -letpan -lssl -lcrypto -ldb
 TARGET       = opiemail
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/mail/mailwrapper.cpp b/noncore/net/mail/mailwrapper.cpp
index 17bed65..13a3fd9 100644
--- a/noncore/net/mail/mailwrapper.cpp
+++ b/noncore/net/mail/mailwrapper.cpp
@@ -7,13 +7,13 @@
 #include <string.h>
 #include <qdir.h>
 #include <qtextstream.h>
 
 #include "mailwrapper.h"
 #include "logindialog.h"
-#include "mail.h"
+//#include "mail.h"
 #include "defines.h"
 
 Attachment::Attachment( DocLnk lnk )
 { 
     doc = lnk; 
     size = QFileInfo( doc.file() ).size(); 
diff --git a/noncore/net/mail/mailwrapper.h b/noncore/net/mail/mailwrapper.h
index 3de28a0..f45eab7 100644
--- a/noncore/net/mail/mailwrapper.h
+++ b/noncore/net/mail/mailwrapper.h
@@ -1,17 +1,17 @@
 #ifndef MAILWRAPPER_H
 #define MAILWRAPPER_H
 
 #include <qpe/applnk.h>
 
-#include <mailmime.h>
-#include <mailimf.h>
-#include <mailsmtp.h>
-#include <mailimap.h>
-#include <mailstorage.h>
-#include <maildriver.h>
+#include <libetpan/mailmime.h>
+#include <libetpan/mailimf.h>
+#include <libetpan/mailsmtp.h>
+#include <libetpan/mailimap.h>
+#include <libetpan/mailstorage.h>
+#include <libetpan/maildriver.h>
 #include <qbitarray.h>
 #include <qdatetime.h>
 
 #include "settings.h"
 
 class Attachment