diff --git a/modules/system/controllers/maillayouts/create.htm b/modules/system/controllers/maillayouts/create.htm
index 313fd44c2..7eba080d2 100644
--- a/modules/system/controllers/maillayouts/create.htm
+++ b/modules/system/controllers/maillayouts/create.htm
@@ -13,7 +13,7 @@
             <?= $this->formRender() ?>
         </div>
 
-        <div class="form-buttons">
+        <div class="form-buttons p-t">
             <div class="loading-indicator-container">
                 <button
                     type="submit"
diff --git a/modules/system/controllers/maillayouts/update.htm b/modules/system/controllers/maillayouts/update.htm
index a0987a69a..092b6a729 100644
--- a/modules/system/controllers/maillayouts/update.htm
+++ b/modules/system/controllers/maillayouts/update.htm
@@ -24,7 +24,7 @@
             <?= $this->formRender() ?>
         </div>
 
-        <div class="form-buttons">
+        <div class="form-buttons p-t">
             <div class="loading-indicator-container">
                 <button
                     type="submit"
diff --git a/modules/system/controllers/mailtemplates/create.htm b/modules/system/controllers/mailtemplates/create.htm
index 86b076d2b..eb3751041 100644
--- a/modules/system/controllers/mailtemplates/create.htm
+++ b/modules/system/controllers/mailtemplates/create.htm
@@ -13,7 +13,7 @@
             <?= $this->formRender() ?>
         </div>
 
-        <div class="form-buttons">
+        <div class="form-buttons p-t">
             <div class="loading-indicator-container">
                 <button
                     type="submit"
diff --git a/modules/system/controllers/mailtemplates/update.htm b/modules/system/controllers/mailtemplates/update.htm
index 8d2753a10..37088bf13 100644
--- a/modules/system/controllers/mailtemplates/update.htm
+++ b/modules/system/controllers/mailtemplates/update.htm
@@ -24,7 +24,7 @@
             <?= $this->formRender() ?>
         </div>
 
-        <div class="form-buttons">
+        <div class="form-buttons p-t">
             <div class="loading-indicator-container">
                 <button
                     type="submit"
diff --git a/modules/system/models/maillayout/fields.yaml b/modules/system/models/maillayout/fields.yaml
index 68437f39b..9bbccb4eb 100644
--- a/modules/system/models/maillayout/fields.yaml
+++ b/modules/system/models/maillayout/fields.yaml
@@ -25,14 +25,17 @@ secondaryTabs:
             size: giant
             tab: system::lang.mail_templates.content_html
             language: html
+            stretch: true
 
         content_css:
             type: codeeditor
             size: giant
             tab: system::lang.mail_templates.content_css
             language: css
+            stretch: true
 
         content_text:
             type: textarea
             size: giant
             tab: system::lang.mail_templates.content_text
+            stretch: true
diff --git a/modules/system/models/mailtemplate/fields.yaml b/modules/system/models/mailtemplate/fields.yaml
index 6551900fd..f38fe6606 100644
--- a/modules/system/models/mailtemplate/fields.yaml
+++ b/modules/system/models/mailtemplate/fields.yaml
@@ -36,8 +36,10 @@ secondaryTabs:
             size: giant
             language: html
             tab: system::lang.mail_templates.content_html
+            stretch: true
 
         content_text:
             type: textarea
             size: giant
             tab: system::lang.mail_templates.content_text
+            stretch: true