diff --git a/client/modules/crm/src/views/call/record/list.js b/client/modules/crm/src/views/call/record/list.js
index 4dbbc9e890..8afab0d7fe 100644
--- a/client/modules/crm/src/views/call/record/list.js
+++ b/client/modules/crm/src/views/call/record/list.js
@@ -26,7 +26,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-Espo.define('crm:views/call/record/list', 'views/record/list', function (Dep) {
+define('crm:views/call/record/list', 'views/record/list', function (Dep) {
 
     return Dep.extend({
 
@@ -55,9 +55,9 @@ Espo.define('crm:views/call/record/list', 'views/record/list', function (Dep) {
                 this.collection.fetch();
             }, this);
 
-            this.notify('Saving...');
-            model.save();
+            Espo.Ui.notify(this.translate('loading', 'messages'));
 
+            model.save();
         },
 
         actionSetNotHeld: function (data) {
@@ -82,7 +82,8 @@ Espo.define('crm:views/call/record/list', 'views/record/list', function (Dep) {
         },
 
         massActionSetHeld: function () {
-            this.notify('Please wait...');
+            Espo.Ui.notify(this.translate('saving', 'messages'));
+
             var data = {};
             data.ids = this.checkedList;
             $.ajax({
@@ -103,7 +104,8 @@ Espo.define('crm:views/call/record/list', 'views/record/list', function (Dep) {
         },
 
         massActionSetNotHeld: function () {
-            this.notify('Please wait...');
+            Espo.Ui.notify(this.translate('saving', 'messages'));
+
             var data = {};
             data.ids = this.checkedList;
             $.ajax({
diff --git a/client/modules/crm/src/views/meeting/record/list.js b/client/modules/crm/src/views/meeting/record/list.js
index 8cc896a8fe..1e6aec6154 100644
--- a/client/modules/crm/src/views/meeting/record/list.js
+++ b/client/modules/crm/src/views/meeting/record/list.js
@@ -81,7 +81,8 @@ Espo.define('crm:views/meeting/record/list', 'views/record/list', function (Dep)
         },
 
         massActionSetHeld: function () {
-            this.notify('Please wait...');
+            Espo.Ui.notify(this.translate('saving', 'messages'));
+
             var data = {};
             data.ids = this.checkedList;
             $.ajax({
@@ -102,7 +103,8 @@ Espo.define('crm:views/meeting/record/list', 'views/record/list', function (Dep)
         },
 
         massActionSetNotHeld: function () {
-            this.notify('Please wait...');
+            Espo.Ui.notify(this.translate('saving', 'messages'));
+
             var data = {};
             data.ids = this.checkedList;
             $.ajax({
diff --git a/client/modules/crm/src/views/record/panels/history.js b/client/modules/crm/src/views/record/panels/history.js
index 80c71b3524..78a7899416 100644
--- a/client/modules/crm/src/views/record/panels/history.js
+++ b/client/modules/crm/src/views/record/panels/history.js
@@ -26,7 +26,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-Espo.define('crm:views/record/panels/history', 'crm:views/record/panels/activities', function (Dep) {
+define('crm:views/record/panels/history', 'crm:views/record/panels/activities', function (Dep) {
 
     return Dep.extend({
 
@@ -163,7 +163,7 @@ Espo.define('crm:views/record/panels/history', 'crm:views/record/panels/activiti
             Espo.require('EmailHelper', function (EmailHelper) {
                 var emailHelper = new EmailHelper(this.getLanguage(), this.getUser(), this.getDateTime(), this.getAcl());
 
-                this.notify('Please wait...');
+                Espo.Ui.notify(this.translate('loading', 'messages'));
 
                 this.getModelFactory().create('Email', function (model) {
                     model.id = id;
diff --git a/client/src/views/list-with-categories.js b/client/src/views/list-with-categories.js
index ed26a07d9b..5eac306ea9 100644
--- a/client/src/views/list-with-categories.js
+++ b/client/src/views/list-with-categories.js
@@ -404,7 +404,8 @@ define('views/list-with-categories', 'views/list', function (Dep) {
 
                         this.collection.abortLastFetch();
 
-                        this.notify('Please wait...');
+                        Espo.Ui.notify(this.translate('loading', 'messages'));
+
                         this.listenToOnce(this.collection, 'sync', function () {
                             this.notify(false);
                         }, this);
diff --git a/client/src/views/modals/select-records-with-categories.js b/client/src/views/modals/select-records-with-categories.js
index 36f052fe35..035864da6a 100644
--- a/client/src/views/modals/select-records-with-categories.js
+++ b/client/src/views/modals/select-records-with-categories.js
@@ -26,7 +26,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-Espo.define('views/modals/select-records-with-categories', ['views/modals/select-records', 'views/list-with-categories'], function (Dep, List) {
+define('views/modals/select-records-with-categories', ['views/modals/select-records', 'views/list-with-categories'], function (Dep, List) {
 
     return Dep.extend({
 
@@ -103,7 +103,7 @@ Espo.define('views/modals/select-records-with-categories', ['views/modals/select
 
                             this.applyCategoryToCollection();
 
-                            this.notify('Please wait...');
+                            Espo.Ui.notify(this.translate('loading', 'messages'));
                             this.listenToOnce(this.collection, 'sync', function () {
                                 this.notify(false);
                             }, this);
diff --git a/client/src/views/record/list-tree-item.js b/client/src/views/record/list-tree-item.js
index 9b29dfb06a..77587b66bd 100644
--- a/client/src/views/record/list-tree-item.js
+++ b/client/src/views/record/list-tree-item.js
@@ -184,7 +184,7 @@ define('views/record/list-tree-item', 'view', function (Dep) {
                     collection.parentId = this.model.id;
                     collection.maxDepth = 1;
 
-                    this.notify('Please wait...');
+                    Espo.Ui.notify(this.translate('loading', 'messages'));
                     this.listenToOnce(collection, 'sync', function () {
                     this.notify(false);
                         this.model.set('childCollection', collection);
diff --git a/client/src/views/record/list.js b/client/src/views/record/list.js
index ae3789632c..2d1545be65 100644
--- a/client/src/views/record/list.js
+++ b/client/src/views/record/list.js
@@ -114,7 +114,7 @@ define('views/record/list', 'view', function (Dep) {
                 if ($(e.currentTarget).parent().hasClass('disabled')) {
                     return;
                 }
-                this.notify('Please wait...');
+                Espo.Ui.notify(this.translate('loading', 'messages'));
                 this.collection.once('sync', function () {
                     this.notify(false);
                 }.bind(this));
@@ -166,7 +166,7 @@ define('views/record/list', 'view', function (Dep) {
             }
             var order = asc ? 'asc' : 'desc';
 
-            this.notify('Please wait...');
+            Espo.Ui.notify(this.translate('loading', 'messages'));
             this.collection.once('sync', function () {
                 this.notify(false);
                 this.trigger('sort', {orderBy: orderBy, order: order});
@@ -702,7 +702,7 @@ define('views/record/list', 'view', function (Dep) {
                 this.listenToOnce(view, 'select', function (templateModel) {
                     this.clearView('pdfTemplate');
 
-                    Espo.Ui.notify(this.translate('pleaseWait', 'messages'));
+                    Espo.Ui.notify(this.translate('loading', 'messages'));
                     this.ajaxPostRequest('Pdf/action/massPrint', {
                         idList: idList,
                         entityType: this.entityType,
diff --git a/client/src/views/record/panels/relationship.js b/client/src/views/record/panels/relationship.js
index 84453a5779..b75b7b4052 100644
--- a/client/src/views/record/panels/relationship.js
+++ b/client/src/views/record/panels/relationship.js
@@ -517,7 +517,7 @@ Espo.define('views/record/panels/relationship', ['views/record/panels/bottom', '
 
         actionUnlinkAllRelated: function (data) {
             this.confirm(this.translate('unlinkAllConfirmation', 'messages'), function () {
-                this.notify('Please wait...');
+                Espo.Ui.notify(this.translate('pleaseWait', 'messages'));
                 $.ajax({
                     url: this.model.name + '/action/unlinkAll',
                     type: 'POST',