--- a/xml/dnsbl.in	Tue Jan 30 16:27:49 2007 -0800
+++ b/xml/dnsbl.in	Mon Feb 19 15:57:24 2007 -0800
@@ -656,16 +656,6 @@
                                 # so all mail TO these env_to addresses is accepted
     };
 
-    context abuse {
-        dnsbl_list xbl;
-        content off {};
-        env_to {
-            abuse@;             # no content filtering on abuse reports
-            postmaster@;        # ""
-        };
-        env_from unknown {};    # ignore all parent white/black listing
-    };
-
     context minimal {
         dnsbl_list sbl dul;
         content on {};
@@ -730,6 +720,18 @@
         };
     };
 
+    # this is at the end, so that these abuse@ and postmaster@ entries will
+    # override any conflicting entries inside the customer contexts.
+    context abuse {
+        dnsbl_list xbl;
+        content off {};
+        env_to {
+            abuse@;             # no content filtering on abuse reports
+            postmaster@;        # ""
+        };
+        env_from unknown {};    # ignore all parent white/black listing
+    };
+
     env_from unknown {
         dcc_from { include "/var/dcc/whitecommon"; };   # copy the dcc OK/MANY values (env_from, substitute mail_host) into this context
         abuse@              abuse;      # replies to abuse reports use the abuse context