--- mailman-2.1.5.1/Mailman/Handlers/Scrubber.py.getfilename	2006-07-25 13:14:53.000000000 +0200
+++ mailman-2.1.5.1/Mailman/Handlers/Scrubber.py	2006-07-25 13:16:24.000000000 +0200
@@ -269,7 +269,10 @@
                 os.umask(omask)
             desc = part.get('content-description', _('not available'))
             try:
-                filename = part.get_filename(_('not available'))
+                try:
+                    filename = part.get_filename(_('not available'))
+                except:
+                    filename = _('not available')
             except ValueError:
                 # Hack to deal with filename containing ' character.
                 filename = _('not available')
@@ -364,7 +367,7 @@
     ctype = msg.get_content_type()
     try:
         fnext = os.path.splitext(msg.get_filename(''))[1]
-    except ValueError:
+    except:
         # Catch the case when msg.get_filename('') fails with a
         # ValueError: need more than 2 values to unpack
         # File "/usr/lib/python2.4/email/Utils.py", line 222, in decode_rfc2231
@@ -391,7 +394,7 @@
         # necessary.
         try:
             filename = msg.get_filename()
-        except ValueError:
+        except:
             # Another case of catching filenames that contain a ' character.
             filename = ''
         if not filename: