diff -r 561e962f5a6e -r 08b1736686fa mailman/mailman.patch
--- a/mailman/mailman.patch	Tue Aug 28 19:02:00 2012 +0200
+++ b/mailman/mailman.patch	Tue Aug 28 19:02:05 2012 +0200
@@ -73,7 +73,7 @@
 Index: Mailman/Handlers/Scrubber.py
 --- Mailman/Handlers/Scrubber.py.orig	2009-02-23 22:23:35 +0100
 +++ Mailman/Handlers/Scrubber.py	2009-03-27 11:55:18 +0100
-@@ -368,6 +368,8 @@
+@@ -371,6 +371,8 @@
                      t = unicode(t, 'ascii', 'replace')
                  try:
                      # Should use HTML-Escape, or try generalizing to UTF-8
@@ -82,23 +82,12 @@
                      t = t.encode(charset, 'replace')
                  except (UnicodeError, LookupError, ValueError,
                          AssertionError):
-Index: Mailman/Queue/OutgoingRunner.py
---- Mailman/Queue/OutgoingRunner.py.orig	2009-02-23 22:23:35 +0100
-+++ Mailman/Queue/OutgoingRunner.py	2009-03-27 11:55:18 +0100
-@@ -89,6 +89,7 @@
-                 syslog('error', 'Cannot connect to SMTP server %s on port %s',
-                        mm_cfg.SMTPHOST, port)
-                 self.__logged = True
-+            self._snooze(0)
-             return True
-         except Errors.SomeRecipientsFailed, e:
-             # Handle local rejects of probe messages differently.
 Index: Mailman/htmlformat.py
 --- Mailman/htmlformat.py.orig	2009-02-23 22:23:35 +0100
 +++ Mailman/htmlformat.py	2009-03-27 11:55:18 +0100
-@@ -300,7 +300,8 @@
+@@ -302,7 +302,8 @@
          charset = 'us-ascii'
-         if self.language:
+         if self.language and Utils.IsLanguage(self.language):
              charset = Utils.GetCharSet(self.language)
 -        output = ['Content-Type: text/html; charset=%s\n' % charset]
 +        output = ['Content-Type: text/html; charset=%s' % charset]