1 files changed, 5 insertions, 2 deletions

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 50ea344785f..7b241a0b1ea 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2650,8 +2650,11 @@ buffer to the end of the headers."
             (prepend-to-buffer rmail-view-buffer beg (point-max))
             ;; rmail-show-message-1 expects this function to leave point
             ;; at the end of the headers.
-            (with-current-buffer rmail-view-buffer
-              (search-forward "\n\n" nil t)))
+
+            (let ((len (- (point-max) beg)))
+              (with-current-buffer rmail-view-buffer
+                (goto-char (1+ len)))))
+
            ;; Handle the case where the headers matching the displayed
            ;; headers regexp should be copied.
            ((and rmail-displayed-headers (null ignored-headers))