diff --git a/conf/default.conf.php b/conf/default.conf.php
index 946d62f91e..45b6eaa42e 100644
--- a/conf/default.conf.php
+++ b/conf/default.conf.php
@@ -303,13 +303,11 @@ return array(
   'metamta.mail-adapter'        =>
     'PhabricatorMailImplementationPHPMailerLiteAdapter',
 
-  // When email is sent, try to hand it off to the MTA immediately. This may
-  // be worth disabling if your MTA infrastructure is slow or unreliable. If you
-  // disable this option, you must run the 'metamta_mta.php' daemon or mail
-  // won't be handed off to the MTA. If you're using Amazon SES it can be a
-  // little slugish sometimes so it may be worth disabling this and moving to
-  // the daemon after you've got your install up and running. If you have a
-  // properly configured local MTA it should not be necessary to disable this.
+  // When email is sent, try to hand it off to the MTA immediately instead of
+  // queueing it for delivery by the daemons. If you are running the Phabricator
+  // daemons with "phd start", you should disable this to provide a (sometimes
+  // substantial) performance boost. It's on by default to make setup and
+  // configuration a little easier.
   'metamta.send-immediately'    => true,
 
   // If you're using Amazon SES to send email, provide your AWS access key
@@ -652,7 +650,7 @@ return array(
   // A domain name to use when authenticating against Active Directory
   // (e.g. 'example.com')
   'ldap.activedirectory_domain' => '',
-  
+
   // The LDAP version
   'ldap.version' => 3,
 
diff --git a/src/docs/configuration/configuring_outbound_email.diviner b/src/docs/configuration/configuring_outbound_email.diviner
index 564f8db100..bd0478ca4e 100644
--- a/src/docs/configuration/configuring_outbound_email.diviner
+++ b/src/docs/configuration/configuring_outbound_email.diviner
@@ -23,12 +23,10 @@ Phabricator can also send outbound email in two ways:
   - immediately, when messages are generated (default); or
   - in the background, via a daemon.
 
-Sending mail in the background requires more configuration, but will greatly
-improve the performance of the application if your mail handler is slow. Note
-that Amazon SES commonly takes 1-2 seconds per email. If you use SES,
-**strongly consider** configuring the daemon. You should also configure the
-daemon if commenting on Revisions or Tasks feels slow, as it may significantly
-improve performance.
+Sending mail in the background requires that you be running the Phabricator
+daemons, but can greatly improve the performance of the application if your mail
+handler is slow. For more information on using daemons, see
+@{article:Managing Daemons with phd}.
 
 = Basics =