adapted includes to the new lib

12 files changed, 33 insertions, 26 deletions

diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index 9f07f56..2ce89db 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -1,35 +1,35 @@
 #include <stdlib.h>
 #include "accountview.h"
-#include "mailtypes.h"
+#include <libmailwrapper/mailtypes.h>
 #include "defines.h"
 #include "newmaildir.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();
@@ -134,79 +134,79 @@ AbstractMail *IMAPviewItem::getWrapper()
 
 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)
 {
     if (childCount()>0 && force==false) return;
     QList<Folder> *folders = wrapper->listFolders();
 
-    QListViewItem *child = firstChild();    
+    QListViewItem *child = firstChild();
     while ( child ) {
         QListViewItem *tmp = child;
         child = child->nextSibling();
         delete tmp;
     }
 
     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) {
@@ -388,65 +388,65 @@ void IMAPfolderItem::contextMenuSelected(int id)
 
 /**
  * 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  ) ) );         
+            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();
 
     QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
     (void) new MBOXviewItem(localfolders,this);
 
     Account *it;
@@ -578,65 +578,65 @@ void MBOXviewItem::createFolder()
     }
 }
 
 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 );
+        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);
             }
diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h
index 361dd86..1d2bf19 100644
--- a/noncore/net/mail/accountview.h
+++ b/noncore/net/mail/accountview.h
@@ -1,41 +1,41 @@
 #ifndef ACCOUNTVIEW_H
 #define ACCOUNTVIEW_H
 
 #include <qlistview.h>
 #include <qlist.h>
 
-#include "settings.h"
-#include "mailwrapper.h"
-#include "abstractmail.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:
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp
index 13c7900..5e823e8 100644
--- a/noncore/net/mail/composemail.cpp
+++ b/noncore/net/mail/composemail.cpp
@@ -1,77 +1,78 @@
 #include <qt.h>
 
 #include <opie/ofiledialog.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <qpe/contact.h>
 
 #include "composemail.h"
-#include "smtpwrapper.h"
+
+#include <libmailwrapper/smtpwrapper.h>
 
 ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags )
     : ComposeMailUI( parent, name, modal, flags )
 {
     settings = s;
 
     QString vfilename = Global::applicationFileName("addressbook",
                 "businesscard.vcf");
     Contact c;
     if (QFile::exists(vfilename)) {
         c = Contact::readVCard( vfilename )[0];
     }
 
     QStringList mails = c.emailList();
     QString defmail = c.defaultEmail();
-    
+
     if (defmail.length()!=0) {
         fromBox->insertItem(defmail);
     }
     QStringList::ConstIterator sit = mails.begin();
     for (;sit!=mails.end();++sit) {
         if ( (*sit)==defmail)
             continue;
         fromBox->insertItem((*sit));
     }
     senderNameEdit->setText(c.firstName()+" "+c.lastName());
     Config cfg( "mail" );
     cfg.setGroup( "Compose" );
     checkBoxLater->setChecked( cfg.readBoolEntry( "sendLater", false ) );
 
     attList->addColumn( tr( "Name" ) );
     attList->addColumn( tr( "Size" ) );
 
     QList<Account> accounts = settings->getAccounts();
-    
+
     Account *it;
     for ( it = accounts.first(); it; it = accounts.next() ) {
         if ( it->getType().compare( "SMTP" ) == 0 ) {
            SMTPaccount *smtp = static_cast<SMTPaccount *>(it);
            smtpAccountBox->insertItem( smtp->getAccountName() );
            smtpAccounts.append( smtp );
         }
     }
 
     if ( smtpAccounts.count() > 0 ) {
         fillValues( smtpAccountBox->currentItem() );
     } else {
         QMessageBox::information( this, tr( "Problem" ),
                                   tr( "<p>Please create an SMTP account first.</p>" ),
                                   tr( "Ok" ) );
         return;
     }
 
     connect( smtpAccountBox, SIGNAL( activated( int ) ), SLOT( fillValues( int ) ) );
     connect( toButton, SIGNAL( clicked() ), SLOT( pickAddressTo() ) );
     connect( ccButton, SIGNAL( clicked() ), SLOT( pickAddressCC() ) );
     connect( bccButton, SIGNAL( clicked() ), SLOT( pickAddressBCC() ) );
     connect( replyButton, SIGNAL( clicked() ), SLOT( pickAddressReply() ) );
     connect( addButton, SIGNAL( clicked() ), SLOT( addAttachment() ) );
     connect( deleteButton, SIGNAL( clicked() ), SLOT( removeAttachment() ) );
 }
 
 void ComposeMail::pickAddress( QLineEdit *line )
 {
     QString names = AddressPicker::getNames();
     if ( line->text().isEmpty() ) {
         line->setText( names );
@@ -162,78 +163,78 @@ void ComposeMail::slotAdjustColumns()
 
 void ComposeMail::addAttachment()
 {
     DocLnk lnk = OFileDialog::getOpenFileName( 1, "/" );
     if ( !lnk.name().isEmpty() ) {
         Attachment *att = new Attachment( lnk );
         (void) new AttachViewItem( attList, att );
     }
 }
 
 void ComposeMail::removeAttachment()
 {
     if ( !attList->currentItem() ) {
         QMessageBox::information( this, tr( "Error" ),
                                   tr( "<p>Please select a File.</p>" ),
                                   tr( "Ok" ) );
     } else {
         attList->takeItem( attList->currentItem() );
     }
 }
 
 void ComposeMail::accept()
 {
     if ( checkBoxLater->isChecked() ) {
         qDebug(  "Send later" );
     }
 
 #if 0
     qDebug( "Sending Mail with " +
             smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() );
 #endif
     Mail *mail = new Mail();
-    
+
     SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() );
     mail->setMail(fromBox->currentText());
 
     if ( !toLine->text().isEmpty() ) {
         mail->setTo( toLine->text() );
     } else {
         qDebug( "No Reciever spezified -> returning" );
         return;
     }
     mail->setName(senderNameEdit->text());
     mail->setCC( ccLine->text() );
     mail->setBCC( bccLine->text() );
     mail->setReply( replyLine->text() );
     mail->setSubject( subjectLine->text() );
     QString txt = message->text();
     if ( !sigMultiLine->text().isEmpty() ) {
         txt.append( "\n--\n" );
         txt.append( sigMultiLine->text() );
     }
     qDebug(txt);
     mail->setMessage( txt );
     AttachViewItem *it = (AttachViewItem *) attList->firstChild();
     while ( it != NULL ) {
         mail->addAttachment( it->getAttachment() );
         it = (AttachViewItem *) it->nextSibling();
     }
 
     SMTPwrapper wrapper( settings );
     wrapper.sendMail( *mail,smtp,checkBoxLater->isChecked() );
-    
+
     QDialog::accept();
 }
 
 AttachViewItem::AttachViewItem( QListView *parent, Attachment *att )
     : QListViewItem( parent )
 {
     attachment = att;
     qDebug( att->getMimeType() );
     setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ?
                   Resource::loadPixmap( "UnknownDocument-14" ) :
                   attachment->getDocLnk().pixmap() );
     setText( 0, att->getName().isEmpty() ? att->getFileName() : att->getName() );
     setText( 1, QString::number( att->getSize() ) );
 }
 
diff --git a/noncore/net/mail/composemail.h b/noncore/net/mail/composemail.h
index 230e397..604c862 100644
--- a/noncore/net/mail/composemail.h
+++ b/noncore/net/mail/composemail.h
@@ -1,42 +1,43 @@
 #ifndef COMPOSEMAIL_H
 #define COMPOSEMAIL_H
 
 #include <qlineedit.h>
 #include <qlistview.h>
 
 #include "composemailui.h"
 #include "addresspickerui.h"
-#include "settings.h"
-#include "mailwrapper.h"
+#include <libmailwrapper/settings.h>
+#include <libmailwrapper/mailwrapper.h>
+
 
 
 class AddressPicker : public AddressPickerUI
 {
         Q_OBJECT
 
 public:
         AddressPicker( QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 );
         static QString getNames();
 
 protected:
         QString selectedNames;
         void accept();
 
 };
 
 
 class ComposeMail : public ComposeMailUI
 {
     Q_OBJECT
     
 public:
     ComposeMail( Settings *s, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 );
 
 public slots:
     void slotAdjustColumns();
 
     void setTo( const QString & to );
     void setSubject( const QString & subject );
     void setInReplyTo( const QString & messageId );
     void setMessage( const QString & text );
 
diff --git a/noncore/net/mail/editaccounts.h b/noncore/net/mail/editaccounts.h
index 10ed8b8..6022eef 100644
--- a/noncore/net/mail/editaccounts.h
+++ b/noncore/net/mail/editaccounts.h
@@ -1,45 +1,46 @@
 #ifndef EDITACCOUNTS_H
 #define EDITACCOUNTS_H
 
 #include <qstring.h>
 #include <qlistview.h>
 
 #include "editaccountsui.h"
 #include "selectmailtypeui.h"
 #include "imapconfigui.h"
 #include "pop3configui.h"
 #include "smtpconfigui.h"
 #include "nntpconfigui.h"
-#include "settings.h"
+#include <libmailwrapper/settings.h>
+
 
 class AccountListItem : public QListViewItem
 {
 
 public:
     AccountListItem( QListView *parent, Account *a);
     Account *getAccount() { return account; }
 
 private:
     Account *account;
 
 };
 
 class EditAccounts : public EditAccountsUI
 {
     Q_OBJECT
 
 public: 
     EditAccounts( Settings *s, QWidget *parent = 0, const char *name = 0, bool modal = 0, WFlags flags = 0 );
     
 public slots:
     void slotNewAccount( const QString &type );
     void slotEditAccount( Account *account );
     void slotDeleteAccount( Account * account );
     void slotAdjustColumns();
 
 protected slots:
     void slotFillLists();
     void slotNewMail();
     void slotEditMail();
     void slotDeleteMail();
     void slotNewNews();
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index 69e1450..a96c88e 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -13,40 +13,40 @@ HEADERS         = defines.h \
                statuswidget.h \
                newmaildir.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
                
 INTERFACES     = editaccountsui.ui \
                selectmailtypeui.ui \
                imapconfigui.ui \
                pop3configui.ui \
                nntpconfigui.ui \
                smtpconfigui.ui \
                addresspickerui.ui \
                composemailui.ui \
                settingsdialogui.ui \
                statuswidgetui.ui \
                newmaildirui.ui
 
 INCLUDEPATH += $(OPIEDIR)/include
 
 CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
 contains( CONFTEST, y ){
-    LIBS        += -lqpe -letpan -lssl -lcrypto -lopie -liconv
+    LIBS        += -lqpe -lopie -lmailwrapper -liconv
 }else{
-    LIBS        += -lqpe -lopie -llibmailwrapper
+    LIBS        += -lqpe -lopie -lmailwrapper
 }
 
 TARGET       = opiemail
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/mail/mailistviewitem.h b/noncore/net/mail/mailistviewitem.h
index 60bfdda..271f616 100644
--- a/noncore/net/mail/mailistviewitem.h
+++ b/noncore/net/mail/mailistviewitem.h
@@ -1,21 +1,22 @@
 #ifndef __MAILLISTVIEWITEM_H
 #define __MAILLISTVIEWITEM_H
 
 #include <qlistview.h>
-#include "mailtypes.h"
+#include <libmailwrapper/mailtypes.h>
+
 
 class MailListViewItem:public QListViewItem
 {
 public:
     MailListViewItem(QListView * parent, MailListViewItem * after );
     virtual ~MailListViewItem(){}
     
     void storeData(const RecMail&data);
     const RecMail&data()const;
     void showEntry();
     
 protected:
     RecMail mail_data;
 };
 
 #endif
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 6511b1f..43d02e7 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -1,47 +1,48 @@
 #include <qlabel.h>
 #include <qvbox.h>
 #include <qheader.h>
 #include <qtimer.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qtextstream.h>
 
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 
+
 #include "defines.h"
 #include "mainwindow.h"
 #include "viewmail.h"
-#include "mailtypes.h"
+#include <libmailwrapper/mailtypes.h>
 #include "mailistviewitem.h"
 
 
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     : QMainWindow( parent, name, flags )
 {
 
     setCaption( tr( "Mail" ) );
     setToolBarsMovable( false );
 
     toolBar = new QToolBar( this );
     menuBar = new QMenuBar( toolBar );
     mailMenu = new QPopupMenu( menuBar );
     menuBar->insertItem( tr( "Mail" ), mailMenu );
     settingsMenu = new QPopupMenu( menuBar );
     menuBar->insertItem( tr( "Settings" ), settingsMenu );
 
     addToolBar( toolBar );
     toolBar->setHorizontalStretchable( true );
 
     QLabel *spacer = new QLabel( toolBar );
     spacer->setBackgroundMode( QWidget::PaletteButton );
     toolBar->setStretchableWidget( spacer );
 
     composeMail = new QAction( tr( "Compose new mail" ), ICON_COMPOSEMAIL,
                                0, 0, this );
     composeMail->addTo( toolBar );
     composeMail->addTo( mailMenu );
 
     sendQueued = new QAction( tr( "Send queued mails" ), ICON_SENDQUEUED,
                               0, 0, this );
     sendQueued->addTo( toolBar );
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index 54453b7..fcd48e2 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -1,38 +1,38 @@
 #include <qmessagebox.h>
 #include "settingsdialog.h"
 #include "opiemail.h"
 #include "editaccounts.h"
 #include "composemail.h"
-#include "smtpwrapper.h"
+#include <libmailwrapper/smtpwrapper.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qaction.h>
 #include <qapplication.h>
 
 OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags )
     : MainWindow( parent, name, flags )
 {
     settings = new Settings();
 
     folderView->populate( settings->getAccounts() );
 
     connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) );
     connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) );
 //    connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) );
     connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) );
     // Added by Stefan Eilers to allow starting by addressbook..
     // copied from old mail2
 #if !defined(QT_NO_COP)
     connect( qApp, SIGNAL( appMessage( const QCString&, const QByteArray& ) ),
              this, SLOT( appMessage( const QCString&, const QByteArray& ) ) );
 #endif
 
 
 
 }
 
 void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
 {
     // copied from old mail2
     if (msg == "writeMail(QString,QString)") {
         QDataStream stream(data,IO_ReadOnly);
         QString name, email;
diff --git a/noncore/net/mail/opiemail.h b/noncore/net/mail/opiemail.h
index 4e3c974..ebed5d8 100644
--- a/noncore/net/mail/opiemail.h
+++ b/noncore/net/mail/opiemail.h
@@ -1,29 +1,30 @@
 #ifndef OPIEMAIL_H
 #define OPIEMAIL_H
 
 #include "mainwindow.h"
-#include "settings.h"
+#include <libmailwrapper/settings.h>
+
 
 class OpieMail : public MainWindow
 {
     Q_OBJECT
 
 public:
     OpieMail( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
     static QString appName() { return QString::fromLatin1("opiemail"); }
 
 public slots:
     virtual void slotwriteMail(const QString&name,const QString&email);
     virtual void slotComposeMail();
     virtual void appMessage(const QCString &msg, const QByteArray &data);
 protected slots:
     virtual void slotSendQueued();
     virtual void slotSearchMails();
     virtual void slotEditSettings();
     virtual void slotEditAccounts();
 private:
     Settings *settings;
 
 };
 
 #endif
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index ed77eb5..9ca6383 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -1,51 +1,51 @@
 #include <qtextbrowser.h>
 #include <qmessagebox.h>
 #include <qtextstream.h>
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qfile.h>
 #include <qapplication.h>
 #include <qvaluelist.h>
 
 #include <qpe/config.h>
 
 #include <opie/ofiledialog.h>
 
-#include "settings.h"
+#include <libmailwrapper/settings.h>
 #include "composemail.h"
 #include "viewmail.h"
-#include "abstractmail.h"
+#include <libmailwrapper/abstractmail.h>
 #include "accountview.h"
-#include "mailtypes.h"
+#include <libmailwrapper/mailtypes.h>
 
 AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
     const QString&fsize,int num,const QValueList<int>&path)
         : QListViewItem(parent,after),_partNum(num)
 {
     _path=path;
         setText(0, mime);
         setText(1, desc);
         setText(2, file);
     setText(3, fsize);
 }
 
 AttachItem::AttachItem(QListViewItem * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
     const QString&fsize,int num,const QValueList<int>&path)
         : QListViewItem(parent,after),_partNum(num)
 {
     _path=path;
         setText(0, mime);
         setText(1, desc);
         setText(2, file);
     setText(3, fsize);
 }
 
 bool AttachItem::isParentof(const QValueList<int>&path)
 {
     /* if not set, then no parent */
     if (path.count()==0||_path.count()==0) return false;
     /* the parent must have one digit less then a child */
     if (path.count()!=_path.count()+1) return false;
     for (unsigned int i=0; i < _path.count();++i) {
         if (_path[i]!=path[i]) return false;
     }
diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h
index 29681cc..2d0e024 100644
--- a/noncore/net/mail/viewmail.h
+++ b/noncore/net/mail/viewmail.h
@@ -1,42 +1,43 @@
 #ifndef VIEWMAIL_H
 #define VIEWMAIL_H
 
 #include <qlistview.h>
 #include <qmap.h>
 #include <qstringlist.h>
 #include <qvaluelist.h>
 
 #include "viewmailbase.h"
-#include "mailtypes.h"
+#include <libmailwrapper/mailtypes.h>
+
 
 class AttachItem : public QListViewItem
 {
 public:
     AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
         const QString&fsize,int num,const QValueList<int>&path);
     AttachItem(QListViewItem * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
         const QString&fsize,int num,const QValueList<int>&path);
     int Partnumber() { return _partNum; }
     bool isParentof(const QValueList<int>&path);
 
 private:
     int _partNum;
     /* needed for a better display of attachments */
     QValueList<int> _path;
 };
 
 class ViewMail : public ViewMailBase
 {
         Q_OBJECT
 
 public:
         ViewMail(  QWidget *parent = 0, const char *name = 0, WFlags fl = Qt::WType_Modal);
         ~ViewMail();
 
         void hide();
         void exec();
         void setMail( RecMail mail );
         void setBody( RecBody body );
         bool deleted;
 
 protected: