*
* Used by attachment_common code.
*
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright © 1999-2007 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
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);