1 files changed, 16 insertions, 10 deletions

diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 0cd0b23..5945b7f 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -1,8 +1,24 @@
 // CHANGED 2004-08-06 Lutz Rogowski
 
+#include <kabc/addresseedialog.h>
+#include <kabc/stdaddressbook.h>
+#include <kabc/addressee.h>
+#ifdef DESKTOP_VERSION
+#include <qapplication.h>
+#include <kabc/addresseedialog.h>
+#endif //DESKTOP_VERSION
+#include <libkdepim/externalapphandler.h>
+
+#include "koprefs.h"
+
+#ifdef  MINIKDE_KDIALOG_H
+#undef MINIKDE_KDIALOG_H
+#endif
+
+
 #include "composemail.h"
 
 #include <libmailwrapper/smtpwrapper.h>
 #include <libmailwrapper/storemail.h>
 #include <libmailwrapper/abstractmail.h>
 #include <libmailwrapper/mailtypes.h>
@@ -23,22 +39,12 @@
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qmultilineedit.h>
 #include <qlabel.h>
 #include <qtabwidget.h>
 #include <qlistview.h>
-#include <kabc/addresseedialog.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/addressee.h>
-#ifdef DESKTOP_VERSION
-#include <qapplication.h>
-#include <kabc/addresseedialog.h>
-#endif //DESKTOP_VERSION
-#include <libkdepim/externalapphandler.h>
-
-#include "koprefs.h"
 
 //using namespace Opie::Core;
 //using namespace Opie::Ui;
 ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal )
     : ComposeMailUI( parent, name, modal )
 {