2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 596e92eaa0e..2adf8adf559 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2006-04-09  Richard Stallman  <rms@gnu.org>
 
+        * mail/rmail.el (rmail-mime-charset-pattern): Ignore format and delsp
+        specs while looking for charset.
+
         * textmodes/picture.el (picture-mode-exit): Run picture-mode-exit-hook.
 
         * play/landmark.el (lm-font-lock-face-O, lm-font-lock-face-X):
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index e0fecb4ff28..a400efc5cc8 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -623,7 +623,9 @@ the variable `rmail-mime-feature'.")
 
 ;;;###autoload
 (defvar rmail-mime-charset-pattern
-  "^content-type:[ ]*text/plain;[ \t\n]*charset=\"?\\([^ \t\n\";]+\\)\"?"
+  (concat "^content-type:[ ]*text/plain;"
+          "\\(?:[ \t\n]*\\(format\\|delsp\\)=\"?[-a-z0-9]+\"?;\\)*"
+          "[ \t\n]*charset=\"?\\([^ \t\n\";]+\\)\"?")
   "Regexp to match MIME-charset specification in a header of message.
 The first parenthesized expression should match the MIME-charset name.")