diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts
index 9065ea31fd..9bcde1d200 100644
--- a/src/lib/actions/analytics.ts
+++ b/src/lib/actions/analytics.ts
@@ -173,6 +173,7 @@ export enum Submit {
     ProjectUpdateTeam = 'submit_project_update_team',
     ProjectService = 'submit_project_service',
     ProjectUpdateSMTP = 'submit_project_update_smtp',
+    ProjectTestSMTP = 'submit_project_test_smtp',
     MemberCreate = 'submit_member_create',
     MemberDelete = 'submit_member_delete',
     MembershipUpdateStatus = 'submit_membership_update_status',
diff --git a/src/lib/components/modal.svelte b/src/lib/components/modal.svelte
index 816ce20466..c7506e98a8 100644
--- a/src/lib/components/modal.svelte
+++ b/src/lib/components/modal.svelte
@@ -64,11 +64,13 @@
                     </button>
                 {/if}
             </div>
-            <p class="u-margin-block-start-4">
-                <slot name="description">
-                    {description}
-                </slot>
-            </p>
+            {#if description}
+                <p class="u-margin-block-start-4">
+                    <slot name="description">
+                        {description}
+                    </slot>
+                </p>
+            {/if}
         </header>
         <div class="modal-content">
             {#if error}
diff --git a/src/lib/elements/forms/inputTags.svelte b/src/lib/elements/forms/inputTags.svelte
index c3f6bdde6e..8fc7241081 100644
--- a/src/lib/elements/forms/inputTags.svelte
+++ b/src/lib/elements/forms/inputTags.svelte
@@ -118,3 +118,15 @@
         <Helper type="warning">{error}</Helper>
     {/if}
 </FormItem>
+
+<style lang="scss">
+    .input-tag {
+        --p-bg-color: var(--color-neutral-10);
+        --p-text-color: var(--color-neutral-60);
+    }
+
+    :global(.theme-dark) .input-tag {
+        --p-bg-color: var(--color-neutral-80);
+        --p-text-color: var(--color-neutral-20);
+    }
+</style>
\ No newline at end of file
diff --git a/src/routes/console/project-[project]/settings/smtp/+page.svelte b/src/routes/console/project-[project]/settings/smtp/+page.svelte
index a35ad9ea7b..6135a55a1e 100644
--- a/src/routes/console/project-[project]/settings/smtp/+page.svelte
+++ b/src/routes/console/project-[project]/settings/smtp/+page.svelte
@@ -23,6 +23,7 @@
     import { organization } from '$lib/stores/organization';
     import { wizard } from '$lib/stores/wizard';
     import ChangeOrganizationTierCloud from '$routes/console/changeOrganizationTierCloud.svelte';
+    import SmtpTestModal from './smtpTestModal.svelte';
 
     let enabled = false;
     let senderName: string;
@@ -34,6 +35,8 @@
     let password: string;
     let secure = false;
 
+    let showTestSMTPModal = false;
+
     onMount(() => {
         enabled = $project.smtpEnabled ?? false;
         senderName = $project.smtpSenderName;
@@ -198,13 +201,32 @@
                 {/if}
             </svelte:fragment>
             <svelte:fragment slot="actions">
-                <Button
-                    submit
-                    disabled={isButtonDisabled ||
-                        $organization.billingPlan === BillingPlan.STARTER}>
-                    Update
-                </Button>
+                <div class="u-flex u-main-end u-gap-16">
+                    <Button text on:click={() => (showTestSMTPModal = true)}>
+                        Send test email
+                    </Button>
+
+                    <Button
+                        submit
+                        disabled={isButtonDisabled ||
+                            $organization.billingPlan === BillingPlan.STARTER}>
+                        Update
+                    </Button>
+                </div>
             </svelte:fragment>
         </CardGrid>
     </Form>
 </Container>
+
+{#if showTestSMTPModal}
+    <SmtpTestModal
+        {senderName}
+        {senderEmail}
+        {replyTo}
+        {host}
+        {port}
+        {username}
+        {password}
+        {secure}
+        bind:showModal={showTestSMTPModal} />
+{/if}
diff --git a/src/routes/console/project-[project]/settings/smtp/smtpTestModal.svelte b/src/routes/console/project-[project]/settings/smtp/smtpTestModal.svelte
new file mode 100644
index 0000000000..4871894424
--- /dev/null
+++ b/src/routes/console/project-[project]/settings/smtp/smtpTestModal.svelte
@@ -0,0 +1,117 @@
+<script lang="ts">
+    import { Button } from '$lib/elements/forms';
+    import { Modal } from '$lib/components';
+    import { FormList } from '$lib/elements/forms';
+    import InputTags from '$lib/elements/forms/inputTags.svelte';
+    import InputCheckbox from '$lib/elements/forms/inputCheckbox.svelte';
+    import { user } from '$lib/stores/user';
+    import { addNotification } from '$lib/stores/notifications';
+    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
+    import { sdk } from '$lib/stores/sdk';
+    import { project } from '../../store';
+
+    export let showModal = false;
+    export let senderName: string;
+    export let senderEmail: string;
+    export let replyTo: string;
+    export let host: string;
+    export let port: number;
+    export let username: string;
+    export let password: string;
+    export let secure;
+
+    let error: string = null;
+    let sendToSelf = true;
+    let sendToOthers = false;
+    let emails = [];
+
+    function close() {
+        showModal = false;
+    }
+
+    async function handleTestEmail() {
+        try {
+            const allMails = [...emails];
+            if (sendToSelf) {
+                allMails.push($user.email);
+            }
+
+            await sdk.forConsole.projects.createSmtpTest(
+                $project.$id,
+                allMails,
+                senderName ? senderName : undefined,
+                senderEmail ? senderEmail : undefined,
+                host ? host : undefined,
+                replyTo ? replyTo : undefined,
+                port ? port : undefined,
+                username ? username : undefined,
+                password ? password : undefined,
+                secure ? 'tls' : undefined
+            );
+            close();
+            if (allMails.length === 1) {
+                addNotification({
+                    type: 'success',
+                    message: `Test email has been sent to ${allMails[0]}`
+                });
+            } else {
+                addNotification({
+                    type: 'success',
+                    message: `Test email has been sent to ${allMails[0]} and ${
+                        allMails.length - 1
+                    } others`
+                });
+            }
+            trackEvent(Submit.ProjectTestSMTP);
+        } catch (e) {
+            error = e.message;
+            trackError(e, Submit.ProjectTestSMTP);
+        }
+    }
+</script>
+
+<Modal bind:error bind:show={showModal} onSubmit={handleTestEmail}>
+    <svelte:fragment slot="title">Send test email</svelte:fragment>
+    <div class="u-margin-block-start-16">
+        <FormList gap={24}>
+            <div class="u-flex u-cross-center u-gap-8">
+                <InputCheckbox
+                    id="send-to-self"
+                    checked={sendToSelf}
+                    on:click={() => (sendToSelf = !sendToSelf)} />
+                <p class="text u-bold">{$user.email}</p>
+            </div>
+
+            <div class="u-flex u-cross-start u-gap-8">
+                <InputCheckbox
+                    id="send-to-others"
+                    wrapperTag="div"
+                    checked={sendToOthers}
+                    on:click={() => (sendToOthers = !sendToOthers)} />
+
+                <div>
+                    <p class="text u-bold">Others</p>
+                    <p class="text u-margin-block-start-8">
+                        Enter the email address(es) to which the test message will be sent
+                    </p>
+                    <div
+                        class="u-margin-block-start-8"
+                        style="border: solid 0.0625rem hsl(var(--color-border)); border-radius: var(--border-radius-small);">
+                        <InputTags
+                            disabled={!sendToOthers}
+                            id="others-emails"
+                            label="Email address(es)"
+                            showLabel={false}
+                            placeholder="Enter email address(es)"
+                            bind:tags={emails} />
+                    </div>
+                </div>
+            </div>
+        </FormList>
+    </div>
+
+    <svelte:fragment slot="footer">
+        <Button secondary on:click={close}>Cancel</Button>
+        <Button submit>Send</Button>
+    </svelte:fragment>
+</Modal>