diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs
index f5719294ba7..7e7e0993144 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs
@@ -181,7 +181,7 @@
       {{preference-checkbox labelKey="user.email_always" checked=email_always}}
 
       <div class='instructions'>
-        {{i18n user.email.frequency}}
+        {{i18n user.email.frequency count=siteSettings.email_time_window_mins}}
       </div>
     </div>
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 3a9a8f9fab5..c8b8d963b5c 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -391,7 +391,10 @@ en:
         ok: "We will email you to confirm"
         invalid: "Please enter a valid email address"
         authenticated: "Your email has been authenticated by {{provider}}"
-        frequency: "We'll only email you if we haven't seen you recently and you haven't read the thing we're emailing you about."
+        frequency:
+          zero: "We'll email you immediately if you haven't read the thing we're emailing you about."
+          one: "We'll only email you if we haven't seen you in the last minute and you haven't read the thing we're emailing you about."
+          other: "We'll only email you if we haven't seen you in the last {{count}} minutes and you haven't read the thing we're emailing you about."
 
       name:
         title: "Name"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 7bde8b1e45c..2b6eb17b47f 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -391,7 +391,9 @@ posting:
     type: list
 
 email:
-  email_time_window_mins: 10
+  email_time_window_mins:
+    default: 10
+    client: true
   email_posts_context: 5
   digest_min_excerpt_length: 100
   digest_topics: 20