1 files changed, 14 insertions, 10 deletions

diff --git a/Mailman/Handlers/CookHeaders.py b/Mailman/Handlers/CookHeaders.py
index d3599e68d..b89ab2cc7 100644
--- a/Mailman/Handlers/CookHeaders.py
+++ b/Mailman/Handlers/CookHeaders.py
@@ -125,16 +125,20 @@ def process(mlist, msg, msgdata):
         # munged into the Reply-To header, but if not, we'll add it to a Cc
         # header.  BAW: should we force it into a Reply-To header in the above
         # code?
-        if mlist.personalize and mlist.reply_goes_to_list <> 1:
-            # Watch out for existing Cc headers, merge, and remove dups.  Note
-            # that RFC 2822 says only zero or one Cc header is allowed.
-            new = []
-            d = {}
-            for pair in getaddresses(msg.get_all('cc', [])):
-                add(pair)
-            add((mlist.description, mlist.GetListEmail()))
-            del msg['Cc']
-            msg['Cc'] = COMMASPACE.join([formataddr(pair) for pair in new])
+        #
+        # BAW: This turned out to be very controversial for MM2.1b4, so we're
+        # disabling this for the final release.  We can re-address this for
+        # future versions.
+##        if mlist.personalize and mlist.reply_goes_to_list <> 1:
+##            # Watch out for existing Cc headers, merge, and remove dups.  Note
+##            # that RFC 2822 says only zero or one Cc header is allowed.
+##            new = []
+##            d = {}
+##            for pair in getaddresses(msg.get_all('cc', [])):
+##                add(pair)
+##            add((mlist.description, mlist.GetListEmail()))
+##            del msg['Cc']
+##            msg['Cc'] = COMMASPACE.join([formataddr(pair) for pair in new])
     # Add list-specific headers as defined in RFC 2369 and RFC 2919, but only
     # if the message is being crafted for a specific list (e.g. not for the
     # password reminders).