diff -urP MHonArc2.5.13.orig/lib/mhrcvars.pl MHonArc2.5.13/lib/mhrcvars.pl
--- MHonArc2.5.13.orig/lib/mhrcvars.pl	Sat Jul 27 07:13:13 2002
+++ MHonArc2.5.13/lib/mhrcvars.pl	Mon Dec 16 21:12:30 2002
@@ -195,6 +195,16 @@
 	    $tmp = defined($key) ? $Index2MsgId{$key} : "";
 	    last REPLACESW;
 	}
+    	if ($var eq 'CHARSET') {	## Message charset
+	    my $esub = sub { $_[0]; };
+	    $canclip = 1; $raw = 1;
+	    ($lref, $key, $pos) = compute_msg_pos($index, $var, $arg);
+	    $tmp = defined($key) ? &$esub($Charset{$key}) : "us-ascii";
+	    if ( $tmp eq "" ) {
+	        $tmp = "us-ascii";
+	    }
+	    last REPLACESW;
+	}
     	if ($var eq 'MSGLOCALDATE') {	## Message local date
 	    ($lref, $key, $pos, $opt) = compute_msg_pos($index, $var, $arg);
 	    $tmp = &time2str($opt || $MsgLocalDateFmt,
diff -urP MHonArc2.5.13.orig/lib/mhtxtplain.pl MHonArc2.5.13/lib/mhtxtplain.pl
--- MHonArc2.5.13.orig/lib/mhtxtplain.pl	Fri Oct 11 00:27:19 2002
+++ MHonArc2.5.13/lib/mhtxtplain.pl	Mon Dec 16 21:12:30 2002
@@ -247,6 +247,7 @@
     } else {
 	$charset = $defset;
     }
+    $mhonarc::Charset{$mhonarc::MHAindex} = $charset;
     ## Grab format parameter (if defined)
     if ( defined($fields->{'content-type'}[0]) and
 	 $fields->{'content-type'}[0] =~ /\bformat\s*=\s*([^\s;]+)/i ) {