diff --git a/static/templates/settings/notification_settings.hbs b/static/templates/settings/notification_settings.hbs
index 72e4bd4624..c21414c85d 100644
--- a/static/templates/settings/notification_settings.hbs
+++ b/static/templates/settings/notification_settings.hbs
@@ -110,7 +110,7 @@
         <div class="alert-notification"></div>
 
         <label for="email_notifications_batching_period">
-            {{t "Batching period for email notifications" }}
+            {{t "Delay before sending message notification emails" }}
         </label>
 
         <div class="input-group">
diff --git a/templates/zerver/help/configure-message-notification-emails.md b/templates/zerver/help/configure-message-notification-emails.md
index 213c52c15e..276804255c 100644
--- a/templates/zerver/help/configure-message-notification-emails.md
+++ b/templates/zerver/help/configure-message-notification-emails.md
@@ -1,5 +1,46 @@
 # Configure message notification emails
 
+Zulip can be configured to send message notification emails for [PMs
+and mentions](/help/pm-mention-alert-notifications), as well as
+[stream messages](/help/stream-notifications).
+
+You can [respond to Zulip messages directly][reply-from-email] by replying to message
+notification emails, unless you are
+connecting to a self-hosted Zulip server whose system administrator
+has not configured the [incoming email gateway][incoming-email-gateway].
+
+[incoming-email-gateway]: https://zulip.readthedocs.io/en/latest/production/email-gateway.html
+
+## Delay before sending emails
+
+To reduce the number of emails you receive, Zulip
+delays sending message notification emails for a configurable period
+of time (default: 2 minutes).  The delay
+helps in a few ways:
+
+* No email is sent if you return to Zulip and read the message before
+  the email would go out.
+* Edits made by the sender soon after sending a message will be
+  reflected in the email.
+* Multiple messages in the same Zulip conversation are combined into
+  a single email. (Different conversations will always be
+  in separate emails, so that you can
+  [respond directly from your email][reply-from-email]).
+
+[reply-from-email]: /help/using-zulip-via-email
+
+To configure the delay for message notification emails:
+
+{start_tabs}
+
+{settings_tab|notifications}
+
+1. Under **Other notification settings**, select the desired time period from the
+   **Delay before sending message notification emails** dropdown.
+
+{end_tabs}
+
+
 ## Include organization name in subject line
 
 If you belong to multiple Zulip organizations, it can be helpful to have the
@@ -14,6 +55,7 @@ name of the organization in the subject line of your message notification emails
 
 {end_tabs}
 
+
 ## Hide message content
 
 For security or compliance reasons, you may want to hide the content of your
@@ -32,3 +74,10 @@ being sent through your email.
    **Include message content in message notification emails**.
 
 {end_tabs}
+
+## Related articles
+
+* [Using Zulip via email](/help/using-zulip-via-email)
+* [Message a stream by email](/help/message-a-stream-by-email)
+* [Stream notifications](/help/stream-notifications)
+* [Hide message content in emails (for organizations)](/help/hide-message-content-in-emails)