diff --git a/include/pear/Mail/mime.php b/include/pear/Mail/mime.php
index 98f7206fa456c316e27eb4bc398b4445cddbb39f..f2aed691168acb91892b422fa83ec385a8049e90 100644
--- a/include/pear/Mail/mime.php
+++ b/include/pear/Mail/mime.php
@@ -679,6 +679,9 @@ class Mail_mime
         if (!empty($value['headers_charset'])) {
             $params['headers_charset'] = $value['headers_charset'];
         }
+        elseif (isset($this->build_params['head_charset'])) {
+            $params['headers_charset'] = $this->build_params['head_charset'];
+        }
         if (!empty($value['language'])) {
             $params['language'] = $value['language'];
         }