diff --git a/application/Espo/Resources/i18n/en_US/Global.json b/application/Espo/Resources/i18n/en_US/Global.json
index 796f3409c3..39173ad818 100644
--- a/application/Espo/Resources/i18n/en_US/Global.json
+++ b/application/Espo/Resources/i18n/en_US/Global.json
@@ -210,7 +210,8 @@
         "streamPostInfo": "Type <strong>@username</strong> to mention users in the post.\n\nAvailable markdown syntax:\n`<code>code</code>`\n**<strong>strong text</strong>**\n*<em>emphasized text</em>*\n~<del>deleted text</del>~\n> blockquote\n(url)[link]",
         "writeYourCommentHere": "Write your comment here",
         "writeMessageToUser": "Write a message to {user}",
-        "writeMessageToSelf": "Write a message to self"
+        "writeMessageToSelf": "Write a message to self",
+        "typeAndPressEnter": "Type & press enter"
     },
     "boolFilters": {
         "onlyMy": "Only My",
diff --git a/frontend/client/res/templates/fields/array/edit.tpl b/frontend/client/res/templates/fields/array/edit.tpl
index 39b393e1c5..97b1f168dd 100644
--- a/frontend/client/res/templates/fields/array/edit.tpl
+++ b/frontend/client/res/templates/fields/array/edit.tpl
@@ -6,5 +6,5 @@
 {{#if hasOptions}}
 <button class="btn btn-default btn-block" type="button" data-action="showAddModal">{{translate 'Add'}}</button>
 {{else}}
-<input class="main-element form-control select" type="text" autocomplete="off" placeholder="{{#if this.options}}{{translate 'Select'}}{{else}}{{translate 'Type & press enter'}}{{/if}}">
+<input class="main-element form-control select" type="text" autocomplete="off" placeholder="{{#if this.options}}{{translate 'Select'}}{{else}}{{translate 'typeAndPressEnter' category='messages'}}{{/if}}">
 {{/if}}
diff --git a/frontend/client/src/views/modals/compose-email.js b/frontend/client/src/views/modals/compose-email.js
index 082564272c..3a9fc4d6e6 100644
--- a/frontend/client/src/views/modals/compose-email.js
+++ b/frontend/client/src/views/modals/compose-email.js
@@ -47,12 +47,12 @@ Espo.define('views/modals/compose-email', 'views/modals/edit', function (Dep) {
 
             this.buttonList.unshift({
                 name: 'saveDraft',
-                text: this.translate('Save Draft'),
+                text: this.translate('Save Draft', 'labels', 'Email'),
             });
 
             this.buttonList.unshift({
                 name: 'send',
-                text: this.getLanguage().translate('Send'),
+                text: this.translate('Send', 'labels', 'Email'),
                 style: 'primary'
             });