3 files changed, 7 insertions, 0 deletions

diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 49fd14f..976e309 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -5,12 +5,16 @@
 #include <qapplication.h>
 #include <kabc/addresseedialog.h>
 #include <kabc/stdaddressbook.h>
 #include <kabc/addressee.h>
+#else
+#include <qpe/qpeapplication.h>
 #endif //DESKTOP_VERSION
 #include <libkdepim/externalapphandler.h>
 
 #include "koprefs.h"
+#include <klocale.h>
+#include <kglobal.h>
 
 #ifdef  MINIKDE_KDIALOG_H
 #undef MINIKDE_KDIALOG_H
 #endif
diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp
index eac05e5..1ed9f34 100644
--- a/kmicromail/libmailwrapper/genericwrapper.cpp
+++ b/kmicromail/libmailwrapper/genericwrapper.cpp
@@ -224,8 +224,9 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
             char*resu = 0;
             int err = MAILIMF_NO_ERROR;
             QString charset = part->searchParamter( "charset");
             qDebug("CHARSET %s ",charset.latin1() );
+#if 0
             if (false ) {
                 //if ( !charset.isEmpty() ) {
                 target->setCharset( charset );
                 err = mailmime_encoded_phrase_parse(charset.latin1(),
@@ -235,8 +236,9 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
                     b = QString::fromUtf8(resu);
                 }
                 if (resu) free(resu);
             }
+#endif
             target->setBodytext(b);
             target->setDescription(part);
         } else {
             bodyCache[b]=new encodedString(data,len);
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 8c0a4cb..0e4a64f 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -15,8 +15,9 @@
 #include <kabc/stdaddressbook.h>
 extern QStatusBar* globalSstatusBarMainWindow;
 #else
 #include <qpe/qpeapplication.h>
+#include <klocale.h>
 #endif
 #include "defines.h"
 #include "mainwindow.h"
 #include <KDGanttMinimizeSplitter.h>