diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php
index 6f57ba9c5..71c5118d2 100644
--- a/modules/system/lang/en/lang.php
+++ b/modules/system/lang/en/lang.php
@@ -8,6 +8,7 @@ return [
     'locale' => [
         'en' => 'English',
         'de' => 'German',
+        'el' => 'Greek',
         'es' => 'Spanish',
         'es-ar' => 'Spanish (Argentina)',
         'fa' => 'Persian',
@@ -27,8 +28,7 @@ return [
         'sk' => 'Slovak (Slovakia)',
         'tr' => 'Turkish',
         'zh-cn' => 'Chinese (China)',
-        'zh-tw' => 'Chinese (Taiwan)',
-        'el' => 'Greek'
+        'zh-tw' => 'Chinese (Taiwan)'
     ],
     'directory' => [
         'create_fail' => 'Cannot create directory: :name'
@@ -170,6 +170,7 @@ return [
         'menu_layouts_label' => 'Mail Layouts',
         'layout' => 'Layout',
         'layouts' => 'Layouts',
+        'no_layout' => '-- No layout --',
         'name' => 'Name',
         'name_comment' => 'Unique name used to refer to this template',
         'code' => 'Code',
diff --git a/modules/system/models/mailtemplate/fields.yaml b/modules/system/models/mailtemplate/fields.yaml
index 3f7d8d75d..b484dc772 100644
--- a/modules/system/models/mailtemplate/fields.yaml
+++ b/modules/system/models/mailtemplate/fields.yaml
@@ -7,7 +7,7 @@ fields:
     layout:
         label: system::lang.mail_templates.layout
         type: relation
-        emptyOption: -- No layout --
+        emptyOption: system::lang.mail_templates.no_layout
 
     code:
         label: system::lang.mail_templates.code
@@ -39,4 +39,4 @@ secondaryTabs:
         content_text:
             type: textarea
             size: huge
-            tab: system::lang.mail_templates.content_text
\ No newline at end of file
+            tab: system::lang.mail_templates.content_text