diff -ruN kdepim-3.5.6/kmail/kmkernel.cpp kdepim-3.5.6-modified/kmail/kmkernel.cpp
--- kdepim-3.5.6/kmail/kmkernel.cpp	2007-01-15 14:28:47 +0300
+++ kdepim-3.5.6-modified/kmail/kmkernel.cpp	2007-04-24 10:42:44 +0400
@@ -1492,7 +1492,7 @@
     KConfigGroupSaver saver(cfg, "Composer");
     if (cfg->readListEntry("pref-charsets").isEmpty())
     {
-      cfg->writeEntry("pref-charsets", "us-ascii,iso-8859-1,locale,utf-8");
+      cfg->writeEntry("pref-charsets", "locale,us-ascii,iso-8859-1,utf-8");
     }
   }
   readConfig();
diff -ruN kdepim-3.5.6/kmail/messagecomposer.cpp kdepim-3.5.6-modified/kmail/messagecomposer.cpp
--- kdepim-3.5.6/kmail/messagecomposer.cpp	2006-10-01 21:30:30 +0400
+++ kdepim-3.5.6-modified/kmail/messagecomposer.cpp	2007-04-27 15:18:35 +0400
@@ -2056,6 +2056,7 @@
     kdDebug(5006) << "Something is wrong and I can not get a codec." << endl;
     textbody = text.local8Bit();
   } else {
+    text=codec->toUnicode(text.latin1(), text.length());
     textbody = codec->fromUnicode( text );
   }
   if (textbody.isNull()) textbody = "";