(message-narrow-to-headers-or-head): Ignore mail-header-separator in

the body.

1 files changed, 6 insertions, 8 deletions

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 1ef0fa7757..eef854f4fb 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -2225,14 +2225,12 @@ Point is left at the beginning of the narrowed-to region."
   (widen)
   (narrow-to-region
    (goto-char (point-min))
-   (cond
-    ((re-search-forward
-      (concat "^" (regexp-quote mail-header-separator) "\n") nil t)
-     (match-beginning 0))
-    ((search-forward "\n\n" nil t)
-     (1- (point)))
-    (t
-     (point-max))))
+   (if (re-search-forward (concat "\\(\n\\)\n\\|^\\("
+				  (regexp-quote mail-header-separator)
+				  "\n\\)")
+			  nil t)
+       (or (match-end 1) (match-beginning 2))
+     (point-max)))
   (goto-char (point-min)))
 
 (defun message-news-p ()