diff --git a/CHANGES b/CHANGES
index 9c8d57d43..2431db556 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2942,3 +2942,5 @@
 * mail: update haraka to 3.1.0
 * sshfs: implement rm via ssh
 * multiple docker registries
+* mail: rename delivered -> sent and received -> saved in event log
+
diff --git a/dashboard/public/translation/da.json b/dashboard/public/translation/da.json
index 73f29ca6d..67449f8fc 100644
--- a/dashboard/public/translation/da.json
+++ b/dashboard/public/translation/da.json
@@ -703,8 +703,6 @@
                 "bounceInfo": "Afsendelse af afvisning",
                 "inboundInfo": "Modtaget",
                 "outboundInfo": "I kø til levering",
-                "receivedInfo": "Gemte",
-                "deliveredInfo": "Afleveret post",
                 "deniedInfo": "Forbindelse nægtet",
                 "spamFilterTrainedInfo": "Spam-filter trænet ved hjælp af postkassens indhold",
                 "underQuotaInfo": "Postkasse {{ mailbox }}} er faldet under {{ quotaPercent }}% quota",
diff --git a/dashboard/public/translation/de.json b/dashboard/public/translation/de.json
index cefeaabea..7a7543f12 100644
--- a/dashboard/public/translation/de.json
+++ b/dashboard/public/translation/de.json
@@ -612,8 +612,6 @@
                 "incoming": "Eingehend",
                 "queued": "Warteschlange",
                 "deferredInfo": "Die Zustellung von E-Mail ist fehlgeschlagen. Wird in {{ delay }} Sekunden erneut versucht.",
-                "deliveredInfo": "Zugestellte E-Mail",
-                "receivedInfo": "Gespeichert",
                 "deniedInfo": "Verbindung verweigert",
                 "spamFilterTrainedInfo": "Der Spam-Filter wird durch Mailbox-Inhalte trainiert",
                 "inboundInfo": "Eingehend",
diff --git a/dashboard/public/translation/en.json b/dashboard/public/translation/en.json
index a05a00961..dfd92c09e 100644
--- a/dashboard/public/translation/en.json
+++ b/dashboard/public/translation/en.json
@@ -738,15 +738,15 @@
                 "spamFilterTrained": "Spam filter trained",
                 "bounceInfo": "Sending bounce",
                 "deferredInfo": "Delivery failure, will retry in {{ delay }}s.",
-                "inboundInfo": "Received",
-                "outboundInfo": "Queued for delivery",
-                "receivedInfo": "Saved",
-                "deliveredInfo": "Delivered mail",
+                "inboundInfo": "Queued for inbound delivery",
+                "outboundInfo": "Queued for outbound delivery",
                 "deniedInfo": "Connection denied",
                 "spamFilterTrainedInfo": "Spam filter trained using mailbox content",
                 "overQuotaInfo": "Mailbox {{ mailbox }} is {{ quotaPercent }}% full",
                 "underQuotaInfo": "Mailbox {{ mailbox }} has fallen below {{ quotaPercent }}% quota",
-                "quota": "Mailbox Quota"
+                "quota": "Mailbox Quota",
+                "savedInfo": "Saved",
+                "sentInfo": "Sent"
             },
             "searchPlaceholder": "Search",
             "from": "From",
@@ -1161,7 +1161,7 @@
             "appDown": "App is down",
             "rebootRequired": "Server reboot required",
             "cloudronUpdateFailed": "Cloudron Update Failed",
-            "diskSpace": "Low Disk Space"
+            "diskSpace": "Low disk space"
         },
         "settingsDialog": {
             "description": "Manage your personal notification preferences here. Cloudron will send an email for the selected events to your primary email address."
diff --git a/dashboard/public/translation/es.json b/dashboard/public/translation/es.json
index ac197f6b5..8018a621a 100644
--- a/dashboard/public/translation/es.json
+++ b/dashboard/public/translation/es.json
@@ -672,8 +672,6 @@
             "type": {
                 "spamFilterTrainedInfo": "Filtro de spam entrenado con contenido del buzón",
                 "deniedInfo": "Conexión denegada",
-                "deliveredInfo": "Correo entregado",
-                "receivedInfo": "Guardado",
                 "outboundInfo": "En cola para entrega",
                 "inboundInfo": "Recibido",
                 "deferredInfo": "Error de entrega, se volverá a intentar en {{ delay }}s.",
diff --git a/dashboard/public/translation/fr.json b/dashboard/public/translation/fr.json
index b10666774..efe038451 100644
--- a/dashboard/public/translation/fr.json
+++ b/dashboard/public/translation/fr.json
@@ -572,9 +572,7 @@
                 "outgoing": "Sortant",
                 "deniedInfo": "Accès refusé",
                 "deferredInfo": "Échec de l'envoi. Nouvelle tentative dans {{ delay }}s.",
-                "deliveredInfo": "Email envoyé",
                 "inboundInfo": "Reçu",
-                "receivedInfo": "Sauvegardé",
                 "outboundInfo": "Envoi en attente",
                 "deferred": "Reporté",
                 "incoming": "Entrant",
diff --git a/dashboard/public/translation/it.json b/dashboard/public/translation/it.json
index 57cdbaa2b..581e41242 100644
--- a/dashboard/public/translation/it.json
+++ b/dashboard/public/translation/it.json
@@ -1260,8 +1260,6 @@
             "type": {
                 "spamFilterTrainedInfo": "Filtro antispam addestrato utilizzando il contenuto della casella postale",
                 "deniedInfo": "Connessione da {{ remote.ip }} negata. {{ details.message || details.reason }}",
-                "deliveredInfo": "Posta consegnata a {{ rcptTo | prettyEmailAddresses }} da {{ mailFrom | prettyEmailAddresses }}",
-                "receivedInfo": "Posta salvata da {{ mailFrom | prettyEmailAddresses }} nella casella di posta {{ rcptTo | prettyEmailAddresses }}",
                 "outboundInfo": "Posta in coda per la consegna a {{ rcptTo | prettyEmailAddresses }} da {{ mailFrom | prettyEmailAddresses }}",
                 "inboundInfo": "Posta in arrivo da {{ mailFrom | prettyEmailAddresses }} a {{ rcptTo | prettyEmailAddresses }}. Spam: {{ details.spamStatus.indexOf ('Yes,') === 0 ? 'Si' : 'No' }}",
                 "bounceInfo": "Bounce inviato a {{ mailFrom | prettyEmailAddresses }} per la posta inviata a {{ rcptTo | prettyEmailAddresses }}. {{ details.message || details.reason }}",
diff --git a/dashboard/public/translation/nl.json b/dashboard/public/translation/nl.json
index 90db0642a..1c987b04b 100644
--- a/dashboard/public/translation/nl.json
+++ b/dashboard/public/translation/nl.json
@@ -736,8 +736,6 @@
                 "denied": "Geweigerd",
                 "spamFilterTrained": "Spam filter getraind",
                 "outboundInfo": "In de wachtrij geplaatst voor aflevering",
-                "receivedInfo": "E-mail opgeslagen",
-                "deliveredInfo": "E-mail afgeleverd",
                 "deniedInfo": "Verbinding geweigerd",
                 "bounce": "Bounce",
                 "bounceInfo": "Bounce-mail gestuurd",
@@ -1394,7 +1392,8 @@
             "title": "Privaat Docker Register",
             "description": "Cloudron kan <a href=\"{{ customAppsLink }}\" target=\"_blank\">aangepaste apps</a> binnenhalen en installeren van een privaat docker register.",
             "usernameNotSet": "Niet ingesteld",
-            "serverNotSet": "Niet ingesteld"
+            "serverNotSet": "Niet ingesteld",
+            "deleteQuestion": "Weet je zeker dat je dit register wilt verwijderen?"
         },
         "privateDockerRegistryDialog": {
             "title": "Privaat Register configuratie",
@@ -1524,7 +1523,8 @@
             "appUp": "App is weer online",
             "appDown": "App werkt niet",
             "rebootRequired": "Server herstart noodzakelijk",
-            "cloudronUpdateFailed": "Cloudron Update Mislukt"
+            "cloudronUpdateFailed": "Cloudron Update Mislukt",
+            "diskSpace": "Weinig Diskruimte"
         },
         "settingsDialog": {
             "description": "Beheer hier je persoonlijke notificatie -instellingen. Cloudron zal een e-mail versturen voor de geselecteerde gebeurtenissen naar je primaire e-mailadres."
diff --git a/dashboard/public/translation/ru.json b/dashboard/public/translation/ru.json
index 40fc3cf79..5d6dd8b36 100644
--- a/dashboard/public/translation/ru.json
+++ b/dashboard/public/translation/ru.json
@@ -1101,12 +1101,10 @@
                 "deferredInfo": "Ошибка доставки, повторная попытка через {{ delay }}сек.",
                 "inboundInfo": "Получено",
                 "outboundInfo": "Поставлен в очередь на доставку",
-                "receivedInfo": "Сохранено",
                 "outgoing": "Исходящие",
                 "incoming": "Входящие",
                 "deferred": "Отсрочено",
                 "bounceInfo": "Полученный отказ",
-                "deliveredInfo": "Сообщение доставлено",
                 "deniedInfo": "В соединении отказано",
                 "spamFilterTrainedInfo": "Спам фильтр обучен с использованием содержимого почтового ящика",
                 "overQuotaInfo": "Почтовый ящик {{ mailbox }} использует {{ quotaPercent }}% квоты",
diff --git a/dashboard/public/translation/vi.json b/dashboard/public/translation/vi.json
index d7ab19ae7..0ac671c33 100644
--- a/dashboard/public/translation/vi.json
+++ b/dashboard/public/translation/vi.json
@@ -985,8 +985,6 @@
             "type": {
                 "spamFilterTrainedInfo": "Bộ lọc spam đã được rèn giũa thêm dựa trên nội dung hộp thư",
                 "deniedInfo": "Kết nối bị từ chối",
-                "deliveredInfo": "Đã gửi thư",
-                "receivedInfo": "Đã lưu thư",
                 "outboundInfo": "Mail đã xếp vào hàng để được gửi đi",
                 "inboundInfo": "Thư đã được nhận",
                 "deferredInfo": "Không gửi được mail, hệ thống sẽ tự động thử lại sau {{ details.delay }} giây nữa.",
diff --git a/dashboard/public/translation/zh_Hans.json b/dashboard/public/translation/zh_Hans.json
index caa3223ea..b2684a4ae 100644
--- a/dashboard/public/translation/zh_Hans.json
+++ b/dashboard/public/translation/zh_Hans.json
@@ -697,8 +697,6 @@
                 "bounce": "退信",
                 "deferredInfo": "发送邮件失败，会在 {{ details.delay }} 秒后重试。",
                 "outboundInfo": "已加入送信队列",
-                "receivedInfo": "已保存",
-                "deliveredInfo": "邮件已送达",
                 "spamFilterTrainedInfo": "垃圾邮件过滤器使用邮箱的内容进行训练",
                 "spamFilterTrained": "垃圾邮件过滤器已训练",
                 "bounceInfo": "发送退信通知",
diff --git a/dashboard/src/views/EmailEventlogView.vue b/dashboard/src/views/EmailEventlogView.vue
index 057465d10..b4f9d809e 100644
--- a/dashboard/src/views/EmailEventlogView.vue
+++ b/dashboard/src/views/EmailEventlogView.vue
@@ -10,12 +10,13 @@ const mailModel = MailModel.create();
 const availableTypes = [
   { id: 'bounce', name: 'Bounce'  },
   { id: 'deferred', name: 'Deferred'  },
-  { id: 'delivered', name: 'Delivered'  },
   { id: 'denied', name: 'Denied'  },
   { id: 'queued', name: 'Queued'  },
   { id: 'quota', name: 'Quota'  },
-  { id: 'received', name: 'Received'  },
+  { id: 'saved', name: 'Saved'  },
+  { id: 'sent', name: 'Sent'  },
   { id: 'spam', name: 'Spam'  },
+  { id: 'spam-learn', name: 'Spam Training'  },
 ];
 
 const refreshBusy = ref(false);
@@ -92,9 +93,9 @@ onMounted(async () => {
             <template v-for="eventlog in eventlogs" :key="eventlog._id">
               <tr @click="onEventLogDetails(eventlog._id)" :class="{ 'active': activeId === eventlog._id }" >
                 <td class="no-wrap">
-                  <i class="fas fa-arrow-circle-left" v-if="eventlog.type === 'delivered'" v-tooltip="$t('emails.eventlog.type.outgoing')"></i>
+                  <i class="fas fa-arrow-circle-left" v-if="eventlog.type === 'sent'" v-tooltip="$t('emails.eventlog.type.outgoing')"></i>
                   <i class="fas fa-history" v-if="eventlog.type === 'deferred'" v-tooltip="$t('emails.eventlog.type.deferred')"></i>
-                  <i class="fas fa-arrow-circle-right" v-if="eventlog.type === 'received'" v-tooltip="$t('emails.eventlog.type.incoming')"></i>
+                  <i class="fas fa-arrow-circle-right" v-if="eventlog.type === 'saved'" v-tooltip="$t('emails.eventlog.type.incoming')"></i>
                   <i class="fas fa-align-justify" v-if="eventlog.type === 'queued' && eventlog.spamStatus && eventlog.spamStatus.indexOf('Yes,') !== 0" v-tooltip="$t('emails.eventlog.type.queued')"></i>
                   <i class="fas fa-trash" v-if="eventlog.type === 'queued' && eventlog.spamStatus && eventlog.spamStatus.indexOf('Yes,') === 0" v-tooltip="$t('emails.eventlog.type.queued')"></i>
                   <i class="fas fa-minus-circle" v-if="eventlog.type === 'denied'" v-tooltip="$t('emails.eventlog.type.denied')"></i>
@@ -112,8 +113,8 @@ onMounted(async () => {
                     <span v-if="eventlog.direction === 'inbound'">{{ $t('emails.eventlog.type.inboundInfo') }}</span>
                     <span v-if="eventlog.direction === 'outbound'">{{ $t('emails.eventlog.type.outboundInfo') }}</span>
                   </span>
-                  <span v-if="eventlog.type === 'received'">{{ $t('emails.eventlog.type.receivedInfo') }}</span>
-                  <span v-if="eventlog.type === 'delivered'">{{ $t('emails.eventlog.type.deliveredInfo') }}</span>
+                  <span v-if="eventlog.type === 'saved'">{{ $t('emails.eventlog.type.savedInfo') }}</span>
+                  <span v-if="eventlog.type === 'sent'">{{ $t('emails.eventlog.type.sentInfo') }}</span>
                   <span v-if="eventlog.type === 'denied'">{{ $t('emails.eventlog.type.deniedInfo') }}. {{ eventlog.message || eventlog.reason }} </span>
                   <span v-if="eventlog.type === 'spam-learn'">{{ $t('emails.eventlog.type.spamFilterTrainedInfo') }}</span>
                   <span v-if="eventlog.type === 'quota'">
diff --git a/src/infra_version.js b/src/infra_version.js
index 30e285ccb..1865924a7 100644
--- a/src/infra_version.js
+++ b/src/infra_version.js
@@ -13,7 +13,7 @@ exports = module.exports = {
     'images': {
         // 'base': 'registry.docker.com/cloudron/base:5.0.0@sha256:04fd70dbd8ad6149c19de39e35718e024417c3e01dc9c6637eaf4a41ec4e596c',
         'graphite': 'registry.docker.com/cloudron/graphite:3.5.0@sha256:ee7c9dc49a6507cb3e3cee25495b2044908feb91dac5df87a9633dea38fdeb8a',
-        'mail': 'registry.docker.com/cloudron/mail:3.16.2@sha256:f6b92e0cdfb9d5a305ee974e1b8d19af8df5c54b654624b359298d719f01b3b4',
+        'mail': 'registry.docker.com/cloudron/mail:3.16.3@sha256:fc2911da3981b13612dd4747e236ff22ff8bb485b24d132f60352407808d7563',
         'mongodb': 'registry.docker.com/cloudron/mongodb:6.1.1@sha256:dd5db2d17c1232e1f8ef5528c86c20b70ba654b199d94de44d22afb17aac00aa',
         'mysql': 'registry.docker.com/cloudron/mysql:3.5.2@sha256:5cf52069a5ffb126afcaf6cdf91dba7e2c719efe48669e46b616979ef825e25b',
         'postgresql': 'registry.docker.com/cloudron/postgresql:6.0.4@sha256:8e93564dacc0d980f90f018a5908cae7019b45afb980b05d34639c33f21d308b',