1 files changed, 12 insertions, 8 deletions

diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp
index b15e692..449fdf1 100644
--- a/noncore/net/mail/composemail.cpp
+++ b/noncore/net/mail/composemail.cpp
@@ -1,5 +1,12 @@
-#include <qt.h>
 
+#include "composemail.h"
+
+#include <libmailwrapper/smtpwrapper.h>
+#include <libmailwrapper/storemail.h>
+#include <libmailwrapper/abstractmail.h>
+#include <libmailwrapper/mailtypes.h>
+
+/* OPIE */
 #include <opie2/ofiledialog.h>
 #include <opie2/odebug.h>
 #include <qpe/resource.h>
@@ -7,12 +14,9 @@
 #include <qpe/global.h>
 #include <qpe/contact.h>
 
-#include "composemail.h"
+/* QT */
+#include <qt.h>
 
-#include <libmailwrapper/smtpwrapper.h>
-#include <libmailwrapper/storemail.h>
-#include <libmailwrapper/abstractmail.h>
-#include <libmailwrapper/mailtypes.h>
 
 using namespace Opie::Core;
 using namespace Opie::Ui;
@@ -188,8 +192,8 @@ void ComposeMail::accept()
     }
 
 #if 0
-    qDebug( "Sending Mail with " +
-            smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() );
+    odebug << "Sending Mail with "
+           << smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() << oendl;
 #endif
     Opie::Core::OSmartPointer<Mail> mail=new Mail;