--- mailman-2.1.8/Mailman/Gui/Bounce.py.bounce-processing	2005-08-26 21:40:15.000000000 -0400
+++ mailman-2.1.8/Mailman/Gui/Bounce.py	2006-05-04 11:19:32.000000000 -0400
@@ -77,9 +77,10 @@
             ('bounce_processing', mm_cfg.Toggle, (_('No'), _('Yes')), 0,
              _('Should Mailman perform automatic bounce processing?'),
              _("""By setting this value to <em>No</em>, you disable all
-             automatic bounce processing for this list, however bounce
-             messages will still be discarded so that the list administrator
-             isn't inundated with them.""")),
+             automatic bounce processing for this list.  If automatic bounce
+             processing is disabled, all bounces will be forwarded to the list
+             administrator(s), and all other bounce-related settings are
+             ignored.""")),
 
             ('bounce_score_threshold', mm_cfg.Number, 5, 0,
              _("""The maximum member bounce score before the member's
--- mailman-2.1.8/Mailman/Queue/BounceRunner.py.bounce-processing	2006-03-09 17:09:34.000000000 -0500
+++ mailman-2.1.8/Mailman/Queue/BounceRunner.py	2006-05-04 11:12:09.000000000 -0400
@@ -194,7 +194,21 @@
                          )
         # List isn't doing bounce processing?
         if not mlist.bounce_processing:
-            return
+            adminurl = mlist.GetScriptURL('admin', absolute=1) + '/bounce'
+            mlist.ForwardMessage(msg,
+                             text=_("""\
+The attached message was received as a bounce.  Since automatic bounce
+processing is disabled for this mailing list, the bounce is being sent
+to the list administrator(s).
+
+For more information see:
+%(adminurl)s
+
+"""),
+                             subject=_('Bounce notification'),
+                             tomoderators=0)
+            syslog('bounce', 'forwarding bounce, message-id: %s',
+                   msg.get('message-id', 'n/a'))
         # Try VERP detection first, since it's quick and easy
         addrs = verp_bounce(mlist, msg)
         if addrs: