PLT-3775/PLT-4067 Fixes for email notifications for 3.4

webapp/components/user_settings/email_notification_setting.jsx

@@ -159,6 +159,12 @@ export default class EmailNotificationSetting extends React.Component {
                 title={localizeMessage('user.settings.notifications.emailNotifications', 'Email notifications')}
                 inputs={[
                     <div key='userNotificationEmailOptions'>
+                        <label>
+                            <FormattedMessage
+                                id='user.settings.notifications.email.send'
+                                defaultMessage='Send email notifications'
+                            />
+                        </label>
                         <div className='radio'>
                             <label>
                                 <input

webapp/i18n/en.json

@@ -1899,6 +1899,7 @@
   "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.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 from {siteName} for more than 5 minutes.",
   "user.settings.notifications.emailNotifications": "Email notifications",