diff --git a/jjb/mail-notify.yaml b/jjb/mail-notify.yaml
index dd3c1e8..a303468 100644
--- a/jjb/mail-notify.yaml
+++ b/jjb/mail-notify.yaml
@@ -1,15 +1,27 @@
 - publisher:
     name: mail-notify-failure
+    publishers:
+      - mail-notify-failure-custom:
+          freebsd_mail_disable: false
+          freebsd_send_to:
+            - developers
+            - recipients
+- publisher:
+    name: mail-notify-failure-custom
+    freebsd_mail_disable: false
+    freebsd_send_to:
+      - developers
+      - recipients
     publishers:
       - email-ext:
-          recipients: ${DEFAULT_RECIPIENTS}
-          subject: "$PROJECT_NAME - Build #$BUILD_NUMBER (r${ENV, var=\"SVN_REVISION\"}) - $BUILD_STATUS"
+          recipients: ${{DEFAULT_RECIPIENTS}}
+          subject: "$PROJECT_NAME - Build #$BUILD_NUMBER (r${{ENV, var=\"SVN_REVISION\"}}) - $BUILD_STATUS"
           body: |
-            $PROJECT_NAME - Build #$BUILD_NUMBER (r${ENV, var="SVN_REVISION"}) - $BUILD_STATUS
+            $PROJECT_NAME - Build #$BUILD_NUMBER (r${{ENV, var="SVN_REVISION"}}) - $BUILD_STATUS
 
-            Build information: ${BUILD_URL}
-            Full change log: ${BUILD_URL}changes
-            Full build log: ${BUILD_URL}console
+            Build information: ${{BUILD_URL}}
+            Full change log: ${{BUILD_URL}}changes
+            Full build log: ${{BUILD_URL}}console
 
             Status explanation:
             "Failure" - the build is suspected being broken by the following changes
@@ -20,30 +32,42 @@
             Change summaries:
             (Those commits are likely but not certainly responsible)
             
-            ${CHANGES, format="%r by %a:\\n%m\\n"}
+            ${{CHANGES, format="%r by %a:\\n%m\\n"}}
             
             The end of the build log:
             
-            ${BUILD_LOG}
+            ${{BUILD_LOG}}
           failure: true
           unstable: false
           fixed: false
-          presend-script: ${DEFAULT_PRESEND_SCRIPT}
-          send-to:
+          presend-script: ${{DEFAULT_PRESEND_SCRIPT}}
+          send-to: '{obj:freebsd_send_to}'
+          disable-publisher: '{obj:freebsd_mail_disable}'
+
+- publisher:
+    name: mail-notify-unstable
+    publishers:
+      - mail-notify-unstable-custom:
+          freebsd_mail_disable: false
+          freebsd_send_to:
             - developers
             - recipients
 - publisher:
-    name: mail-notify-unstable
+    name: mail-notify-unstable-custom
+    freebsd_mail_disable: false
+    freebsd_send_to:
+      - developers
+      - recipients
     publishers:
       - email-ext:
-          recipients: ${DEFAULT_RECIPIENTS}
-          subject: "$PROJECT_NAME - Build #$BUILD_NUMBER (r${ENV, var=\"SVN_REVISION\"}) - $BUILD_STATUS"
+          recipients: '${{DEFAULT_RECIPIENTS}}'
+          subject: "$PROJECT_NAME - Build #$BUILD_NUMBER (r${{ENV, var=\"SVN_REVISION\"}}) - $BUILD_STATUS"
           body: |
-            $PROJECT_NAME - Build #$BUILD_NUMBER (r${ENV, var="SVN_REVISION"}) - $BUILD_STATUS
+            $PROJECT_NAME - Build #$BUILD_NUMBER (r${{ENV, var="SVN_REVISION"}}) - $BUILD_STATUS
 
-            Build information: ${BUILD_URL}
-            Full change log: ${BUILD_URL}changes
-            Full build log: ${BUILD_URL}console
+            Build information: ${{BUILD_URL}}
+            Full change log: ${{BUILD_URL}}changes
+            Full build log: ${{BUILD_URL}}console
 
             Status explanation:
             "Unstable" - some tests are suspected being broken by the following changes
@@ -54,39 +78,50 @@
             Change summaries:
             (Those commits are likely but not certainly responsible)
             
-            ${CHANGES, format="%r by %a:\\n%m\\n"}
+            ${{CHANGES, format="%r by %a:\\n%m\\n"}}
             
             The failed test cases:
             
-            ${FAILED_TESTS, showStack="false", showMessage="true", maxTests=100}
+            ${{FAILED_TESTS, showStack="false", showMessage="true", maxTests=100}}
           failure: false
           unstable: true
           fixed: false
-          presend-script: ${DEFAULT_PRESEND_SCRIPT}
-          send-to:
-            - developers
-            - recipients
+          presend-script: ${{DEFAULT_PRESEND_SCRIPT}}
+          send-to: '{obj:freebsd_send_to}'
+          disable-publisher: '{obj:freebsd_mail_disable}'
+
 - publisher:
     name: mail-notify-fixed
+    publishers:
+      - mail-notify-fixed-custom:
+          freebsd_mail_disable: false
+          freebsd_send_to:
+            #- culprits
+            - recipients
+- publisher:
+    name: mail-notify-fixed-custom
+    freebsd_mail_disable: false
+    freebsd_send_to:
+      #- culprits
+      - recipients
     publishers:
       - email-ext:
-          recipients: ${DEFAULT_RECIPIENTS}
-          subject: "$PROJECT_NAME - Build #$BUILD_NUMBER (r${ENV, var=\"SVN_REVISION\"}) - $BUILD_STATUS"
+          recipients: ${{DEFAULT_RECIPIENTS}}
+          subject: "$PROJECT_NAME - Build #$BUILD_NUMBER (r${{ENV, var=\"SVN_REVISION\"}}) - $BUILD_STATUS"
           body: |
-            $PROJECT_NAME - Build #$BUILD_NUMBER (r${ENV, var="SVN_REVISION"}) - $BUILD_STATUS
+            $PROJECT_NAME - Build #$BUILD_NUMBER (r${{ENV, var="SVN_REVISION"}}) - $BUILD_STATUS
             
-            Build information: ${BUILD_URL}
-            Full change log: ${BUILD_URL}changes
-            Full build log: ${BUILD_URL}console
+            Build information: ${{BUILD_URL}}
+            Full change log: ${{BUILD_URL}}changes
+            Full build log: ${{BUILD_URL}}console
             
             Change summaries:
             (Those commits are likely but not certainly responsible)
             
-            ${CHANGES, format="%r by %a:\\n%m\\n"}
+            ${{CHANGES, format="%r by %a:\\n%m\\n"}}
           failure: false
           unstable: false
           fixed: true
-          presend-script: ${DEFAULT_PRESEND_SCRIPT}
-          send-to:
-            #- culprits
-            - recipients
+          presend-script: ${{DEFAULT_PRESEND_SCRIPT}}
+          send-to: '{obj:freebsd_send_to}'
+          disable-publisher: '{obj:freebsd_mail_disable}'
diff --git a/jjb/template.yaml b/jjb/template.yaml
index d0c04c1..063e3ac 100644
--- a/jjb/template.yaml
+++ b/jjb/template.yaml
@@ -80,7 +80,8 @@
     publishers:
       - scan-clang-warnings
       - clean-jail
-      - mail-notify-failure
+      - mail-notify-failure:
+          freebsd-mail-disable: true
       - mail-notify-fixed
     wrappers:
       - timestamps
@@ -212,8 +213,16 @@
     publishers:
       - make-symlink
       - publish-junit-results
-      - mail-notify-failure
-      - mail-notify-unstable
+      - mail-notify-failure-custom:
+          freebsd_mail_disable: false
+          freebsd_send_to:
+            #- developers
+            - recipients
+      - mail-notify-unstable-custom:
+          freebsd_mail_disable: false
+          freebsd_send_to:
+            #- developers
+            - recipients
       - mail-notify-fixed
     wrappers:
       - timestamps
@@ -248,8 +257,16 @@
       - clean-jail
       - make-symlink
       - publish-junit-results
-      - mail-notify-failure
-      - mail-notify-unstable
+      - mail-notify-failure-custom:
+          freebsd_mail_disable: false
+          freebsd_send_to:
+            #- developers
+            - recipients
+      - mail-notify-unstable-custom:
+          freebsd_mail_disable: false
+          freebsd_send_to:
+            #- developers
+            - recipients
       - mail-notify-fixed
     triggers:
       - timed: '0 22 * * *'