--- a/src/compose.php.orig	2004-05-31 21:32:34.000000000 +0400
+++ a/src/compose.php	2004-11-15 01:21:27.000000000 +0300
@@ -609,6 +609,7 @@ function newMail ($mailbox='', $passed_i
         }
 
         $encoding = $message->header->encoding;
+	$charset = $message->header->getParameter('charset');
         $type0 = $message->type0;
         $type1 = $message->type1;
         foreach ($entities as $ent) {
@@ -629,7 +630,9 @@ function newMail ($mailbox='', $passed_i
                     $bodypart = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $bodypart);
                 }
             }
+	    $bodypart = charset_decode($charset, $bodypart);
             $body .= $bodypart;
+
         }
         if ($default_use_priority) {
             $mailprio = substr($orig_header->priority,0,1);
@@ -1067,7 +1070,8 @@ function showInputForm ($session, $value
     }
     }
     else {
-       echo htmlspecialchars(decodeHeader($body,false,false));
+//       echo htmlspecialchars(decodeHeader($body,false,false));
+       echo decodeHeader($body,true,false);
     }
     echo '</textarea><br />' . "\n" .
          '      </td>' . "\n" .