diff --git a/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap b/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap
index 421802e5ac..d987bfcdf9 100644
--- a/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap
+++ b/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap
@@ -502,6 +502,1497 @@ http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
+
+
+
+
+",
+}
+`;
+
+exports[`Batch sending tests Newsletter settings Hides comments button for email only posts 1 1`] = `
+Object {
+ "html": "
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+ |
+ |
+
+
+
+
+
+
+",
+}
+`;
+
+exports[`Batch sending tests Newsletter settings Hides comments button for email only posts 2 1`] = `
+Object {
+ "html": "
+Hello world
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Ghost [http://127.0.0.1:2369/]
+
+
+Daily newsletter [http://127.0.0.1:2369/]
+
+
+
+
+
+
+
+
+
+
+This is a test post title [http://127.0.0.1:2369/email/post-uuid/]
+
+
+
+
+
+
+
+
+
+By Joe Bloggs • 1 Jan 2023
+
+
+View in browser [http://127.0.0.1:2369/email/post-uuid/]
+
+
+
+
+
+
+
+
+
+
+
+Hello world
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Ghost © 2023 – Unsubscribe [unsubscribe_url]
+
+
+
+https://ghost.org/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+",
+}
+`;
+
+exports[`Batch sending tests Newsletter settings Hides comments button if comments disabled 1 1`] = `
+Object {
+ "html": "
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+ |
+ |
+
+
+
+
+
+
+",
+}
+`;
+
+exports[`Batch sending tests Newsletter settings Hides comments button if comments disabled 2 1`] = `
+Object {
+ "html": "
+Hello world
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Ghost [http://127.0.0.1:2369/]
+
+
+Daily newsletter [http://127.0.0.1:2369/]
+
+
+
+
+
+
+
+
+
+
+This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-6/]
+
+
+
+
+
+
+
+
+
+By Joe Bloggs • 1 Jan 2023
+
+
+View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-6/]
+
+
+
+
+
+
+
+
+
+
+
+Hello world
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Ghost © 2023 – Unsubscribe [unsubscribe_url]
+
+
+
+https://ghost.org/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+",
+}
+`;
+
+exports[`Batch sending tests Newsletter settings Hides comments button if disabled in newsletter 1 1`] = `
+Object {
+ "html": "
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+ |
+ |
+
+
+
+
+
+
+",
+}
+`;
+
+exports[`Batch sending tests Newsletter settings Hides comments button if disabled in newsletter 2 1`] = `
+Object {
+ "html": "
+Hello world
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Ghost [http://127.0.0.1:2369/]
+
+
+Daily newsletter [http://127.0.0.1:2369/]
+
+
+
+
+
+
+
+
+
+
+This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-7/]
+
+
+
+
+
+
+
+
+
+By Joe Bloggs • 1 Jan 2023
+
+
+View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-7/]
+
+
+
+
+
+
+
+
+
+
+
+Hello world
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Ghost © 2023 – Unsubscribe [unsubscribe_url]
+
+
+
+https://ghost.org/
+
+
+
+
+
+
+
+
+
+
+
@@ -1463,6 +2954,1609 @@ http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
}
`;
+exports[`Batch sending tests Newsletter settings Shows 2 comment buttons for published posts with feedback enabled 1 1`] = `
+Object {
+ "html": "
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+ |
+
+
+
+
+
+ |
+ |
+
+
+
+
+
+
+",
+}
+`;
+
+exports[`Batch sending tests Newsletter settings Shows 2 comment buttons for published posts with feedback enabled 2 1`] = `
+Object {
+ "html": "
+Hello world
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Ghost [http://127.0.0.1:2369/]
+
+
+Daily newsletter [http://127.0.0.1:2369/]
+
+
+
+
+
+
+
+
+
+
+This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-4/]
+
+
+
+
+
+
+
+
+
+By Joe Bloggs • 1 Jan 2023
+
+•
+[http://127.0.0.1:2369/this-is-a-test-post-title-4/#ghost-comments]
+
+
+View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-4/]
+
+
+
+
+
+
+
+
+
+
+
+Hello world
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://127.0.0.1:2369/this-is-a-test-post-title-4/#/feedback/post-id/1/?uuid=member-uuid
+
+
+
+http://127.0.0.1:2369/this-is-a-test-post-title-4/#/feedback/post-id/0/?uuid=member-uuid
+
+
+
+http://127.0.0.1:2369/this-is-a-test-post-title-4/#ghost-comments
+
+
+
+
+
+
+
+
+
+
+
+
+Ghost © 2023 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid]
+
+
+
+https://ghost.org/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+",
+}
+`;
+
+exports[`Batch sending tests Newsletter settings Shows 2 comment buttons for published posts without feedback enabled 1 1`] = `
+Object {
+ "html": "
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+ |
+
+
+
+
+
+ |
+ |
+
+
+
+
+
+
+",
+}
+`;
+
+exports[`Batch sending tests Newsletter settings Shows 2 comment buttons for published posts without feedback enabled 2 1`] = `
+Object {
+ "html": "
+Hello world
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Ghost [http://127.0.0.1:2369/]
+
+
+Daily newsletter [http://127.0.0.1:2369/]
+
+
+
+
+
+
+
+
+
+
+This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-3/]
+
+
+
+
+
+
+
+
+
+By Joe Bloggs • 1 Jan 2023
+
+•
+[http://127.0.0.1:2369/this-is-a-test-post-title-3/#ghost-comments]
+
+
+View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-3/]
+
+
+
+
+
+
+
+
+
+
+
+Hello world
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://127.0.0.1:2369/this-is-a-test-post-title-3/#ghost-comments
+
+
+
+
+
+
+
+
+
+
+
+
+Ghost © 2023 – Unsubscribe [unsubscribe_url]
+
+
+
+https://ghost.org/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+",
+}
+`;
+
+exports[`Batch sending tests Newsletter settings Shows comments button for published posts 1 1`] = `
+Object {
+ "html": "member-uuid