1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index de626fb40cf..2c7e7fab6cc 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1602,7 +1602,8 @@ typically for purposes of moderating a list."
 (defvar mail-unsent-separator
  (concat "^ *---+ +Unsent message follows +---+ *$\\|"
          "^ *---+ +Returned message +---+ *$\\|"
-          "^ *---+ +Original message +---+ *$"))
+          "^ *---+ +Original message +---+ *$\\|"
+          "^|? *---+ +Message text follows: +---+ *|?$"))
 (defun rmail-retry-failure ()
  "Edit a mail message which is based on the contents of the current message.

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index de626fb40cf..2c7e7fab6cc 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el
@@ -1602,7 +1602,8 @@ typically for purposes of moderating a list."
1602	(defvar mail-unsent-separator	1602	(defvar mail-unsent-separator
1603	(concat "^ ---+ +Unsent message follows +---+ $\\\|"	1603	(concat "^ ---+ +Unsent message follows +---+ $\\\|"
1604	"^ ---+ +Returned message +---+ $\\\|"	1604	"^ ---+ +Returned message +---+ $\\\|"
1605	"^ ---+ +Original message +---+ $"))	1605	"^ ---+ +Original message +---+ $\\\|"
		1606	"^\|? ---+ +Message text follows: +---+ \|?$"))
1606		1607
1607	(defun rmail-retry-failure ()	1608	(defun rmail-retry-failure ()
1608	"Edit a mail message which is based on the contents of the current message.	1609	"Edit a mail message which is based on the contents of the current message.