diff --git a/application/Espo/Core/Utils/AdminNotificationManager.php b/application/Espo/Core/Utils/AdminNotificationManager.php
index 7d0df608f2..9d13676950 100644
--- a/application/Espo/Core/Utils/AdminNotificationManager.php
+++ b/application/Espo/Core/Utils/AdminNotificationManager.php
@@ -95,7 +95,13 @@ class AdminNotificationManager
             $extensionsNeedingUpgrade = $this->getExtensionsNeedingUpgrade();
             if (!empty($extensionsNeedingUpgrade)) {
                 foreach ($extensionsNeedingUpgrade as $extensionName => $extensionDetails) {
-                    $message = $this->getLanguage()->translate('newExtensionVersionIsAvailable', 'messages', 'Admin');
+                    $label = 'new' . Util::toCamelCase($extensionName, ' ', true) .'VersionIsAvailable';
+
+                    $message = $this->getLanguage()->get(['Admin', 'messages', $label]);
+                    if (!$message) {
+                        $message = $this->getLanguage()->translate('newExtensionVersionIsAvailable', 'messages', 'Admin');
+                    }
+
                     $notificationList[] = array(
                         'id' => 'newExtensionVersionIsAvailable' . Util::toCamelCase($extensionName, ' ', true),
                         'type' => 'newExtensionVersionIsAvailable',
diff --git a/application/Espo/Jobs/CheckNewExtensionsVersions.php b/application/Espo/Jobs/CheckNewExtensionVersion.php
similarity index 90%
rename from application/Espo/Jobs/CheckNewExtensionsVersions.php
rename to application/Espo/Jobs/CheckNewExtensionVersion.php
index d089891acb..2e040df149 100644
--- a/application/Espo/Jobs/CheckNewExtensionsVersions.php
+++ b/application/Espo/Jobs/CheckNewExtensionVersion.php
@@ -31,7 +31,7 @@ namespace Espo\Jobs;
 
 use Espo\Core\Exceptions;
 
-class CheckNewExtensionsVersions extends CheckNewVersion
+class CheckNewExtensionVersion extends CheckNewVersion
 {
     public function run()
     {
@@ -41,9 +41,9 @@ class CheckNewExtensionsVersions extends CheckNewVersion
 
         $job = $this->getEntityManager()->getEntity('Job');
         $job->set(array(
-            'name' => 'Check for New Version of installed extensions (job)',
+            'name' => 'Check for new versions of installed extensions (job)',
             'serviceName' => 'AdminNotifications',
-            'methodName' => 'jobCheckNewExtensionsVersions',
+            'methodName' => 'jobCheckNewExtensionVersion',
             'executeTime' => $this->getRunTime()
         ));
 
diff --git a/application/Espo/Resources/i18n/en_US/Admin.json b/application/Espo/Resources/i18n/en_US/Admin.json
index ea5833fd81..9f33088eaf 100644
--- a/application/Espo/Resources/i18n/en_US/Admin.json
+++ b/application/Espo/Resources/i18n/en_US/Admin.json
@@ -177,9 +177,9 @@
         "selectExtensionPackage": "Select extension package",
         "extensionInstalled": "Extension {name} {version} has been installed.",
         "installExtension": "Extension {name} {version} is ready for an installation.",
-        "cronIsNotConfigured": "Scheduled jobs are not running.  Hence inbound emails, notifications and reminders are not working. Please follow the <a target=\"_blank\" href=\"https://www.espocrm.com/documentation/administration/server-configuration/#user-content-setup-a-crontab\">instructions</a> to setup cron job.",
+        "cronIsNotConfigured": "Scheduled jobs are not running.  Hence inbound emails, notifications and reminders are not working. Please follow the [instructions](https://www.espocrm.com/documentation/administration/server-configuration/#user-content-setup-a-crontab) to setup cron job.",
         "newVersionIsAvailable": "New EspoCRM version {latestVersion} is available.",
-        "newExtensionVersionIsAvailable": "New release {latestVersion} of {extensionName} is available.",
+        "newExtensionVersionIsAvailable": "New {extensionName} version {latestVersion} is available.",
         "uninstallConfirmation": "Are you sure you want to uninstall the extension?"
     },
     "descriptions": {
diff --git a/application/Espo/Resources/i18n/en_US/Settings.json b/application/Espo/Resources/i18n/en_US/Settings.json
index 8cc19e8bdf..e9ac83eac0 100644
--- a/application/Espo/Resources/i18n/en_US/Settings.json
+++ b/application/Espo/Resources/i18n/en_US/Settings.json
@@ -93,7 +93,7 @@
         "aclAllowDeleteCreated": "Allow to remove created records",
         "adminNotifications": "System notifications in administration panel",
         "adminNotificationsNewVersion": "Show notification when new EspoCRM version is available",
-        "adminNotificationsNewExtensionVersion": "Show notification when new version of extensions are available",
+        "adminNotificationsNewExtensionVersion": "Show notification when new versions of extensions are available",
         "textFilterUseContainsForVarchar": "Use 'contains' operator when filtering varchar fields",
         "authTokenPreventConcurrent": "Only one auth token per user",
         "scopeColorsDisabled": "Disable scope colors",
diff --git a/application/Espo/Resources/metadata/entityDefs/ScheduledJob.json b/application/Espo/Resources/metadata/entityDefs/ScheduledJob.json
index 7c9914cd5b..c3a81256e5 100644
--- a/application/Espo/Resources/metadata/entityDefs/ScheduledJob.json
+++ b/application/Espo/Resources/metadata/entityDefs/ScheduledJob.json
@@ -83,8 +83,8 @@
             "isSystem": true,
             "scheduling": "15 5 * * *"
         },
-        "CheckNewExtensionsVersions": {
-            "name": "Check for New Version of Installed Extensions",
+        "CheckNewExtensionVersion": {
+            "name": "Check for New Versions of Installed Extensions",
             "isSystem": true,
             "scheduling": "25 5 * * *"
         }
diff --git a/application/Espo/Services/AdminNotifications.php b/application/Espo/Services/AdminNotifications.php
index baefb9b2ff..b84fa0adaa 100644
--- a/application/Espo/Services/AdminNotifications.php
+++ b/application/Espo/Services/AdminNotifications.php
@@ -78,7 +78,7 @@ class AdminNotifications extends \Espo\Core\Services\Base
      *
      * @return boolean
      */
-    public function jobCheckNewExtensionsVersions($data)
+    public function jobCheckNewExtensionVersion($data)
     {
         $config = $this->getConfig();
 
diff --git a/client/res/templates/admin/panels/notifications.tpl b/client/res/templates/admin/panels/notifications.tpl
index fd6113bd1c..7ec57e16ba 100644
--- a/client/res/templates/admin/panels/notifications.tpl
+++ b/client/res/templates/admin/panels/notifications.tpl
@@ -5,7 +5,7 @@
                 <div class="list-group list list-expanded">
                 {{#each notificationList}}
                     <div data-id="{{id}}" class="list-group-item notificatin-item">
-                        <div class="text-danger">{{{message}}}</div>
+                        <div class="text-danger complex-text">{{complexText message}}</div>
                     </div>
                 {{/each}}
                 </div>