diff --git a/blue-theme/left.cgi b/blue-theme/left.cgi
index 8481c745f..c4432bfdf 100755
--- a/blue-theme/left.cgi
+++ b/blue-theme/left.cgi
@@ -11,7 +11,6 @@ use WebminCore;
 @cats = &get_visible_modules_categories();
 @modules = map { @{$_->{'modules'}} } @cats;
 
-$charset = defined($force_charset) ? $force_charset : &get_charset();
 print &popup_header();
 print <<EOF;
 <link rel="stylesheet" type="text/css" href="left.css" />
diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index fcfce2cf4..69861d3c1 100644
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -3512,5 +3512,34 @@ close(OUTr);
 return @errs;
 }
 
+# get_mail_charset(&mail, &body)
+# Returns the character set to use for the HTML page for some email
+sub get_mail_charset
+{
+my ($mail, $body) = @_;
+my $ctype;
+if ($body) {
+	$ctype = $body->{'header'}->{'content-type'};
+	}
+$ctype ||= $mail->{'header'}->{'content-type'};
+if ($ctype =~ /charset="([a-z0-9\-]+)"/i ||
+    $ctype =~ /charset='([a-z0-9\-]+)'/i ||
+    $ctype =~ /charset=([a-z0-9\-]+)/i) {
+	$charset = $1;
+	}
+}
+## Special handling of HTML header charset ($force_charset):
+## For japanese text(ISO-2022-JP/EUC=JP/SJIS), the HTML output and
+## text contents ($bodycontents) are already converted to EUC,
+## so overriding HTML charset to that in the mail header ($charset)
+## is generally wrong. (cf. mailbox/boxes-lib.pl:eucconv())
+if ( &get_charset() =~ /^EUC/i ) {	# EUC-JP,EUC-KR
+	return undef;
+	}
+else {
+	return $charset;
+	}
+}
+
 1;
 
diff --git a/mailboxes/view_mail.cgi b/mailboxes/view_mail.cgi
index 64e619883..c111f1dd0 100755
--- a/mailboxes/view_mail.cgi
+++ b/mailboxes/view_mail.cgi
@@ -3,7 +3,7 @@
 # View a single email message 
 
 require './mailboxes-lib.pl';
-$force_charset = '';
+$main::force_charset = '';
 &ReadParse();
 &can_user($in{'user'}) || &error($text{'mail_ecannot'});
 if (&is_user($in{'user'})) {
diff --git a/mysql/view_table.cgi b/mysql/view_table.cgi
index d908e7a27..f19d69963 100755
--- a/mysql/view_table.cgi
+++ b/mysql/view_table.cgi
@@ -11,7 +11,7 @@ else {
 require './view-lib.pl';
 
 if ($config{'charset'}) {
-	$force_charset = $config{'charset'};
+	$main::force_charset = $config{'charset'};
 	}
 if ($ENV{'CONTENT_TYPE'} !~ /boundary=/) {
 	&ReadParse();
diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index 0b01c7459..40de46c55 100755
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -754,7 +754,8 @@ sub header
 {
 return if ($main::done_webmin_header++);
 my $ll;
-my $charset = defined($force_charset) ? $force_charset : &get_charset();
+my $charset = defined($main::force_charset) ? $main::force_charset
+					    : &get_charset();
 &PrintHeader($charset);
 &load_theme_library();
 if (defined(&theme_header)) {
@@ -1019,7 +1020,8 @@ sub popup_header
 {
 return if ($main::done_webmin_header++);
 my $ll;
-my $charset = defined($force_charset) ? $force_charset : &get_charset();
+my $charset = defined($main::force_charset) ? $main::force_charset
+					    : &get_charset();
 &PrintHeader($charset);
 &load_theme_library();
 if (defined(&theme_popup_header)) {