(mail-abbrev-in-expansion-header-p): Use mail-header-end.

1 files changed, 2 insertions, 7 deletions

diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index 14ca13b8b17..8a3b6721223 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -447,13 +447,8 @@ of a mail alias.")
        ;; are we at the front of an appropriate header line?
        (looking-at mail-abbrev-mode-regexp))
      ;;
-     ;; ...and we are before the mail-header-separator
-     (< (point)
-        (save-excursion
-          (goto-char (point-min))
-          (search-forward (concat "\n" mail-header-separator "\n")
-                          nil 0)
-          (point))))))
+     ;; ...and are we in the headers?
+     (< (point) (mail-header-end)))))
 
 (defvar mail-mode-abbrev-table) ; quiet the compiler