(unforward-rmail-message): Handle any kind of forwarding delimiters.

1 files changed, 5 insertions, 3 deletions

diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index 814198f3baf..d4975b1daad 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -142,10 +142,12 @@ following the containing message."
   (goto-char (point-min))
   (let (beg end (buffer-read-only nil) msg-string who-forwarded-it)
     (setq who-forwarded-it (mail-fetch-field "From"))
-    (if (re-search-forward "^-* Start of forwarded message -*$" nil t)
-	(setq beg (1+ (point)))
+    (if (re-search-forward "^----" nil t)
+	nil
       (error "No forwarded message"))
-    (if (re-search-forward "^-* End of forwarded message -*$" nil t)
+    (forward-line 1)
+    (setq beg (point))
+    (if (re-search-forward "^----" nil t)
 	(setq end (match-beginning 0))
       (error "No terminator for forwarded message"))
     (widen)