16 files changed, 244 insertions, 137 deletions
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 2dcbc75..f44100b 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -438,66 +438,66 @@ void ComposeMail::accept()
    while ( it != 0 ) {
        mail->addAttachment( it->getAttachment() );
        it = (AttachViewItem *) it->nextSibling();
    }
    SMTPwrapper wrapper( smtp );
    if ( wrapper.sendMail( mail,checkBoxLater->isChecked() ) )
        setStatus( tr ("Mail sent"));
    else {
        setStatus( tr ("Error: Something went wrong. Nothing sent"));
        return;
    }
        
    QDialog::accept();
 }
 void ComposeMail::reject()
 {
    //qDebug("ComposeMail::reject() ");
    int yesno = QMessageBox::warning(0,i18n("Store message?"),
                                     i18n("Store message into drafts?\n"),
                                     i18n("Yes"),
                                     i18n("No"));
    //qDebug("button %d ", yesno);
    if (yesno == 0) {
        if ( toLine->text().isEmpty() ) {
            QMessageBox::warning(0,i18n("Sending mail"),
                                 i18n("No Receiver spezified" ) );
            return;
        }  
        saveAsDraft();
    }
    if (yesno == 2) {
        qDebug("return ");
        return;
    }
    QDialog::reject();
 }
 ComposeMail::~ComposeMail()
 {
 }
 void ComposeMail::reEditMail(const RecMailP&current)
 {
    RecMailP data = current;
-    message->setText(QString::fromUtf8( data->Wrapper()->fetchBody(current)->Bodytext().latin1() ));
+    message->setText(data->Wrapper()->fetchBody(current)->Bodytext());
-    subjectLine->setText( QString::fromUtf8( data->getSubject().latin1() ));
+    subjectLine->setText( data->getSubject());
-    toLine->setText(QString::fromUtf8( data->To().join(",").latin1() ));
+    toLine->setText(data->To().join(","));
-    ccLine->setText(QString::fromUtf8( data->CC().join(",").latin1() ));
+    ccLine->setText(data->CC().join(","));
-    bccLine->setText(QString::fromUtf8( data->Bcc().join(",").latin1() ));
+    bccLine->setText(data->Bcc().join(","));
-    replyLine->setText(QString::fromUtf8( data->Replyto().latin1() ));
+    replyLine->setText(data->Replyto());
 }
 AttachViewItem::AttachViewItem( QListView *parent, Attachment *att )
    : QListViewItem( parent )
 {
    attachment = att;
    if ( !attachment->getPixmap().isNull() )
        setPixmap( 0,attachment->getPixmap() );
    setText( 0, att->getName().isEmpty() ? att->getFileName() : att->getName() );
    setText( 1, QString::number( att->getSize() ) );
 }
diff --git a/kmicromail/koprefs.cpp b/kmicromail/koprefs.cpp
index 8143b6f..342bbf3 100644
--- a/kmicromail/koprefs.cpp
+++ b/kmicromail/koprefs.cpp
@@ -12,111 +12,114 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #include <time.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 #include <qdir.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 #include <qstring.h>
 #include <qregexp.h>
 #include <qfont.h>
 #include <qcolor.h>
 #include <qstringlist.h>
 #include <stdlib.h>
 #include <kglobal.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kemailsettings.h>
 #include <kstaticdeleter.h>
 #include "koprefs.h"
 #include "mainwindow.h"
 KOPrefs *KOPrefs::mInstance = 0;
 static KStaticDeleter<KOPrefs> insd;
 KOPrefs::KOPrefs() :
  KPimPrefs("kopiemailrc")
 {
    mAppFont = QFont("helvetica",12);
    mComposeFont = QFont("helvetica",12);
    mReadFont = QFont("helvetica",12);
    KPrefs::setCurrentGroup("General");
+    addItemString("SendCodec",&mSendCodec,i18n ("userdefined") );
    addItemString("SenderName",&mName,i18n ("Please set at") );
    addItemString("SenderEmail",&mEmail,i18n ("Settings@General TAB") );
    addItemBool("ViewMailAsHtml",&mViewAsHtml,false);
    addItemBool("SendMailLater",&mSendLater,true);
    addItemBool("UseKapi",&mUseKapi,false);
+    addItemInt("CurrentCodec",&mCurrentCodec,0);
    
    KPrefs::setCurrentGroup("Fonts");
    addItemFont("Application Font",&mAppFont);
    addItemFont("Compose Font",&mComposeFont);
    addItemFont("Read Font",&mReadFont);
    fillMailDefaults();
+    isDirty = false;
 }
 KOPrefs::~KOPrefs()
 {
+    if ( isDirty )
+        writeConfig();
  if (mInstance == this)
      mInstance = insd.setObject(0); 
 }
 KOPrefs *KOPrefs::instance()
 {
  if (!mInstance) {
      mInstance = insd.setObject(new KOPrefs());
      mInstance->readConfig();
  }
  return mInstance;
 }
 void KOPrefs::usrSetDefaults()
 {
   
 }
 void KOPrefs::fillMailDefaults()
 {
  if (mName.isEmpty()) mName = i18n ("Please set at");
  if (mEmail.isEmpty()) mEmail = i18n ("Settings@General TAB");
 }
 void KOPrefs::usrReadConfig()
 {
  KPimPrefs::usrReadConfig();
 }
 void KOPrefs::usrWriteConfig()
 {
  KPimPrefs::usrWriteConfig();
 }
 KConfig* KOPrefs::getConfig()
 {
    return config();
 }
diff --git a/kmicromail/koprefs.h b/kmicromail/koprefs.h
index f0a4463..91f3fa3 100644
--- a/kmicromail/koprefs.h
+++ b/kmicromail/koprefs.h
@@ -23,55 +23,58 @@
 #ifndef KOPREFS_H
 #define KOPREFS_H
 #include <libkdepim/kpimprefs.h>
 class KConfig;
 class QFont;
 class QColor;
 class QStringList;
 class KOPrefs : public KPimPrefs
 {
  public:
    virtual ~KOPrefs();
    /** Get instance of KOPrefs. It is made sure that there is only one
    instance. */
    static KOPrefs *instance();
    /** Set preferences to default values */
    void usrSetDefaults();
    /** Read preferences from config file */
    void usrReadConfig();
    /** Write preferences to config file */
    void usrWriteConfig();
    void setCategoryDefaults(){;};
  protected:
    /** Fill empty mail fields with default values. */
    void fillMailDefaults();
  private:
    /** Constructor disabled for public. Use instance() to create a KOPrefs
    object. */
    KOPrefs();
    static KOPrefs *mInstance;
  public:
    // preferences data
    KConfig* getConfig();
    QFont mAppFont;
    QFont mComposeFont;
    QFont mReadFont;
    QString mName;
+    QString mSendCodec;
    QString mEmail;
-    bool mSendLater, mViewAsHtml, mUseKapi;
+    QString mCurrentCodeName;
+    int mCurrentCodec;
+    bool mSendLater, mViewAsHtml, mUseKapi, isDirty;
  private:
 };
 #endif
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index c878fc9..4abf859 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -96,157 +96,162 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
 KOPrefsDialog::~KOPrefsDialog()
 {
 }
 void KOPrefsDialog::setupGlobalTab() 
 {
   QFrame *topFrame = addPage(i18n("Global"),0,0);
   kdelibcfg = new KDEPIMConfigWidget(  KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" );
   QVBoxLayout *topLayout = new QVBoxLayout(topFrame);
   topLayout->addWidget( kdelibcfg );
 } 
 void KOPrefsDialog::setupMainTab() 
 {
    QFrame *topFrame = addPage(i18n("General"),0,0);
  QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
  topLayout->setSpacing(spacingHint());
  topLayout->setMargin(marginHint());
  mNameEdit = new QLineEdit(topFrame);
  mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame);
  topLayout->addWidget(mNameLabel,0,0);
  topLayout->addWidget(mNameEdit,0,1);
  mEmailEdit = new QLineEdit(topFrame);
  mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame);
  topLayout->addWidget(mEmailLabel,1,0);
  topLayout->addWidget(mEmailEdit,1,1); 
  QLabel *lab = new QLabel( i18n("HINT: Separate multiple\neMail addresses by \";\""), topFrame);
  topLayout->addMultiCellWidget(lab,2,2,0,1);
  KPrefsDialogWidBool*  ttt =  addWidBool(i18n("Ignore above settings and\nuse KA/Pi \"Who am I\" instead!"),
                                    &(KOPrefs::instance()->mUseKapi),topFrame);
  topLayout->addMultiCellWidget(ttt->checkBox(),3,3,0,1);
 }
 void KOPrefsDialog::setupMailTab()
 {
 QFrame *topFrame = addPage(i18n("Mail"),0,0);
  QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
  topLayout->setSpacing(spacingHint());
  topLayout->setMargin(marginHint());
  KPrefsDialogWidBool*  ttt =  addWidBool(i18n("View mail as html"),
                 &(KOPrefs::instance()->mViewAsHtml),topFrame);
-                       topLayout->addMultiCellWidget(ttt->checkBox(),0,0,0,1);
+  topLayout->addMultiCellWidget(ttt->checkBox(),0,0,0,1);
+  
+  
  ttt =  addWidBool(i18n("Send mails later"),
-               &(KOPrefs::instance()->mSendLater),topFrame);
+                    &(KOPrefs::instance()->mSendLater),topFrame);
-                       topLayout->addMultiCellWidget(ttt->checkBox(),1,1,0,1);
+  topLayout->addMultiCellWidget(ttt->checkBox(),1,1,0,1);
- 
+  mCodecEdit = new QLineEdit(topFrame);
+  topLayout->addMultiCellWidget( new QLabel(mCodecEdit, i18n("User defined codec for new mails:"), topFrame),2,2,0,1);
+  topLayout->addMultiCellWidget(mCodecEdit,3,3,0,1);
+  topLayout->addMultiCellWidget( new QLabel(0, i18n("Example: iso-8859-15"), topFrame),4,4,0,1);
 }
 void KOPrefsDialog::setupFontsTab()
 {
    QFrame *topFrame = addPage(i18n("Fonts"),0,0);
    //  DesktopIcon("fonts",KIcon::SizeMedium));
  QGridLayout *topLayout = new QGridLayout(topFrame,7,3);
  topLayout->setSpacing(1);
  topLayout->setMargin(3);
  KPrefsDialogWidFont * tVFont;
  int i = 0;
  KPrefsDialogWidFont *timeLabelsFont =
      addWidFont(i18n("OK"),i18n("Application(nr)"),
                 &(KOPrefs::instance()->mAppFont),topFrame);
  topLayout->addWidget(timeLabelsFont->label(),i,0);
  topLayout->addWidget(timeLabelsFont->preview(),i,1);
  topLayout->addWidget(timeLabelsFont->button(),i,2);
  ++i;
  timeLabelsFont =
      addWidFont(i18n("Dear Mr."),i18n("Compose mail:"),
                 &(KOPrefs::instance()->mComposeFont),topFrame);
  topLayout->addWidget(timeLabelsFont->label(),i,0);
  topLayout->addWidget(timeLabelsFont->preview(),i,1);
  topLayout->addWidget(timeLabelsFont->button(),i,2);
  ++i;
  KPrefsDialogWidFont *timeBarFont =
      addWidFont(i18n("Hello"),i18n("Read mail:"),
                 &(KOPrefs::instance()->mReadFont),topFrame);
  topLayout->addWidget(timeBarFont->label(),i,0);
  topLayout->addWidget(timeBarFont->preview(),i,1);
  topLayout->addWidget(timeBarFont->button(),i,2);
  ++i;
  topLayout->setColStretch(1,1);
  topLayout->setRowStretch(4,1);
 }
 void KOPrefsDialog::usrReadConfig()
 {
 
  mNameEdit->setText(KOPrefs::instance()->mName);
  mEmailEdit->setText(KOPrefs::instance()->mEmail);
+  mCodecEdit->setText(KOPrefs::instance()->mSendCodec);
  kdelibcfg->readConfig();
 }
 void KOPrefsDialog::usrWriteConfig()
 {
    KOPrefs::instance()->mName = mNameEdit->text();
    KOPrefs::instance()->mEmail = mEmailEdit->text();
-  kdelibcfg->writeConfig();
+    KOPrefs::instance()->mSendCodec = mCodecEdit->text();
+    kdelibcfg->writeConfig();
 
    
 }
 #if 0
 void KOPrefsDialog::setupLocaleDateTab()
 {
 QFrame *topFrame = addPage(i18n("Date Format"),0,0);
   QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());  
   int iii = 0;
   
   KPrefsWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame);
   QString format;
   if ( QApplication::desktop()->width() < 480 )
       format = "(%d.%m.%Y)";
   else 
       format = "(%d.%m.%Y|%A %d %B %Y)";
   syncPrefsGroup->addRadio(i18n("24.03.2004 "+format));
   if ( QApplication::desktop()->width() < 480 )
       format = "(%m.%d.%Y)";
   else 
       format = "(%m.%d.%Y|%A %B %d %Y)";
   syncPrefsGroup->addRadio(i18n("03.24.2004 "+format));
   if ( QApplication::desktop()->width() < 480 )
       format = "(%Y-%m-%d)";
   else 
       format = "(%Y-%m-%d|%A %Y %B %d)";
   syncPrefsGroup->addRadio(i18n("2004-03-24 "+format));
   syncPrefsGroup->addRadio(i18n("User defined"));
   topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
   ++iii;   
   ++iii;
   QLabel * lab;
   mUserDateFormatLong = new QLineEdit(topFrame);
   lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame);
   topLayout->addWidget(lab ,iii,0);
   topLayout->addWidget(mUserDateFormatLong,iii,1);
   ++iii;
   mUserDateFormatShort = new QLineEdit(topFrame);
   lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame);
   topLayout->addWidget(lab ,iii,0);
   topLayout->addWidget(mUserDateFormatShort,iii,1);
   ++iii;
   lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame);
diff --git a/kmicromail/koprefsdialog.h b/kmicromail/koprefsdialog.h
index 615574b..a0416ae 100644
--- a/kmicromail/koprefsdialog.h
+++ b/kmicromail/koprefsdialog.h
@@ -18,96 +18,97 @@
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef _KOPREFSDIALOG_H
 #define _KOPREFSDIALOG_H
 #include <qframe.h>
 #include <qdict.h>
 #include <qcolor.h>
 #include <qlistview.h>
 #include <kdialogbase.h>
 #include <libkdepim/kprefsdialog.h>
 #include <libkdepim/kdateedit.h>
 #include <kcmconfigs/kdepimconfigwidget.h>
 class KColorButton;
 class QSpinBox;
 class QSlider;
 class KURLRequester;
 class QComboBox;
 class QLineEdit;
 class QStringList;
 /** Dialog to change the korganizer configuration.
  */
 class KOPrefsDialog : public KPrefsDialog
 {
    Q_OBJECT
  public:
    /** Initialize dialog and pages */
    KOPrefsDialog(QWidget *parent=0,char *name=0,bool modal=false);
    ~KOPrefsDialog(); 
 protected:
    void usrReadConfig();
    void usrWriteConfig();
    void setupMainTab();
    void setupGlobalTab();
    void setupMailTab();
    void setupFontsTab();
 private:
    KDEPIMConfigWidget* kdelibcfg;
    QLineEdit *mNameEdit;
+    QLineEdit *mCodecEdit;
    QLineEdit *mEmailEdit;
    QLabel *mNameLabel;
    QLabel *mEmailLabel;
 #if 0
    /*
  public slots:
    void showPrinterTab();
    
   
    void updateCategories();
    void showSyncPage();
  protected slots:
    void selectSoundFile();
    void setCategoryColor();
    void updateCategoryColor();
    void updateTimezoneOffset( int );
    void warningExperimental(bool on);
    void warningGroupScheduling();
    void warningProjectView();
    void toggleEmailSettings(bool);
    
    //additional emails
    void addItem();
    void removeItem();
    void updateItem();
    void updateInput();
 */
  protected:
    void usrReadConfig();
    void usrWriteConfig();
    void setupMainTab();
    void setupTimeTab();
    void setupTimeZoneTab();
    void setupLocaleTab();
    void setupLocaleDateTab();
    void setupFontsTab();
    void setupColorsTab();
    void setupViewsTab();
    void setupDisplayTab();
    void setupPrinterTab();
    void setupGroupSchedulingTab();
    void setupGroupAutomationTab();
    void setupSyncTab();
    void setupSyncAlgTab();
diff --git a/kmicromail/libetpan/mime/mailmime_decode.c b/kmicromail/libetpan/mime/mailmime_decode.c
index dbaeb68..b2ab0f7 100644
--- a/kmicromail/libetpan/mime/mailmime_decode.c
+++ b/kmicromail/libetpan/mime/mailmime_decode.c
@@ -72,268 +72,283 @@ static int mailmime_encoding_parse(const char * message, size_t length,
                                   size_t * index, int * result);
 static int mailmime_etoken_parse(const char * message, size_t length,
                                 size_t * index, char ** result);
 static int
 mailmime_non_encoded_word_parse(const char * message, size_t length,
                                size_t * index,
                                char ** result);
 static int
 mailmime_encoded_word_parse(const char * message, size_t length,
                            size_t * index,
                            struct mailmime_encoded_word ** result);
     
 enum {
  TYPE_ERROR,
  TYPE_WORD,
  TYPE_ENCODED_WORD,
 };
 int mailmime_encoded_phrase_parse(const char * default_fromcode,
    const char * message, size_t length,
    size_t * index, const char * tocode,
    char ** result)
 {
  MMAPString * gphrase;
  struct mailmime_encoded_word * word;
  int first;
  size_t cur_token;
  int r;
  int res;
  char * str;
  char * wordutf8;
  int type;
  cur_token = * index;
  gphrase = mmap_string_new("");
  if (gphrase == NULL) {
    res = MAILIMF_ERROR_MEMORY;
    goto err;
  }
  first = TRUE;
  type = TYPE_ERROR; /* XXX - removes a gcc warning */
+  // LUTZ add
+  int appendNewLine = FALSE;
+  while (1) { //while
-  while (1) {
+      r = mailmime_encoded_word_parse(message, length, &cur_token, &word);
+      if (r == MAILIMF_NO_ERROR) {
-    r = mailmime_encoded_word_parse(message, length, &cur_token, &word);
+          if (!first) {
-    if (r == MAILIMF_NO_ERROR) {
+              if (type != TYPE_ENCODED_WORD) {
-      if (!first) {
+                  if (mmap_string_append_c(gphrase, ' ') == NULL) {
-        if (type != TYPE_ENCODED_WORD) {
+                      mailmime_encoded_word_free(word);
-          if (mmap_string_append_c(gphrase, ' ') == NULL) {
+                      res = MAILIMF_ERROR_MEMORY;
-            mailmime_encoded_word_free(word);
+                      goto free;
-            res = MAILIMF_ERROR_MEMORY;
+                  }
-            goto free;
+              }
-          }
+          }
-        }
+          type = TYPE_ENCODED_WORD;
-      }
+          wordutf8 = NULL;
-      type = TYPE_ENCODED_WORD;
+          r = charconv(tocode, word->wd_charset, word->wd_text,
-      wordutf8 = NULL;
+                       strlen(word->wd_text), &wordutf8);
-      r = charconv(tocode, word->wd_charset, word->wd_text,
+          switch (r) {
-                   strlen(word->wd_text), &wordutf8);
+          case MAIL_CHARCONV_ERROR_MEMORY:
-      switch (r) {
+              mailmime_encoded_word_free(word);
-      case MAIL_CHARCONV_ERROR_MEMORY:
+              res = MAILIMF_ERROR_MEMORY;
-        mailmime_encoded_word_free(word);
+              goto free;
-        res = MAILIMF_ERROR_MEMORY;
-        goto free;
+          case MAIL_CHARCONV_ERROR_UNKNOWN_CHARSET:
+          case MAIL_CHARCONV_ERROR_CONV:
-      case MAIL_CHARCONV_ERROR_UNKNOWN_CHARSET:
+              mailmime_encoded_word_free(word);
-      case MAIL_CHARCONV_ERROR_CONV:
+              res = MAILIMF_ERROR_PARSE;
-        mailmime_encoded_word_free(word);
+              goto free;
-        res = MAILIMF_ERROR_PARSE;
+          }
-        goto free;
-      }
      
-      if (wordutf8 != NULL) {
+          if (wordutf8 != NULL) {
-        if (mmap_string_append(gphrase, wordutf8) == NULL) {
+              if (mmap_string_append(gphrase, wordutf8) == NULL) {
+                  mailmime_encoded_word_free(word);
+                  free(wordutf8);
+                  res = MAILIMF_ERROR_MEMORY;
+                  goto free;
+              }
+              free(wordutf8);
+          }
          mailmime_encoded_word_free(word);
-          free(wordutf8);
+          first = FALSE;
-          res = MAILIMF_ERROR_MEMORY;
+      }
+      else if (r == MAILIMF_ERROR_PARSE) {
+          /* do nothing */
+      }
+      else {
+          res = r;
          goto free;
-        }
-        free(wordutf8);
      }
-      mailmime_encoded_word_free(word);
-      first = FALSE;
-    }
-    else if (r == MAILIMF_ERROR_PARSE) {
-      /* do nothing */
-    }
-    else {
-      res = r;
-      goto free;
-    }
-    if (r == MAILIMF_ERROR_PARSE) {
-      char * raw_word;
-      r = mailmime_non_encoded_word_parse(message, length,
+      if (r == MAILIMF_ERROR_PARSE) {
-                                          &cur_token, &raw_word);
+          char * raw_word;
-      if (r == MAILIMF_NO_ERROR) {
-        if (!first) {
+          r = mailmime_non_encoded_word_parse(message, length,
-          if (mmap_string_append_c(gphrase, ' ') == NULL) {
+                                              &cur_token, &raw_word);
-            free(raw_word);
+          if (r == MAILIMF_NO_ERROR) {
-            res = MAILIMF_ERROR_MEMORY;
+              if (!first) {
-            goto free;
+                  if (mmap_string_append_c(gphrase, ' ') == NULL) {
-          }
+                      free(raw_word);
-        }
+                      res = MAILIMF_ERROR_MEMORY;
-        type = TYPE_WORD;
+                      goto free;
+                  }
+              }
+              type = TYPE_WORD;
        
-        wordutf8 = NULL;
+              wordutf8 = NULL;
-        r = charconv(tocode, default_fromcode, raw_word,
+              r = charconv(tocode, default_fromcode, raw_word,
-            strlen(raw_word), &wordutf8);
+                           strlen(raw_word), &wordutf8);
        
-        switch (r) {
+              switch (r) {
-        case MAIL_CHARCONV_ERROR_MEMORY:
+              case MAIL_CHARCONV_ERROR_MEMORY:
-          free(raw_word);
+                  free(raw_word);
-          res = MAILIMF_ERROR_MEMORY;
+                  res = MAILIMF_ERROR_MEMORY;
-          goto free;
+                  goto free;
          
-        case MAIL_CHARCONV_ERROR_UNKNOWN_CHARSET:
+              case MAIL_CHARCONV_ERROR_UNKNOWN_CHARSET:
-        case MAIL_CHARCONV_ERROR_CONV:
+              case MAIL_CHARCONV_ERROR_CONV:
-          free(raw_word);
+                  free(raw_word);
-          res = MAILIMF_ERROR_PARSE;
+                  res = MAILIMF_ERROR_PARSE;
-          goto free;
+                  goto free;
-        }
+              }
-        
+              // LUTZ add
-        if (mmap_string_append(gphrase, wordutf8) == NULL) {
+              if ( appendNewLine ) {
-          free(wordutf8);
+                  appendNewLine = FALSE;
-          free(raw_word);
+              if (mmap_string_append(gphrase, "\n") == NULL) {
-          res = MAILIMF_ERROR_MEMORY;
+                  free(wordutf8);
-          goto free;
+                  free(raw_word);
-        }
+                  res = MAILIMF_ERROR_MEMORY;
-        // LUTZ fix
+                  goto free;
-        free(wordutf8);
+              }
-        free(raw_word);
+              }
-        first = FALSE;
+              //fprintf(stderr,"append *%s*  \n",wordutf8 );
+              if (mmap_string_append(gphrase, wordutf8) == NULL) {
+                  free(wordutf8);
+                  free(raw_word);
+                  res = MAILIMF_ERROR_MEMORY;
+                  goto free;
+              }
+              // LUTZ fix
+              free(wordutf8);
+              free(raw_word);
+              first = FALSE;
+          }
+          else if (r == MAILIMF_ERROR_PARSE) {
+              // LUTZ add
+              if ( cur_token >= length )
+                  break;
+              ++cur_token;
+              appendNewLine = TRUE;
+          }
+          else {
+              res = r;
+              goto free;
+          }
      }
-      else if (r == MAILIMF_ERROR_PARSE) {
-        break;
-      }
-      else {
-        res = r;
-        goto free;
-      }
-    }
  }
  if (first) {
    res = MAILIMF_ERROR_PARSE;
    goto free;
  }
  str = strdup(gphrase->str);
  if (str == NULL) {
    res = MAILIMF_ERROR_MEMORY;
    goto free;
  }
  mmap_string_free(gphrase);
  * result = str;
  * index = cur_token;
  return MAILIMF_NO_ERROR;
 free:
  mmap_string_free(gphrase);
 err:
  return res;
 }
 static int
 mailmime_non_encoded_word_parse(const char * message, size_t length,
                                size_t * index,
                                char ** result)
 {
  int end;
  size_t cur_token;
  int res;
  char * text;
  int r;
  size_t begin;
  cur_token = * index;
  r = mailimf_fws_parse(message, length, &cur_token);
  if ((r != MAILIMF_NO_ERROR) && (r != MAILIMF_ERROR_PARSE)) {
    res = r;
    goto err;
  }
  begin = cur_token;
  end = FALSE;
  while (1) {
    if (cur_token >= length)
      break;
    switch (message[cur_token]) {
      case ' ':
      case '\t':
      case '\r':
      case '\n':
        end = TRUE;
        break;
    }
    if (end)
      break;
    cur_token ++;
  }
  if (cur_token - begin == 0) {
-    res = MAILIMF_ERROR_PARSE;
+      res = MAILIMF_ERROR_PARSE;
-    goto err;
+      goto err;
  }
  text = malloc(cur_token - begin + 1);
  if (text == NULL) {
    res = MAILIMF_ERROR_MEMORY;
    goto err;
  }
  memcpy(text, message + begin, cur_token - begin);
  text[cur_token - begin] = '\0';
  * index = cur_token;
  * result = text;
  return MAILIMF_NO_ERROR;
 err:
  return res;
 }
 static int mailmime_encoded_word_parse(const char * message, size_t length,
                                       size_t * index,
                                       struct mailmime_encoded_word ** result)
 {
  size_t cur_token;
  char * charset;
  int encoding;
  char * text;
  size_t end_encoding;
  char * decoded;
  size_t decoded_len;
  struct mailmime_encoded_word * ew;
  int r;
  int res;
  int opening_quote;
  int end;
  cur_token = * index;
  r = mailimf_fws_parse(message, length, &cur_token);
  if ((r != MAILIMF_NO_ERROR) && (r != MAILIMF_ERROR_PARSE)) {
    res = r;
    goto err;
  }
  opening_quote = FALSE;
  r = mailimf_char_parse(message, length, &cur_token, '\"');
  if (r == MAILIMF_NO_ERROR) {
diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp
index 8ee112c..ed5c898 100644
--- a/kmicromail/libmailwrapper/abstractmail.cpp
+++ b/kmicromail/libmailwrapper/abstractmail.cpp
@@ -31,120 +31,121 @@ AbstractMail* AbstractMail::getWrapper(POP3account *a)
 }
 AbstractMail* AbstractMail::getWrapper(NNTPaccount *a)
 {
    return new NNTPwrapper(a);
 }
 AbstractMail* AbstractMail::getWrapper(const QString&a,const QString&name)
 {
    return new MHwrapper(a,name);
 }
 AbstractMail* AbstractMail::getWrapper(Account*a)
 {
    if (!a) return 0;
    switch (a->getType()) {
        case MAILLIB::A_IMAP:
            return new IMAPwrapper((IMAPaccount*)a);
            break;
        case MAILLIB::A_POP3:
            return new POP3wrapper((POP3account*)a);
            break;
        case MAILLIB::A_NNTP:
            return new NNTPwrapper((NNTPaccount*)a);
            break;
        default:
            return 0;
    }
 }
 encodedString* AbstractMail::decode_String(const encodedString*text,const QString&enc)
 {
    // odebug << "Decode string start" << oendl; 
    char*result_text;
    size_t index = 0;
    /* reset for recursive use! */
    size_t target_length = 0;
    result_text = 0;
    int mimetype = MAILMIME_MECHANISM_7BIT;
    if (enc.lower()=="quoted-printable") {
        mimetype = MAILMIME_MECHANISM_QUOTED_PRINTABLE;
    } else if (enc.lower()=="base64") {
        mimetype = MAILMIME_MECHANISM_BASE64;
    } else if (enc.lower()=="8bit") {
        mimetype = MAILMIME_MECHANISM_8BIT;
    } else if (enc.lower()=="binary") {
        mimetype = MAILMIME_MECHANISM_BINARY;
    }
    int err = mailmime_part_parse(text->Content(),text->Length(),&index,mimetype,
    &result_text,&target_length);
    encodedString* result = new encodedString();
    if (err == MAILIMF_NO_ERROR) {
        result->setContent(result_text,target_length);
    }
    //odebug << "Decode string finished" << oendl; 
    return result;
 }
 QString AbstractMail::convert_String(const char*text)
 {
    size_t index = 0;
    char*res = 0;
    int err = MAILIMF_NO_ERROR;
    QString result(text);
+    //qDebug("convert_String %s ", text);
+    //err = mailmime_encoded_phrase_parse("iso-8859-1",
+    //                                      text, strlen(text),&index, "iso-8859-1",&res);
    err = mailmime_encoded_phrase_parse("iso-8859-1",
-                                            text, strlen(text),&index, "iso-8859-1",&res);
+                                          text, strlen(text),&index, "utf-8",&res);
    if (err == MAILIMF_NO_ERROR && res && strlen(res)) {
-        result = QString(res);
+        result = QString::fromUtf8(res);
    }
    //qDebug("convert_String:%s ",result.latin1() );
    if (res) free(res);
    return result;
 }
 /* cp & paste from launcher */
 QString AbstractMail::gen_attachment_id()
 {
    QFile file( "/proc/sys/kernel/random/uuid" );
    if (!file.open(IO_ReadOnly ) )
        return QString::null;
    QTextStream stream(&file);
    return "{" + stream.read().stripWhiteSpace() + "}";
 }
 int AbstractMail::createMbox(const QString&,const FolderP&,const QString& ,bool)
 {
    return 0;
 }
 QString AbstractMail::defaultLocalfolder()
 {
    //  QString f = getenv( "HOME" );
    QString f = locateLocal( "data", "kopiemail/localmail");
    //  f += "/Applications/opiemail/localmail";
    return f;
 }
 QString AbstractMail::draftFolder()
 {
    return QString("Drafts");
 }
 /* temporary - will be removed when implemented in all classes */
 void AbstractMail::deleteMails(const QString &,const QValueList<Opie::Core::OSmartPointer<RecMail> > &)
 {
 }
 void AbstractMail::deleteMailList(const QValueList<RecMailP>&target)
 {
    //qDebug("AbstractMail::deleteMailList:: Please reimplement! ");
    // this is currently re-implemented in pop3wrapper and imapwrapper
    int iii = 0;
    int count = target.count(); 
    QProgressBar wid ( count );
    wid.setCaption( i18n("Deleting ..."));
diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp
index d89a5f9..49227dd 100644
--- a/kmicromail/libmailwrapper/genericwrapper.cpp
+++ b/kmicromail/libmailwrapper/genericwrapper.cpp
@@ -175,96 +175,110 @@ QString Genericwrapper::getencoding(mailmime_mechanism*aEnc)
    case MAILMIME_MECHANISM_TOKEN:
    default:
        if (aEnc->enc_token) {
            enc = QString(aEnc->enc_token);
        }
        break;
    }
    return enc;
 }
 void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rec,int current_count)
 {
    if (current_rec >= 10) {
        ; // odebug << "too deep recursion!" << oendl; 
    }
    if (!message || !mime) {
        return;
    }
    int r;
    char*data = 0;
    size_t len;
    clistiter * cur = 0;
    QString b;
    RecPartP part = new RecPart();
    switch (mime->mm_type) {
    case MAILMIME_SINGLE:
    {
        QValueList<int>countlist = recList;
        countlist.append(current_count);
        r = mailmessage_fetch_section(message,mime,&data,&len);
        part->setSize(len);
        part->setPositionlist(countlist);
        b = gen_attachment_id();
        part->setIdentifier(b);
        fillSingleBody(part,message,mime);
        if (part->Type()=="text" && target->Bodytext().isNull()) {
            encodedString*rs = new encodedString();
            rs->setContent(data,len);
            encodedString*res = decode_String(rs,part->Encoding());
            if (countlist.count()>2) {
                bodyCache[b]=rs;
                target->addPart(part);
            } else {
                delete rs;
            }
            b = QString(res->Content());
            delete res;
+            size_t index = 0;
+            char*resu = 0;
+            int err = MAILIMF_NO_ERROR;
+            QString charset = part->searchParamter( "charset");
+            qDebug("CHARSET %s ",charset.latin1() );
+            if ( !charset.isEmpty() ) {
+                err = mailmime_encoded_phrase_parse(charset.latin1(),
+                                                    b.latin1(), b.length(),&index, "utf-8",&resu);
+                if (err == MAILIMF_NO_ERROR && resu && strlen(resu)) {
+                    //qDebug("res %d %s ", index, resu);
+                    b = QString::fromUtf8(resu);
+                }
+                if (resu) free(resu);
+            }
            target->setBodytext(b);
            target->setDescription(part);
        } else {
            bodyCache[b]=new encodedString(data,len);
            target->addPart(part);
        }
    }
    break;
    case MAILMIME_MULTIPLE:
    {
        unsigned int ccount = 1;
        mailmime*cbody=0;
        QValueList<int>countlist = recList;
        for (cur = clist_begin(mime->mm_data.mm_multipart.mm_mp_list) ; cur != NULL ; cur = clist_next(cur)) {
            cbody = (mailmime*)clist_content(cur);
            if (cbody->mm_type==MAILMIME_MULTIPLE) {
                RecPartP targetPart = new RecPart();
                targetPart->setType("multipart");
                countlist.append(current_count);
                targetPart->setPositionlist(countlist);
                target->addPart(targetPart);
            }
            traverseBody(target,message, cbody,countlist,current_rec+1,ccount);
            if (cbody->mm_type==MAILMIME_MULTIPLE) {
                countlist = recList;
            }
            ++ccount;
        }
    }
    break;
    case MAILMIME_MESSAGE:
    {
        QValueList<int>countlist = recList;
        countlist.append(current_count);
        /* the own header is always at recursion 0 - we don't need that */
        if (current_rec > 0) {
            part->setPositionlist(countlist);
            r = mailmessage_fetch_section(message,mime,&data,&len);
            part->setSize(len);
            part->setPositionlist(countlist);
            b = gen_attachment_id();
            part->setIdentifier(b);
            part->setType("message");
            part->setSubtype("rfc822");
            bodyCache[b]=new encodedString(data,len);
            target->addPart(part);
        }
        if (mime->mm_data.mm_message.mm_msg_mime != NULL) {
@@ -299,97 +313,97 @@ QString Genericwrapper::parseAddressList( mailimf_address_list *list )
    for ( clistiter *current = clist_begin( list->ad_list ); current != NULL; current = current->next ) {
        mailimf_address *addr = (mailimf_address *) current->data;
        if ( !first ) {
            result.append( "," );
        } else {
            first = false;
        }
        switch ( addr->ad_type ) {
            case MAILIMF_ADDRESS_MAILBOX:
                result.append( parseMailbox( addr->ad_data.ad_mailbox ) );
                break;
            case MAILIMF_ADDRESS_GROUP:
                result.append( parseGroup( addr->ad_data.ad_group ) );
                break;
            default:
                ; // odebug << "Generic: unkown mailimf address type" << oendl; 
                break;
        }
    }
    return result;
 }
 QString Genericwrapper::parseGroup( mailimf_group *group )
 {
    QString result( "" );
    result.append( group->grp_display_name );
    result.append( ": " );
    if ( group->grp_mb_list != NULL ) {
        result.append( parseMailboxList( group->grp_mb_list ) );
    }
    result.append( ";" );
    return result;
 }
 QString Genericwrapper::parseMailbox( mailimf_mailbox *box )
 {
    QString result( "" );
    if ( box->mb_display_name == NULL ) {
        result.append( box->mb_addr_spec );
    } else {
-        result.append( convert_String(box->mb_display_name).latin1() );
+        result.append( convert_String(box->mb_display_name) );
        result.append( " <" );
        result.append( box->mb_addr_spec );
        result.append( ">" );
    }
    return result;
 }
 QString Genericwrapper::parseMailboxList( mailimf_mailbox_list *list )
 {
    QString result( "" );
    bool first = true;
    for ( clistiter *current = clist_begin( list->mb_list ); current != NULL; current = current->next ) {
        mailimf_mailbox *box = (mailimf_mailbox *) current->data;
        if ( !first ) {
            result.append( "," );
        } else {
            first = false;
        }
        result.append( parseMailbox( box ) );
    }
    return result;
 }
 encodedString* Genericwrapper::fetchDecodedPart(const RecMailP&,const RecPartP&part)
 {
    QMap<QString,encodedString*>::ConstIterator it = bodyCache.find(part->Identifier());
    if (it==bodyCache.end()) return new encodedString();
    encodedString*t = decode_String(it.data(),part->Encoding());
    return t;
 }
 encodedString* Genericwrapper::fetchRawPart(const RecMailP&,const RecPartP&part)
 {
    QMap<QString,encodedString*>::ConstIterator it = bodyCache.find(part->Identifier());
    if (it==bodyCache.end()) return new encodedString();
    encodedString*t = it.data();
    return t;
 }
 QString Genericwrapper::fetchTextPart(const RecMailP&mail,const RecPartP&part)
 {
    encodedString*t = fetchDecodedPart(mail,part);
    QString text=t->Content();
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp
index d90a8d2..eb2b47d 100644
--- a/kmicromail/libmailwrapper/imapwrapper.cpp
+++ b/kmicromail/libmailwrapper/imapwrapper.cpp
@@ -707,96 +707,115 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMailP&mail,const QValueList<int
        msg_att = (mailimap_msg_att*)current->data;
        mailimap_msg_att_item*msg_att_item;
        for(cur = clist_begin(msg_att->att_list) ; cur != NULL ; cur = clist_next(cur)) {
            msg_att_item = (mailimap_msg_att_item*)clist_content(cur);
            if (msg_att_item->att_type == MAILIMAP_MSG_ATT_ITEM_STATIC) {
                if (msg_att_item->att_data.att_static->att_type == MAILIMAP_MSG_ATT_BODY_SECTION) {
                    char*text = msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part;
                    /* detach - we take over the content */
                    msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part = 0L;
                    res->setContent(text,msg_att_item->att_data.att_static->att_data.att_body_section->sec_length);
                }
            }
        }
    } else {
        ;//odebug << "error fetching text: " << m_imap->imap_response << "" << oendl; 
    }
    if (result) mailimap_fetch_list_free(result);
    return res;
 }
 /* current_recursion is for recursive calls.
   current_count means the position inside the internal loop! */
 void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&target_body,
    int current_recursion,QValueList<int>recList,int current_count)
 {
    if (!body || current_recursion>=10) {
        return;
    }
    switch (body->bd_type) {
    case MAILIMAP_BODY_1PART:
    {
        QValueList<int>countlist = recList;
        countlist.append(current_count);
        RecPartP currentPart = new RecPart();
        mailimap_body_type_1part*part1 = body->bd_data.bd_body_1part;
        QString id("");
        currentPart->setPositionlist(countlist);
        for (unsigned int j = 0; j < countlist.count();++j) {
            id+=(j>0?" ":"");
            id+=QString("%1").arg(countlist[j]);
        }
        //odebug << "ID = " << id.latin1() << "" << oendl; 
        currentPart->setIdentifier(id);
        fillSinglePart(currentPart,part1);
        /* important: Check for is NULL 'cause a body can be empty!
           And we put it only into the mail if it is the FIRST part */
        if (part1->bd_type==MAILIMAP_BODY_TYPE_1PART_TEXT && target_body->Bodytext().isNull() && countlist[0]==1) {
            QString body_text = fetchTextPart(mail,countlist,true,currentPart->Encoding());
+            size_t index = 0;
+            char*res = 0;
+            int err = MAILIMF_NO_ERROR;
+            
+            QString charset = currentPart->searchParamter( "charset");
+            qDebug("CHARSET %s ",charset.latin1() );
+            //if ( false ) {
+            if ( !charset.isEmpty() ) {
+                //err = mailmime_encoded_phrase_parse("iso-8859-1",
+                //                                      text, strlen(text),&index, "iso-8859-1",&res);
+                err = mailmime_encoded_phrase_parse(charset.latin1(),
+                                                    body_text.latin1(), body_text.length(),&index, "utf-8",&res);
+                if (err == MAILIMF_NO_ERROR && res && strlen(res)) {
+                    //qDebug("res %d %s ", index, res);
+                    body_text = QString::fromUtf8(res);
+                }
+                if (res) free(res);
+            }
            //qDebug("encoding %d text %s ",currentPart->Encoding().latin1(), body_text.latin1() );
            target_body->setDescription(currentPart);
            target_body->setBodytext(body_text);
            if (countlist.count()>1) {
                target_body->addPart(currentPart);
            }
        } else {
            target_body->addPart(currentPart);
        }
        if (part1->bd_type==MAILIMAP_BODY_TYPE_1PART_MSG) {
            traverseBody(mail,part1->bd_data.bd_type_msg->bd_body,target_body,current_recursion+1,countlist);
        }
    }
    break;
    case MAILIMAP_BODY_MPART:
    {
        QValueList<int>countlist = recList;
        clistcell*current=0;
        mailimap_body*current_body=0;
        unsigned int ccount = 1;
        mailimap_body_type_mpart*mailDescription = body->bd_data.bd_body_mpart;
        for (current=clist_begin(mailDescription->bd_list);current!=0;current=clist_next(current)) {
            current_body = (mailimap_body*)current->data;
            if (current_body->bd_type==MAILIMAP_BODY_MPART) {
                RecPartP targetPart = new RecPart();
                targetPart->setType("multipart");
                fillMultiPart(targetPart,mailDescription);
                countlist.append(current_count);
                targetPart->setPositionlist(countlist);
                target_body->addPart(targetPart);
                QString id("");
                for (unsigned int j = 0; j < countlist.count();++j) {
                    id+=(j>0?" ":"");
                    id+=QString("%1").arg(countlist[j]);
                }
                // odebug << "ID(mpart) = " << id.latin1() << "" << oendl; 
            }
            traverseBody(mail,current_body,target_body,current_recursion+1,countlist,ccount);
            if (current_body->bd_type==MAILIMAP_BODY_MPART) {
                countlist = recList;
            }
            ++ccount;
        }
    }
    break;
    default:
    break;
    }
diff --git a/kmicromail/libmailwrapper/mboxwrapper.cpp b/kmicromail/libmailwrapper/mboxwrapper.cpp
index 0cdbae4..87f8c8a 100644
--- a/kmicromail/libmailwrapper/mboxwrapper.cpp
+++ b/kmicromail/libmailwrapper/mboxwrapper.cpp
@@ -80,96 +80,97 @@ void MBOXwrapper::deleteMail(const RecMailP & mail)
    }
    r = mailsession_remove_message(folder->fld_session,mail->getNumber());
    if (r != MAIL_NO_ERROR) {
        ; // << "error deleting mail" << oendl; 
    }
    mailfolder_free(folder);
    mailstorage_free(storage);
 }
 void MBOXwrapper::answeredMail(const RecMailP&)
 {
 }
 RecBodyP MBOXwrapper::fetchBody( const RecMailP &mail )
 {
    RecBodyP body = new RecBody();
    mailstorage*storage = mailstorage_new(NULL);
    QString p = MBOXPath+"/";
    p+=mail->getMbox();
    mailmessage * msg;
    char*data=0;
    size_t size;
    int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
    mailfolder*folder;
    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);
    r = mailfolder_connect(folder);
    if (r != MAIL_NO_ERROR) {
        ; // << "Error initializing mbox" << oendl; 
        mailfolder_free(folder);
        mailstorage_free(storage);
        return body;
    }
    r = mailsession_get_message(folder->fld_session, mail->getNumber(), &msg);
    if (r != MAIL_NO_ERROR) {
        ; // << "Error fetching mail " << mail->getNumber() << "" << oendl; 
        mailfolder_free(folder);
        mailstorage_free(storage);
        return body;
    }
    r = mailmessage_fetch(msg,&data,&size);
    if (r != MAIL_NO_ERROR) {
        ; // << "Error fetching mail " << mail->getNumber() << "" << oendl; 
        mailfolder_free(folder);
        mailstorage_free(storage);
        mailmessage_free(msg);
        return body;
    }
+    qDebug("MBOXwrapper::fetchBody ");
    body = parseMail(msg);
    mailmessage_fetch_result_free(msg,data);
    mailfolder_free(folder);
    mailstorage_free(storage);
    return body;
 }
 void MBOXwrapper::mbox_progress( size_t current, size_t maximum )
 {
    ; // << "MBOX " << current << " von " << maximum << "" << oendl; 
 }
 int MBOXwrapper::createMbox(const QString&folder,const FolderP&,const QString&,bool )
 {
    QString p = MBOXPath+"/";
    p+=folder;
    QFileInfo fi(p);
    if (fi.exists()) {
        Global::statusMessage(i18n("Mailbox exists."));
        return 0;
    }
    mailmbox_folder*f = 0;
    if (mailmbox_init(p.latin1(),0,1,0,&f) != MAIL_NO_ERROR) {
        Global::statusMessage(i18n("Error init folder"));
        return 0;
    }
    if (f) mailmbox_done(f);
    return 1;
 }
 void MBOXwrapper::storeMessage(const char*msg,size_t length, const QString&folder)
 {
    QString p = MBOXPath+"/";
    p+=folder;
    mailmbox_folder*f = 0;
    int r = mailmbox_init(p.latin1(),0,1,0,&f);
    if (r != MAIL_NO_ERROR) {
        Global::statusMessage(i18n("Error init folder"));
        return;
    }
    r = mailmbox_append_message(f,msg,length);
    if (r != MAIL_NO_ERROR) {
        Global::statusMessage(i18n("Error writing to message folder"));
    }
    mailmbox_done(f);
 }
diff --git a/kmicromail/libmailwrapper/mhwrapper.cpp b/kmicromail/libmailwrapper/mhwrapper.cpp
index 90b5d23..982d7a6 100644
--- a/kmicromail/libmailwrapper/mhwrapper.cpp
+++ b/kmicromail/libmailwrapper/mhwrapper.cpp
@@ -83,96 +83,97 @@ void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSm
 QValueList<Opie::Core::OSmartPointer<Folder> >* MHwrapper::listFolders()
 {
    QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >();
    /* this is needed! */
    if (m_storage) mailstorage_disconnect(m_storage);
    init_storage();
    if (!m_storage) {
        return folders;
    }
    mail_list*flist = 0;
    clistcell*current=0;
    int r = mailsession_list_folders(m_storage->sto_session,NULL,&flist);
    if (r != MAIL_NO_ERROR || !flist) {
        qDebug("error getting folder list ");
        return folders;
    }
    for (current=clist_begin(flist->mb_list);current!=0;current=clist_next(current)) {
        QString t = (char*)current->data;
        t.replace(0,MHPath.length(),"");
        folders->append(new MHFolder(t,MHPath));
    }
    mail_list_free(flist);
    return folders;
 }
 void MHwrapper::deleteMail(const RecMailP&mail)
 {
    init_storage();
    if (!m_storage) {
        return;
    }
    int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1());
    if (r!=MAIL_NO_ERROR) {
        qDebug("error selecting folder! ");
        return;
    }
    r = mailsession_remove_message(m_storage->sto_session,mail->getNumber());
    if (r != MAIL_NO_ERROR) {
        qDebug("error deleting mail ");
    }
 }
 void MHwrapper::answeredMail(const RecMailP&)
 {
 }
 RecBodyP MHwrapper::fetchBody( const RecMailP &mail )
 {
+    qDebug("MHwrapper::fetchBody ");
    RecBodyP body = new RecBody();
    init_storage();
    if (!m_storage) {
        return body;
    }
    mailmessage * msg;
    char*data=0;
    /* mail should hold the complete path! */
    int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1());
    if (r != MAIL_NO_ERROR) {
        return body;
    }
    r = mailsession_get_message(m_storage->sto_session, mail->getNumber(), &msg);
    if (r != MAIL_NO_ERROR) {
        qDebug("Error fetching mail ");
       
        return body;
    }
    body = parseMail(msg);
    mailmessage_fetch_result_free(msg,data);
    return body;
 }
 void MHwrapper::mbox_progress( size_t current, size_t maximum )
 {
    qDebug("MBox Progress %d of %d",current,maximum );
    //odebug << "MH " << current << " von " << maximum << "" << oendl; 
 }
 QString MHwrapper::buildPath(const QString&p)
 {
    QString f="";
    if (p.length()==0||p=="/")
        return MHPath;
    if (!p.startsWith(MHPath)) {
        f+=MHPath;
    }
    if (!p.startsWith("/")) {
        f+="/";
    }
    f+=p;
    return f;
 }
 int MHwrapper::createMbox(const QString&folder,const FolderP&pfolder,const QString&,bool )
 {
    init_storage();
diff --git a/kmicromail/mailistviewitem.cpp b/kmicromail/mailistviewitem.cpp
index 5ef5b6a..484a635 100644
--- a/kmicromail/mailistviewitem.cpp
+++ b/kmicromail/mailistviewitem.cpp
@@ -10,98 +10,98 @@ MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item )
 {
 }
 void MailListViewItem::showEntry()
 {
    if ( mail_data->getFlags().testBit( FLAG_ANSWERED ) == true) {
        setPixmap( 0, SmallIcon ( "kmmsgreplied") );
    } else if ( mail_data->getFlags().testBit( FLAG_SEEN ) == true )  {
        /* I think it looks nicer if there are not such a log of icons but only on mails
           replied or new - Alwin*/ 
        //setPixmap( 0,SmallIcon ("kmmsgunseen") );
    } else  {
        setPixmap( 0,SmallIcon ( "kmmsgnew") );
    }
    double s = mail_data->Msgsize();
    int w = 0;
    s/=1024;
    if (s>999.0) {
        s/=1024.0;
        ++w;
    }
    QString fsort;
    fsort.sprintf( "%.2f", s );
    QString fsize = QString::number( s, 'f', 2 );
    //  1.23
    // 11.23
    // 111.23
    // 999.23 maxlen
    switch(fsize.length() ) {
    case 4:
        fsort = "00" + fsize ;
        break;
    case 5:
        fsort = "0" + fsize ;
        break;
    default:
        fsort = fsize ;
    break;
    
    }
    if ( w == 0 ) {
        setText(3, fsize + "kB" );
        mKeyMap.insert(3, "k" + fsort);
        //setText(3, "kB" + fsort ); // test only
    } else {
        //setText(3, fsize + "MB");
        mKeyMap.insert(3, "M" +fsort );
    }
-    setText(1,QString::fromUtf8( mail_data->getSubject().latin1()));
+    setText(1,mail_data->getSubject());
-    setText(2,QString::fromUtf8( mail_data->getFrom().latin1()));
+    setText(2,mail_data->getFrom());
 #if 0    
    QString date = mail_data->getDate();
    
    int kom = date.find( ",")+2;
    if ( kom == 1 )
    kom = 0;
    if (  date.mid(kom,1) == " ")
        ++kom;
    if ( date.mid(kom+1,1) == " " )
        date =  "0" + date.mid( kom ); 
    else if ( kom )
        date =  date.mid( kom ); 
    if ( kom || date.mid(2,1 ) == " ") {
        QString mon = date.mid(3,3);
        QString so = 00;
        if ( mon == "Jan" )
            so = "01";
        else if ( mon == "Feb" )
            so = "02";
        else if ( mon == "Mar" )
            so = "03";
        else if ( mon == "Apr" )
            so = "04";
        else if ( mon == "May" )
            so = "05";
        else if ( mon == "Jun" )
            so = "06";
        else if ( mon == "Jul" )
            so = "07";
        else if ( mon == "Aug" )
            so = "08";
        else if ( mon == "Sep" )
            so = "09";
        else if ( mon == "Oct" )
            so = "10";
        else if ( mon == "Nov" )
            so = "11";
        else if ( mon == "Dec" )
            so = "12";
        date = date.mid(7,4)+so+date.left(2)+date.mid(12,14);
    }
    //qDebug("insert Date %s ", date.latin1());
    // if ( date.left(1) != "1" || date.left(1) != "2" )
    //  date = date.mid(5);
    mKeyMap.insert(4,date);
 #endif
    mKeyMap.insert(4,mail_data->getIsoDate());
    setText(4,mail_data->getDate());
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 98eb9a5..3013931 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -1,242 +1,283 @@
 // CHANGED 2004-08-06 Lutz Rogowski
 #include <qlabel.h>
 #include <qvbox.h>
 #include <qheader.h>
 #include <qtimer.h>
 #include <qlayout.h>
 //#include <kdialog.h>
 #include <kiconloader.h>
 #include <kapplication.h>
 #ifdef DESKTOP_VERSION
 #include <qapplication.h>
 #include <qstatusbar.h> 
+#include <kabc/stdaddressbook.h>
 extern QStatusBar* globalSstatusBarMainWindow;
 #else
 #include <qpe/qpeapplication.h>
 #endif
 #include "defines.h"
 #include "mainwindow.h"
 #include <KDGanttMinimizeSplitter.h>
-#include <kabc/stdaddressbook.h>
+#include "koprefs.h"
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
    : QMainWindow( parent, name ) //, flags )
 {
 #ifdef DESKTOP_VERSION
    globalSstatusBarMainWindow = statusBar();
 #endif
    setCaption( i18n( "KOpieMail/Pi" ) );
    setToolBarsMovable( false ); 
    //KABC::StdAddressBook::self();
    toolBar = new QToolBar( this );
    menuBar = new QPEMenuBar( toolBar );
    mailMenu = new QPopupMenu( menuBar );
    menuBar->insertItem( i18n( "Mail" ), mailMenu );
    settingsMenu = new QPopupMenu( menuBar );
    menuBar->insertItem( i18n( "Settings" ), settingsMenu );
    addToolBar( toolBar );
    toolBar->setHorizontalStretchable( true );
    QAction* getMail = new QAction( i18n( "Get all new mails" ), SmallIcon("enter"),
                               0, 0, this );
    connect(getMail, SIGNAL( activated() ),
            SLOT( slotGetAllMail() ) );
    getMail->addTo( mailMenu );
    getMail = new QAction( i18n( "Get new messages" ), SmallIcon("add"),
                               0, 0, this );
    getMail->addTo( toolBar );
    getMail->addTo( mailMenu );
    connect(getMail, SIGNAL( activated() ),
            SLOT( slotGetMail() ) );
    composeMail = new QAction( i18n( "Compose new mail" ), SmallIcon("composemail"),
                               0, 0, this );
    composeMail->addTo( toolBar );
    composeMail->addTo( mailMenu );
    sendQueued = new QAction( i18n( "Send queued mails" ), SmallIcon("sendqueued") ,
                              0, 0, this );
    sendQueued->addTo( toolBar );
    sendQueued->addTo( mailMenu );
    /*
    syncFolders = new QAction( i18n( "Sync mailfolders" ), ICON_SYNC,
                               0, 0, this );
    syncFolders->addTo( toolBar );
    syncFolders->addTo( mailMenu );
    */
    showFolders = new QAction( i18n( "Show/Hide folders" ), SmallIcon("showfolders") ,
                               0, 0, this, 0, true );
    showFolders->addTo( toolBar );
    showFolders->addTo( mailMenu );
    showFolders->setOn( true );
    connect(showFolders, SIGNAL( toggled(bool) ),
            SLOT( slotShowFolders(bool) ) );
    /*
      searchMails = new QAction( i18n( "Search mails" ), SmallIcon("find") ),
                               0, 0, this );
    searchMails->addTo( toolBar );
    searchMails->addTo( mailMenu );
    */
    deleteMails = new QAction(i18n("Delete Mail"),  SmallIcon("trash"), 0, 0, this);
    deleteMails->addTo( toolBar );
    deleteMails->addTo( mailMenu );
    connect( deleteMails, SIGNAL( activated() ),
             SLOT( slotDeleteMail() ) );
    editSettings = new QAction( i18n( "Edit settings" ), SmallIcon("SettingsIcon")  ,
                                0, 0, this );
    editSettings->addTo( settingsMenu );
    connect( editSettings, SIGNAL( activated() ),
             SLOT( slotEditSettings() ) );
    editAccounts = new QAction( i18n( "Configure accounts" ),  SmallIcon("editaccounts")  ,
                                0, 0, this );
    editAccounts->addTo( settingsMenu );
+    codecMenu = new QPopupMenu( menuBar );
+    codecMenu->insertItem( "Western (iso-8859-1)",0,0);
+    codecMenu->insertItem( "Cyrillic (iso-8859-5)",1,1);
+    codecMenu->insertItem( "Western (iso-8859-15)",2,2);
+    codecMenu->insertItem( "Chinese (big-5)",3,3);
+    codecMenu->insertItem( "Unicode (utf-8)",4,4);
+    codecMenu->insertItem( "Userdefined ("+KOPrefs::instance()->mSendCodec+")",5,5);
+    settingsMenu->insertItem( i18n("Codec for new mails"), codecMenu);
    //setCentralWidget( view );
    QVBox* wrapperBox = new QVBox( this );
    setCentralWidget( wrapperBox );
    // QWidget *view = new QWidget( wrapperBox );
    KDGanttMinimizeSplitter* split = new KDGanttMinimizeSplitter( Qt::Horizontal, wrapperBox);
    split->setMinimizeDirection( KDGanttMinimizeSplitter::Left);
    //layout = new QBoxLayout ( split, QBoxLayout::LeftToRight );
    folderView = new AccountView( split );
    folderView->header()->hide();
    folderView->setRootIsDecorated( false );
    folderView->addColumn( i18n( "Mailbox" ) );
    //layout->addWidget( folderView );
    mailView = new QListView( split );
    mailView->addColumn( i18n( " " ) );
    mailView->addColumn( i18n( "Subject" ),QListView::Manual );
    mailView->addColumn( i18n( "Sender" ),QListView::Manual );
    mailView->addColumn( i18n( "Size" ),QListView::Manual);
    mailView->addColumn( i18n( "Date" ),QListView::Manual);
    mailView->setAllColumnsShowFocus(true);
    //mailView->setSorting(-1);
    mailView->setRootIsDecorated( false );
    statusWidget = new StatusWidget( wrapperBox );
    statusWidget->hide();
    //layout->addWidget( mailView );
    //layout->setStretchFactor( folderView, 1 );
    //layout->setStretchFactor( mailView, 2 );
    slotAdjustLayout();
 #ifndef DESKTOP_VERSION
    QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold);
    QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold);
 #endif
    connect( mailView, SIGNAL(  doubleClicked (QListViewItem* )),this,
             SLOT( mailLeftClicked(QListViewItem*) ) );
    connect( mailView, SIGNAL(  returnPressed (QListViewItem* )),this,
             SLOT( mailLeftClicked(QListViewItem*) ) );
    connect( mailView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this,
             SLOT( mailHold(int,QListViewItem*,const QPoint&,int) ) );
    connect(folderView, SIGNAL(refreshMailview(const QValueList<RecMailP>&)),
            this,SLOT(refreshMailView(const QValueList<RecMailP>&)));
    connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) );
    connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) );
 //    connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) );
    connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) );
    //mailView->setMultiSelection ( true );
    mailView->setSelectionMode( QListView::Extended );
    QValueList<int> list;
    int fw = 100;
    if ( QApplication::desktop()->width() > 320 )
        fw = 50;
    list.append( fw );
    list.append( 100 );
    split->setSizes( list );
    QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) );
    mailView->setShowSortIndicator ( true ); 
    QLabel *spacer = new QLabel( toolBar );
    spacer->setBackgroundMode( QWidget::PaletteButton );
    toolBar->setStretchableWidget( spacer );
    QAction* closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this); 
    connect( closeMail, SIGNAL( activated() ), SLOT( close() ) );
    if ( QApplication::desktop()->width() > 320 )
        closeMail->addTo(toolBar);
        closeMail->addTo(mailMenu);
   QPopupMenu* helpMenu = new QPopupMenu( menuBar );
   menuBar->insertItem( i18n( "Help" ), helpMenu ); 
   QAction* li = new QAction(i18n("About"), QPixmap(), 0, 0, this); 
   connect( li, SIGNAL( activated() ), SLOT( showAbout()) );
   li->addTo(helpMenu);
   li = new QAction(i18n("Licence"),QPixmap(), 0, 0, this); 
   connect( li, SIGNAL( activated() ), SLOT( showLicence()) );
   li->addTo(helpMenu); 
   li = new QAction(i18n("LibEtPan Licence"), QPixmap(), 0, 0, this); 
   connect( li, SIGNAL( activated() ), SLOT( showEtpanLicence()) );
   li->addTo(helpMenu);
+   connect( codecMenu, SIGNAL( activated(int) ), this, SLOT( slotSetCodec( int )) );
+   slotSetCodec( KOPrefs::instance()->mCurrentCodec );
 #ifdef DESKTOP_VERSION
   resize ( 640, 480 );
 #endif
 }
 MainWindow::~MainWindow()
 {
 }
+void MainWindow::slotSetCodec( int codec )
+{ 
+    codecMenu->setItemChecked(KOPrefs::instance()->mCurrentCodec, false  );
+    //qDebug("codec %d ", codec);
+    KOPrefs::instance()->mCurrentCodec = codec;
+    KOPrefs::instance()->isDirty = true;
+    QString name;
+    switch ( codec ) {
+    case 0:
+        name = "iso-8859-1";
+        break;
+    case 1:
+        name = "iso-8859-5";
+        break;
+    case 2:
+        name = "iso-8859-15";
+        break;
+    case 3:
+        name = "big-5";
+        break;
+    case 4:
+        name = "utf-8";
+        break;
+    case 5:
+        name = KOPrefs::instance()->mSendCodec.lower();
+        break;
+    }
+    KOPrefs::instance()->mCurrentCodeName = name ;
+    codecMenu->changeItem ( 5, "Userdefined ("+KOPrefs::instance()->mSendCodec+")");
+    codecMenu->setItemChecked(KOPrefs::instance()->mCurrentCodec, true );
+}
 void  MainWindow::showLicence()
 {
    KApplication::showLicence();
 }
 void  MainWindow::showAbout()
 {
    QString version;
 #include <../version>
    QString cap = "About KOpieMail/Pi";
                QString text =i18n("KOpieMail/Platform-independent\n") +
                        "(OM/Pi) " + version + " - "
                      
 #ifdef DESKTOP_VERSION
                        "Desktop Edition\n"
 #else
                       "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n"
 #endif
                "www.pi-sync.net\n\n"
 "Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.net>\n"
                "KOpieMail/Pi is based on Opie Mail\n"
                "Copyright (c) Rajko Albrecht and the Opie team\n"
                "KOpieMail/Pi is licensed under the GPL\n"
                "\n"
                "KOpieMail/Pi uses LibEtPan - a mail stuff library\n"
        "Copyright (C) 2001, 2002 - DINH Viet Hoa\n"
                "libEtPan has its own licence - see LibEtPan licence\n";
    KApplication::showText( cap, text );
 }
 void  MainWindow::showEtpanLicence()
 {
    KApplication::showFile( "LibEtPan licence", "kdepim/kopiemail/COPYRIGHTlibetpan" );
 } 
 void MainWindow::appMessage(const QCString &, const QByteArray &)
 {
    qDebug("appMessage implemented by subclass");
 }
 void MainWindow::slotAdjustLayout() {
    /*
  QWidget *d = QApplication::desktop();
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h
index f5ab69b..d0a5caf 100644
--- a/kmicromail/mainwindow.h
+++ b/kmicromail/mainwindow.h
@@ -1,68 +1,69 @@
 // CHANGED 2004-08-06 Lutz Rogowski
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 #include <qmainwindow.h>
 #include <qlistview.h>
 #include <qaction.h>
 #include <qtoolbar.h>
 #ifdef DESKTOP_VERSION
 #include <qmenubar.h>
 #define QPEMenuBar QMenuBar
 #else
 #include <qpe/qpemenubar.h>
 #endif
 #include "accountview.h"
 #include "statuswidget.h"
 #include <libmailwrapper/mailtypes.h>
 #include <opie2/osmartpointer.h>
 class RecMail;
 class MainWindow : public QMainWindow
 {
    Q_OBJECT
 public:
    MainWindow( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
    virtual ~MainWindow();
 public slots:
    virtual void slotAdjustColumns();
    virtual void appMessage(const QCString &msg, const QByteArray &data);
    virtual void slotComposeMail();
 protected slots:
    virtual void slotSendQueued();
    virtual void slotEditAccounts();
    virtual void slotShowFolders( bool show );
    virtual void refreshMailView(const QValueList<RecMailP>&);
    virtual void displayMail();
    virtual void slotGetMail() = 0;
    virtual void slotGetAllMail() = 0;
    virtual void slotDeleteMail();
+    virtual void slotSetCodec(int);
    virtual void mailHold(int, QListViewItem *,const QPoint&,int);
    virtual void slotAdjustLayout();
    virtual void slotEditSettings();
    virtual void mailLeftClicked( QListViewItem * );
    void showLicence();
    void showAbout();
    void showEtpanLicence(); 
 protected:
    QToolBar *toolBar;
    StatusWidget *statusWidget;
    QPEMenuBar *menuBar;
-    QPopupMenu *mailMenu, *settingsMenu;
+    QPopupMenu *mailMenu, *settingsMenu, *codecMenu;
    QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails,
            *editSettings, *editAccounts, *syncFolders;
    AccountView *folderView;
    QListView *mailView;
    //QBoxLayout *layout;
 };
 #endif
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index af5376f..18a5600 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -1,83 +1,84 @@
 // CHANGED 2004-09-31 Lutz Rogowski
 // CHANGED 2004-08-06 Lutz Rogowski
 #include "koprefsdialog.h"
 #include <kapplication.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 "klocale.h"
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qcursor.h>
 #include <qregexp.h>
 #include <qpe/global.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>
+#include "koprefs.h"
 //using namespace Opie::Core;
 OpieMail::OpieMail( QWidget *parent, const char *name )
    : MainWindow( parent, name) //, WStyle_ContextHelp )
 {
    settings = new Settings();
    setIcon(SmallIcon( "kmicromail" )  );
    folderView->populate( settings->getAccounts() );
  
 }
 OpieMail::~OpieMail()
 {
    if (settings) delete settings;
 }
 void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
 {
    
 }
 #include <stdlib.h>
 void OpieMail::message(const QCString &msg, const QByteArray &data)
 {
    // copied from old mail2
    static int ii = 0;
    //qDebug("QCOP CALL ############################# %d ", ii);
    //QString mess ( msg  );
    //qDebug("Message = %s ",mess.latin1());
    ++ii;
    //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this);
    mPendingEmail = QString::null;
    mPendingName = QString::null;
    if (msg == "writeMail(QString,QString)")
    {
        //qDebug("writeMail(QString,QString) ");
        QDataStream stream(data,IO_ReadOnly);
        stream >> mPendingName >> mPendingEmail;
        // removing the whitespaces at beginning and end is needed!
        QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); 
    }
    else if (msg == "newMail()")
    {
        //qDebug("slotComposeMail() ");
        // we cannot call slotComposeMail(); directly, because may be executing a QCOP call
        // and a QCOP call does not like a processevents in his execution
@@ -192,148 +193,149 @@ void OpieMail::slotSendQueued()
    }
    if ( QMessageBox::warning(this, i18n("Sending all mails"), i18n("Do you really want to send\nall queued mails?" )  , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No )
        return;
    if (smtpList.count()==1)
    {
        smtp = smtpList.at(0);
    }
    else
    {
        smtp = 0;
        selectsmtp selsmtp;
        selsmtp.setSelectionlist(&smtpList);
 #ifndef DESKTOP_VERSION
        selsmtp.showMaximized();
 #endif
        if (  selsmtp.exec() == QDialog::Accepted )
        {
            smtp = selsmtp.selected_smtp();
        }
    }
    if (smtp)
    {
     
        Global::statusMessage("Sending mails...!");
        SMTPwrapper * wrap = new SMTPwrapper(smtp);
        if ( wrap->flushOutbox() )
        {
            Global::statusMessage("Mails sent!");
        } 
        delete wrap;
    }
    // pending refresh list view, if outgoing is displayed
 }
 void OpieMail::slotSearchMails()
 {
    qDebug("OpieMail::slotSearchMails():not implemented ");
 }
 void OpieMail::slotEditSettings()
 {
    KOPrefsDialog settingsDialog( this,  "koprefs", true );
 #ifndef DESKTOP_VERSION
    settingsDialog.showMaximized();
 #endif
    settingsDialog.exec();
+   slotSetCodec( KOPrefs::instance()->mCurrentCodec );
    //    KApplication::execDialog(settingsDialog);
 }
 void OpieMail::slotEditAccounts()
 {
    EditAccounts eaDialog( settings, this, 0, true );
    eaDialog.slotAdjustColumns();
 #ifndef DESKTOP_VERSION
    eaDialog.showMaximized();
 #endif
    eaDialog.exec();
    if ( settings ) delete settings;
    settings = new Settings();
    folderView->populate( settings->getAccounts() );
 }
 void OpieMail::replyMail()
 {
    QListViewItem*item = mailView->currentItem();
    if (!item) return;
    RecMailP mail = ((MailListViewItem*)item)->data();
    RecBodyP body = folderView->fetchBody(mail);
    QString rtext;
    rtext += QString("* %1 wrote on %2:\n")        // no i18n on purpose
-        .arg(  QString::fromUtf8( mail->getFrom().latin1()))
+        .arg(  mail->getFrom())
-             .arg( QString::fromUtf8( mail->getDate().latin1() ));
+             .arg( mail->getDate());
-    QString text = QString::fromUtf8( body->Bodytext().latin1() );
+    QString text = body->Bodytext();
    QStringList lines = QStringList::split(QRegExp("\\n"), text);
    QStringList::Iterator it;
    for (it = lines.begin(); it != lines.end(); it++)
    {
        rtext += "> " + *it + "\n";
    }
    rtext += "\n";
    QString prefix;
    if ( mail->getSubject().find(QRegExp("^Re: .*$")) != -1) prefix = "";
    else prefix = "Re: ";                // no i18n on purpose
    Settings *settings = new Settings();
    ComposeMail composer( settings ,this, 0, true);
    if (mail->Replyto().isEmpty()) {
-        composer.setTo( QString::fromUtf8( mail->getFrom().latin1()));
+        composer.setTo( mail->getFrom());
    } else {
-        composer.setTo( QString::fromUtf8(mail->Replyto().latin1()));
+        composer.setTo( mail->Replyto());
    }
-    composer.setSubject( prefix + QString::fromUtf8( mail->getSubject().latin1() ) );
+    composer.setSubject( prefix + mail->getSubject());
    composer.setMessage( rtext );
-    composer.setInReplyTo( QString::fromUtf8(mail->Msgid().latin1()));
+    composer.setInReplyTo( mail->Msgid());
    if ( QDialog::Accepted == KApplication::execDialog( &composer ) )
    {
        mail->Wrapper()->answeredMail(mail);
    }
    delete settings;
 }
 void OpieMail::displayMail()
 {
    QListViewItem*item = mailView->currentItem();
    if (!item) return;
    RecMailP mail = ((MailListViewItem*)item)->data();
    RecBodyP body = folderView->fetchBody(mail);
    ViewMail readMail( this,"", Qt::WType_Modal   );
    readMail.setBody( body );
    readMail.setMail( mail );
 #ifndef DESKTOP_VERSION
    readMail.showMaximized();
 #else
    readMail.resize( 640, 480);
 #endif
    readMail.exec();
    if (  readMail.deleted )
    {
        folderView->refreshCurrent();
    }
    else
    {
        ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() );
    }
 }
 void OpieMail::slotGetAllMail()
 {
    QListViewItem * item = folderView->firstChild();
    while ( item ){
        ((AccountViewItem *)item)->contextMenuSelected( 101 );
        item = item->nextSibling ();
    }
 }
 void OpieMail::slotGetMail()
 {
    QListViewItem * item = folderView->currentItem();
    if ( ! item ) return;
    ((AccountViewItem *)item)->contextMenuSelected( 101 );
 }
 void OpieMail::slotDeleteMail()
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index 2093678..4883231 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -53,97 +53,97 @@ AttachItem::AttachItem(QListViewItem * parent,QListViewItem *after, const QStrin
    _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;
    }
    return true;
 }
 AttachItem* ViewMail::searchParent(const QValueList<int>&path)
 {
    QListViewItemIterator it( attachments );
    for ( ; it.current(); ++it )
    {
        AttachItem*ati = (AttachItem*)it.current();
        if (ati->isParentof(path)) return ati;
    }
    return 0;
 }
 AttachItem* ViewMail::lastChild(AttachItem*parent)
 {
    if (!parent) return 0;
    AttachItem* item = (AttachItem*)parent->firstChild();
    if (!item) return item;
    AttachItem*temp=0;
    while( (temp=(AttachItem*)item->nextSibling()))
    {
        item = temp;
    }
    return item;
 }
 void ViewMail::setBody(const RecBodyP&body )
 {
    m_body = body;
-    m_mail[2] = QString::fromUtf8( body->Bodytext().latin1() );
+    m_mail[2] = body->Bodytext();
    // qDebug("********text %s ",m_mail[2].latin1() );
    attachbutton->setEnabled(body->Parts().count()>0);
    attachments->setEnabled(body->Parts().count()>0);
    if (body->Parts().count()==0)
    {
        return;
    }
    AttachItem * curItem=0;
    AttachItem * parentItem = 0;
    QString type=body->Description()->Type()+"/"+body->Description()->Subtype();
    QString desc,fsize;
    double s = body->Description()->Size();
    int w;
    w=0;
    while (s>1024)
    {
        s/=1024;
        ++w;
        if (w>=2) break;
    }
    QString q="";
    switch(w)
    {
    case 1:
        q="k";
        break;
    case 2:
        q="M";
        break;
    default:
        break;
    }
    {
        /* I did not found a method to make a CONTENT reset on a QTextStream
           so I use this construct that the stream will re-constructed in each
           loop. To let it work, the textstream is packed into a own area of
           code is it will be destructed after finishing its small job.
        */
        QTextOStream o(&fsize);
        if (w>0) o.precision(2); else o.precision(0);
        o.setf(QTextStream::fixed);
        o << s << " " << q << "Byte";
    }
    curItem=new AttachItem(attachments,curItem,type,"Mailbody","",fsize,-1,body->Description()->Positionlist());
@@ -256,148 +256,148 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
            }
        }
        break ;
    case 2: 
        {
 #ifdef DESKTOP_VERSION
            QString tmpfile = locateLocal( "tmp", "opiemail-image");
 #else
            QString tmpfile = "/tmp/opiemail-image";
 #endif
            encodedString*content = m_recMail->Wrapper()->fetchDecodedPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] );
            if (content) {
                QFile output(tmpfile);
                output.open(IO_WriteOnly);
                output.writeBlock(content->Content(),content->Length());
                output.close();
                delete content;
                MailImageDlg iview("");
                iview.setName(tmpfile);
                KApplication::execDialog(&iview);
                output.remove();
            }
        }
        break;
    case 1:
        if (  ( ( AttachItem* )item )->Partnumber() == -1 )
        {
            setText();
        }
        else
        {
            if (  m_recMail->Wrapper() != 0l )
            { // make sure that there is a wrapper , even after delete or simular actions
                browser->setText( m_recMail->Wrapper()->fetchTextPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) );
            }
        }
        break;
    }
    delete menu;
 }
 void ViewMail::setMail(const RecMailP&mail )
 {
    m_recMail = mail;
-    m_mail[0] = QString::fromUtf8( mail->getFrom().latin1() );
+    m_mail[0] = mail->getFrom();
-    m_mail[1] = QString::fromUtf8( mail->getSubject().latin1() );
+    m_mail[1] = mail->getSubject();
-    m_mail[3] = QString::fromUtf8( mail->getDate().latin1() );
+    m_mail[3] = mail->getDate();
-    m_mail[4] = QString::fromUtf8( mail->Msgid().latin1() );
+    m_mail[4] = mail->Msgid();
    m_mail2[0] = mail->To();
    m_mail2[1] = mail->CC();
    m_mail2[2] = mail->Bcc();
    setText();
 }
 ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
        : ViewMailBase(parent, name, fl), _inLoop(false)
 {
    m_gotBody = false;
    deleted = false;
    connect( reply, SIGNAL(activated()), SLOT(slotReply()));
    connect( forward, SIGNAL(activated()), SLOT(slotForward()));
    connect( deleteMail, SIGNAL( activated() ),  SLOT( slotDeleteMail() ) );
    connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) ); 
    connect( closeMail, SIGNAL( activated() ), SLOT( close() ) );
    attachments->setEnabled(m_gotBody);
    connect( attachments,  SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) );
    readConfig();
    attachments->setSorting(-1);
 }
 void ViewMail::readConfig()
 {
 
    setFont ( KOPrefs::instance()->mReadFont );
    m_showHtml =  KOPrefs::instance()->mViewAsHtml;
    showHtml->setOn( m_showHtml );
 }
 void ViewMail::setText()
 {
    QString toString;
    QString ccString;
    QString bccString;
   
-    toString = QString::fromUtf8(m_mail2[0].join(",").latin1());
+    toString = m_mail2[0].join(",");
-    ccString  =  QString::fromUtf8(m_mail2[1].join(",").latin1());
+    ccString  = m_mail2[1].join(",");
-    bccString = QString::fromUtf8(m_mail2[2].join(",").latin1());
+    bccString = m_mail2[2].join(",");
  
    setCaption( i18n("E-Mail by %1").arg( m_mail[0] ) );
    m_mailHtml = "<html><body>"
                 "<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>"
                 "<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>"
                 "</td></tr><tr bgcolor=\"#EEEEE6\"><td>"
                 "<b>" + i18n( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>"
                 "<b>" + i18n(  "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" +
                 i18n( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>"
                 "<b>" + i18n( "Date" ) + ": </b> " +  m_mail[3] +
                 "</td></tr></table><font>";
    if ( !m_showHtml )
    {
        browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" );
    }
    else
    {
        browser->setText( QString( m_mailHtml) + m_mail[2] + "</font></html>" );
    }
    // remove later in favor of a real handling
    m_gotBody = true;
 }
 ViewMail::~ViewMail()
 {
    m_recMail->Wrapper()->cleanMimeCache();
    hide();
 }
 void ViewMail::hide()
 {
    QWidget::hide();
    if (_inLoop)
    {
        _inLoop = false;
        qApp->exit_loop();
    }
 }
 void ViewMail::exec()
 {
@@ -405,99 +405,99 @@ void ViewMail::exec()
    if (!_inLoop)
    {
        _inLoop = true;
        qApp->enter_loop();
    }
 }
 QString ViewMail::deHtml(const QString &string)
 {
    QString string_ = string;
    string_.replace(QRegExp("&"), "&amp;");
    string_.replace(QRegExp("<"), "&lt;");
    string_.replace(QRegExp(">"), "&gt;");
    string_.replace(QRegExp("\\n"), "<br>");
    return string_;
 }
 void ViewMail::slotReply()
 {
    if (!m_gotBody)
    {
        QMessageBox::information(this, i18n("Error"), i18n("<p>The mail body is not yet downloaded, so you cannot reply yet."), i18n("Ok"));
        return;
    }
    QString rtext;
    rtext += QString("* %1 wrote on %2:\n")        // no i18n on purpose
             .arg(  m_mail[0] )
             .arg( m_mail[3] );
    QString text = m_mail[2];
    QStringList lines = QStringList::split(QRegExp("\\n"), text);
    QStringList::Iterator it;
    for (it = lines.begin(); it != lines.end(); it++)
    {
        rtext += "> " + *it + "\n";
    }
    rtext += "\n";
    QString prefix;
    if ( m_mail[1].find(QRegExp("^Re: .*$")) != -1) prefix = "";
    else prefix = "Re: ";                // no i18n on purpose
    Settings *settings = new Settings();
    ComposeMail composer( settings ,this, 0, true);
    if (m_recMail->Replyto().isEmpty()) {
-        composer.setTo(  QString::fromUtf8( m_recMail->getFrom().latin1()));
+        composer.setTo(m_recMail->getFrom());
    } else {
-        composer.setTo(  QString::fromUtf8( m_recMail->Replyto().latin1()));
+        composer.setTo(m_recMail->Replyto());
    }
    composer.setSubject( prefix + m_mail[1] );
    composer.setMessage( rtext );
    composer.setInReplyTo(m_recMail->Msgid());
    if ( QDialog::Accepted == KApplication::execDialog( &composer ) )
    {
        m_recMail->Wrapper()->answeredMail(m_recMail);
    }
    delete settings;
 }
  
 void ViewMail::slotForward()
 {
    if (!m_gotBody)
    {
        QMessageBox::information(this, i18n("Error"), i18n("<p>The mail body is not yet downloaded, so you cannot forward yet."), i18n("Ok"));
        return;
    }
    QString ftext;
    ftext += QString("\n----- Forwarded message from %1 -----\n\n")
             .arg( m_mail[0] );
    if (!m_mail[3].isNull())
        ftext += QString("Date: %1\n")
                 .arg( m_mail[3] );
    if (!m_mail[0].isNull())
        ftext += QString("From: %1\n")
                 .arg( m_mail[0] );
    if (!m_mail[1].isNull())
        ftext += QString("Subject: %1\n")
                 .arg( m_mail[1] );
    ftext += QString("\n%1\n")
             .arg( m_mail[2]);
    ftext += QString("----- End forwarded message -----\n");
    Settings *settings = new Settings();
    ComposeMail composer( settings ,this, 0, true);
    composer.setSubject( "Fwd: " + m_mail[1] );
    composer.setMessage( ftext );
    if ( QDialog::Accepted == KApplication::execDialog( &composer ))
    {
    }
 }
 void ViewMail::slotDeleteMail( )