diff --git a/modules/system/models/mailsettings/fields.yaml b/modules/system/models/mailsettings/fields.yaml
index 38f24078e..cec33ac26 100644
--- a/modules/system/models/mailsettings/fields.yaml
+++ b/modules/system/models/mailsettings/fields.yaml
@@ -37,6 +37,25 @@ tabs:
                 field: send_mode
                 condition: value[smtp]
 
+        smtp_port:
+            label: system::lang.mail.smtp_port
+            tab: system::lang.mail.general
+            span: auto
+            trigger:
+                action: show
+                field: send_mode
+                condition: value[smtp]
+
+        smtp_encryption:
+            type: dropdown
+            label: system::lang.mail.smtp_encryption
+            tab: system::lang.mail.general
+            span: auto
+            trigger:
+                action: show
+                field: send_mode
+                condition: value[smtp]
+
         smtp_authorization:
             type: checkbox
             label: system::lang.mail.smtp_authorization
@@ -65,24 +84,6 @@ tabs:
                 field: send_mode
                 condition: value[smtp]
 
-        smtp_port:
-            label: system::lang.mail.smtp_port
-            tab: system::lang.mail.general
-            trigger:
-                action: show
-                field: send_mode
-                condition: value[smtp]
-
-        smtp_encryption:
-            type: dropdown
-            label: system::lang.mail.smtp_encryption
-            tab: system::lang.mail.general
-            span: left
-            trigger:
-                action: show
-                field: send_mode
-                condition: value[smtp]
-
         sendmail_path:
             label: system::lang.mail.sendmail_path
             commentAbove: system::lang.mail.sendmail_path_comment