--- I18N.pm	2010-01-27 01:46:36.000000000 +0100
+++ new-I18N.pm	2010-02-11 18:18:05.000000000 +0100
@@ -345,7 +345,7 @@
         # Some _other_ MUAs encode quotes _already_, and double quotes
         # confuse us a lot, so only quote it if it isn't quoted
         # already.
-        $enc_str = qq{"$enc_str"} if $enc_str =~ /[,;]/ and $enc_str !~ /^".*"$/;
+        $enc_str = qq{"$enc_str"} if $enc_str =~ /[,;]/ and $enc_str !~ /^".*"$/ and $tag ne 'Subject';
 
 	$str .= $prefix . $enc_str . $trailing;
     }
@@ -485,7 +485,7 @@
                     }
                 }
             }
-            $value = DecodeMIMEWordsToEncoding( $value, $enc ) unless $preserve_words;
+            $value = DecodeMIMEWordsToEncoding( $value, $enc, $tag ) unless $preserve_words;
             $head->add( $tag, $value );
         }
     }