From d46b1a0ac98f19d2804d97e7e084611f5bd5568e Mon Sep 17 00:00:00 2001
From: Prakhar Pratyush <prakhar@zulip.com>
Date: Thu, 24 Jul 2025 17:20:41 +0530
Subject: [PATCH] settings: Add a new "Notifications security" section in org
 settings.

This commit adds a new section named "Notifications security"
below "Automated messages and emails" in Organization settings.

The "Allow message content in message notification emails"
setting is moved from "Automated messages and emails" section
to this new section.

This serves as a prep work as we plan to add a new setting
"Require end-to-end encryption for push notification content"
in this section.

Fixes part of #35370.
---
 help/hide-message-content-in-emails.md        |  2 +-
 .../settings/organization_settings_admin.hbs  | 20 +++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/help/hide-message-content-in-emails.md b/help/hide-message-content-in-emails.md
index 790027e42c..1d5780a27a 100644
--- a/help/hide-message-content-in-emails.md
+++ b/help/hide-message-content-in-emails.md
@@ -15,7 +15,7 @@ being sent through the email system.
 
 {settings_tab|organization-settings}
 
-1. Under **Automated messages and emails**, toggle
+1. Under **Notifications security**, toggle
    **Allow message content in message notification emails**.
 
 {end_tabs}
diff --git a/web/templates/settings/organization_settings_admin.hbs b/web/templates/settings/organization_settings_admin.hbs
index 0ca0cf4c00..4a5d655d18 100644
--- a/web/templates/settings/organization_settings_admin.hbs
+++ b/web/templates/settings/organization_settings_admin.hbs
@@ -34,12 +34,6 @@
                   value_type="number"
                   custom_classes="decorated-stream-name-dropdown-widget"}}
 
-                {{> settings_checkbox
-                  setting_name="realm_message_content_allowed_in_email_notifications"
-                  prefix="id_"
-                  is_checked=realm_message_content_allowed_in_email_notifications
-                  label=admin_settings_label.realm_message_content_allowed_in_email_notifications}}
-
                 {{> settings_checkbox
                   setting_name="realm_send_welcome_emails"
                   prefix="id_"
@@ -70,6 +64,20 @@
             </div>
         </div>
 
+        <div class="settings-subsection-parent">
+            <div class="subsection-header">
+                <h3>{{t "Notifications security" }}</h3>
+                {{> settings_save_discard_widget section_name="notifications-security" }}
+            </div>
+            <div class="inline-block organization-settings-parent">
+                {{> settings_checkbox
+                  setting_name="realm_message_content_allowed_in_email_notifications"
+                  prefix="id_"
+                  is_checked=realm_message_content_allowed_in_email_notifications
+                  label=admin_settings_label.realm_message_content_allowed_in_email_notifications}}
+            </div>
+        </div>
+
         <div id="org-compose-settings" class="settings-subsection-parent">
             <div class="subsection-header">
                 <h3>{{t "Compose settings"}}</h3>