Quick fix. Closes bug #660529.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4413 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/read_body.php b/src/read_body.php
index 289cbcaee06b3e13753e70950d6640c2d5d8dcaa..57448d74ac0c4f380b49f9bfdbddeff5d6a39f07 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -389,11 +389,16 @@ function formatRecipientString($recipients, $item ) {
 function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, 
                          $color, $FirstTimeSee) {
     global $msn_user_support, $default_use_mdn, $default_use_priority,
-           $show_xmailer_default, $mdn_user_support, $PHP_SELF, $javascript_on;
+           $show_xmailer_default, $mdn_user_support, $PHP_SELF, $javascript_on,
+          $squirrelmail_language;
 
     $header = $message->rfc822_header;
     $env = array();
-    $env[_("Subject")] = htmlspecialchars(decodeHeader($header->subject));   
+    if ($squirrelmail_language == 'ja_JP') {
+        $env[_("Subject")] = htmlspecialchars(decodeHeader($header->subject));
+    } else {
+       $env[_("Subject")] = decodeHeader(htmlspecialchars($header->subject));
+    }   
     $from_name = $header->getAddr_s('from');
     if (!$from_name) {
         $from_name = $header->getAddr_s('sender');