diff --git a/src/routes/console/project-[project]/messaging/providers/store.ts b/src/routes/console/project-[project]/messaging/providers/store.ts
index 4853e3450a..f2ef834253 100644
--- a/src/routes/console/project-[project]/messaging/providers/store.ts
+++ b/src/routes/console/project-[project]/messaging/providers/store.ts
@@ -199,14 +199,14 @@ export const providers: ProvidersMap = {
                         placeholder: 'Enter name'
                     },
                     {
-                        label: 'Reply-to email',
+                        label: 'Reply to email',
                         name: 'replyToEmail',
                         type: 'email',
                         optional: true,
                         placeholder: 'Enter email'
                     },
                     {
-                        label: 'Reply-to name',
+                        label: 'Reply to name',
                         name: 'replyToName',
                         type: 'text',
                         optional: true,
@@ -244,14 +244,14 @@ export const providers: ProvidersMap = {
                         placeholder: 'Enter name'
                     },
                     {
-                        label: 'Reply-to email',
+                        label: 'Reply to email',
                         name: 'replyToEmail',
                         type: 'email',
                         optional: true,
                         placeholder: 'Enter email'
                     },
                     {
-                        label: 'Reply-to name',
+                        label: 'Reply to name',
                         name: 'replyToName',
                         type: 'text',
                         optional: true,
@@ -260,18 +260,44 @@ export const providers: ProvidersMap = {
                 ]
             },
             [Providers.SMTP]: {
-                classIcon: 'mail',
                 title: 'SMTP',
                 description: '',
                 configure: [
                     {
-                        label: 'Host',
+                        label: 'Sender name',
+                        name: 'fromName',
+                        type: 'text',
+                        optional: true,
+                        placeholder: 'Enter name'
+                    },
+                    {
+                        label: 'Sender email',
+                        name: 'fromEmail',
+                        type: 'email',
+                        placeholder: 'Enter email'
+                    },
+                    {
+                        label: 'Reply to name',
+                        name: 'replyToName',
+                        type: 'text',
+                        optional: true,
+                        placeholder: 'Enter name'
+                    },
+                    {
+                        label: 'Reply to email',
+                        name: 'replyToEmail',
+                        type: 'email',
+                        optional: true,
+                        placeholder: 'Enter email'
+                    },
+                    {
+                        label: 'Server host',
                         name: 'host',
                         type: 'text',
                         placeholder: 'Enter host'
                     },
                     {
-                        label: 'Port',
+                        label: 'Server port',
                         name: 'port',
                         type: 'text',
                         optional: true,
@@ -314,33 +340,6 @@ export const providers: ProvidersMap = {
                         type: 'text',
                         optional: true,
                         placeholder: 'Enter mailer'
-                    },
-                    {
-                        label: 'Sender email',
-                        name: 'fromEmail',
-                        type: 'email',
-                        placeholder: 'Enter email'
-                    },
-                    {
-                        label: 'Sender name',
-                        name: 'fromName',
-                        type: 'text',
-                        optional: true,
-                        placeholder: 'Enter name'
-                    },
-                    {
-                        label: 'Reply-to email',
-                        name: 'replyToEmail',
-                        type: 'email',
-                        optional: true,
-                        placeholder: 'Enter email'
-                    },
-                    {
-                        label: 'Reply-to name',
-                        name: 'replyToName',
-                        type: 'text',
-                        optional: true,
-                        placeholder: 'Enter name'
                     }
                 ]
             }