diff -ruP --exclude=.DS_Store mailman-2.1.9/Mailman/Defaults.py.in mailman-2.1.9-modinc/Mailman/Defaults.py.in --- mailman-2.1.9/Mailman/Defaults.py.in 2006-08-04 13:20:33.000000000 +0100 +++ mailman-2.1.9-modinc/Mailman/Defaults.py.in 2006-09-18 21:36:50.000000000 +0100 @@ -1012,7 +1012,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 -ruP --exclude=.DS_Store mailman-2.1.9/Mailman/Gui/General.py mailman-2.1.9-modinc/Mailman/Gui/General.py --- mailman-2.1.9/Mailman/Gui/General.py 2006-08-30 15:54:22.000000000 +0100 +++ mailman-2.1.9-modinc/Mailman/Gui/General.py 2006-09-18 21:36:50.000000000 +0100 @@ -155,6 +155,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))""")), + _('''Reply-To: header munging'''), ('first_strip_reply_to', mm_cfg.Radio, (_('No'), _('Yes')), 0, diff -ruP --exclude=.DS_Store mailman-2.1.9/Mailman/Handlers/Hold.py mailman-2.1.9-modinc/Mailman/Handlers/Hold.py --- mailman-2.1.9/Mailman/Handlers/Hold.py 2006-07-30 20:35:36.000000000 +0100 +++ mailman-2.1.9-modinc/Mailman/Handlers/Hold.py 2006-09-18 21:36:50.000000000 +0100 @@ -284,7 +284,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 -ruP --exclude=.DS_Store mailman-2.1.9/Mailman/MailList.py mailman-2.1.9-modinc/Mailman/MailList.py --- mailman-2.1.9/Mailman/MailList.py 2006-03-12 02:24:53.000000000 +0000 +++ mailman-2.1.9-modinc/Mailman/MailList.py 2006-09-18 21:36:50.000000000 +0100 @@ -356,6 +356,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 -ruP --exclude=.DS_Store mailman-2.1.9/Mailman/Version.py mailman-2.1.9-modinc/Mailman/Version.py --- mailman-2.1.9/Mailman/Version.py 2006-09-13 04:21:03.000000000 +0100 +++ mailman-2.1.9-modinc/Mailman/Version.py 2006-09-18 21:36:50.000000000 +0100 @@ -37,7 +37,9 @@ (REL_LEVEL << 4) | (REL_SERIAL << 0)) # config.pck schema version number -DATA_FILE_VERSION = 96 +# DATA_FILE_VERSION = 96 +# 96.1 to take account of extra moderate_inc_body list attribute +DATA_FILE_VERSION = 96.1 # qfile/*.db schema version number QFILE_SCHEMA_VERSION = 3