diff options
Diffstat (limited to 'Mailman')
| -rw-r--r-- | Mailman/Bouncers/Qmail.py | 3 | ||||
| -rw-r--r-- | Mailman/Bouncers/SimpleMatch.py | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Mailman/Bouncers/Qmail.py b/Mailman/Bouncers/Qmail.py index def4abfa0..72a67db2b 100644 --- a/Mailman/Bouncers/Qmail.py +++ b/Mailman/Bouncers/Qmail.py @@ -33,7 +33,8 @@ import email.Iterators introtags = [ 'Hi. This is the', "We're sorry. There's a problem", - 'Check your send e-mail address.' + 'Check your send e-mail address.', + 'This is the mail delivery agent at' ] acre = re.compile(r'<(?P<addr>[^>]*)>:') diff --git a/Mailman/Bouncers/SimpleMatch.py b/Mailman/Bouncers/SimpleMatch.py index 12eeffdca..d344f3289 100644 --- a/Mailman/Bouncers/SimpleMatch.py +++ b/Mailman/Bouncers/SimpleMatch.py @@ -87,6 +87,10 @@ PATTERNS = [ (_c('Unable to deliver message to the following address\(es\)\.'), _c('--- Original message follows\.'), _c('<(?P<addr>[^>]*)>:')), + # googlemail.com + (_c('Delivery to the following recipient failed'), + _c('----- Original message -----'), + _c('^\s*(?P<addr>[^\s@]+@[^\s@]+)\s*$')), # kundenserver.de (_c('A message that you sent could not be delivered'), _c('^---'), |