1 files changed, 4 insertions, 1 deletions

diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index f4f5df17bba..5916329f68a 100644
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -56,7 +56,10 @@ When t this still needs to be initialized.")
 (defcustom mail-complete-alist
   ;; Don't use backquote here; we don't want backquote to get loaded
   ;; just because of loading this file.
-  (cons (cons mail-address-field-regexp '(mail-get-names pattern))
+  ;; Don't refer to mail-address-field-regexp here;
+  ;; that confuses some things such as cus-dep.el.
+  (cons '("^\\(Resent-\\)?\\(To\\|From\\|CC\\|BCC\\|Reply-to\\):"
+          . (mail-get-names pattern))
         '(("Newsgroups:" . (if (boundp 'gnus-active-hashtb)
                                gnus-active-hashtb
                              (if (boundp news-group-article-assoc)