--- d:/test-mailman-2.1/Mailman/Handlers/Scrubber.py	2009-12-21 10:50:20.000000000 -0800
+++ d:/test-mailman/Mailman/Handlers/Scrubber.py	2011-05-24 13:15:54.774088800 -0700
@@ -314,7 +314,7 @@
     # We still have to sanitize multipart messages to flat text because
     # Pipermail can't handle messages with list payloads.  This is a kludge;
     # def (n) clever hack ;).
-    if msg.is_multipart() and sanitize <> 2:
+    if msg.is_multipart():
         # By default we take the charset of the first text/plain part in the
         # message, but if there was none, we'll use the list's preferred
         # language's charset.
@@ -337,7 +337,8 @@
                 continue
             # All parts should be scrubbed to text/plain by now.
             partctype = part.get_content_type()
-            if partctype <> 'text/plain':
+            if partctype <> 'text/plain' and (partctype <> 'text/html' or
+                                              sanitize <> 2):
                 text.append(_('Skipped content of type %(partctype)s\n'))
                 continue
             try: