diff --git a/webapp/channels/src/components/user_settings/notifications/email_notification_setting/__snapshots__/email_notification_setting.test.tsx.snap b/webapp/channels/src/components/user_settings/notifications/email_notification_setting/__snapshots__/email_notification_setting.test.tsx.snap
index 12f1aea0ea..58ca0fe931 100644
--- a/webapp/channels/src/components/user_settings/notifications/email_notification_setting/__snapshots__/email_notification_setting.test.tsx.snap
+++ b/webapp/channels/src/components/user_settings/notifications/email_notification_setting/__snapshots__/email_notification_setting.test.tsx.snap
@@ -30,60 +30,53 @@ exports[`components/user_settings/notifications/EmailNotificationSetting should
     inputs={
       Array [
         <fieldset>
-          <legend
-            className="form-legend"
-          >
-            <Memo(MemoizedFormattedMessage)
-              defaultMessage="Send email notifications"
-              id="user.settings.notifications.email.send"
-            />
-          </legend>
-          <div
-            className="radio"
-          >
-            <label>
-              <input
-                checked={false}
-                data-email-interval={30}
-                data-enable-email="true"
-                id="emailNotificationImmediately"
-                name="emailNotifications"
-                onChange={[Function]}
-                type="radio"
-              />
-              <Memo(MemoizedFormattedMessage)
-                defaultMessage="Immediately"
-                id="user.settings.notifications.email.immediately"
-              />
-            </label>
-          </div>
-          <div
-            className="radio"
-          >
-            <label>
-              <input
-                checked={true}
-                data-email-interval={0}
-                data-enable-email="false"
-                id="emailNotificationNever"
-                name="emailNotifications"
-                onChange={[Function]}
-                type="radio"
-              />
-              <Memo(MemoizedFormattedMessage)
-                defaultMessage="Never"
-                id="user.settings.notifications.email.never"
-              />
-            </label>
-          </div>
+          <fieldset>
+            <div
+              className="radio"
+            >
+              <label>
+                <input
+                  checked={false}
+                  data-email-interval={30}
+                  data-enable-email="true"
+                  id="emailNotificationImmediately"
+                  name="emailNotifications"
+                  onChange={[Function]}
+                  type="radio"
+                />
+                <Memo(MemoizedFormattedMessage)
+                  defaultMessage="On"
+                  id="user.settings.notifications.email.on"
+                />
+              </label>
+            </div>
+            <div
+              className="radio"
+            >
+              <label>
+                <input
+                  checked={true}
+                  data-email-interval={0}
+                  data-enable-email="false"
+                  id="emailNotificationNever"
+                  name="emailNotifications"
+                  onChange={[Function]}
+                  type="radio"
+                />
+                <Memo(MemoizedFormattedMessage)
+                  defaultMessage="Off"
+                  id="user.settings.notifications.email.off"
+                />
+              </label>
+            </div>
+          </fieldset>
           <div
             className="mt-3"
           >
             <Memo(MemoizedFormattedMessage)
-              defaultMessage="Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes."
+              defaultMessage="When enabled, email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes."
               id="user.settings.notifications.emailInfo"
             />
-             
           </div>
         </fieldset>,
         null,
@@ -130,76 +123,65 @@ exports[`components/user_settings/notifications/EmailNotificationSetting should
             <fieldset
               key="userNotificationEmailOptions"
             >
-              <legend
-                className="form-legend"
-              >
-                <FormattedMessage
-                  defaultMessage="Send email notifications"
-                  id="user.settings.notifications.email.send"
+              <fieldset>
+                <div
+                  className="radio"
                 >
-                  <span>
-                    Send email notifications
-                  </span>
-                </FormattedMessage>
-              </legend>
-              <div
-                className="radio"
-              >
-                <label>
-                  <input
-                    checked={false}
-                    data-email-interval={30}
-                    data-enable-email="true"
-                    id="emailNotificationImmediately"
-                    name="emailNotifications"
-                    onChange={[Function]}
-                    type="radio"
-                  />
-                  <FormattedMessage
-                    defaultMessage="Immediately"
-                    id="user.settings.notifications.email.immediately"
-                  >
-                    <span>
-                      Immediately
-                    </span>
-                  </FormattedMessage>
-                </label>
-              </div>
-              <div
-                className="radio"
-              >
-                <label>
-                  <input
-                    checked={true}
-                    data-email-interval={0}
-                    data-enable-email="false"
-                    id="emailNotificationNever"
-                    name="emailNotifications"
-                    onChange={[Function]}
-                    type="radio"
-                  />
-                  <FormattedMessage
-                    defaultMessage="Never"
-                    id="user.settings.notifications.email.never"
-                  >
-                    <span>
-                      Never
-                    </span>
-                  </FormattedMessage>
-                </label>
-              </div>
+                  <label>
+                    <input
+                      checked={false}
+                      data-email-interval={30}
+                      data-enable-email="true"
+                      id="emailNotificationImmediately"
+                      name="emailNotifications"
+                      onChange={[Function]}
+                      type="radio"
+                    />
+                    <FormattedMessage
+                      defaultMessage="On"
+                      id="user.settings.notifications.email.on"
+                    >
+                      <span>
+                        On
+                      </span>
+                    </FormattedMessage>
+                  </label>
+                </div>
+                <div
+                  className="radio"
+                >
+                  <label>
+                    <input
+                      checked={true}
+                      data-email-interval={0}
+                      data-enable-email="false"
+                      id="emailNotificationNever"
+                      name="emailNotifications"
+                      onChange={[Function]}
+                      type="radio"
+                    />
+                    <FormattedMessage
+                      defaultMessage="Off"
+                      id="user.settings.notifications.email.off"
+                    >
+                      <span>
+                        Off
+                      </span>
+                    </FormattedMessage>
+                  </label>
+                </div>
+              </fieldset>
               <div
                 className="mt-3"
               >
                 <FormattedMessage
-                  defaultMessage="Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes."
+                  defaultMessage="When enabled, email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes."
                   id="user.settings.notifications.emailInfo"
                 >
                   <span>
-                    Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes.
+                    When enabled, email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes.
                   </span>
                 </FormattedMessage>
-                 
               </div>
             </fieldset>
           </div>
@@ -287,8 +269,8 @@ exports[`components/user_settings/notifications/EmailNotificationSetting should
 <SettingItemMin
   describe={
     <Memo(MemoizedFormattedMessage)
-      defaultMessage="Never"
-      id="user.settings.notifications.email.never"
+      defaultMessage="Off"
+      id="user.settings.notifications.email.off"
     />
   }
   section="email"
@@ -306,8 +288,8 @@ exports[`components/user_settings/notifications/EmailNotificationSetting should
 <SettingItemMin
   describe={
     <Memo(MemoizedFormattedMessage)
-      defaultMessage="Immediately"
-      id="user.settings.notifications.email.immediately"
+      defaultMessage="On"
+      id="user.settings.notifications.email.on"
     />
   }
   section="email"
@@ -359,26 +341,26 @@ exports[`components/user_settings/notifications/EmailNotificationSetting should
               id="user.settings.notifications.email.send"
             />
           </legend>
-          <div
-            className="radio"
-          >
-            <label>
-              <input
-                checked={false}
-                data-email-interval={30}
-                data-enable-email="true"
-                id="emailNotificationImmediately"
-                name="emailNotifications"
-                onChange={[Function]}
-                type="radio"
-              />
-              <Memo(MemoizedFormattedMessage)
-                defaultMessage="Immediately"
-                id="user.settings.notifications.email.immediately"
-              />
-            </label>
-          </div>
           <fieldset>
+            <div
+              className="radio"
+            >
+              <label>
+                <input
+                  checked={false}
+                  data-email-interval={30}
+                  data-enable-email="true"
+                  id="emailNotificationImmediately"
+                  name="emailNotifications"
+                  onChange={[Function]}
+                  type="radio"
+                />
+                <Memo(MemoizedFormattedMessage)
+                  defaultMessage="As soon as you’re away for 5 minutes"
+                  id="user.settings.notifications.email.asSoonAsYouAreAwayForFiveMinutes"
+                />
+              </label>
+            </div>
             <div
               className="radio"
             >
@@ -422,36 +404,31 @@ exports[`components/user_settings/notifications/EmailNotificationSetting should
                 />
               </label>
             </div>
+            <div
+              className="radio"
+            >
+              <label>
+                <input
+                  checked={true}
+                  data-email-interval={0}
+                  data-enable-email="false"
+                  id="emailNotificationNever"
+                  name="emailNotifications"
+                  onChange={[Function]}
+                  type="radio"
+                />
+                <Memo(MemoizedFormattedMessage)
+                  defaultMessage="Never"
+                  id="user.settings.notifications.email.never"
+                />
+              </label>
+            </div>
           </fieldset>
-          <div
-            className="radio"
-          >
-            <label>
-              <input
-                checked={true}
-                data-email-interval={0}
-                data-enable-email="false"
-                id="emailNotificationNever"
-                name="emailNotifications"
-                onChange={[Function]}
-                type="radio"
-              />
-              <Memo(MemoizedFormattedMessage)
-                defaultMessage="Never"
-                id="user.settings.notifications.email.never"
-              />
-            </label>
-          </div>
           <div
             className="mt-3"
           >
             <Memo(MemoizedFormattedMessage)
-              defaultMessage="Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes."
-              id="user.settings.notifications.emailInfo"
-            />
-             
-            <Memo(MemoizedFormattedMessage)
-              defaultMessage="Notifications received over the time period selected are combined and sent in a single email."
+              defaultMessage="Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes. If you choose to receive notifications every 15 minutes or every hour, notifications during that period will be combined into a single email."
               id="user.settings.notifications.emailBatchingInfo"
             />
           </div>
@@ -512,30 +489,30 @@ exports[`components/user_settings/notifications/EmailNotificationSetting should
                   </span>
                 </FormattedMessage>
               </legend>
-              <div
-                className="radio"
-              >
-                <label>
-                  <input
-                    checked={false}
-                    data-email-interval={30}
-                    data-enable-email="true"
-                    id="emailNotificationImmediately"
-                    name="emailNotifications"
-                    onChange={[Function]}
-                    type="radio"
-                  />
-                  <FormattedMessage
-                    defaultMessage="Immediately"
-                    id="user.settings.notifications.email.immediately"
-                  >
-                    <span>
-                      Immediately
-                    </span>
-                  </FormattedMessage>
-                </label>
-              </div>
               <fieldset>
+                <div
+                  className="radio"
+                >
+                  <label>
+                    <input
+                      checked={false}
+                      data-email-interval={30}
+                      data-enable-email="true"
+                      id="emailNotificationImmediately"
+                      name="emailNotifications"
+                      onChange={[Function]}
+                      type="radio"
+                    />
+                    <FormattedMessage
+                      defaultMessage="As soon as you’re away for 5 minutes"
+                      id="user.settings.notifications.email.asSoonAsYouAreAwayForFiveMinutes"
+                    >
+                      <span>
+                        As soon as you’re away for 5 minutes
+                      </span>
+                    </FormattedMessage>
+                  </label>
+                </div>
                 <div
                   className="radio"
                 >
@@ -587,48 +564,39 @@ exports[`components/user_settings/notifications/EmailNotificationSetting should
                     </FormattedMessage>
                   </label>
                 </div>
+                <div
+                  className="radio"
+                >
+                  <label>
+                    <input
+                      checked={true}
+                      data-email-interval={0}
+                      data-enable-email="false"
+                      id="emailNotificationNever"
+                      name="emailNotifications"
+                      onChange={[Function]}
+                      type="radio"
+                    />
+                    <FormattedMessage
+                      defaultMessage="Never"
+                      id="user.settings.notifications.email.never"
+                    >
+                      <span>
+                        Never
+                      </span>
+                    </FormattedMessage>
+                  </label>
+                </div>
               </fieldset>
-              <div
-                className="radio"
-              >
-                <label>
-                  <input
-                    checked={true}
-                    data-email-interval={0}
-                    data-enable-email="false"
-                    id="emailNotificationNever"
-                    name="emailNotifications"
-                    onChange={[Function]}
-                    type="radio"
-                  />
-                  <FormattedMessage
-                    defaultMessage="Never"
-                    id="user.settings.notifications.email.never"
-                  >
-                    <span>
-                      Never
-                    </span>
-                  </FormattedMessage>
-                </label>
-              </div>
               <div
                 className="mt-3"
               >
                 <FormattedMessage
-                  defaultMessage="Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes."
-                  id="user.settings.notifications.emailInfo"
-                >
-                  <span>
-                    Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes.
-                  </span>
-                </FormattedMessage>
-                 
-                <FormattedMessage
-                  defaultMessage="Notifications received over the time period selected are combined and sent in a single email."
+                  defaultMessage="Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes. If you choose to receive notifications every 15 minutes or every hour, notifications during that period will be combined into a single email."
                   id="user.settings.notifications.emailBatchingInfo"
                 >
                   <span>
-                    Notifications received over the time period selected are combined and sent in a single email.
+                    Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes. If you choose to receive notifications every 15 minutes or every hour, notifications during that period will be combined into a single email.
                   </span>
                 </FormattedMessage>
               </div>
@@ -731,60 +699,53 @@ exports[`components/user_settings/notifications/EmailNotificationSetting should
   inputs={
     Array [
       <fieldset>
-        <legend
-          className="form-legend"
-        >
-          <Memo(MemoizedFormattedMessage)
-            defaultMessage="Send email notifications"
-            id="user.settings.notifications.email.send"
-          />
-        </legend>
-        <div
-          className="radio"
-        >
-          <label>
-            <input
-              checked={false}
-              data-email-interval={30}
-              data-enable-email="true"
-              id="emailNotificationImmediately"
-              name="emailNotifications"
-              onChange={[Function]}
-              type="radio"
-            />
-            <Memo(MemoizedFormattedMessage)
-              defaultMessage="Immediately"
-              id="user.settings.notifications.email.immediately"
-            />
-          </label>
-        </div>
-        <div
-          className="radio"
-        >
-          <label>
-            <input
-              checked={true}
-              data-email-interval={0}
-              data-enable-email="false"
-              id="emailNotificationNever"
-              name="emailNotifications"
-              onChange={[Function]}
-              type="radio"
-            />
-            <Memo(MemoizedFormattedMessage)
-              defaultMessage="Never"
-              id="user.settings.notifications.email.never"
-            />
-          </label>
-        </div>
+        <fieldset>
+          <div
+            className="radio"
+          >
+            <label>
+              <input
+                checked={false}
+                data-email-interval={30}
+                data-enable-email="true"
+                id="emailNotificationImmediately"
+                name="emailNotifications"
+                onChange={[Function]}
+                type="radio"
+              />
+              <Memo(MemoizedFormattedMessage)
+                defaultMessage="On"
+                id="user.settings.notifications.email.on"
+              />
+            </label>
+          </div>
+          <div
+            className="radio"
+          >
+            <label>
+              <input
+                checked={true}
+                data-email-interval={0}
+                data-enable-email="false"
+                id="emailNotificationNever"
+                name="emailNotifications"
+                onChange={[Function]}
+                type="radio"
+              />
+              <Memo(MemoizedFormattedMessage)
+                defaultMessage="Off"
+                id="user.settings.notifications.email.off"
+              />
+            </label>
+          </div>
+        </fieldset>
         <div
           className="mt-3"
         >
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes."
+            defaultMessage="When enabled, email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes."
             id="user.settings.notifications.emailInfo"
           />
-           
         </div>
       </fieldset>,
       null,
@@ -811,60 +772,53 @@ exports[`components/user_settings/notifications/EmailNotificationSetting should
   inputs={
     Array [
       <fieldset>
-        <legend
-          className="form-legend"
-        >
-          <Memo(MemoizedFormattedMessage)
-            defaultMessage="Send email notifications"
-            id="user.settings.notifications.email.send"
-          />
-        </legend>
-        <div
-          className="radio"
-        >
-          <label>
-            <input
-              checked={true}
-              data-email-interval={30}
-              data-enable-email="true"
-              id="emailNotificationImmediately"
-              name="emailNotifications"
-              onChange={[Function]}
-              type="radio"
-            />
-            <Memo(MemoizedFormattedMessage)
-              defaultMessage="Immediately"
-              id="user.settings.notifications.email.immediately"
-            />
-          </label>
-        </div>
-        <div
-          className="radio"
-        >
-          <label>
-            <input
-              checked={false}
-              data-email-interval={0}
-              data-enable-email="false"
-              id="emailNotificationNever"
-              name="emailNotifications"
-              onChange={[Function]}
-              type="radio"
-            />
-            <Memo(MemoizedFormattedMessage)
-              defaultMessage="Never"
-              id="user.settings.notifications.email.never"
-            />
-          </label>
-        </div>
+        <fieldset>
+          <div
+            className="radio"
+          >
+            <label>
+              <input
+                checked={true}
+                data-email-interval={30}
+                data-enable-email="true"
+                id="emailNotificationImmediately"
+                name="emailNotifications"
+                onChange={[Function]}
+                type="radio"
+              />
+              <Memo(MemoizedFormattedMessage)
+                defaultMessage="On"
+                id="user.settings.notifications.email.on"
+              />
+            </label>
+          </div>
+          <div
+            className="radio"
+          >
+            <label>
+              <input
+                checked={false}
+                data-email-interval={0}
+                data-enable-email="false"
+                id="emailNotificationNever"
+                name="emailNotifications"
+                onChange={[Function]}
+                type="radio"
+              />
+              <Memo(MemoizedFormattedMessage)
+                defaultMessage="Off"
+                id="user.settings.notifications.email.off"
+              />
+            </label>
+          </div>
+        </fieldset>
         <div
           className="mt-3"
         >
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes."
+            defaultMessage="When enabled, email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes."
             id="user.settings.notifications.emailInfo"
           />
-           
         </div>
       </fieldset>,
       <React.Fragment>
@@ -912,60 +866,53 @@ exports[`components/user_settings/notifications/EmailNotificationSetting should
   inputs={
     Array [
       <fieldset>
-        <legend
-          className="form-legend"
-        >
-          <Memo(MemoizedFormattedMessage)
-            defaultMessage="Send email notifications"
-            id="user.settings.notifications.email.send"
-          />
-        </legend>
-        <div
-          className="radio"
-        >
-          <label>
-            <input
-              checked={false}
-              data-email-interval={30}
-              data-enable-email="true"
-              id="emailNotificationImmediately"
-              name="emailNotifications"
-              onChange={[Function]}
-              type="radio"
-            />
-            <Memo(MemoizedFormattedMessage)
-              defaultMessage="Immediately"
-              id="user.settings.notifications.email.immediately"
-            />
-          </label>
-        </div>
-        <div
-          className="radio"
-        >
-          <label>
-            <input
-              checked={true}
-              data-email-interval={0}
-              data-enable-email="false"
-              id="emailNotificationNever"
-              name="emailNotifications"
-              onChange={[Function]}
-              type="radio"
-            />
-            <Memo(MemoizedFormattedMessage)
-              defaultMessage="Never"
-              id="user.settings.notifications.email.never"
-            />
-          </label>
-        </div>
+        <fieldset>
+          <div
+            className="radio"
+          >
+            <label>
+              <input
+                checked={false}
+                data-email-interval={30}
+                data-enable-email="true"
+                id="emailNotificationImmediately"
+                name="emailNotifications"
+                onChange={[Function]}
+                type="radio"
+              />
+              <Memo(MemoizedFormattedMessage)
+                defaultMessage="On"
+                id="user.settings.notifications.email.on"
+              />
+            </label>
+          </div>
+          <div
+            className="radio"
+          >
+            <label>
+              <input
+                checked={true}
+                data-email-interval={0}
+                data-enable-email="false"
+                id="emailNotificationNever"
+                name="emailNotifications"
+                onChange={[Function]}
+                type="radio"
+              />
+              <Memo(MemoizedFormattedMessage)
+                defaultMessage="Off"
+                id="user.settings.notifications.email.off"
+              />
+            </label>
+          </div>
+        </fieldset>
         <div
           className="mt-3"
         >
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes."
+            defaultMessage="When enabled, email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes."
             id="user.settings.notifications.emailInfo"
           />
-           
         </div>
       </fieldset>,
       null,
diff --git a/webapp/channels/src/components/user_settings/notifications/email_notification_setting/email_notification_setting.tsx b/webapp/channels/src/components/user_settings/notifications/email_notification_setting/email_notification_setting.tsx
index e16895e992..f64caf8ebf 100644
--- a/webapp/channels/src/components/user_settings/notifications/email_notification_setting/email_notification_setting.tsx
+++ b/webapp/channels/src/components/user_settings/notifications/email_notification_setting/email_notification_setting.tsx
@@ -191,12 +191,21 @@ export default class EmailNotificationSetting extends React.PureComponent<Props,
         } else if (enableEmail) {
             switch (newInterval) {
             case Preferences.INTERVAL_IMMEDIATE:
-                description = (
-                    <FormattedMessage
-                        id='user.settings.notifications.email.immediately'
-                        defaultMessage='Immediately'
-                    />
-                );
+                if (this.props.enableEmailBatching) {
+                    description = (
+                        <FormattedMessage
+                            id='user.settings.notifications.email.asSoonAsYouAreAwayForFiveMinutes'
+                            defaultMessage='As soon as you’re away for 5 minutes'
+                        />
+                    );
+                } else {
+                    description = (
+                        <FormattedMessage
+                            id='user.settings.notifications.email.on'
+                            defaultMessage='On'
+                        />
+                    );
+                }
                 break;
             case Preferences.INTERVAL_HOUR:
                 description = (
@@ -216,19 +225,29 @@ export default class EmailNotificationSetting extends React.PureComponent<Props,
                 );
                 break;
             default:
-                description = (
+                description = this.props.enableEmailBatching ? (
                     <FormattedMessage
                         id='user.settings.notifications.email.never'
                         defaultMessage='Never'
                     />
+                ) : (
+                    <FormattedMessage
+                        id='user.settings.notifications.email.off'
+                        defaultMessage='Off'
+                    />
                 );
             }
         } else {
-            description = (
+            description = this.props.enableEmailBatching ? (
                 <FormattedMessage
                     id='user.settings.notifications.email.never'
                     defaultMessage='Never'
                 />
+            ) : (
+                <FormattedMessage
+                    id='user.settings.notifications.email.off'
+                    defaultMessage='Off'
+                />
             );
         }
 
@@ -277,11 +296,29 @@ export default class EmailNotificationSetting extends React.PureComponent<Props,
         }
 
         const {newInterval} = this.state;
-        let batchingOptions = null;
-        let batchingInfo = null;
+        let emailOptions = null;
+        let emailInfo = null;
+        let emailTitle = null;
         if (this.props.enableEmailBatching) {
-            batchingOptions = (
+            emailOptions = (
                 <fieldset>
+                    <div className='radio'>
+                        <label>
+                            <input
+                                id='emailNotificationImmediately'
+                                type='radio'
+                                name='emailNotifications'
+                                checked={newInterval === Preferences.INTERVAL_IMMEDIATE}
+                                data-enable-email={'true'}
+                                data-email-interval={Preferences.INTERVAL_IMMEDIATE}
+                                onChange={this.handleChange}
+                            />
+                            <FormattedMessage
+                                id='user.settings.notifications.email.asSoonAsYouAreAwayForFiveMinutes'
+                                defaultMessage='As soon as you’re away for 5 minutes'
+                            />
+                        </label>
+                    </div>
                     <div className='radio'>
                         <label>
                             <input
@@ -317,13 +354,85 @@ export default class EmailNotificationSetting extends React.PureComponent<Props,
                             />
                         </label>
                     </div>
+                    <div className='radio'>
+                        <label>
+                            <input
+                                id='emailNotificationNever'
+                                type='radio'
+                                name='emailNotifications'
+                                checked={newInterval === Preferences.INTERVAL_NEVER}
+                                data-enable-email={'false'}
+                                data-email-interval={Preferences.INTERVAL_NEVER}
+                                onChange={this.handleChange}
+                            />
+                            <FormattedMessage
+                                id='user.settings.notifications.email.never'
+                                defaultMessage='Never'
+                            />
+                        </label>
+                    </div>
                 </fieldset>
             );
 
-            batchingInfo = (
+            emailInfo = (
                 <FormattedMessage
                     id='user.settings.notifications.emailBatchingInfo'
-                    defaultMessage='Notifications received over the time period selected are combined and sent in a single email.'
+                    defaultMessage='Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes. If you choose to receive notifications every 15 minutes or every hour, notifications during that period will be combined into a single email.'
+                />
+            );
+
+            emailTitle = ( // Renders only in case emails are batched
+                <legend className='form-legend'>
+                    <FormattedMessage
+                        id='user.settings.notifications.email.send'
+                        defaultMessage='Send email notifications'
+                    />
+                </legend>
+            );
+        } else {
+            emailOptions = (
+                <fieldset>
+                    <div className='radio'>
+                        <label>
+                            <input
+                                id='emailNotificationImmediately'
+                                type='radio'
+                                name='emailNotifications'
+                                checked={newInterval === Preferences.INTERVAL_IMMEDIATE}
+                                data-enable-email={'true'}
+                                data-email-interval={Preferences.INTERVAL_IMMEDIATE}
+                                onChange={this.handleChange}
+                            />
+                            <FormattedMessage
+                                id='user.settings.notifications.email.on'
+                                defaultMessage='On'
+                            />
+                        </label>
+                    </div>
+                    <div className='radio'>
+                        <label>
+                            <input
+                                id='emailNotificationNever'
+                                type='radio'
+                                name='emailNotifications'
+                                checked={newInterval === Preferences.INTERVAL_NEVER}
+                                data-enable-email={'false'}
+                                data-email-interval={Preferences.INTERVAL_NEVER}
+                                onChange={this.handleChange}
+                            />
+                            <FormattedMessage
+                                id='user.settings.notifications.email.off'
+                                defaultMessage='Off'
+                            />
+                        </label>
+                    </div>
+                </fieldset>
+            );
+
+            emailInfo = (
+                <FormattedMessage
+                    id='user.settings.notifications.emailInfo'
+                    defaultMessage='When enabled, email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes.'
                 />
             );
         }
@@ -364,54 +473,10 @@ export default class EmailNotificationSetting extends React.PureComponent<Props,
                 }
                 inputs={[
                     <fieldset key='userNotificationEmailOptions'>
-                        <legend className='form-legend'>
-                            <FormattedMessage
-                                id='user.settings.notifications.email.send'
-                                defaultMessage='Send email notifications'
-                            />
-                        </legend>
-                        <div className='radio'>
-                            <label>
-                                <input
-                                    id='emailNotificationImmediately'
-                                    type='radio'
-                                    name='emailNotifications'
-                                    checked={newInterval === Preferences.INTERVAL_IMMEDIATE}
-                                    data-enable-email={'true'}
-                                    data-email-interval={Preferences.INTERVAL_IMMEDIATE}
-                                    onChange={this.handleChange}
-                                />
-                                <FormattedMessage
-                                    id='user.settings.notifications.email.immediately'
-                                    defaultMessage='Immediately'
-                                />
-                            </label>
-                        </div>
-                        {batchingOptions}
-                        <div className='radio'>
-                            <label>
-                                <input
-                                    id='emailNotificationNever'
-                                    type='radio'
-                                    name='emailNotifications'
-                                    checked={newInterval === Preferences.INTERVAL_NEVER}
-                                    data-enable-email={'false'}
-                                    data-email-interval={Preferences.INTERVAL_NEVER}
-                                    onChange={this.handleChange}
-                                />
-                                <FormattedMessage
-                                    id='user.settings.notifications.email.never'
-                                    defaultMessage='Never'
-                                />
-                            </label>
-                        </div>
+                        {emailTitle}
+                        {emailOptions}
                         <div className='mt-3'>
-                            <FormattedMessage
-                                id='user.settings.notifications.emailInfo'
-                                defaultMessage='Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes.'
-                            />
-                            {' '}
-                            {batchingInfo}
+                            {emailInfo}
                         </div>
                     </fieldset>,
                     threadsNotificationSelection,
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 47ef6f785b..f218f0c700 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -5839,16 +5839,18 @@
   "user.settings.notifications.desktopNotificationSound.soundUpstairs": "Upstairs",
   "user.settings.notifications.desktopNotificationSound.soundUrgent": "Urgent",
   "user.settings.notifications.desktopNotificationSounds.title": "Desktop notification sounds",
+  "user.settings.notifications.email.asSoonAsYouAreAwayForFiveMinutes": "As soon as you’re away for 5 minutes",
   "user.settings.notifications.email.disabled": "Email notifications are not enabled",
   "user.settings.notifications.email.disabled_long": "Email notifications have not been enabled by your System Administrator.",
   "user.settings.notifications.email.everyHour": "Every hour",
   "user.settings.notifications.email.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
-  "user.settings.notifications.email.immediately": "Immediately",
   "user.settings.notifications.email.never": "Never",
   "user.settings.notifications.email.notifyForthreads": "Notify me about replies to threads I’m following",
+  "user.settings.notifications.email.off": "Off",
+  "user.settings.notifications.email.on": "On",
   "user.settings.notifications.email.send": "Send email notifications",
-  "user.settings.notifications.emailBatchingInfo": "Notifications received over the time period selected are combined and sent in a single email.",
-  "user.settings.notifications.emailInfo": "Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes.",
+  "user.settings.notifications.emailBatchingInfo": "Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes. If you choose to receive notifications every 15 minutes or every hour, notifications during that period will be combined into a single email.",
+  "user.settings.notifications.emailInfo": "When enabled, email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes.",
   "user.settings.notifications.emailNotifications": "Email notifications",
   "user.settings.notifications.header": "Notifications",
   "user.settings.notifications.icon": "Notification Settings Icon",