Exposes Reply-To email header configuration in UI. (mattermost#2327)

zerotier · Feb 12, 2019 · a411a9f · a411a9f
1 parent cda01fb
commit a411a9f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/components/admin_console/email_settings.jsx b/components/admin_console/email_settings.jsx
@@ -33,6 +33,7 @@ export default class EmailSettings extends AdminSettings {
         config.EmailSettings.EnablePreviewModeBanner = this.state.enablePreviewModeBanner;
         config.EmailSettings.FeedbackName = this.state.feedbackName;
         config.EmailSettings.FeedbackEmail = this.state.feedbackEmail;
+        config.EmailSettings.ReplyToAddress = this.state.replyToAddress;
         config.EmailSettings.FeedbackOrganization = this.state.feedbackOrganization;
         config.EmailSettings.EnableSMTPAuth = this.state.enableSMTPAuth;
         config.EmailSettings.SMTPUsername = this.state.smtpUsername;
@@ -251,6 +252,26 @@ export default class EmailSettings extends AdminSettings {
                     disabled={!this.state.sendEmailNotifications}
                     setByEnv={this.isSetByEnv('EmailSettings.FeedbackEmail')}
                 />
+                <TextSetting
+                    id='replyToAddress'
+                    label={
+                        <FormattedMessage
+                            id='admin.email.replyToAddressTitle'
+                            defaultMessage='Notification Reply-To Address:'
+                        />
+                    }
+                    placeholder={Utils.localizeMessage('admin.email.notificationEmailExample', 'Ex: "[email protected]", "[email protected]"')}
+                    helpText={
+                        <FormattedMessage
+                            id='admin.email.replyToAddressDescription'
+                            defaultMessage='Email address used in the Reply-To header when sending notification emails from Mattermost.'
+                        />
+                    }
+                    value={this.state.replyToAddress}
+                    onChange={this.handleChange}
+                    disabled={!this.state.sendEmailNotifications}
+                    setByEnv={this.isSetByEnv('EmailSettings.ReplyToAddress')}
+                />
                 <TextSetting
                     id='feedbackOrganization'
                     label={

diff --git a/i18n/en.json b/i18n/en.json
@@ -420,6 +420,8 @@
   "admin.email.notificationOrganizationExample": "E.g.: \"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\"",
   "admin.email.notificationsDescription": "Typically set to true in production. When true, Mattermost attempts to send email notifications. Developers may set this field to false to skip email setup for faster development.",
   "admin.email.notificationsTitle": "Enable Email Notifications: ",
+  "admin.email.replyToAddressTitle": "Notification Reply-To Address: ",
+  "admin.email.replyToAddressDescription": "Email address used in the Reply-To header when sending notification emails from Mattermost.",
   "admin.email.pushContentDesc": "\"Send generic description with only sender name\" includes only the name of the person who sent the message in push notifications, with no information about channel name or message contents.\n \n\"Send generic description with sender and channel names\" includes the name of the person who sent the message and the channel it was sent in, but not the message text.\n \n\"Send full message snippet\" includes a message excerpt in push notifications, which may contain confidential information sent in messages. If your Push Notification Service is outside your firewall, it is *highly recommended* this option only be used with an \"https\" protocol to encrypt the connection.",
   "admin.email.pushContentTitle": "Push Notification Contents:",
   "admin.email.pushOff": "Do not send push notifications",