(defalias 'mail-header-xref 'mime-entity-xref-internal)
 (defalias 'mail-header-set-xref 'mime-entity-set-xref-internal)
 
+(defalias 'nnheader-decode-subject
+  (mime-find-field-decoder 'Subject 'unfolding))
+(defalias 'nnheader-decode-from
+  (mime-find-field-decoder 'From 'unfolding))
+
 (defsubst make-full-mail-header (&optional number subject from date id
                                           references chars lines xref)
   "Create a new mail header structure initialized with the parameters given."
    nil
    nil nil nil
    (if subject
-       (eword-decode-and-unfold-unstructured-field subject)
+       (nnheader-decode-subject subject)
      )
    (if from
-       (eword-decode-and-unfold-structured-field from)
+       (nnheader-decode-from from)
      )
    date id references
    chars lines xref