Correctly update cached message flags in ALL places when they are changed by the...

[squirrelmail.git] / src / view_text.php

diff --git a/src/view_text.php b/src/view_text.php
index 8f4344752abcd8dae3deaa8934b187237c57cf9f..e2ea3f02e4bec4f6345560867b15390e4bc24e0a 100644 (file)
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -65,17 +65,17 @@ if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
 
 if ($type1 == 'html' || (isset($override_type1) &&  $override_type1 == 'html')) {
     $ishtml = TRUE;
-    $body = MagicHTML( $body, $passed_id, $message, $mailbox);
     // html attachment with character set information
     if (! empty($charset)) {
         $body = charset_decode($charset,$body,false,true);
     }
+    $body = MagicHTML( $body, $passed_id, $message, $mailbox);
 } else {
     $ishtml = FALSE;
     translateText($body, $wrap_at, $charset);
 }
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 $oTemplate->assign('view_message_href', $msg_url);
 $oTemplate->assign('download_href', $dwnld_url);