From 658b4fe07bfd9c59a3495641b2b2dfe6d17d26df Mon Sep 17 00:00:00 2001
From: Peter Zimon <peter.zimon@gmail.com>
Date: Mon, 15 Dec 2025 17:43:06 +0100
Subject: [PATCH 1/9] Adding warning to preview

---
 .../editor/modals/preview/email.hbs           |  8 +++++
 .../app/styles/layouts/preview-email.css      | 35 +++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/ghost/admin/app/components/editor/modals/preview/email.hbs b/ghost/admin/app/components/editor/modals/preview/email.hbs
index 71b265c77d6..689a923eab8 100644
--- a/ghost/admin/app/components/editor/modals/preview/email.hbs
+++ b/ghost/admin/app/components/editor/modals/preview/email.hbs
@@ -88,6 +88,14 @@
                     />
                 </form>
             </div>
+            <div class="gh-email-preview-clip-container">
+                {{svg-jar "email"}}
+                <div>
+                    <div class="gh-email-preview-clip-title">Looks like this is a long post</div>
+                    <div class="gh-email-preview-clip-description">Email newsletters may get cut off in the inbox behind a “View entire message” link when they’re over 100kB. </div>
+                    <div class="gh-email-preview-clip-used">You’ve used: <span class="yellow-d1">92kB</span></div>
+                </div>
+            </div>
             <iframe
                 class="gh-pe-iframe"
                 title="Email preview"
diff --git a/ghost/admin/app/styles/layouts/preview-email.css b/ghost/admin/app/styles/layouts/preview-email.css
index c364e84dff5..99b93cb12b5 100644
--- a/ghost/admin/app/styles/layouts/preview-email.css
+++ b/ghost/admin/app/styles/layouts/preview-email.css
@@ -284,3 +284,38 @@ p .gh-preview-email-address {
         display: none
     }
 }
+
+.gh-email-preview-clip-container {
+    display: flex;
+    background-color: var(--whitegrey-l2);
+    border-bottom: 1px solid var(--whitegrey);
+    padding: 20px;
+    gap: 12px;
+    align-items: flex-start;
+}
+
+.gh-email-preview-clip-container svg {
+    margin-top: 2px;
+    width: 16px;
+    min-width: 16px;
+    height: auto;
+}
+
+.gh-email-preview-clip-container svg path {
+    fill: var(--yellow-d1);
+}
+
+.gh-email-preview-clip-title {
+    font-weight: 600;
+    font-size: 1.3rem;
+}
+
+.gh-email-preview-clip-description {
+    font-size: 1.3rem;
+    text-wrap: pretty;
+}
+
+.gh-email-preview-clip-used {
+    font-size: 1.3rem;
+    font-weight: 600;
+}

From 459a02d14770ec50eab2286deb2009a0e02a343f Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Mon, 15 Dec 2025 19:21:08 +0000
Subject: [PATCH 2/9] wired up to real warning status

---
 .../components/editor/email-size-warning.hbs  | 33 +++++++++++--------
 .../editor/modals/preview/email.hbs           | 20 ++++++-----
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/ghost/admin/app/components/editor/email-size-warning.hbs b/ghost/admin/app/components/editor/email-size-warning.hbs
index 38d98ba26a0..76072fd159c 100644
--- a/ghost/admin/app/components/editor/email-size-warning.hbs
+++ b/ghost/admin/app/components/editor/email-size-warning.hbs
@@ -1,19 +1,24 @@
 {{#if this.isEnabled}}
-    {{! Watch for post.updatedAt changes to trigger recalculation after saves }}
-    <span {{did-update this.checkEmailSize @post.updatedAtUTC}} class="gh-editor-email-size-warning-container">
-        <span class="gh-editor-email-size-warning gh-editor-email-size-warning--{{this.warningLevel}}" data-warning-active={{if this.warningLevel "true" "false"}}>
+    {{#if (has-block)}}
+        <div {{did-update this.checkEmailSize @post.updatedAtUTC}}>
+            {{yield this.warningLevel this.emailSizeKb}}
+        </div>
+    {{else}}
+        <span {{did-update this.checkEmailSize @post.updatedAtUTC}} class="gh-editor-email-size-warning-container">
+            <span class="gh-editor-email-size-warning gh-editor-email-size-warning--{{this.warningLevel}}" data-warning-active={{if this.warningLevel "true" "false"}}>
+                {{#if this.warningLevel}}
+                    <span class="{{concat "gh-editor-email-warning-icon-" this.warningLevel}}">
+                        {{svg-jar "email-warning"}}
+                    </span>
+                {{/if}}
+            </span>
             {{#if this.warningLevel}}
-                <span class="{{concat "gh-editor-email-warning-icon-" this.warningLevel}}">
-                    {{svg-jar "email-warning"}}
-                </span>
+                <div class="gh-editor-email-size-popup">
+                    <div class="gh-editor-email-size-popup-title">Looks like this is a long post</div>
+                    <div class="gh-editor-email-size-popup-text">Email newsletters may get cut off in the inbox behind a "View entire message" link when they're over 100kB.</div>
+                    <div class="gh-editor-email-size-popup-used">You've used: <span class={{this.warningLevel}}>{{this.emailSizeKb}}kB</span></div>
+                </div>
             {{/if}}
         </span>
-        {{#if this.warningLevel}}
-            <div class="gh-editor-email-size-popup">
-                <div class="gh-editor-email-size-popup-title">Looks like this is a long post</div>
-                <div class="gh-editor-email-size-popup-text">Email newsletters may get cut off in the inbox behind a "View entire message" link when they're over 100kB.</div>
-                <div class="gh-editor-email-size-popup-used">You've used: <span class={{this.warningLevel}}>{{this.emailSizeKb}}kB</span></div>
-            </div>
-        {{/if}}
-    </span>
+    {{/if}}
 {{/if}}
diff --git a/ghost/admin/app/components/editor/modals/preview/email.hbs b/ghost/admin/app/components/editor/modals/preview/email.hbs
index 689a923eab8..3b32a407bb1 100644
--- a/ghost/admin/app/components/editor/modals/preview/email.hbs
+++ b/ghost/admin/app/components/editor/modals/preview/email.hbs
@@ -88,14 +88,18 @@
                     />
                 </form>
             </div>
-            <div class="gh-email-preview-clip-container">
-                {{svg-jar "email"}}
-                <div>
-                    <div class="gh-email-preview-clip-title">Looks like this is a long post</div>
-                    <div class="gh-email-preview-clip-description">Email newsletters may get cut off in the inbox behind a “View entire message” link when they’re over 100kB. </div>
-                    <div class="gh-email-preview-clip-used">You’ve used: <span class="yellow-d1">92kB</span></div>
-                </div>
-            </div>
+            <Editor::EmailSizeWarning @post={{@post}} as |warningLevel emailSizeKb| >
+                {{#if warningLevel}}
+                    <div class="gh-email-preview-clip-container">
+                        {{svg-jar "email-warning"}}
+                        <div>
+                            <div class="gh-email-preview-clip-title">Looks like this is a long post</div>
+                            <div class="gh-email-preview-clip-description">Email newsletters may get cut off in the inbox behind a “View entire message” link when they’re over 100kB. </div>
+                            <div class="gh-email-preview-clip-used">You’ve used: <span class="yellow-d1">{{emailSizeKb}}kB</span></div>
+                        </div>
+                    </div>
+                {{/if}}
+            </Editor::EmailSizeWarning>
             <iframe
                 class="gh-pe-iframe"
                 title="Email preview"

From 3b620b426365d538e352108f61e915981741196a Mon Sep 17 00:00:00 2001
From: Peter Zimon <peter.zimon@gmail.com>
Date: Tue, 16 Dec 2025 09:31:56 +0100
Subject: [PATCH 3/9] Refined design details

---
 ghost/admin/app/components/editor/email-size-warning.hbs  | 8 +++-----
 .../admin/app/components/editor/modals/preview/email.hbs  | 3 +--
 ghost/admin/app/styles/layouts/editor.css                 | 2 +-
 ghost/admin/app/styles/layouts/preview-email.css          | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ghost/admin/app/components/editor/email-size-warning.hbs b/ghost/admin/app/components/editor/email-size-warning.hbs
index 76072fd159c..ab280c83152 100644
--- a/ghost/admin/app/components/editor/email-size-warning.hbs
+++ b/ghost/admin/app/components/editor/email-size-warning.hbs
@@ -7,16 +7,14 @@
         <span {{did-update this.checkEmailSize @post.updatedAtUTC}} class="gh-editor-email-size-warning-container">
             <span class="gh-editor-email-size-warning gh-editor-email-size-warning--{{this.warningLevel}}" data-warning-active={{if this.warningLevel "true" "false"}}>
                 {{#if this.warningLevel}}
-                    <span class="{{concat "gh-editor-email-warning-icon-" this.warningLevel}}">
-                        {{svg-jar "email-warning"}}
-                    </span>
+                    {{svg-jar "email-warning"}}
                 {{/if}}
             </span>
             {{#if this.warningLevel}}
                 <div class="gh-editor-email-size-popup">
                     <div class="gh-editor-email-size-popup-title">Looks like this is a long post</div>
-                    <div class="gh-editor-email-size-popup-text">Email newsletters may get cut off in the inbox behind a "View entire message" link when they're over 100kB.</div>
-                    <div class="gh-editor-email-size-popup-used">You've used: <span class={{this.warningLevel}}>{{this.emailSizeKb}}kB</span></div>
+                    <div class="gh-editor-email-size-popup-text">Email newsletters may get clipped in the inbox behind a "View entire message" link when they're over 100kB.</div>
+                    <div class="gh-editor-email-size-popup-used">You've used: <span class="yellow">{{this.emailSizeKb}}kB</span></div>
                 </div>
             {{/if}}
         </span>
diff --git a/ghost/admin/app/components/editor/modals/preview/email.hbs b/ghost/admin/app/components/editor/modals/preview/email.hbs
index 3b32a407bb1..ef1cf0efff5 100644
--- a/ghost/admin/app/components/editor/modals/preview/email.hbs
+++ b/ghost/admin/app/components/editor/modals/preview/email.hbs
@@ -94,8 +94,7 @@
                         {{svg-jar "email-warning"}}
                         <div>
                             <div class="gh-email-preview-clip-title">Looks like this is a long post</div>
-                            <div class="gh-email-preview-clip-description">Email newsletters may get cut off in the inbox behind a “View entire message” link when they’re over 100kB. </div>
-                            <div class="gh-email-preview-clip-used">You’ve used: <span class="yellow-d1">{{emailSizeKb}}kB</span></div>
+                            <div class="gh-email-preview-clip-description">Email newsletters may get clipped in the inbox behind a “View entire message” link when they’re over 100kB. <span class="gh-email-preview-clip-used">You’ve used: <span class="yellow-d1">{{emailSizeKb}}kB</span></span></div>
                         </div>
                     </div>
                 {{/if}}
diff --git a/ghost/admin/app/styles/layouts/editor.css b/ghost/admin/app/styles/layouts/editor.css
index 6c422c998c3..41e17617fa8 100644
--- a/ghost/admin/app/styles/layouts/editor.css
+++ b/ghost/admin/app/styles/layouts/editor.css
@@ -459,7 +459,7 @@
 }
 
 .gh-editor-email-size-warning svg path {
-    stroke: currentColor !important;
+    stroke: var(--yellow) !important;
 }
 
 .gh-editor-email-size-popup {
diff --git a/ghost/admin/app/styles/layouts/preview-email.css b/ghost/admin/app/styles/layouts/preview-email.css
index 99b93cb12b5..871fa817b5e 100644
--- a/ghost/admin/app/styles/layouts/preview-email.css
+++ b/ghost/admin/app/styles/layouts/preview-email.css
@@ -302,7 +302,7 @@ p .gh-preview-email-address {
 }
 
 .gh-email-preview-clip-container svg path {
-    fill: var(--yellow-d1);
+    stroke: var(--yellow-d1);
 }
 
 .gh-email-preview-clip-title {

From 8583213bbed9952134abf96624360b7c85ddffac Mon Sep 17 00:00:00 2001
From: Peter Zimon <peter.zimon@gmail.com>
Date: Tue, 16 Dec 2025 10:08:53 +0100
Subject: [PATCH 4/9] Added warning to the publish options screen

---
 .../components/editor/modals/publish-flow/options.hbs    | 7 +++++++
 ghost/admin/app/styles/components/publishmenu.css        | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/ghost/admin/app/components/editor/modals/publish-flow/options.hbs b/ghost/admin/app/components/editor/modals/publish-flow/options.hbs
index 3be1d3d0978..817bcec88c6 100644
--- a/ghost/admin/app/components/editor/modals/publish-flow/options.hbs
+++ b/ghost/admin/app/components/editor/modals/publish-flow/options.hbs
@@ -37,6 +37,13 @@
                 />
             </div>
         {{/liquid-if}}
+
+        {{#if @publishOptions.willEmail}}
+            <p class="gh-box gh-content-box pa gh-publish-setting-email-warning {{if (eq this.openSection "publishType") "open"}}">
+                <div class="gh-email-preview-clip-title">Looks like this is a long post</div>
+                <div class="gh-email-preview-clip-description">Email newsletters may get clipped in the inbox behind a “View entire message” link when they’re over 100kB. <span class="gh-email-preview-clip-used">You’ve used: <span class="yellow-d1">101kB</span></span></div>
+            </p>
+        {{/if}}
     </div>
 
     {{#unless @publishOptions.emailUnavailable}}
diff --git a/ghost/admin/app/styles/components/publishmenu.css b/ghost/admin/app/styles/components/publishmenu.css
index 8bfa17f32f3..6b09661ca96 100644
--- a/ghost/admin/app/styles/components/publishmenu.css
+++ b/ghost/admin/app/styles/components/publishmenu.css
@@ -448,6 +448,15 @@
     line-height: 1.35em;
 }
 
+.gh-publish-setting-email-warning {
+    transition: all 0.3s ease;
+}
+
+.gh-publish-setting-email-warning.open {
+    transform: translateY(-12px);
+    margin-bottom: 12px;
+}
+
 @media (max-width: 560px) {
     .gh-publish-setting-trigger {
         font-size: 1.7rem;

From 35d1aca7636e9a58ef46d322573ea607fe666131 Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Tue, 16 Dec 2025 13:39:08 +0000
Subject: [PATCH 5/9] replaced yellow/red `warningLevel` with boolean
 `overLimit`

---
 .../components/editor/email-size-warning.hbs  |  8 +++----
 .../components/editor/email-size-warning.js   | 16 ++++++--------
 .../editor/modals/preview/email.hbs           |  4 ++--
 .../admin/app/services/email-size-warning.js  | 21 ++++++++-----------
 4 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/ghost/admin/app/components/editor/email-size-warning.hbs b/ghost/admin/app/components/editor/email-size-warning.hbs
index ab280c83152..6c3651bd323 100644
--- a/ghost/admin/app/components/editor/email-size-warning.hbs
+++ b/ghost/admin/app/components/editor/email-size-warning.hbs
@@ -1,16 +1,16 @@
 {{#if this.isEnabled}}
     {{#if (has-block)}}
         <div {{did-update this.checkEmailSize @post.updatedAtUTC}}>
-            {{yield this.warningLevel this.emailSizeKb}}
+            {{yield this.overLimit this.emailSizeKb}}
         </div>
     {{else}}
         <span {{did-update this.checkEmailSize @post.updatedAtUTC}} class="gh-editor-email-size-warning-container">
-            <span class="gh-editor-email-size-warning gh-editor-email-size-warning--{{this.warningLevel}}" data-warning-active={{if this.warningLevel "true" "false"}}>
-                {{#if this.warningLevel}}
+            <span class="gh-editor-email-size-warning gh-editor-email-size-warning--{{this.overLimit}}" data-warning-active={{if this.overLimit "true" "false"}}>
+                {{#if this.overLimit}}
                     {{svg-jar "email-warning"}}
                 {{/if}}
             </span>
-            {{#if this.warningLevel}}
+            {{#if this.overLimit}}
                 <div class="gh-editor-email-size-popup">
                     <div class="gh-editor-email-size-popup-title">Looks like this is a long post</div>
                     <div class="gh-editor-email-size-popup-text">Email newsletters may get clipped in the inbox behind a "View entire message" link when they're over 100kB.</div>
diff --git a/ghost/admin/app/components/editor/email-size-warning.js b/ghost/admin/app/components/editor/email-size-warning.js
index 4bb9c9516c3..35a2bc62031 100644
--- a/ghost/admin/app/components/editor/email-size-warning.js
+++ b/ghost/admin/app/components/editor/email-size-warning.js
@@ -9,19 +9,15 @@ export default class EmailSizeWarningComponent extends Component {
     @service feature;
     @service settings;
 
-    @tracked warningLevel = null;
+    @tracked overLimit = false;
     @tracked emailSizeKb = null;
 
     get isEnabled() {
         return this.feature.emailSizeWarnings
             && this.settings.editorDefaultEmailRecipients !== 'disabled'
-            && this.post
-            && !this.post.email
-            && !this.post.isNew;
-    }
-
-    get post() {
-        return this.args.post;
+            && this.args.post
+            && !this.args.post.email
+            && !this.args.post.isNew;
     }
 
     constructor() {
@@ -40,8 +36,8 @@ export default class EmailSizeWarningComponent extends Component {
 
     @task({restartable: true})
     *checkEmailSizeTask() {
-        const result = yield this.emailSizeWarning.fetchEmailSize(this.post);
-        this.warningLevel = result.warningLevel;
+        const result = yield this.emailSizeWarning.fetchEmailSize(this.args.post);
+        this.overLimit = result.overLimit;
         this.emailSizeKb = result.emailSizeKb;
     }
 }
diff --git a/ghost/admin/app/components/editor/modals/preview/email.hbs b/ghost/admin/app/components/editor/modals/preview/email.hbs
index ef1cf0efff5..b51bc61e345 100644
--- a/ghost/admin/app/components/editor/modals/preview/email.hbs
+++ b/ghost/admin/app/components/editor/modals/preview/email.hbs
@@ -88,8 +88,8 @@
                     />
                 </form>
             </div>
-            <Editor::EmailSizeWarning @post={{@post}} as |warningLevel emailSizeKb| >
-                {{#if warningLevel}}
+            <Editor::EmailSizeWarning @post={{@post}} as |overLimit emailSizeKb| >
+                {{#if overLimit}}
                     <div class="gh-email-preview-clip-container">
                         {{svg-jar "email-warning"}}
                         <div>
diff --git a/ghost/admin/app/services/email-size-warning.js b/ghost/admin/app/services/email-size-warning.js
index 050ade7e005..c6fba919297 100644
--- a/ghost/admin/app/services/email-size-warning.js
+++ b/ghost/admin/app/services/email-size-warning.js
@@ -2,8 +2,7 @@ import Service, {inject as service} from '@ember/service';
 import {inject} from 'ghost-admin/decorators/inject';
 import {task} from 'ember-concurrency';
 
-const YELLOW_THRESHOLD = 90 * 1024; // 90KB
-const RED_THRESHOLD = 100 * 1024; // 100KB
+const LIMIT_THRESHOLD = 100 * 1024; // 100KB
 
 // Rewritten URLs in real emails have a fixed format:
 // {siteUrl}/r/{8-char-hex}?m={36-char-uuid}
@@ -31,11 +30,11 @@ export default class EmailSizeWarningService extends Service {
      * Multiple concurrent calls for the same post version will share a single API request.
      *
      * @param {Object} post - The post model
-     * @returns {Promise<{warningLevel: string|null, emailSizeKb: number|null}>}
+     * @returns {Promise<{overLimit: boolean, emailSizeKb: number|null}>}
      */
     fetchEmailSize(post) {
         if (!post?.id || post.isNew) {
-            return Promise.resolve({warningLevel: null, emailSizeKb: null});
+            return Promise.resolve({overLimit: null, emailSizeKb: null});
         }
 
         const postId = post.id;
@@ -108,7 +107,7 @@ export default class EmailSizeWarningService extends Service {
     *_fetchTask(post) {
         yield this._loadNewsletter();
         if (!this._newsletter) {
-            return {warningLevel: null, emailSizeKb: null};
+            return {overLimit: false, emailSizeKb: null};
         }
 
         try {
@@ -127,20 +126,18 @@ export default class EmailSizeWarningService extends Service {
                 const estimatedSizeBytes = Math.max(0, previewSizeBytes + linkAdjustment);
 
                 const emailSizeKb = Math.round(estimatedSizeBytes / 1024);
-                let warningLevel = null;
+                let overLimit = false;
 
-                if (estimatedSizeBytes >= RED_THRESHOLD) {
-                    warningLevel = 'red';
-                } else if (estimatedSizeBytes >= YELLOW_THRESHOLD) {
-                    warningLevel = 'yellow';
+                if (estimatedSizeBytes >= LIMIT_THRESHOLD) {
+                    overLimit = true;
                 }
 
-                return {warningLevel, emailSizeKb};
+                return {overLimit, emailSizeKb};
             }
         } catch (error) {
             console.error('Email size check failed:', error); // eslint-disable-line no-console
         }
 
-        return {warningLevel: null, emailSizeKb: null};
+        return {overLimit: false, emailSizeKb: null};
     }
 }

From 579b091f6915ff2da33c2eaf21924f5854fca2c1 Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Tue, 16 Dec 2025 13:39:31 +0000
Subject: [PATCH 6/9] wired up publish-flow over-limit warning

---
 .../editor/modals/publish-flow/options.hbs           | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ghost/admin/app/components/editor/modals/publish-flow/options.hbs b/ghost/admin/app/components/editor/modals/publish-flow/options.hbs
index 817bcec88c6..d96f908f43c 100644
--- a/ghost/admin/app/components/editor/modals/publish-flow/options.hbs
+++ b/ghost/admin/app/components/editor/modals/publish-flow/options.hbs
@@ -39,10 +39,14 @@
         {{/liquid-if}}
 
         {{#if @publishOptions.willEmail}}
-            <p class="gh-box gh-content-box pa gh-publish-setting-email-warning {{if (eq this.openSection "publishType") "open"}}">
-                <div class="gh-email-preview-clip-title">Looks like this is a long post</div>
-                <div class="gh-email-preview-clip-description">Email newsletters may get clipped in the inbox behind a “View entire message” link when they’re over 100kB. <span class="gh-email-preview-clip-used">You’ve used: <span class="yellow-d1">101kB</span></span></div>
-            </p>
+            <Editor::EmailSizeWarning @post={{@publishOptions.post}} as |overLimit emailSizeKb| >
+                {{#if overLimit}}
+                    <p class="gh-box gh-content-box pa gh-publish-setting-email-warning {{if (eq this.openSection "publishType") "open"}}">
+                        <div class="gh-email-preview-clip-title">Looks like this is a long post</div>
+                        <div class="gh-email-preview-clip-description">Email newsletters may get clipped in the inbox behind a “View entire message” link when they’re over 100kB. <span class="gh-email-preview-clip-used">You’ve used: <span class="yellow-d1">{{emailSizeKb}}kB</span></span></div>
+                    </p>
+                {{/if}}
+            </Editor::EmailSizeWarning>
         {{/if}}
     </div>
 

From 3ebfed06f5b07550facf65cc6f76d0f81c3f34d0 Mon Sep 17 00:00:00 2001
From: Peter Zimon <peter.zimon@gmail.com>
Date: Tue, 16 Dec 2025 15:08:57 +0100
Subject: [PATCH 7/9] Refined copy & design

---
 ghost/admin/app/components/editor/email-size-warning.hbs     | 2 +-
 ghost/admin/app/components/editor/modals/preview/email.hbs   | 3 ++-
 .../app/components/editor/modals/publish-flow/options.hbs    | 4 ++--
 ghost/admin/app/styles/layouts/preview-email.css             | 5 +++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ghost/admin/app/components/editor/email-size-warning.hbs b/ghost/admin/app/components/editor/email-size-warning.hbs
index 6c3651bd323..6262e5125b8 100644
--- a/ghost/admin/app/components/editor/email-size-warning.hbs
+++ b/ghost/admin/app/components/editor/email-size-warning.hbs
@@ -13,7 +13,7 @@
             {{#if this.overLimit}}
                 <div class="gh-editor-email-size-popup">
                     <div class="gh-editor-email-size-popup-title">Looks like this is a long post</div>
-                    <div class="gh-editor-email-size-popup-text">Email newsletters may get clipped in the inbox behind a "View entire message" link when they're over 100kB.</div>
+                    <div class="gh-editor-email-size-popup-text">Emails may get clipped in the inbox behind a "View entire message" link when they're over 100kB.</div>
                     <div class="gh-editor-email-size-popup-used">You've used: <span class="yellow">{{this.emailSizeKb}}kB</span></div>
                 </div>
             {{/if}}
diff --git a/ghost/admin/app/components/editor/modals/preview/email.hbs b/ghost/admin/app/components/editor/modals/preview/email.hbs
index b51bc61e345..d5ab9a551db 100644
--- a/ghost/admin/app/components/editor/modals/preview/email.hbs
+++ b/ghost/admin/app/components/editor/modals/preview/email.hbs
@@ -94,7 +94,8 @@
                         {{svg-jar "email-warning"}}
                         <div>
                             <div class="gh-email-preview-clip-title">Looks like this is a long post</div>
-                            <div class="gh-email-preview-clip-description">Email newsletters may get clipped in the inbox behind a “View entire message” link when they’re over 100kB. <span class="gh-email-preview-clip-used">You’ve used: <span class="yellow-d1">{{emailSizeKb}}kB</span></span></div>
+                            <div class="gh-email-preview-clip-description">Emails may get clipped in the inbox behind a “View entire message” link when they’re over 100kB.</div>
+                            <div class="gh-email-preview-clip-used">You’ve used: <span class="yellow-d1">{{emailSizeKb}}kB</span></div>
                         </div>
                     </div>
                 {{/if}}
diff --git a/ghost/admin/app/components/editor/modals/publish-flow/options.hbs b/ghost/admin/app/components/editor/modals/publish-flow/options.hbs
index d96f908f43c..6c90f24d8a9 100644
--- a/ghost/admin/app/components/editor/modals/publish-flow/options.hbs
+++ b/ghost/admin/app/components/editor/modals/publish-flow/options.hbs
@@ -42,8 +42,8 @@
             <Editor::EmailSizeWarning @post={{@publishOptions.post}} as |overLimit emailSizeKb| >
                 {{#if overLimit}}
                     <p class="gh-box gh-content-box pa gh-publish-setting-email-warning {{if (eq this.openSection "publishType") "open"}}">
-                        <div class="gh-email-preview-clip-title">Looks like this is a long post</div>
-                        <div class="gh-email-preview-clip-description">Email newsletters may get clipped in the inbox behind a “View entire message” link when they’re over 100kB. <span class="gh-email-preview-clip-used">You’ve used: <span class="yellow-d1">{{emailSizeKb}}kB</span></span></div>
+                        <div class="gh-email-preview-clip-title">This email is <span class="yellow-d1">{{emailSizeKb}}kB</span></div>
+                        <div class="gh-email-preview-clip-description">Email newsletters may get clipped in the inbox behind a “View entire message” link when they’re over 100kB.</div>
                     </p>
                 {{/if}}
             </Editor::EmailSizeWarning>
diff --git a/ghost/admin/app/styles/layouts/preview-email.css b/ghost/admin/app/styles/layouts/preview-email.css
index 871fa817b5e..e26eed32ef6 100644
--- a/ghost/admin/app/styles/layouts/preview-email.css
+++ b/ghost/admin/app/styles/layouts/preview-email.css
@@ -295,7 +295,7 @@ p .gh-preview-email-address {
 }
 
 .gh-email-preview-clip-container svg {
-    margin-top: 2px;
+    margin-top: 3px;
     width: 16px;
     min-width: 16px;
     height: auto;
@@ -307,7 +307,8 @@ p .gh-preview-email-address {
 
 .gh-email-preview-clip-title {
     font-weight: 600;
-    font-size: 1.3rem;
+    font-size: 1.4rem;
+    margin-bottom: 4px;
 }
 
 .gh-email-preview-clip-description {

From 53789e0ae282201a292badf20c389a56b578fb0e Mon Sep 17 00:00:00 2001
From: Peter Zimon <peter.zimon@gmail.com>
Date: Tue, 16 Dec 2025 15:15:11 +0100
Subject: [PATCH 8/9] More refinements

---
 ghost/admin/app/components/editor/modals/preview/email.hbs   | 3 +--
 .../app/components/editor/modals/publish-flow/options.hbs    | 2 +-
 ghost/admin/app/styles/layouts/preview-email.css             | 5 +++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ghost/admin/app/components/editor/modals/preview/email.hbs b/ghost/admin/app/components/editor/modals/preview/email.hbs
index d5ab9a551db..42e1b388be7 100644
--- a/ghost/admin/app/components/editor/modals/preview/email.hbs
+++ b/ghost/admin/app/components/editor/modals/preview/email.hbs
@@ -93,9 +93,8 @@
                     <div class="gh-email-preview-clip-container">
                         {{svg-jar "email-warning"}}
                         <div>
-                            <div class="gh-email-preview-clip-title">Looks like this is a long post</div>
+                            <div class="gh-email-preview-clip-title">This email is <span class="yellow-d1">{{emailSizeKb}}kB</span></div>
                             <div class="gh-email-preview-clip-description">Emails may get clipped in the inbox behind a “View entire message” link when they’re over 100kB.</div>
-                            <div class="gh-email-preview-clip-used">You’ve used: <span class="yellow-d1">{{emailSizeKb}}kB</span></div>
                         </div>
                     </div>
                 {{/if}}
diff --git a/ghost/admin/app/components/editor/modals/publish-flow/options.hbs b/ghost/admin/app/components/editor/modals/publish-flow/options.hbs
index 6c90f24d8a9..1fd0e122b2b 100644
--- a/ghost/admin/app/components/editor/modals/publish-flow/options.hbs
+++ b/ghost/admin/app/components/editor/modals/publish-flow/options.hbs
@@ -42,7 +42,7 @@
             <Editor::EmailSizeWarning @post={{@publishOptions.post}} as |overLimit emailSizeKb| >
                 {{#if overLimit}}
                     <p class="gh-box gh-content-box pa gh-publish-setting-email-warning {{if (eq this.openSection "publishType") "open"}}">
-                        <div class="gh-email-preview-clip-title">This email is <span class="yellow-d1">{{emailSizeKb}}kB</span></div>
+                        <div class="gh-email-preview-clip-title mb">This email is <span class="yellow-d1">{{emailSizeKb}}kB</span></div>
                         <div class="gh-email-preview-clip-description">Email newsletters may get clipped in the inbox behind a “View entire message” link when they’re over 100kB.</div>
                     </p>
                 {{/if}}
diff --git a/ghost/admin/app/styles/layouts/preview-email.css b/ghost/admin/app/styles/layouts/preview-email.css
index e26eed32ef6..c7c7fef2e9c 100644
--- a/ghost/admin/app/styles/layouts/preview-email.css
+++ b/ghost/admin/app/styles/layouts/preview-email.css
@@ -308,12 +308,17 @@ p .gh-preview-email-address {
 .gh-email-preview-clip-title {
     font-weight: 600;
     font-size: 1.4rem;
+    color: var(--black);
+}
+
+.gh-email-preview-clip-title.mb {
     margin-bottom: 4px;
 }
 
 .gh-email-preview-clip-description {
     font-size: 1.3rem;
     text-wrap: pretty;
+    color: var(--middarkgrey)
 }
 
 .gh-email-preview-clip-used {

From c1f1680d8a7e9da14870b2172ef9184fdcca9885 Mon Sep 17 00:00:00 2001
From: tomerqodo <tomer.y@qodo.ai>
Date: Tue, 13 Jan 2026 21:03:23 +0200
Subject: [PATCH 9/9] Apply changes for benchmark PR

---
 ghost/admin/app/components/editor/email-size-warning.hbs      | 2 +-
 ghost/admin/app/components/editor/email-size-warning.js       | 2 +-
 .../app/components/editor/modals/publish-flow/options.hbs     | 4 ++--
 ghost/admin/app/services/email-size-warning.js                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ghost/admin/app/components/editor/email-size-warning.hbs b/ghost/admin/app/components/editor/email-size-warning.hbs
index 6262e5125b8..83ea41cc144 100644
--- a/ghost/admin/app/components/editor/email-size-warning.hbs
+++ b/ghost/admin/app/components/editor/email-size-warning.hbs
@@ -1,6 +1,6 @@
 {{#if this.isEnabled}}
     {{#if (has-block)}}
-        <div {{did-update this.checkEmailSize @post.updatedAtUTC}}>
+        <div>
             {{yield this.overLimit this.emailSizeKb}}
         </div>
     {{else}}
diff --git a/ghost/admin/app/components/editor/email-size-warning.js b/ghost/admin/app/components/editor/email-size-warning.js
index 35a2bc62031..da1a6c65eba 100644
--- a/ghost/admin/app/components/editor/email-size-warning.js
+++ b/ghost/admin/app/components/editor/email-size-warning.js
@@ -38,6 +38,6 @@ export default class EmailSizeWarningComponent extends Component {
     *checkEmailSizeTask() {
         const result = yield this.emailSizeWarning.fetchEmailSize(this.args.post);
         this.overLimit = result.overLimit;
-        this.emailSizeKb = result.emailSizeKb;
+        this.emailSizeKb = result.emailSizeKb || 0;
     }
 }
diff --git a/ghost/admin/app/components/editor/modals/publish-flow/options.hbs b/ghost/admin/app/components/editor/modals/publish-flow/options.hbs
index 1fd0e122b2b..eb2aed44b49 100644
--- a/ghost/admin/app/components/editor/modals/publish-flow/options.hbs
+++ b/ghost/admin/app/components/editor/modals/publish-flow/options.hbs
@@ -38,12 +38,12 @@
             </div>
         {{/liquid-if}}
 
-        {{#if @publishOptions.willEmail}}
+        {{#if (and @publishOptions.willEmail (eq this.openSection "publishType"))}}
             <Editor::EmailSizeWarning @post={{@publishOptions.post}} as |overLimit emailSizeKb| >
                 {{#if overLimit}}
                     <p class="gh-box gh-content-box pa gh-publish-setting-email-warning {{if (eq this.openSection "publishType") "open"}}">
                         <div class="gh-email-preview-clip-title mb">This email is <span class="yellow-d1">{{emailSizeKb}}kB</span></div>
-                        <div class="gh-email-preview-clip-description">Email newsletters may get clipped in the inbox behind a “View entire message” link when they’re over 100kB.</div>
+                        <div class="gh-email-preview-clip-description">Email newsletters may get clipped in the inbox behind a "View entire message" link when they're over 100kB.</div>
                     </p>
                 {{/if}}
             </Editor::EmailSizeWarning>
diff --git a/ghost/admin/app/services/email-size-warning.js b/ghost/admin/app/services/email-size-warning.js
index c6fba919297..15e27406c0e 100644
--- a/ghost/admin/app/services/email-size-warning.js
+++ b/ghost/admin/app/services/email-size-warning.js
@@ -34,7 +34,7 @@ export default class EmailSizeWarningService extends Service {
      */
     fetchEmailSize(post) {
         if (!post?.id || post.isNew) {
-            return Promise.resolve({overLimit: null, emailSizeKb: null});
+            return Promise.resolve({overLimit: false, emailSizeKb: null});
         }
 
         const postId = post.id;