X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fview_text.php;h=dbdc16b89bf42173e1f73af12265f2f069845142;hb=ccd2ed36e090f2a5e263d461631e7ce967abc7f4;hp=8f4344752abcd8dae3deaa8934b187237c57cf9f;hpb=4b5049de2fa934c45599d6e4c74bf2bbee10d34d;p=squirrelmail.git

diff --git a/src/view_text.php b/src/view_text.php
index 8f434475..dbdc16b8 100644
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -11,6 +11,9 @@
  * @package squirrelmail
  */
 
+/** This is the view_text page */
+define('PAGE_NAME', 'view_text');
+
 /** SquirrelMail required files. */
 include('../include/init.php');
 include(SM_PATH . 'functions/imap_general.php');
@@ -65,17 +68,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);
@@ -85,4 +88,3 @@ $oTemplate->assign('body', $body);
 $oTemplate->display('view_text.tpl');
 
 $oTemplate->display('footer.tpl');
-?>