diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d802725444..25869e3b0b0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-12  Chong Yidong  <cyd@stupidchicken.com>
+
+	* simple.el (compose-mail): Remove mail-setup-with-from from
+	customization checks.
+
 2009-12-12  Eli Zaretskii  <eliz@gnu.org>
 
 	* arc-mode.el (archive-rar-summarize): Support Attribute fields in
diff --git a/lisp/simple.el b/lisp/simple.el
index 774b69a4842..e3e790ba1aa 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5647,7 +5647,7 @@ Each action has the form (FUNCTION . ARGS)."
 	 (dolist (var '(mail-mode-hook mail-send-hook mail-setup-hook
 			mail-yank-hooks mail-archive-file-name
 			mail-default-reply-to mail-mailing-lists
-			mail-self-blind mail-setup-with-from))
+			mail-self-blind))
 	   (and (boundp var)
 		(symbol-value var)
 		(push var warn-vars)))