diff --git a/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte b/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte
index 5e680c334f..7c8d89bab2 100644
--- a/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte
+++ b/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte
@@ -112,5 +112,7 @@
     {/if}
     <Topics topics={Object.values(data.topicsById)} />
     <Targets targets={Object.values(data.targetsById)} usersById={data.usersById} />
-    <Delete />
+    {#if $message.status !== MessageType.Processing}
+        <Delete message={$message} />
+    {/if}
 </Container>
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/delete.svelte b/src/routes/console/project-[project]/messaging/message-[message]/delete.svelte
index 707b16c72b..4ffdf4b2d5 100644
--- a/src/routes/console/project-[project]/messaging/message-[message]/delete.svelte
+++ b/src/routes/console/project-[project]/messaging/message-[message]/delete.svelte
@@ -2,9 +2,10 @@
     import { BoxAvatar, CardGrid, Heading } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { toLocaleDateTime } from '$lib/helpers/date';
-    import { MessageType } from '@appwrite.io/console';
+    import type { Models } from '@appwrite.io/console';
     import DeleteModal from './deleteModal.svelte';
-    import { message } from './store';
+
+    export let message: Models.Message & { data: Record<string, unknown> };
 
     let showDelete = false;
 </script>
@@ -12,32 +13,30 @@
 <CardGrid>
     <Heading tag="h6" size="7">Delete message</Heading>
     <p>
-        The message will be permanently deleted, including all data associated with this message.
-        This action is irreversible.
+        The message will be permanently deleted{message.status === 'scheduled'
+            ? ', and its delivery will be canceled'
+            : ''}. This action is irreversible.
     </p>
     <svelte:fragment slot="aside">
         <BoxAvatar>
             <svelte:fragment slot="title">
                 <h6 class="u-bold u-trim-1" data-private>
-                    {$message.data.title ??
-                        $message.data.subject ??
-                        $message.data.content ??
+                    {message.data.title ??
+                        message.data.subject ??
+                        message.data.content ??
                         'Message'}
                 </h6>
             </svelte:fragment>
             <p>
-                Last updated: {toLocaleDateTime($message.$updatedAt)}
+                Last updated: {toLocaleDateTime(message.$updatedAt)}
             </p>
         </BoxAvatar>
     </svelte:fragment>
 
     <svelte:fragment slot="actions">
-        <Button
-            disabled={$message.status === MessageType.Processing}
-            secondary
-            on:click={() => (showDelete = true)}
-            event="delete_file">Delete</Button>
+        <Button secondary on:click={() => (showDelete = true)} event="delete_message"
+            >Delete</Button>
     </svelte:fragment>
 </CardGrid>
 
-<DeleteModal bind:show={showDelete} />
+<DeleteModal {message} bind:show={showDelete} />
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/deleteModal.svelte b/src/routes/console/project-[project]/messaging/message-[message]/deleteModal.svelte
index 247b8d3ab5..0f6396df32 100644
--- a/src/routes/console/project-[project]/messaging/message-[message]/deleteModal.svelte
+++ b/src/routes/console/project-[project]/messaging/message-[message]/deleteModal.svelte
@@ -7,17 +7,33 @@
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
-    import { message } from './store';
+    import type { Models } from '@appwrite.io/console';
 
     export let show = false;
+    export let message: Models.Message & { data: Record<string, unknown> };
+
+    let description = message.data.title ?? message.data.subject ?? message.data.content ?? '';
 
     const deleteMessage = async () => {
         try {
-            await sdk.forProject.messaging.delete($message.$id);
+            await sdk.forProject.messaging.delete(message.$id);
             show = false;
+            let notificationMessage = '';
+            switch (message.status) {
+                case 'draft':
+                    notificationMessage = `The ${message.status} message has been deleted`;
+                    break;
+                case 'scheduled':
+                    notificationMessage =
+                        'The scheduled message has been deleted, and its delivery was cancelled';
+                    break;
+                default:
+                    notificationMessage = 'The message has been deleted';
+                    break;
+            }
             addNotification({
                 type: 'success',
-                message: `Message has been deleted`
+                message: notificationMessage
             });
             trackEvent(Submit.MessagingMessageDelete);
             await goto(`${base}/console/project-${$page.params.project}/messaging`);
@@ -38,7 +54,27 @@
     icon="exclamation"
     state="warning"
     headerDivider={false}>
-    <p data-private>Are you sure you want to delete this message?</p>
+    <p data-private>
+        Are you sure you want to delete
+        {#if description}
+            <span class="u-bold">{description}</span>{:else}
+            this message
+        {/if}?
+    </p>
+
+    <p class="u-bold">
+        {#if message.status === 'draft'}
+            This action is irreversible.
+        {:else if message.status === 'scheduled'}
+            This is a scheduled message. Deleting it will result in the cancellation of its
+            delivery. This action is irreversible.
+        {:else if message.status === 'sent'}
+            The message has already been sent. After deleting it, you will no longer see it here.
+        {:else if message.status === 'failed'}
+            The message has been sent with errors. After deleting it, you will no longer see it
+            here.
+        {/if}
+    </p>
     <svelte:fragment slot="footer">
         <Button text on:click={() => (show = false)}>Cancel</Button>
         <Button secondary submit>Delete</Button>