diff --git a/application/Espo/Resources/i18n/bg_BG/Admin.json b/application/Espo/Resources/i18n/bg_BG/Admin.json
index a68b37cb9f..4485bbe1a1 100644
--- a/application/Espo/Resources/i18n/bg_BG/Admin.json
+++ b/application/Espo/Resources/i18n/bg_BG/Admin.json
@@ -269,7 +269,7 @@
     "accessInfoPortal": "Access Info за портали",
     "assignment": "назначение",
     "mention": "Споменавам",
-    "noteEmailRecieved": "Забележка за което ще получи Email",
+    "noteEmailReceived": "Забележка за което ще получи Email",
     "notePost": "Забележка за публикация",
     "notePostNoParent": "Забележка за публикация (без майка)",
     "noteStatus": "Забележка за Актуализация на състоянието",
diff --git a/application/Espo/Resources/i18n/da_DK/Admin.json b/application/Espo/Resources/i18n/da_DK/Admin.json
index b0f11de215..2987a5a782 100644
--- a/application/Espo/Resources/i18n/da_DK/Admin.json
+++ b/application/Espo/Resources/i18n/da_DK/Admin.json
@@ -229,7 +229,7 @@
     "accessInfoPortal": "Adgangsinfo for portaler",
     "assignment": "Opgave",
     "mention": "Nævne",
-    "noteEmailRecieved": "Notat omkring modtagne Email",
+    "noteEmailReceived": "Notat omkring modtagne Email",
     "notePost": "Notat omkring poster",
     "notePostNoParent": "Note omkring poster (Ingen henvisning)",
     "noteStatus": "Notat omkring status opdatering",
diff --git a/application/Espo/Resources/i18n/de_DE/Admin.json b/application/Espo/Resources/i18n/de_DE/Admin.json
index ba277091ff..a8dc1331e2 100644
--- a/application/Espo/Resources/i18n/de_DE/Admin.json
+++ b/application/Espo/Resources/i18n/de_DE/Admin.json
@@ -234,7 +234,7 @@
     "accessInfoPortal": "Zugriffsinfo für Portale",
     "assignment": "Zuweisung",
     "mention": "Erwähnen",
-    "noteEmailRecieved": "Hinweis zu empfangenen E-Mails",
+    "noteEmailReceived": "Hinweis zu empfangenen E-Mails",
     "notePost": "Hinweis zum Beitrag",
     "notePostNoParent": "Hinweis zum Beitrag (no Parent)",
     "noteStatus": "Benachrichtigung über Statusupdates",
diff --git a/application/Espo/Resources/i18n/en_US/Admin.json b/application/Espo/Resources/i18n/en_US/Admin.json
index 8952de357f..644e2e6c40 100644
--- a/application/Espo/Resources/i18n/en_US/Admin.json
+++ b/application/Espo/Resources/i18n/en_US/Admin.json
@@ -291,7 +291,7 @@
         "accessInfoPortal": "Access Info for Portals",
         "assignment": "Assignment",
         "mention": "Mention",
-        "noteEmailRecieved": "Note about Recieved Email",
+        "noteEmailReceived": "Note about Received Email",
         "notePost": "Note about Post",
         "notePostNoParent": "Note about Post (no Parent)",
         "noteStatus": "Note about Status Update",
diff --git a/application/Espo/Resources/i18n/es_MX/Admin.json b/application/Espo/Resources/i18n/es_MX/Admin.json
index 5c4b9de516..c5642644e5 100644
--- a/application/Espo/Resources/i18n/es_MX/Admin.json
+++ b/application/Espo/Resources/i18n/es_MX/Admin.json
@@ -257,7 +257,7 @@
     "accessInfoPortal": "Información de Acceso a Portales",
     "assignment": "Asignación",
     "mention": "Mención",
-    "noteEmailRecieved": "Nota sobre el Correo Recibido",
+    "noteEmailReceived": "Nota sobre el Correo Recibido",
     "notePost": "Nota sobre la Publicación",
     "notePostNoParent": "Nota sobre la Publicación (No el Padre)",
     "noteStatus": "Nota sobre el Estado de la Actualización",
diff --git a/application/Espo/Resources/i18n/it_IT/Admin.json b/application/Espo/Resources/i18n/it_IT/Admin.json
index 653cb5a874..a81149172b 100644
--- a/application/Espo/Resources/i18n/it_IT/Admin.json
+++ b/application/Espo/Resources/i18n/it_IT/Admin.json
@@ -243,7 +243,7 @@
     "accessInfoPortal": "Accedi alle informazioni per i portali",
     "assignment": "Assegnato",
     "mention": "Citare\n",
-    "noteEmailRecieved": "Nota sull'e-mail ricevuta",
+    "noteEmailReceived": "Nota sull'e-mail ricevuta",
     "notePost": "Nota su post",
     "notePostNoParent": "Nota su post (nessun genitore)",
     "noteStatus": "Nota sull'aggiornamento dello stato",
diff --git a/application/Espo/Resources/i18n/lt_LT/Admin.json b/application/Espo/Resources/i18n/lt_LT/Admin.json
index 337717f0f3..c8c58ffae5 100644
--- a/application/Espo/Resources/i18n/lt_LT/Admin.json
+++ b/application/Espo/Resources/i18n/lt_LT/Admin.json
@@ -248,7 +248,7 @@
     "accessInfoPortal": "Prieiga prie informacijos portalams",
     "assignment": "Priskyrimai",
     "mention": "Paminėti",
-    "noteEmailRecieved": "Pranešimas apie gautą el. laišką",
+    "noteEmailReceived": "Pranešimas apie gautą el. laišką",
     "notePost": "Pranešimas apie įrašą",
     "notePostNoParent": "Pranešimas apie įrašą (be susijusių)",
     "noteStatus": "Pranešimas apie statuso atnaujinimą",
diff --git a/application/Espo/Resources/i18n/lv_LV/Admin.json b/application/Espo/Resources/i18n/lv_LV/Admin.json
index 80ec4db729..c70ddf9326 100644
--- a/application/Espo/Resources/i18n/lv_LV/Admin.json
+++ b/application/Espo/Resources/i18n/lv_LV/Admin.json
@@ -258,7 +258,7 @@
     "accessInfoPortal": "Piekļuves informācija par portāliem",
     "assignment": "Uzdevums",
     "mention": "Pieminēt",
-    "noteEmailRecieved": "Piezīme par saņemto e-pastu",
+    "noteEmailReceived": "Piezīme par saņemto e-pastu",
     "notePost": "Piezīme par Postu",
     "notePostNoParent": "Piezīme par ziņojumu (bez vecākiem)",
     "noteStatus": "Piezīme par statusa atjaunināšanu",
diff --git a/application/Espo/Resources/i18n/nl_NL/Admin.json b/application/Espo/Resources/i18n/nl_NL/Admin.json
index 52afd1654f..4f7e05a9f3 100644
--- a/application/Espo/Resources/i18n/nl_NL/Admin.json
+++ b/application/Espo/Resources/i18n/nl_NL/Admin.json
@@ -227,7 +227,7 @@
     "accessInfoPortal": "Toegangs info voor Portaal",
     "assignment": "Toegewezen",
     "mention": "Genoemd",
-    "noteEmailRecieved": "Opmerking ontvangen E-mail",
+    "noteEmailReceived": "Opmerking ontvangen E-mail",
     "notePost": "Opmerking over bericht",
     "notePostNoParent": "Opmerking over bericht",
     "noteStatus": "Opmerking over status-update",
diff --git a/application/Espo/Resources/i18n/pl_PL/Admin.json b/application/Espo/Resources/i18n/pl_PL/Admin.json
index ac73aca85f..f1845bde2e 100644
--- a/application/Espo/Resources/i18n/pl_PL/Admin.json
+++ b/application/Espo/Resources/i18n/pl_PL/Admin.json
@@ -243,7 +243,7 @@
   "templates": {
     "accessInfo": "Informacje dostępowe",
     "mention": "Wzmianka",
-    "noteEmailRecieved": "Notatka o otrzymanej wiadomości e-mail",
+    "noteEmailReceived": "Notatka o otrzymanej wiadomości e-mail",
     "notePost": "Notatka o wpisie"
   }
 }
\ No newline at end of file
diff --git a/application/Espo/Resources/i18n/uk_UA/Admin.json b/application/Espo/Resources/i18n/uk_UA/Admin.json
index 31d367ed9e..42738ff266 100644
--- a/application/Espo/Resources/i18n/uk_UA/Admin.json
+++ b/application/Espo/Resources/i18n/uk_UA/Admin.json
@@ -252,7 +252,7 @@
   "templates": {
     "assignment": "Призначення",
     "mention": "Згадування",
-    "noteEmailRecieved": "Повідомлення про отриманий емейл",
+    "noteEmailReceived": "Повідомлення про отриманий емейл",
     "notePost": "Повідомлення про пост",
     "noteStatus": "Повідомлення про оновлення статусу",
     "passwordChangeLink": "Посилання на зміну паролю"
diff --git a/application/Espo/Resources/i18n/zh_TW/Admin.json b/application/Espo/Resources/i18n/zh_TW/Admin.json
index b8ba28e604..4cf9bdf429 100644
--- a/application/Espo/Resources/i18n/zh_TW/Admin.json
+++ b/application/Espo/Resources/i18n/zh_TW/Admin.json
@@ -281,7 +281,7 @@
     "accessInfoPortal": "分配",
     "assignment": "提到",
     "mention": "已接收電子郵件的附註",
-    "noteEmailRecieved": "關於發文的附註",
+    "noteEmailReceived": "關於發文的附註",
     "notePost": "關於發文的附註 (無上層)",
     "notePostNoParent": "關於狀態更新的附註",
     "noteStatus": "密碼更改鏈結",
diff --git a/application/Espo/Resources/metadata/app/templates.json b/application/Espo/Resources/metadata/app/templates.json
index 70f494dc86..a9ae5eea3c 100644
--- a/application/Espo/Resources/metadata/app/templates.json
+++ b/application/Espo/Resources/metadata/app/templates.json
@@ -11,7 +11,7 @@
     "mention": {
         "scope": "Note"
     },
-    "noteEmailRecieved": {
+    "noteEmailReceived": {
         "scope": "Note"
     },
     "notePost": {
diff --git a/application/Espo/Resources/templates/noteEmailRecieved/en_US/body.tpl b/application/Espo/Resources/templates/noteEmailReceived/en_US/body.tpl
similarity index 61%
rename from application/Espo/Resources/templates/noteEmailRecieved/en_US/body.tpl
rename to application/Espo/Resources/templates/noteEmailReceived/en_US/body.tpl
index 2c258b8e16..6a8e11857b 100644
--- a/application/Espo/Resources/templates/noteEmailRecieved/en_US/body.tpl
+++ b/application/Espo/Resources/templates/noteEmailReceived/en_US/body.tpl
@@ -1,4 +1,4 @@
-<p>Email recieved from {{fromName}}, related to {{entityTypeLowerFirst}} '{{parentName}}'.</p>
+<p>Email received from {{fromName}}, related to {{entityTypeLowerFirst}} '{{parentName}}'.</p>
 <p>{{subject}}</p>
 <p>{{{post}}}</p>
 <p><a href="{{url}}">View</a></p>
\ No newline at end of file
diff --git a/application/Espo/Resources/templates/noteEmailReceived/en_US/subject.tpl b/application/Espo/Resources/templates/noteEmailReceived/en_US/subject.tpl
new file mode 100644
index 0000000000..4e8492fcee
--- /dev/null
+++ b/application/Espo/Resources/templates/noteEmailReceived/en_US/subject.tpl
@@ -0,0 +1 @@
+Email received: [{{{entityType}}}] {{{name}}}
\ No newline at end of file
diff --git a/application/Espo/Resources/templates/noteEmailRecieved/zh_CN/body.tpl b/application/Espo/Resources/templates/noteEmailReceived/zh_CN/body.tpl
similarity index 100%
rename from application/Espo/Resources/templates/noteEmailRecieved/zh_CN/body.tpl
rename to application/Espo/Resources/templates/noteEmailReceived/zh_CN/body.tpl
diff --git a/application/Espo/Resources/templates/noteEmailRecieved/zh_CN/subject.tpl b/application/Espo/Resources/templates/noteEmailReceived/zh_CN/subject.tpl
similarity index 100%
rename from application/Espo/Resources/templates/noteEmailRecieved/zh_CN/subject.tpl
rename to application/Espo/Resources/templates/noteEmailReceived/zh_CN/subject.tpl
diff --git a/application/Espo/Resources/templates/noteEmailRecieved/en_US/subject.tpl b/application/Espo/Resources/templates/noteEmailRecieved/en_US/subject.tpl
deleted file mode 100644
index 1fb0f5c336..0000000000
--- a/application/Espo/Resources/templates/noteEmailRecieved/en_US/subject.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Email recieved: [{{{entityType}}}] {{{name}}}
\ No newline at end of file
diff --git a/application/Espo/Services/EmailNotification.php b/application/Espo/Services/EmailNotification.php
index 1c15754d13..b621bbcabe 100644
--- a/application/Espo/Services/EmailNotification.php
+++ b/application/Espo/Services/EmailNotification.php
@@ -669,13 +669,13 @@ class EmailNotification extends \Espo\Core\Services\Base
         $data['entityType'] = $this->getLanguage()->translate($data['parentType'], 'scopeNames');
         $data['entityTypeLowerFirst'] = Util::mbLowerCaseFirst($data['entityType']);
 
-        $subjectTpl = $this->getTemplateFileManager()->getTemplate('noteEmailRecieved', 'subject', $parentType);
-        $bodyTpl = $this->getTemplateFileManager()->getTemplate('noteEmailRecieved', 'body', $parentType);
+        $subjectTpl = $this->getTemplateFileManager()->getTemplate('noteEmailReceived', 'subject', $parentType);
+        $bodyTpl = $this->getTemplateFileManager()->getTemplate('noteEmailReceived', 'body', $parentType);
 
         $subjectTpl = str_replace(["\n", "\r"], '', $subjectTpl);
 
-        $subject = $this->getHtmlizer()->render($note, $subjectTpl, 'note-email-recieved-email-subject-' . $parentType, $data, true);
-        $body = $this->getHtmlizer()->render($note, $bodyTpl, 'note-email-recieved-email-body-' . $parentType, $data, true);
+        $subject = $this->getHtmlizer()->render($note, $subjectTpl, 'note-email-received-email-subject-' . $parentType, $data, true);
+        $body = $this->getHtmlizer()->render($note, $bodyTpl, 'note-email-received-email-body-' . $parentType, $data, true);
 
         $email = $this->getEntityManager()->getEntity('Email');
 
diff --git a/upgrades/5.8.3-5.8.4/data.json b/upgrades/5.8.3-5.8.4/data.json
new file mode 100644
index 0000000000..bdca4f6cfd
--- /dev/null
+++ b/upgrades/5.8.3-5.8.4/data.json
@@ -0,0 +1,4 @@
+{
+    "manifest": {
+    }
+}
\ No newline at end of file
diff --git a/upgrades/5.8.3-5.8.4/scripts/AfterUpgrade.php b/upgrades/5.8.3-5.8.4/scripts/AfterUpgrade.php
new file mode 100644
index 0000000000..e3c1485a6c
--- /dev/null
+++ b/upgrades/5.8.3-5.8.4/scripts/AfterUpgrade.php
@@ -0,0 +1,33 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/
+
+class AfterUpgrade
+{
+    public function run($container)
+    {
+        $from = 'custom/Espo/Custom/Resources/templates/noteEmailRecieved';
+        $to = 'custom/Espo/Custom/Resources/templates/noteEmailReceived';
+        if (is_dir($from)) {
+            rename($from, $to);
+        }
+    }
+}
diff --git a/upgrades/5.8/scripts/AfterUpgrade.php b/upgrades/5.8/scripts/AfterUpgrade.php
index 186d0dd54d..6b19381d71 100644
--- a/upgrades/5.8/scripts/AfterUpgrade.php
+++ b/upgrades/5.8/scripts/AfterUpgrade.php
@@ -34,6 +34,12 @@ class AfterUpgrade
         $config->set('personNameFormat', 'firstLast');
         $config->set('streamEmailWithContentEntityTypeList', ['Case']);
         $config->save();
+
+        $from = 'custom/Espo/Custom/Resources/templates/noteEmailRecieved';
+        $to = 'custom/Espo/Custom/Resources/templates/noteEmailReceived';
+        if (is_dir($from)) {
+            rename($from, $to);
+        }
     }
 
     protected function populateOpportunityContactId()