Index: /trunk/roundcubemail/program/include/iniset.php
===================================================================
--- /trunk/roundcubemail/program/include/iniset.php	(revision 1967)
+++ /trunk/roundcubemail/program/include/iniset.php	(revision 1968)
@@ -63,4 +63,9 @@
 }
 
+// set internal encoding for mbstring extension
+if(extension_loaded('mbstring'))
+  mb_internal_encoding(RCMAIL_CHARSET);
+	      
+
 /**
  * Use PHP5 autoload for dynamic class loading
Index: /trunk/roundcubemail/program/include/main.inc
===================================================================
--- /trunk/roundcubemail/program/include/main.inc	(revision 1967)
+++ /trunk/roundcubemail/program/include/main.inc	(revision 1968)
@@ -208,10 +208,8 @@
     }
 
-  // settings for mbstring module (by Tadashi Jokagi)
-  if (is_null($mbstring_loaded)) {
-    if ($mbstring_loaded = extension_loaded("mbstring"))
-      mb_internal_encoding(RCMAIL_CHARSET);
-  }
-
+
+  if (is_null($mbstring_loaded))
+    $mbstring_loaded = extension_loaded('mbstring');
+    
   // convert charset using mbstring module
   if ($mbstring_loaded)