From a0c61812dd9a9f43813a004dc99b7dfe58abc797 Mon Sep 17 00:00:00 2001
From: msapiro <>
Date: Sat, 18 Mar 2006 17:27:56 +0000
Subject: Fixed VERP_CONFIRM_REGEXP to accommodate 'broken' MUAs that add the
 local_part of the From: address as a 'real name' in the To: header when
 replying.

---
 Mailman/Defaults.py.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in
index e5dc7d82..d2e67f79 100644
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -642,8 +642,12 @@ VERP_DELIVERY_INTERVAL = 0
 VERP_CONFIRM_FORMAT = '%(addr)s+%(cookie)s'
 
 # This is analogous to VERP_REGEXP, but for splitting apart the
-# VERP_CONFIRM_FORMAT.
-VERP_CONFIRM_REGEXP = r'^(?P<addr>[^+]+?)\+(?P<cookie>[^@]+)@.*$'
+# VERP_CONFIRM_FORMAT.  MUAs have been observed that mung
+# From: local_part@host
+# into
+# To: "local_part" <local_part@host>
+# when replying, so we skip everything up to '<' if any.
+VERP_CONFIRM_REGEXP = r'^(.*<)?(?P<addr>[^+]+?)\+(?P<cookie>[^@]+)@.*$'
 
 # Set this to Yes to enable VERP-like (more user friendly) confirmations
 VERP_CONFIRMATIONS = No
-- 
cgit v1.2.3