diff -Naru -x '*~' /home/httpd/html/moodle.orig/lib/moodlelib.php /home/httpd/html/moodle/lib/moodlelib.php
--- /home/httpd/html/moodle.orig/lib/moodlelib.php	2005-09-24 14:09:58.000000000 +0900
+++ /home/httpd/html/moodle/lib/moodlelib.php	2005-09-25 00:13:55.000000000 +0900
@@ -3537,6 +3537,11 @@
         }
     }
 
+    // t-kita2005-07-17
+    if (function_exists('use_lang_lib') && use_lang_lib()) {
+        email_encoding($mail);
+    }
+
     if ($mail->Send()) {
         set_send_count($user);
         return true;
@@ -5337,6 +5342,13 @@
             set_config('locale', $CFG->locale);                 // Cache it to save lookups in future
         }
     }
+
+    // t-kita2005-07-17
+    $currlang = current_language();
+    if ($currlang != 'en') {
+        setlocale (LC_ALL, $CFG->locale);
+    }
+
     setlocale (LC_TIME, $CFG->locale);
     setlocale (LC_COLLATE, $CFG->locale);
 
