diff --git a/src/js/index.js b/src/js/index.js
index c8d95613f..8e200ba10 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -349,6 +349,13 @@ var ACTION_USER_REMOVE = 'user.remove';
 var ACTION_USER_UPDATE = 'user.update';
 var ACTION_USER_TRANSFER = 'user.transfer';
 
+var ACTION_MAIL_ENABLED = 'mail.enabled';
+var ACTION_MAIL_DISABLED = 'mail.disabled';
+var ACTION_MAIL_MAILBOX_ADD = 'mail.box.add';
+var ACTION_MAIL_MAILBOX_REMOVE = 'mail.box.remove';
+var ACTION_MAIL_LIST_ADD = 'mail.list.add';
+var ACTION_MAIL_LIST_REMOVE = 'mail.list.remove';
+
 app.filter('eventLogSource', function() {
     return function(eventLog) {
         var source = eventLog.source;
@@ -428,6 +435,24 @@ app.filter('eventLogDetails', function() {
         case ACTION_USER_LOGIN:
             return (data.user ? (data.user.email + (data.user.username ? ' (' + data.user.username + ')' : '')) : data.userId) + ' logged in';
 
+        case ACTION_MAIL_ENABLED:
+            return 'Cloudron Mail was enabled for domain ' + data.domain;
+
+        case ACTION_MAIL_DISABLED:
+            return 'Cloudron Mail was disabled for domain ' + data.domain;
+
+        case ACTION_MAIL_MAILBOX_ADD:
+            return 'Mailbox with name ' + data.name + ' was added in domain ' + data.domain;
+
+        case ACTION_MAIL_MAILBOX_REMOVE:
+            return 'Mailbox with name ' + data.name + ' was removed in domain ' + data.domain;
+
+        case ACTION_MAIL_LIST_ADD:
+            return 'Mail list with name ' + data.name + ' was added in domain ' + data.domain;
+
+        case ACTION_MAIL_LIST_REMOVE:
+            return 'Mail list with name ' + data.name + ' was added in domain ' + data.domain;
+
         default: return eventLog.action;
         }
     };
@@ -458,6 +483,12 @@ app.filter('eventLogAction', function() {
         case ACTION_USER_LOGIN: return 'User login';
         case ACTION_USER_REMOVE: return 'User removed';
         case ACTION_USER_UPDATE: return 'User updated';
+        case ACTION_MAIL_ENABLED: return 'Mail enabled';
+        case ACTION_MAIL_DISABLED: return 'Mail disabled';
+        case ACTION_MAIL_MAILBOX_ADD: return 'Mailbox added';
+        case ACTION_MAIL_MAILBOX_REMOVE: return 'Mailbox removed';
+        case ACTION_MAIL_LIST_ADD: return 'Mail list added';
+        case ACTION_MAIL_LIST_REMOVE: return 'Mail list removed';
         default: return eventLog.action;
         }
     };
diff --git a/src/views/activity.js b/src/views/activity.js
index f0bcdbe95..80620fa1f 100644
--- a/src/views/activity.js
+++ b/src/views/activity.js
@@ -27,6 +27,11 @@ angular.module('Application').controller('ActivityController', ['$scope', '$loca
         { name: 'cloudron.activate', value: 'cloudron.activate' },
         { name: 'cloudron.start', value: 'cloudron.start' },
         { name: 'cloudron.update', value: 'cloudron.update' },
+        { name: 'mail.enabled', value: 'mail.enabled' },
+        { name: 'mail.box.add', value: 'mail.box.add' },
+        { name: 'mail.box.remove', value: 'mail.box.remove' },
+        { name: 'mail.list.add', value: 'mail.list.add' },
+        { name: 'mail.list.remove', value: 'mail.list.remove' },
         { name: 'user.add', value: 'user.add' },
         { name: 'user.login', value: 'user.login' },
         { name: 'user.remove', value: 'user.remove' },