diff --git a/src/js/client.js b/src/js/client.js
index 956375491..e63f07860 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -3522,22 +3522,26 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
             return 'Mail was disabled for domain ' + data.domain;
 
         case ACTION_MAIL_MAILBOX_ADD:
-            return 'Mailbox with name ' + data.name + ' was added in domain ' + data.domain;
+            return 'Mailbox ' + data.name + '@' + data.domain + ' was added';
 
         case ACTION_MAIL_MAILBOX_UPDATE:
-            return 'Mailbox with name ' + data.name + ' was updated in domain ' + data.domain;
+            if (data.aliases) {
+                return 'Mailbox aliases of ' + data.name + '@' + data.domain + ' was updated';
+            } else {
+                return 'Mailbox ' + data.name + '@' + data.domain + ' was updated';
+            }
 
         case ACTION_MAIL_MAILBOX_REMOVE:
-            return 'Mailbox with name ' + data.name + ' was removed in domain ' + data.domain;
+            return 'Mailbox ' + data.name + '@' + data.domain + ' was removed';
 
         case ACTION_MAIL_LIST_ADD:
-            return 'Mail list with name ' + data.name + ' was added in domain ' + data.domain;
+            return 'Mail list ' + data.name + '@' + data.domain + 'was added';
 
         case ACTION_MAIL_LIST_UPDATE:
-            return 'Mail list with name ' + data.name + ' was updated in domain ' + data.domain;
+            return 'Mail list ' + data.name + '@' + data.domain + ' was updated';
 
         case ACTION_MAIL_LIST_REMOVE:
-            return 'Mail list with name ' + data.name + ' was removed in domain ' + data.domain;
+            return 'Mail list ' + data.name + '@' + data.domain + ' was removed';
 
         case ACTION_START:
             return 'Cloudron started with version ' + data.version;