1 files changed, 6 insertions, 3 deletions

diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 153c7c0..e088b9e 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -1,53 +1,56 @@
 // CHANGED 2004-09-31 Lutz Rogowski
 // CHANGED 2004-08-06 Lutz Rogowski
 
+#include "koprefsdialog.h"
+#include <libkdepim/externalapphandler.h>
+#include <libkdepim/kpimglobalprefs.h>
+#ifdef  MINIKDE_KDIALOG_H
+#undef MINIKDE_KDIALOG_H
+#endif
 #include "settingsdialog.h"
 #include "opiemail.h"
 #include "editaccounts.h"
 #include "composemail.h"
 #include "mailistviewitem.h"
 #include "viewmail.h"
 #include "selectstore.h"
 #include "selectsmtp.h"
 #include "accountitem.h"
-#include "koprefsdialog.h"
 #include "klocale.h"
 
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qcursor.h>
 #include <qregexp.h>
-#include <libkdepim/externalapphandler.h>
-#include <libkdepim/kpimglobalprefs.h>
 
 #ifdef DESKTOP_VERSION
 #include <qapplication.h>
 #else
 #include <qpe/qpeapplication.h>
 #endif
 #include <libmailwrapper/smtpwrapper.h>
 #include <libmailwrapper/mailtypes.h>
 #include <libmailwrapper/abstractmail.h>
 /* OPIE */
 //#include <qpe/resource.h>
 //#include <qpe/qpeapplication.h>
 
 /* QT */
 
 //using namespace Opie::Core;
 
 OpieMail::OpieMail( QWidget *parent, const char *name )
     : MainWindow( parent, name) //, WStyle_ContextHelp )
 {
     settings = new Settings();
 
     folderView->populate( settings->getAccounts() );
   
 }
 
 OpieMail::~OpieMail()
 {
     if (settings) delete settings;
 }
 
 void OpieMail::appMessage(const QCString &msg, const QByteArray &data)