--- rmail.el.~1.448.~	2008-02-10 21:13:03.000000000 +0000
+++ rmail.el	2008-02-12 04:05:42.000000000 +0000
@@ -345,6 +345,19 @@
 		 face)
   :group 'rmail-headers)
 
+(defface rmail-header-name-face
+  '((t (:inherit font-lock-function-name-face)))
+  "Face to use for highlighting the header names."
+  :group 'rmail-headers
+  :version "22.1")
+
+;;;###autoload
+(defcustom rmail-header-name 'rmail-header-name-face "\
+*Face to use for highlighting the header names."
+  :type '(choice (const :tag "Default" nil)
+		 face)
+  :group 'rmail-headers)
+
 ;;;###autoload
 (defcustom rmail-delete-after-output nil "\
 *Non-nil means automatically delete a message that is copied to a file."
@@ -705,12 +718,12 @@
 	   (cite-prefix "a-z")
 	   (cite-suffix (concat cite-prefix "0-9_.@-`'\"")))
       (list '("^\\(From\\|Sender\\|Resent-From\\):"
-	      . font-lock-function-name-face)
-	    '("^Reply-To:.*$" . font-lock-function-name-face)
-	    '("^Subject:" . font-lock-comment-face)
-	    '("^X-Spam-Status:" . font-lock-keyword-face)
+	      . rmail-header-name-face)
+	    '("^Reply-To:.*$" . rmail-header-name-face)
+	    '("^Subject:" . rmail-header-name-face)
+	    '("^X-Spam-Status:" . rmail-header-name-face)
 	    '("^\\(To\\|Apparently-To\\|Cc\\|Newsgroups\\):"
-	      . font-lock-keyword-face)
+	      . rmail-header-name-face))
 	    ;; Use MATCH-ANCHORED to effectively anchor the regexp left side.
 	    `(,cite-chars
 	      (,(concat "\\=[ \t]*"
@@ -721,7 +734,7 @@
 	       (1 font-lock-comment-delimiter-face nil t)
 	       (5 font-lock-comment-face nil t)))
 	    '("^\\(X-[a-z0-9-]+\\|In-reply-to\\|Date\\):.*\\(\n[ \t]+.*\\)*$"
-	      . font-lock-string-face))))
+	      . rmail-header-name-face))))))
   "Additional expressions to highlight in Rmail mode.")
 
 ;; Perform BODY in the summary buffer