* lisp/message.el (message-make-forward-subject): Use

`eword-decode-field'.

* lisp/nnheader.el (make-full-mail-header): Use `eword-decode-field'.

diff --git a/lisp/message.el b/lisp/message.el
index e3c0872..3e7704b 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3920,10 +3920,12 @@ the message."
       (let ((funcs message-make-forward-subject-function)
            (subject (if message-wash-forwarded-subjects
                         (message-wash-subject
-                         (or (eword-decode-unstructured-field-body
-                              (message-fetch-field "Subject")) ""))
-                      (or (eword-decode-unstructured-field-body
-                           (message-fetch-field "Subject")) ""))))
+                         (or (eword-decode-field
+                               'Subject (message-fetch-field "Subject"))
+                               ""))
+                      (or (eword-decode-field
+                            'Subject (message-fetch-field "Subject"))
+                           ""))))
        ;; Make sure funcs is a list.
        (and funcs
             (not (listp funcs))