diff -up mailman-2.1.11/Mailman/Handlers/Decorate.py.footer mailman-2.1.11/Mailman/Handlers/Decorate.py
--- mailman-2.1.11/Mailman/Handlers/Decorate.py.footer	2008-10-29 08:41:59.000000000 +0100
+++ mailman-2.1.11/Mailman/Handlers/Decorate.py	2008-10-29 08:43:28.000000000 +0100
@@ -227,7 +227,8 @@ def decorate(mlist, template, what, extr
         template = Utils.to_percent(template)
     # Interpolate into the template
     try:
-        text = re.sub(r' *\r?\n', r'\n', template % d)
+        text = re.sub(r'(?m)(?<!^--) +(?=\n)', '',
+                      re.sub(r'\r\n', r'\n', template % d))
     except (ValueError, TypeError), e:
         syslog('error', 'Exception while calculating %s:\n%s', what, e)
         what = what.upper()