1 files changed, 3 insertions, 1 deletions
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.")

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'.")
623		623
624	;;;###autoload	624	;;;###autoload
625	(defvar rmail-mime-charset-pattern	625	(defvar rmail-mime-charset-pattern
626	"^content-type:[ ]text/plain;[ \t\n]charset=\"?\\([^ \t\n\";]+\\)\"?"	626	(concat "^content-type:[ ]*text/plain;"
		627	"\\(?:[ \t\n]\\(format\\\|delsp\\)=\"?[-a-z0-9]+\"?;\\)"
		628	"[ \t\n]*charset=\"?\\([^ \t\n\";]+\\)\"?")
627	"Regexp to match MIME-charset specification in a header of message.	629	"Regexp to match MIME-charset specification in a header of message.
628	The first parenthesized expression should match the MIME-charset name.")	630	The first parenthesized expression should match the MIME-charset name.")
629		631