- The from_is_list header munging feature introduced in Mailman 2.1.16 is

  no longer erroneously applied to Mailman generated notices.

2 files changed, 10 insertions, 3 deletions

diff --git a/Mailman/Handlers/CookHeaders.py b/Mailman/Handlers/CookHeaders.py
index 150b4922..991c5004 100755
--- a/Mailman/Handlers/CookHeaders.py
+++ b/Mailman/Handlers/CookHeaders.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -65,7 +65,10 @@ def uheader(mlist, s, header_name=None, continuation_ws='\t', maxlinelen=None):
     return Header(s, charset, maxlinelen, header_name, continuation_ws)
 
 def change_header(name, value, mlist, msg, msgdata, delete=True, repl=True):
-    if mm_cfg.ALLOW_FROM_IS_LIST and mlist.from_is_list == 2:
+    if (mm_cfg.ALLOW_FROM_IS_LIST and
+        mlist.from_is_list == 2 and
+        not msgdata.get('_fasttrack')
+       ):
         msgdata.setdefault('add_header', {})[name] = value
     elif repl or not msg.has_key(name):
         if delete:
@@ -116,7 +119,7 @@ def process(mlist, msg, msgdata):
     change_header('Precedence', 'list',
                   mlist, msg, msgdata, repl=False)
     # Do we change the from so the list takes ownership of the email
-    if mm_cfg.ALLOW_FROM_IS_LIST and mlist.from_is_list:
+    if mm_cfg.ALLOW_FROM_IS_LIST and mlist.from_is_list and not fasttrack:
         realname, email = parseaddr(msg['from'])
         replies = getaddresses(msg.get('reply-to', ''))
         reply_addrs = [x[1].lower() for x in replies]
diff --git a/NEWS b/NEWS
index c35d68d0..5844a13f 100755
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,10 @@ Here is a history of user visible changes to Mailman.
 
   Bug Fixes and other patches
 
+    - The from_is_list header munging feature introduced in Mailman 2.1.16 is
+      no longer erroneously applied to Mailman generated notices.
+      (LP: #1279667)
+
     - Changed the message from the confirm CGI to not indicate approval is
       required for an acceptance of an invitation.  (LP: #1277744)