diff options
Diffstat (limited to 'Mailman/Handlers/Decorate.py')
| -rw-r--r-- | Mailman/Handlers/Decorate.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Mailman/Handlers/Decorate.py b/Mailman/Handlers/Decorate.py index afb0a1c9..03266fae 100644 --- a/Mailman/Handlers/Decorate.py +++ b/Mailman/Handlers/Decorate.py @@ -97,7 +97,12 @@ def process(mlist, msg, msgdata): uheader = unicode(header, lcset) ufooter = unicode(footer, lcset) try: - oldpayload = unicode(msg.get_payload(decode=1), mcset) + # First, check if the message was Scrubber-munged + if msg.get('x-mailman-scrubbed'): + decode = False + else: + decode = True + oldpayload = unicode(msg.get_payload(decode=decode), mcset) frontsep = endsep = u'' if header and not header.endswith('\n'): frontsep = u'\n' |