--- a/man/message.texi	Mon Aug 13 09:13:58 2007 +0200
+++ b/man/message.texi	Mon Aug 13 09:15:11 2007 +0200
@@ -299,6 +299,7 @@
 * Insertion::           Inserting things into message buffers.
 * Various Commands::    Various things.
 * Sending::             Actually sending the message.
+* Mail Aliases::        How to use mail aliases.
 @end menu
 
 
@@ -555,6 +556,30 @@
 @end table
 
 
+
+@node Mail Aliases
+@section Mail Aliases
+@cindex mail aliases
+@cindex aliases
+
+Message uses @code{mailabbrev} to handle mail aliases.  
+@code{mailabbrev} works by parsing the @file{/etc/mailrc} and
+@file{~/.mailrc} files.  These files look like:
+
+@example
+alias lmi "Lars Magne Ingebrigtsen <larsi@@ifi.uio.no>"
+alias ding "ding@@ifi.uio.no (ding mailing list)"
+@end example
+
+After adding lines like this to your @file{~/.mailrc} file, you should
+be able to just write @samp{lmi} in the @code{To} or @code{Cc} (and so
+on) headers and press @kbd{SPC} to expand the alias.
+
+No expansion will be performed upon sending of the message---all
+expansions have to be done explicitly.
+
+
+
 @node Variables
 @chapter Variables
 
@@ -661,6 +686,13 @@
 @code{message-send-mail-with-sendmail}.   If you prefer using MH
 instead, set this variable to @code{message-send-mail-with-mh}.
 
+@item message-mh-deletable-headers
+@vindex message-mh-deletable-headers
+Most versions of MH doesn't like being fed messages that contain the
+headers in this variable.  If this variable is non-@code{nil} (which is
+the default), these headers will be removed before mailing.  Set it to
+@code{nil} if your MH can handle these headers.
+
 @end table
 
 
@@ -696,8 +728,10 @@
 @cindex organization
 This optional header will be filled out depending on the
 @code{message-user-organization} variable.
-@code{message-user-organization-file} will be used if that variable is
-@code{t}.
+@code{message-user-organization-file} will be used if this variable is
+@code{t}.  This variable can also be a string (in which case this string
+will be used), or it can be a function (which will be called with no
+parameters and should return a string to be used).
 
 @item Lines
 @cindex Lines
@@ -890,6 +924,22 @@
 @vindex message-header-setup-hook
 Hook called narrowed to the headers after initializing the headers. 
 
+For instance, if you're running Gnus and wish to insert a
+@samp{Mail-Copies-To} header in all your news articles and all messages
+you send to mailing lists, you could do something like the following:
+
+@lisp
+(defun my-message-header-setup-hook ()
+  (when (or (message-fetch-field "newsgroups")
+	    (gnus-group-find-parameter
+             gnus-newsgroup-name 'to-address)
+	    (gnus-group-find-parameter
+             gnus-newsgroup-name 'to-list))
+    (insert "Mail-Copies-To: never\n")))
+
+(add-hook 'message-header-setup-hook 'my-message-header-setup-hook)
+@end lisp
+
 @item message-send-hook
 @vindex message-send-hook
 Hook run before sending messages.