1 files changed, 11 insertions, 5 deletions

diff --git a/kmicromail/libmailwrapper/generatemail.cpp b/kmicromail/libmailwrapper/generatemail.cpp
index 32311d7..2d213fe 100644
--- a/kmicromail/libmailwrapper/generatemail.cpp
+++ b/kmicromail/libmailwrapper/generatemail.cpp
@@ -15,2 +15,3 @@ Generatemail::Generatemail()
 {
+    mCharset = "iso-8859-1";
 }
@@ -147,3 +148,3 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet
         param = mailmime_parameter_new( strdup( "charset" ),
-                                        strdup( "iso-8859-1" ) );
+                                        strdup( mCharset.latin1() ) );
         mechanism = MAILMIME_MECHANISM_QUOTED_PRINTABLE;
@@ -172,3 +173,4 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet
         } else {
-            err = mailmime_set_body_text(filePart,strdup( TextContent.utf8()),TextContent.utf8().length());
+            err = mailmime_set_body_text(filePart,strdup( TextContent.utf8().data()),TextContent.utf8().length()); 
+            //err = mailmime_set_body_text(filePart,strdup( TextContent.latin1()),TextContent.length());
         }
@@ -229,4 +231,5 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) {
     QCString __str;
+    //qDebug(" Generatemail::buildTxtPart %s", str.latin1());
     param = mailmime_parameter_new( strdup( "charset" ),
-                                    strdup( "iso-8859-1" ) );
+                                    strdup( mCharset.latin1() ) );
     if ( param == NULL )
@@ -250,4 +253,5 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) {
     {
-        __str = str.utf8();
-        err = mailmime_set_body_text( txtPart, __str.data(), __str.length() );
+        //__str = str.utf8();
+        __str = QCString (str.latin1());
+        err = mailmime_set_body_text( txtPart, strdup(__str.data()), __str.length() );
     }
@@ -400,2 +404,4 @@ mailmime *Generatemail::createMimeMail(const Opie::Core::OSmartPointer<Mail> &ma
 
+    //LR disabled for now
+    //mCharset = mail->getCharset().lower();
     fields = createImfFields( mail );