1 files changed, 9 insertions, 7 deletions

diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index af5376f..18a5600 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -32,8 +32,9 @@
 #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 )
@@ -236,8 +237,9 @@ void OpieMail::slotEditSettings()
     settingsDialog.showMaximized();
 #endif
     settingsDialog.exec();
 
+   slotSetCodec( KOPrefs::instance()->mCurrentCodec );
     //    KApplication::execDialog(settingsDialog);
 }
 
 void OpieMail::slotEditAccounts()
@@ -262,12 +264,12 @@ void OpieMail::replyMail()
     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( QString::fromUtf8( mail->getDate().latin1() ));
+        .arg(  mail->getFrom())
+             .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++)
     {
@@ -281,15 +283,15 @@ void OpieMail::replyMail()
 
     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);