diff --git a/apps/mail/messages/ar.json b/apps/mail/messages/ar.json
index bd7d9c19b..d52f18a36 100644
--- a/apps/mail/messages/ar.json
+++ b/apps/mail/messages/ar.json
@@ -448,6 +448,8 @@
         "noResultsFound": "لم يتم العثور على نتائج",
         "zeroSignature": "توقيع Zero",
         "zeroSignatureDescription": "إضافة توقيع Zero إلى رسائل البريد الإلكتروني الخاصة بك.",
+        "undoSendEnabled": "التراجع عن الإرسال",
+        "undoSendEnabledDescription": "السماح بإلغاء رسائل البريد الإلكتروني خلال 30 ثانية من إرسالها.",
         "defaultEmailAlias": "الاسم المستعار الافتراضي للبريد الإلكتروني",
         "selectDefaultEmail": "اختر البريد الإلكتروني الافتراضي",
         "defaultEmailDescription": "سيتم استخدام هذا البريد الإلكتروني كعنوان \"من\" الافتراضي عند إنشاء رسائل إلكترونية جديدة",
diff --git a/apps/mail/messages/ca.json b/apps/mail/messages/ca.json
index 05fb34640..7ae853232 100644
--- a/apps/mail/messages/ca.json
+++ b/apps/mail/messages/ca.json
@@ -448,6 +448,8 @@
         "noResultsFound": "No s'han trobat resultats",
         "zeroSignature": "Signatura Zero",
         "zeroSignatureDescription": "Afegeix una signatura Zero als teus correus.",
+        "undoSendEnabled": "Desfer enviament",
+        "undoSendEnabledDescription": "Permet cancel·lar correus electrònics dins dels 30 segons després d'enviar-los.",
         "defaultEmailAlias": "Àlies de correu predeterminat",
         "selectDefaultEmail": "Selecciona el correu predeterminat",
         "defaultEmailDescription": "Aquest correu s'utilitzarà com a adreça predeterminada 'De' quan es redactin nous correus",
diff --git a/apps/mail/messages/cs.json b/apps/mail/messages/cs.json
index 05a1fa3d7..cd1acfb18 100644
--- a/apps/mail/messages/cs.json
+++ b/apps/mail/messages/cs.json
@@ -448,6 +448,8 @@
         "noResultsFound": "Nebyly nalezeny žádné výsledky",
         "zeroSignature": "Zero podpis",
         "zeroSignatureDescription": "Přidat Zero podpis k vašim emailům.",
+        "undoSendEnabled": "Odvolat odeslání",
+        "undoSendEnabledDescription": "Umožnit zrušení e-mailů do 30 sekund po odeslání.",
         "defaultEmailAlias": "Výchozí e-mailový alias",
         "selectDefaultEmail": "Vybrat výchozí e-mail",
         "defaultEmailDescription": "Tento e-mail bude použit jako výchozí adresa 'Od' při psaní nových e-mailů",
diff --git a/apps/mail/messages/de.json b/apps/mail/messages/de.json
index 3314ffd9c..e0723d8d4 100644
--- a/apps/mail/messages/de.json
+++ b/apps/mail/messages/de.json
@@ -448,6 +448,8 @@
         "noResultsFound": "Keine Ergebnisse gefunden",
         "zeroSignature": "Zero-Signatur",
         "zeroSignatureDescription": "Füge deinen E-Mails eine Zero-Signatur hinzu.",
+        "undoSendEnabled": "Senden rückgängig machen",
+        "undoSendEnabledDescription": "Ermöglicht das Abbrechen von E-Mails innerhalb von 30 Sekunden nach dem Senden.",
         "defaultEmailAlias": "Standard-E-Mail-Alias",
         "selectDefaultEmail": "Standard-E-Mail auswählen",
         "defaultEmailDescription": "Diese E-Mail wird als Standard-Absenderadresse beim Verfassen neuer E-Mails verwendet",
diff --git a/apps/mail/messages/es.json b/apps/mail/messages/es.json
index f9a76007c..68d3f4a7e 100644
--- a/apps/mail/messages/es.json
+++ b/apps/mail/messages/es.json
@@ -448,6 +448,8 @@
         "noResultsFound": "No se han encontrado resultados",
         "zeroSignature": "Firma Zero",
         "zeroSignatureDescription": "Añade una firma Zero a tus correos.",
+        "undoSendEnabled": "Deshacer envío",
+        "undoSendEnabledDescription": "Permitir cancelar correos electrónicos dentro de los 30 segundos posteriores al envío.",
         "defaultEmailAlias": "Alias de correo electrónico predeterminado",
         "selectDefaultEmail": "Seleccionar correo predeterminado",
         "defaultEmailDescription": "Este correo electrónico se utilizará como dirección predeterminada 'De' al redactar nuevos correos",
diff --git a/apps/mail/messages/fa.json b/apps/mail/messages/fa.json
index 4c47e4164..bbe8b0a3f 100644
--- a/apps/mail/messages/fa.json
+++ b/apps/mail/messages/fa.json
@@ -448,6 +448,8 @@
         "noResultsFound": "نتیجه‌ای یافت نشد",
         "zeroSignature": "امضای Zero",
         "zeroSignatureDescription": "افزودن امضای Zero به ایمیل‌های شما.",
+        "undoSendEnabled": "لغو ارسال",
+        "undoSendEnabledDescription": "امکان لغو ایمیل‌ها در مدت ۳۰ ثانیه پس از ارسال.",
         "defaultEmailAlias": "نام مستعار ایمیل پیش‌فرض",
         "selectDefaultEmail": "انتخاب ایمیل پیش‌فرض",
         "defaultEmailDescription": "این ایمیل به عنوان آدرس پیش‌فرض 'از طرف' هنگام نوشتن ایمیل‌های جدید استفاده خواهد شد",
diff --git a/apps/mail/messages/fr.json b/apps/mail/messages/fr.json
index 01591a77b..e359f23d8 100644
--- a/apps/mail/messages/fr.json
+++ b/apps/mail/messages/fr.json
@@ -448,6 +448,8 @@
         "noResultsFound": "Aucun résultat trouvé",
         "zeroSignature": "Signature Zero",
         "zeroSignatureDescription": "Ajouter une signature Zero à vos courriels.",
+        "undoSendEnabled": "Annuler l'envoi",
+        "undoSendEnabledDescription": "Permettre d'annuler les emails dans les 30 secondes suivant l'envoi.",
         "defaultEmailAlias": "Alias e-mail par défaut",
         "selectDefaultEmail": "Sélectionner l'e-mail par défaut",
         "defaultEmailDescription": "Cette adresse e-mail sera utilisée comme adresse d'expédition par défaut lors de la rédaction de nouveaux e-mails",
diff --git a/apps/mail/messages/hi.json b/apps/mail/messages/hi.json
index 1a47026ed..ccc1a5b24 100644
--- a/apps/mail/messages/hi.json
+++ b/apps/mail/messages/hi.json
@@ -448,6 +448,8 @@
         "noResultsFound": "कोई परिणाम नहीं मिला",
         "zeroSignature": "ज़ीरो सिग्नेचर",
         "zeroSignatureDescription": "अपने ईमेल में ज़ीरो सिग्नेचर जोड़ें।",
+        "undoSendEnabled": "भेजना रद्द करें",
+        "undoSendEnabledDescription": "भेजने के 30 सेकंड के भीतर ईमेल रद्द करने की अनुमति दें।",
         "defaultEmailAlias": "डिफ़ॉल्ट ईमेल उपनाम",
         "selectDefaultEmail": "डिफ़ॉल्ट ईमेल चुनें",
         "defaultEmailDescription": "नए ईमेल लिखते समय यह ईमेल डिफ़ॉल्ट 'प्रेषक' पते के रूप में उपयोग किया जाएगा",
diff --git a/apps/mail/messages/hu.json b/apps/mail/messages/hu.json
index 45e899a1c..56528f78c 100644
--- a/apps/mail/messages/hu.json
+++ b/apps/mail/messages/hu.json
@@ -448,6 +448,8 @@
         "noResultsFound": "Nincs találat",
         "zeroSignature": "Zero aláírás",
         "zeroSignatureDescription": "Zero aláírás hozzáadása az e-mailjeihez.",
+        "undoSendEnabled": "Küldés visszavonása",
+        "undoSendEnabledDescription": "Lehetővé teszi az e-mailek visszavonását a küldéstől számított 30 másodpercen belül.",
         "defaultEmailAlias": "Alapértelmezett e-mail álnév",
         "selectDefaultEmail": "Alapértelmezett e-mail kiválasztása",
         "defaultEmailDescription": "Ez az e-mail lesz az alapértelmezett 'Feladó' cím új e-mailek írásakor",
diff --git a/apps/mail/messages/ja.json b/apps/mail/messages/ja.json
index fa6bf6c67..b771d621c 100644
--- a/apps/mail/messages/ja.json
+++ b/apps/mail/messages/ja.json
@@ -448,6 +448,8 @@
         "noResultsFound": "結果が見つかりませんでした",
         "zeroSignature": "Zero署名",
         "zeroSignatureDescription": "メールにZero署名を追加します。",
+        "undoSendEnabled": "送信取り消し",
+        "undoSendEnabledDescription": "メール送信後30秒以内の取り消しを許可します。",
         "defaultEmailAlias": "デフォルトのメールエイリアス",
         "selectDefaultEmail": "デフォルトのメールを選択",
         "defaultEmailDescription": "このメールは新しいメールを作成する際のデフォルトの「差出人」アドレスとして使用されます",
diff --git a/apps/mail/messages/ko.json b/apps/mail/messages/ko.json
index f5d8618bc..881069847 100644
--- a/apps/mail/messages/ko.json
+++ b/apps/mail/messages/ko.json
@@ -448,6 +448,8 @@
         "noResultsFound": "검색 결과 없음",
         "zeroSignature": "Zero 서명",
         "zeroSignatureDescription": "이메일에 Zero 서명을 추가합니다.",
+        "undoSendEnabled": "전송 취소",
+        "undoSendEnabledDescription": "이메일 전송 후 30초 이내에 취소할 수 있습니다.",
         "defaultEmailAlias": "기본 이메일 별칭",
         "selectDefaultEmail": "기본 이메일 선택",
         "defaultEmailDescription": "이 이메일은 새 이메일 작성 시 기본 '보낸 사람' 주소로 사용됩니다",
diff --git a/apps/mail/messages/lv.json b/apps/mail/messages/lv.json
index 8b55cabfd..1e098941f 100644
--- a/apps/mail/messages/lv.json
+++ b/apps/mail/messages/lv.json
@@ -448,6 +448,8 @@
         "noResultsFound": "Netika atrasts neviens rezultāts",
         "zeroSignature": "Zero paraksts",
         "zeroSignatureDescription": "Pievienot Zero parakstu saviem e-pastiem.",
+        "undoSendEnabled": "Atsaukt nosūtīšanu",
+        "undoSendEnabledDescription": "Ļaut atcelt e-pastus 30 sekunžu laikā pēc nosūtīšanas.",
         "defaultEmailAlias": "Noklusējuma e-pasta aizstājvārds",
         "selectDefaultEmail": "Izvēlieties noklusējuma e-pastu",
         "defaultEmailDescription": "Šis e-pasts tiks izmantots kā noklusējuma 'No' adrese, rakstot jaunus e-pastus",
diff --git a/apps/mail/messages/nl.json b/apps/mail/messages/nl.json
index 5af820401..371bd62c4 100644
--- a/apps/mail/messages/nl.json
+++ b/apps/mail/messages/nl.json
@@ -448,6 +448,8 @@
         "noResultsFound": "Geen resultaten gevonden",
         "zeroSignature": "Zero-handtekening",
         "zeroSignatureDescription": "Voeg een Zero-handtekening toe aan je e-mails.",
+        "undoSendEnabled": "Verzenden ongedaan maken",
+        "undoSendEnabledDescription": "Sta toe om e-mails binnen 30 seconden na verzending te annuleren.",
         "defaultEmailAlias": "Standaard e-mailalias",
         "selectDefaultEmail": "Selecteer standaard e-mail",
         "defaultEmailDescription": "Dit e-mailadres wordt gebruikt als standaard 'Van'-adres bij het opstellen van nieuwe e-mails",
diff --git a/apps/mail/messages/pl.json b/apps/mail/messages/pl.json
index dba91a6f7..ad876902c 100644
--- a/apps/mail/messages/pl.json
+++ b/apps/mail/messages/pl.json
@@ -448,6 +448,8 @@
         "noResultsFound": "Nie znaleziono wyników",
         "zeroSignature": "Podpis Zero",
         "zeroSignatureDescription": "Dodaj podpis Zero do swoich e-maili.",
+        "undoSendEnabled": "Cofnij wysyłanie",
+        "undoSendEnabledDescription": "Pozwala anulować wysyłanie e-maili w ciągu 30 sekund od ich wysłania.",
         "defaultEmailAlias": "Domyślny alias e-mail",
         "selectDefaultEmail": "Wybierz domyślny e-mail",
         "defaultEmailDescription": "Ten e-mail będzie używany jako domyślny adres 'Od' podczas tworzenia nowych wiadomości e-mail",
diff --git a/apps/mail/messages/pt.json b/apps/mail/messages/pt.json
index d577609d6..f342609f2 100644
--- a/apps/mail/messages/pt.json
+++ b/apps/mail/messages/pt.json
@@ -448,6 +448,8 @@
         "noResultsFound": "Nenhum resultado encontrado",
         "zeroSignature": "Assinatura Zero",
         "zeroSignatureDescription": "Adicionar uma assinatura Zero aos seus e-mails.",
+        "undoSendEnabled": "Desfazer envio",
+        "undoSendEnabledDescription": "Permitir cancelar emails dentro de 30 segundos após o envio.",
         "defaultEmailAlias": "Alias de Email Padrão",
         "selectDefaultEmail": "Selecionar email padrão",
         "defaultEmailDescription": "Este email será usado como endereço 'De' padrão ao compor novos emails",
diff --git a/apps/mail/messages/ru.json b/apps/mail/messages/ru.json
index 8c5cbe2a3..461d6a3e5 100644
--- a/apps/mail/messages/ru.json
+++ b/apps/mail/messages/ru.json
@@ -448,6 +448,8 @@
         "noResultsFound": "Результаты не найдены",
         "zeroSignature": "Подпись Zero",
         "zeroSignatureDescription": "Добавьте подпись Zero к вашим письмам.",
+        "undoSendEnabled": "Отменить отправку",
+        "undoSendEnabledDescription": "Позволяет отменить отправку писем в течение 30 секунд после отправки.",
         "defaultEmailAlias": "Адрес электронной почты по умолчанию",
         "selectDefaultEmail": "Выберите адрес электронной почты по умолчанию",
         "defaultEmailDescription": "Этот адрес будет использоваться в качестве адреса отправителя по умолчанию при создании новых писем",
diff --git a/apps/mail/messages/tr.json b/apps/mail/messages/tr.json
index 498430658..1efee64a4 100644
--- a/apps/mail/messages/tr.json
+++ b/apps/mail/messages/tr.json
@@ -448,6 +448,8 @@
         "noResultsFound": "Sonuç bulunamadı",
         "zeroSignature": "Zero İmzası",
         "zeroSignatureDescription": "E-postalarınıza Zero imzası ekleyin.",
+        "undoSendEnabled": "Gönderimi Geri Al",
+        "undoSendEnabledDescription": "E-postaları gönderdikten sonra 30 saniye içinde iptal etmeye izin ver.",
         "defaultEmailAlias": "Varsayılan E-posta Adresi",
         "selectDefaultEmail": "Varsayılan e-postayı seç",
         "defaultEmailDescription": "Bu e-posta, yeni e-postalar oluştururken varsayılan 'Kimden' adresi olarak kullanılacaktır",
diff --git a/apps/mail/messages/vi.json b/apps/mail/messages/vi.json
index ea7b7c38d..6c1141d81 100644
--- a/apps/mail/messages/vi.json
+++ b/apps/mail/messages/vi.json
@@ -448,6 +448,8 @@
         "noResultsFound": "Không tìm thấy kết quả nào",
         "zeroSignature": "Chữ ký Zero",
         "zeroSignatureDescription": "Thêm chữ ký Zero vào email của bạn.",
+        "undoSendEnabled": "Hoàn tác gửi",
+        "undoSendEnabledDescription": "Cho phép hủy email trong vòng 30 giây sau khi gửi.",
         "defaultEmailAlias": "Bí danh email mặc định",
         "selectDefaultEmail": "Chọn email mặc định",
         "defaultEmailDescription": "Email này sẽ được sử dụng làm địa chỉ 'Từ' mặc định khi soạn email mới",
diff --git a/apps/mail/messages/zh_CN.json b/apps/mail/messages/zh_CN.json
index c5bba3603..75c8546cf 100644
--- a/apps/mail/messages/zh_CN.json
+++ b/apps/mail/messages/zh_CN.json
@@ -448,6 +448,8 @@
         "noResultsFound": "未找到结果",
         "zeroSignature": "Zero 签名",
         "zeroSignatureDescription": "在您的邮件中添加 Zero 签名。",
+        "undoSendEnabled": "撤销发送",
+        "undoSendEnabledDescription": "允许在发送邮件后的30秒内取消发送。",
         "defaultEmailAlias": "默认邮箱别名",
         "selectDefaultEmail": "选择默认邮箱",
         "defaultEmailDescription": "此邮箱将作为撰写新邮件时的默认\"发件人\"地址",
diff --git a/apps/mail/messages/zh_TW.json b/apps/mail/messages/zh_TW.json
index 286103a96..fcd6fa6b6 100644
--- a/apps/mail/messages/zh_TW.json
+++ b/apps/mail/messages/zh_TW.json
@@ -448,6 +448,8 @@
         "noResultsFound": "找不到結果",
         "zeroSignature": "Zero 簽名檔",
         "zeroSignatureDescription": "在您的電子郵件中新增 Zero 簽名檔。",
+        "undoSendEnabled": "取消傳送",
+        "undoSendEnabledDescription": "允許在傳送後 30 秒內取消電子郵件的傳送。",
         "defaultEmailAlias": "預設電子郵件別名",
         "selectDefaultEmail": "選擇預設電子郵件",
         "defaultEmailDescription": "此電子郵件將作為撰寫新郵件時的預設「寄件者」地址",
diff --git a/i18n.lock b/i18n.lock
index 633e15662..2681f688b 100644
--- a/i18n.lock
+++ b/i18n.lock
@@ -888,6 +888,8 @@ checksums:
     pages/settings/general/noResultsFound: 5518f2865757dc73900aa03ef8be6934
     pages/settings/general/zeroSignature: 0e94e29f00f4b39838ebed8a774148c3
     pages/settings/general/zeroSignatureDescription: 296c4c81828361128b071969cde8ad76
+    pages/settings/general/undoSendEnabled: 20c02fde2ab10932a598b89ba1267079
+    pages/settings/general/undoSendEnabledDescription: b76f6f7945381839e5ffd3eb261ae5b8
     pages/settings/general/defaultEmailAlias: dc269bad429dd22b27d82118441ea9b2
     pages/settings/general/selectDefaultEmail: c2abb2947589920179e4757876ea905c
     pages/settings/general/defaultEmailDescription: 0ebf26fceccb4cad99f4b2a20cbcfab0