1 files changed, 14 insertions, 19 deletions

diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index f1e0225..2093678 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -99,5 +99,6 @@ void ViewMail::setBody(const RecBodyP&body )
 
     m_body = body;
-    m_mail[2] = body->Bodytext();
+    m_mail[2] = QString::fromUtf8( body->Bodytext().latin1() );
+    // qDebug("********text %s ",m_mail[2].latin1() );
     attachbutton->setEnabled(body->Parts().count()>0);
     attachments->setEnabled(body->Parts().count()>0);
@@ -301,8 +302,8 @@ void ViewMail::setMail(const RecMailP&mail )
     m_recMail = mail;
 
-    m_mail[0] = mail->getFrom();
-    m_mail[1] = mail->getSubject();
-    m_mail[3] = mail->getDate();
-    m_mail[4] = mail->Msgid();
+    m_mail[0] = QString::fromUtf8( mail->getFrom().latin1() );
+    m_mail[1] = QString::fromUtf8( mail->getSubject().latin1() );
+    m_mail[3] = QString::fromUtf8( mail->getDate().latin1() );
+    m_mail[4] = QString::fromUtf8( mail->Msgid().latin1() );
 
     m_mail2[0] = mail->To();
@@ -349,16 +350,9 @@ void ViewMail::setText()
     QString bccString;
 
-    for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it )
-    {
-        toString += (*it);
-    }
-    for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it )
-    {
-        ccString += (*it);
-    }
-    for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it )
-    {
-        bccString += (*it);
-    }
+   
+    toString = QString::fromUtf8(m_mail2[0].join(",").latin1());
+    ccString  =  QString::fromUtf8(m_mail2[1].join(",").latin1());
+    bccString = QString::fromUtf8(m_mail2[2].join(",").latin1());
+  
 
     setCaption( i18n("E-Mail by %1").arg( m_mail[0] ) );
@@ -457,7 +451,7 @@ void ViewMail::slotReply()
     ComposeMail composer( settings ,this, 0, true);
     if (m_recMail->Replyto().isEmpty()) {
-        composer.setTo( m_recMail->getFrom());
+        composer.setTo(  QString::fromUtf8( m_recMail->getFrom().latin1()));
     } else {
-        composer.setTo( m_recMail->Replyto());
+        composer.setTo(  QString::fromUtf8( m_recMail->Replyto().latin1()));
     }
     composer.setSubject( prefix + m_mail[1] );
@@ -469,4 +463,5 @@ void ViewMail::slotReply()
         m_recMail->Wrapper()->answeredMail(m_recMail);
     }
+    delete settings;
 }