2 files changed, 13 insertions, 22 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 2c21288e395..ff3d7e3ce13 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,8 +1,3 @@
-2009-12-01  Chong Yidong  <cyd@stupidchicken.com>
-
-        * message.el (message-setup-hook, message-send-hook): Make into aliases
-        for mail-*-hook.
-
 2009-11-29  Juri Linkov  <juri@jurta.org>
 
         * gnus-sum.el (gnus-recenter): Use `recenter-top-bottom'
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 7993aff87cd..3f529047d29 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -918,14 +918,12 @@ auto-fill in message buffers."
   :type '(choice (const :tag "Don't turn on auto fill" nil)
                  (integer)))
 
-;; (defcustom message-setup-hook nil
-;;   "Normal hook, run each time a new outgoing message is initialized.
-;; The function `message-setup' runs this hook."
-;;   :group 'message-various
-;;   :link '(custom-manual "(message)Various Message Variables")
-;;   :type 'hook)
-
-(defvaralias 'message-setup-hook 'mail-setup-hook)
+(defcustom message-setup-hook nil
+  "Normal hook, run each time a new outgoing message is initialized.
+The function `message-setup' runs this hook."
+  :group 'message-various
+  :link '(custom-manual "(message)Various Message Variables")
+  :type 'hook)
 
 (defcustom message-cancel-hook nil
   "Hook run when cancelling articles."
@@ -1567,15 +1565,13 @@ starting with `not' and followed by regexps."
   "Alist of mail and news faces for facemenu.
 The cdr of each entry is a function for applying the face to a region.")
 
-;; (defcustom message-send-hook nil
-;;   "Hook run before sending messages.
-;; This hook is run quite early when sending."
-;;   :group 'message-various
-;;   :options '(ispell-message)
-;;   :link '(custom-manual "(message)Various Message Variables")
-;;   :type 'hook)
-
-(defvaralias 'message-send-hook 'mail-send-hook)
+(defcustom message-send-hook nil
+  "Hook run before sending messages.
+This hook is run quite early when sending."
+  :group 'message-various
+  :options '(ispell-message)
+  :link '(custom-manual "(message)Various Message Variables")
+  :type 'hook)
 
 (defcustom message-send-mail-hook nil
   "Hook run before sending mail messages.