diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts
index bdde53667..261813824 100644
--- a/src/lib/actions/analytics.ts
+++ b/src/lib/actions/analytics.ts
@@ -225,6 +225,7 @@ export enum Submit {
     MembershipUpdate = 'submit_membership_update',
     MembershipUpdateStatus = 'submit_membership_update_status',
     MessagingTargetUpdate = 'submit_messaging_target_update',
+    MessagingUpdateHtmlMode = 'submit_update_html_mode',
     ProviderUpdate = 'submit_provider_update',
     TeamCreate = 'submit_team_create',
     TeamDelete = 'submit_team_delete',
diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/emailMessage.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/emailMessage.svelte
index 47560f433..7e0c473c0 100644
--- a/src/routes/(console)/project-[project]/messaging/message-[message]/emailMessage.svelte
+++ b/src/routes/(console)/project-[project]/messaging/message-[message]/emailMessage.svelte
@@ -73,7 +73,13 @@
                 ></InputText>
                 <InputTextarea id="message" label="Message" disabled={!isDraft} bind:value={content}
                 ></InputTextarea>
-                <InputSwitch label="HTML mode" id="html" bind:value={html}>
+                <InputSwitch
+                    label="HTML mode"
+                    id="html"
+                    bind:value={html}
+                    on:change={() => {
+                        trackEvent(Submit.MessagingUpdateHtmlMode);
+                    }}>
                     <svelte:fragment slot="description">
                         Enable the HTML mode if your message contains HTML tags.
                     </svelte:fragment>
diff --git a/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte b/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte
index b4568b02d..fcb66f702 100644
--- a/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte
+++ b/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte
@@ -15,6 +15,7 @@
     import { clickOnEnter } from '$lib/helpers/a11y';
     import { ID, MessagingProviderType } from '@appwrite.io/console';
     import { sdk } from '$lib/stores/sdk';
+    import { Submit, trackEvent } from '$lib/actions/analytics';
 
     let showCustomId = false;
     let showTest = false;
@@ -101,7 +102,13 @@
             </svelte:fragment>
         </Modal>
     </div>
-    <InputSwitch label="HTML mode" id="html" bind:value={$messageParams[$providerType]['html']}>
+    <InputSwitch
+        label="HTML mode"
+        id="html"
+        bind:value={$messageParams[$providerType]['html']}
+        on:change={() => {
+            trackEvent(Submit.MessagingUpdateHtmlMode);
+        }}>
         <svelte:fragment slot="description">
             Enable the HTML mode if your message contains HTML tags.
         </svelte:fragment>