summaryrefslogtreecommitdiff
path: root/Mailman/Handlers/ToOutgoing.py
diff options
context:
space:
mode:
Diffstat (limited to 'Mailman/Handlers/ToOutgoing.py')
-rw-r--r--Mailman/Handlers/ToOutgoing.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/Mailman/Handlers/ToOutgoing.py b/Mailman/Handlers/ToOutgoing.py
index b9b4c7f15..4732b9845 100644
--- a/Mailman/Handlers/ToOutgoing.py
+++ b/Mailman/Handlers/ToOutgoing.py
@@ -33,7 +33,12 @@ def process(mlist, msg, msgdata):
# Also, if personalization is /not/ enabled, but VERP_DELIVERY_INTERVAL is
# set (and we've hit this interval), then again, this message should be
# VERPed. Otherwise, no.
- if mlist.personalize:
+ #
+ # Note that the verp flag may already be set, e.g. by mailpasswds using
+ # VERP_PASSWORD_REMINDERS. Preserve any existing verp flag.
+ if msgdata.has_key('verp'):
+ pass
+ elif mlist.personalize:
if mm_cfg.VERP_PERSONALIZED_DELIVERIES:
msgdata['verp'] = 1
elif interval == 0: