diff --git a/ghost/admin/app/components/editor/modals/preview/email.hbs b/ghost/admin/app/components/editor/modals/preview/email.hbs
index 897fc365cb..d8b22d173e 100644
--- a/ghost/admin/app/components/editor/modals/preview/email.hbs
+++ b/ghost/admin/app/components/editor/modals/preview/email.hbs
@@ -13,7 +13,7 @@
@triggerComponent={{component "gh-power-select/trigger"}}
@triggerClass="gh-preview-newsletter-trigger"
@dropdownClass="gh-publish-newsletter-dropdown gh-preview-newsletter-dropdown"
- @extra={{concat "<" (full-email-address (or this.newsletter.senderEmail "noreply")) ">"}}
+ @extra={{concat "<" (full-email-address (or this.newsletter.senderEmail this.settings.defaultEmailAddress "noreply")) ">"}}
@selectedItemComponent={{component "editor/modals/preview/selected-newsletter-label"}}
data-test-email-preview-newsletter-select
as |option|
@@ -23,7 +23,7 @@
{{else}}
{{this.newsletter.name}} <{{full-email-address
- (or this.newsletter.senderEmail "noreply")}}>
+ (or this.newsletter.senderEmail this.settings.defaultEmailAddress "noeply")}}>
{{/if}}
diff --git a/ghost/admin/app/components/modals/email-preview.hbs b/ghost/admin/app/components/modals/email-preview.hbs
index 1b14a01e92..9a3d43dd81 100644
--- a/ghost/admin/app/components/modals/email-preview.hbs
+++ b/ghost/admin/app/components/modals/email-preview.hbs
@@ -20,7 +20,7 @@
- {{or this.newsletter.senderName this.settings.title}} <{{full-email-address (or this.newsletter.senderEmail "noreply")}}>
+ {{or this.newsletter.senderName this.settings.title}} <{{full-email-address (or this.newsletter.senderEmail this.settings.defaultEmailAddress "noreply")}}>
To: Jamie Larson <jamie@example.com>
@@ -35,7 +35,7 @@
- {{or this.newsletter.senderName this.settings.title}} <{{full-email-address (or this.newsletter.senderEmail "noreply")}}>
+ {{or this.newsletter.senderName this.settings.title}} <{{full-email-address (or this.newsletter.senderEmail this.settings.defaultEmailAddress "noreply")}}>
To: Jamie Larson <jamie@example.com>
diff --git a/ghost/admin/app/models/setting.js b/ghost/admin/app/models/setting.js
index a7a719e2f0..8bd80b8524 100644
--- a/ghost/admin/app/models/setting.js
+++ b/ghost/admin/app/models/setting.js
@@ -110,6 +110,12 @@ export default Model.extend(ValidationEngine, {
*/
recommendationsEnabled: attr('boolean'),
+ /**
+ * Newsletter emails
+ */
+ defaultEmailAddress: attr('string'),
+ supportEmailAddress: attr('string'),
+
// HACK - not a real model attribute but a workaround for Ember Data not
// exposing meta from save responses
_meta: attr()