# This patch file, files created by its use and not subject to other copyright
# and any changes in other files generated by its use are
# Copyright (C) 2000-2004 by the Free Software Foundation, Inc.
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
# This patch file is Free Software and permission is granted to copy and
# redistribute it in original or modified form under the terms of the
# GNU General Public License (GPL).
# See the GPL COPYING files accompanying Mailman distributions this
# patch was intended to work in conjunction with for further details.
diff -r -u -P --exclude=.DS_Store mailman-2.1.4/Mailman/Defaults.py.in mailman-2.1.4-mod/Mailman/Defaults.py.in
--- mailman-2.1.4/Mailman/Defaults.py.in	Sat Dec 13 16:34:17 2003
+++ mailman-2.1.4-mod/Mailman/Defaults.py.in	Thu Jan  1 13:57:14 2004
@@ -949,7 +949,9 @@
 # Check for administrivia in messages sent to the main list?
 DEFAULT_ADMINISTRIVIA = Yes
 
-
+# Should the body of a message requiring moderation be included in the 
+# request to the moderator(s)
+DEFAULT_MODERATE_INC_BODY = Yes
 
 #####
 # Digestification defaults.  Same caveat applies here as with list defaults.
diff -r -u -P --exclude=.DS_Store mailman-2.1.4/Mailman/Gui/General.py mailman-2.1.4-mod/Mailman/Gui/General.py
--- mailman-2.1.4/Mailman/Gui/General.py	Wed Dec 11 12:41:56 2002
+++ mailman-2.1.4-mod/Mailman/Gui/General.py	Thu Jan  1 13:57:14 2004
@@ -149,6 +149,10 @@
              _("""Hide the sender of a message, replacing it with the list
              address (Removes From, Sender and Reply-To fields)""")),
 
+            ('moderate_inc_body', mm_cfg.Radio, (_('No'), _('Yes')), 0,
+             _("""Should the body of a message requiring  moderation be
+             included in the request to the moderator(s))""")),
+
             _('''<tt>Reply-To:</tt> header munging'''),
 
             ('first_strip_reply_to', mm_cfg.Radio, (_('No'), _('Yes')), 0,
diff -r -u -P --exclude=.DS_Store mailman-2.1.4/Mailman/Handlers/Hold.py mailman-2.1.4-mod/Mailman/Handlers/Hold.py
--- mailman-2.1.4/Mailman/Handlers/Hold.py	Fri Dec 26 22:55:45 2003
+++ mailman-2.1.4-mod/Mailman/Handlers/Hold.py	Thu Jan  1 13:57:14 2004
@@ -274,7 +274,8 @@
             dmsg['Sender'] = requestaddr
             dmsg['From'] = requestaddr
             nmsg.attach(text)
-            nmsg.attach(MIMEMessage(msg))
+            if mlist.moderate_inc_body:
+                nmsg.attach(MIMEMessage(msg))
             nmsg.attach(MIMEMessage(dmsg))
             nmsg.send(mlist, **{'tomoderators': 1})
         finally:
diff -r -u -P --exclude=.DS_Store mailman-2.1.4/Mailman/MailList.py mailman-2.1.4-mod/Mailman/MailList.py
--- mailman-2.1.4/Mailman/MailList.py	Mon Dec  1 00:54:16 2003
+++ mailman-2.1.4-mod/Mailman/MailList.py	Thu Jan  1 13:57:14 2004
@@ -329,6 +329,7 @@
         self.obscure_addresses = mm_cfg.DEFAULT_OBSCURE_ADDRESSES
         self.admin_member_chunksize = mm_cfg.DEFAULT_ADMIN_MEMBER_CHUNKSIZE
         self.administrivia = mm_cfg.DEFAULT_ADMINISTRIVIA
+        self.moderate_inc_body = mm_cfg.DEFAULT_MODERATE_INC_BODY
         self.preferred_language = mm_cfg.DEFAULT_SERVER_LANGUAGE
         self.available_languages = []
         self.include_rfc2369_headers = 1
diff -r -u -P --exclude=.DS_Store mailman-2.1.4/Mailman/Version.py mailman-2.1.4-mod/Mailman/Version.py
--- mailman-2.1.4/Mailman/Version.py	Wed Dec 31 16:45:08 2003
+++ mailman-2.1.4-mod/Mailman/Version.py	Thu Jan  1 14:04:33 2004
@@ -36,7 +36,8 @@
                (REL_LEVEL << 4)  | (REL_SERIAL << 0))
 
 # config.pck schema version number
-DATA_FILE_VERSION = 90
+# 90.1 to take account of extra moderate_inc_body list attribute
+DATA_FILE_VERSION = 90.1
 
 # qfile/*.db schema version number
 QFILE_SCHEMA_VERSION = 3