From baf094d0263dfb26f450008d3f3b000c34d376a6 Mon Sep 17 00:00:00 2001
From: Shuki Vaknin <shukivaknin@gmail.com>
Date: Wed, 24 Jun 2026 17:26:22 +0300
Subject: [PATCH] feat(scheduled): Send now button on scheduled/delayed
 messages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds a 'Send now' action to the scheduled-send view (both the toolbar and the
inline banner) so a queued message — whether explicitly scheduled or held by the
undo-send delay — can be sent immediately instead of only cancel/reschedule/edit.
Reuses the existing reschedule path (reschedules the submission to now), so no
new JMAP plumbing. Toolbar 'Cancel send' demoted to ghost so 'Send now' is the
single primary action. i18n added across locales.
---
 components/email/email-viewer.tsx | 13 ++++++++++++-
 locales/cs/common.json            |  3 ++-
 locales/da/common.json            |  3 ++-
 locales/de/common.json            |  3 ++-
 locales/en/common.json            |  3 ++-
 locales/es/common.json            |  3 ++-
 locales/fr/common.json            |  3 ++-
 locales/hu/common.json            |  3 ++-
 locales/it/common.json            |  3 ++-
 locales/ja/common.json            |  3 ++-
 locales/ko/common.json            |  3 ++-
 locales/lv/common.json            |  3 ++-
 locales/nl/common.json            |  3 ++-
 locales/pl/common.json            |  3 ++-
 locales/pt/common.json            |  3 ++-
 locales/ro/common.json            |  3 ++-
 locales/ru/common.json            |  3 ++-
 locales/tr/common.json            |  3 ++-
 locales/uk/common.json            |  3 ++-
 locales/zh/common.json            |  3 ++-
 20 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/components/email/email-viewer.tsx b/components/email/email-viewer.tsx
index e8b8aadd..35d99813 100644
--- a/components/email/email-viewer.tsx
+++ b/components/email/email-viewer.tsx
@@ -3515,7 +3515,17 @@ export function EmailViewer({
         )}
         {isScheduled && canCancelScheduled && (
           <>
-            <Button variant="default" size="sm" onClick={onCancelScheduled} className="sm:flex sm:h-8" title={t('cancel_scheduled_send')}>
+            <Button
+              variant="default"
+              size="sm"
+              onClick={() => onRescheduleScheduled?.(new Date(Date.now() + 1000).toISOString())}
+              className="sm:flex sm:h-8"
+              title={t('send_now')}
+            >
+              <Send className="w-4 h-4" />
+              {showToolbarLabels && <span className="hidden sm:inline text-sm">{t('send_now')}</span>}
+            </Button>
+            <Button variant="ghost" size="sm" onClick={onCancelScheduled} className="sm:flex sm:h-8" title={t('cancel_scheduled_send')}>
               <X className="w-4 h-4" />
               <span className="hidden sm:inline text-sm">{t('cancel_scheduled_send')}</span>
             </Button>
@@ -5029,6 +5039,7 @@ export function EmailViewer({
               <div className="flex items-center gap-2">
                 {canCancelScheduled && (
                   <>
+                    <Button size="sm" variant="default" onClick={() => onRescheduleScheduled?.(new Date(Date.now() + 1000).toISOString())}>{t('send_now')}</Button>
                     <Button size="sm" variant="outline" onClick={onCancelScheduled}>{t('cancel_scheduled_send')}</Button>
                     <Button
                       size="sm"
diff --git a/locales/cs/common.json b/locales/cs/common.json
index 0c96d96f..a562fc46 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -565,7 +565,8 @@
       "add_to_contacts": "Přidat do kontaktů",
       "copied": "Zkopírováno!",
       "copy_failed": "Kopírování se nezdařilo"
-    }
+    },
+    "send_now": "Send now"
   },
   "email_composer": {
     "read_receipt_on": "Vyžádáno potvrzení o přečtení (kliknutím vypnete)",
diff --git a/locales/da/common.json b/locales/da/common.json
index 9e696fee..861f2ff2 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -565,7 +565,8 @@
       "add_to_contacts": "Tilføj til kontakter",
       "copied": "Kopieret!",
       "copy_failed": "Kunne ikke kopiere"
-    }
+    },
+    "send_now": "Send now"
   },
   "email_composer": {
     "read_receipt_on": "Læsekvittering anmodet (klik for at deaktivere)",
diff --git a/locales/de/common.json b/locales/de/common.json
index fddc8a3c..b32ebd79 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -565,7 +565,8 @@
       "add_to_contacts": "Zu Kontakten hinzufügen",
       "copied": "Kopiert!",
       "copy_failed": "Kopieren fehlgeschlagen"
-    }
+    },
+    "send_now": "Send now"
   },
   "email_composer": {
     "read_receipt_on": "Lesebestätigung angefordert (klicken zum Deaktivieren)",
diff --git a/locales/en/common.json b/locales/en/common.json
index ad4368d9..90c4ae6b 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -565,7 +565,8 @@
       "add_to_contacts": "Add to contacts",
       "copied": "Copied!",
       "copy_failed": "Failed to copy"
-    }
+    },
+    "send_now": "Send now"
   },
   "email_composer": {
     "read_receipt_on": "Read receipt requested (click to disable)",
diff --git a/locales/es/common.json b/locales/es/common.json
index f75b4220..895a2e2e 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -565,7 +565,8 @@
       "add_to_contacts": "Añadir a contactos",
       "copied": "¡Copiado!",
       "copy_failed": "Error al copiar"
-    }
+    },
+    "send_now": "Send now"
   },
   "email_composer": {
     "read_receipt_on": "Confirmación de lectura solicitada (haz clic para desactivar)",
diff --git a/locales/fr/common.json b/locales/fr/common.json
index 76a2312f..31ac4fbd 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -565,7 +565,8 @@
       "add_to_contacts": "Ajouter aux contacts",
       "copied": "Copié !",
       "copy_failed": "Échec de la copie"
-    }
+    },
+    "send_now": "Send now"
   },
   "email_composer": {
     "read_receipt_on": "Accusé de lecture demandé (cliquez pour désactiver)",
diff --git a/locales/hu/common.json b/locales/hu/common.json
index 754ee99e..a335ace5 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -565,7 +565,8 @@
       "add_to_contacts": "Hozzáadás a névjegyekhez",
       "copied": "Másolva!",
       "copy_failed": "A másolás nem sikerült"
-    }
+    },
+    "send_now": "Send now"
   },
   "email_composer": {
     "read_receipt_on": "Olvasási visszaigazolás kérve (kattints a letiltáshoz)",
diff --git a/locales/it/common.json b/locales/it/common.json
index 091ab27c..691a1699 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -565,7 +565,8 @@
       "add_to_contacts": "Aggiungi ai contatti",
       "copied": "Copiato!",
       "copy_failed": "Copia non riuscita"
-    }
+    },
+    "send_now": "Send now"
   },
   "email_composer": {
     "read_receipt_on": "Conferma di lettura richiesta (clicca per disattivare)",
diff --git a/locales/ja/common.json b/locales/ja/common.json
index e504cbf5..e77e2918 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -565,7 +565,8 @@
       "add_to_contacts": "連絡先に追加",
       "copied": "コピーしました！",
       "copy_failed": "コピーに失敗しました"
-    }
+    },
+    "send_now": "Send now"
   },
   "email_composer": {
     "read_receipt_on": "開封確認を要求中（クリックで無効化）",
diff --git a/locales/ko/common.json b/locales/ko/common.json
index e18b4c2c..e2268c40 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -565,7 +565,8 @@
       "add_to_contacts": "연락처에 추가",
       "copied": "복사됨!",
       "copy_failed": "복사하지 못했습니다"
-    }
+    },
+    "send_now": "Send now"
   },
   "email_composer": {
     "read_receipt_on": "읽음 확인 요청됨 (클릭하여 해제)",
diff --git a/locales/lv/common.json b/locales/lv/common.json
index 1d58b448..e0fcff20 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -565,7 +565,8 @@
       "add_to_contacts": "Pievienot kontaktpersonām",
       "copied": "Nokopēts!",
       "copy_failed": "Neizdevās nokopēt"
-    }
+    },
+    "send_now": "Send now"
   },
   "email_composer": {
     "read_receipt_on": "Pieprasīts lasīšanas apstiprinājums (noklikšķiniet, lai atspējotu)",
diff --git a/locales/nl/common.json b/locales/nl/common.json
index 82ff3e60..b0eb82d4 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -565,7 +565,8 @@
       "add_to_contacts": "Aan contacten toevoegen",
       "copied": "Gekopieerd!",
       "copy_failed": "Kopiëren mislukt"
-    }
+    },
+    "send_now": "Send now"
   },
   "email_composer": {
     "read_receipt_on": "Leesbevestiging aangevraagd (klik om uit te schakelen)",
diff --git a/locales/pl/common.json b/locales/pl/common.json
index e5597797..4d90c738 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -565,7 +565,8 @@
       "add_to_contacts": "Dodaj do kontaktów",
       "copied": "Skopiowano!",
       "copy_failed": "Nie udało się skopiować"
-    }
+    },
+    "send_now": "Send now"
   },
   "email_composer": {
     "read_receipt_on": "Zażądano potwierdzenia przeczytania (kliknij, aby wyłączyć)",
diff --git a/locales/pt/common.json b/locales/pt/common.json
index 7844d950..d274d1ba 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -565,7 +565,8 @@
       "add_to_contacts": "Adicionar aos contatos",
       "copied": "Copiado!",
       "copy_failed": "Falha ao copiar"
-    }
+    },
+    "send_now": "Send now"
   },
   "email_composer": {
     "read_receipt_on": "Confirmação de leitura solicitada (clique para desativar)",
diff --git a/locales/ro/common.json b/locales/ro/common.json
index a74b4405..bc2cc165 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -565,7 +565,8 @@
       "add_to_contacts": "Adaugă la contacte",
       "copied": "Copiat!",
       "copy_failed": "Copierea a eșuat"
-    }
+    },
+    "send_now": "Send now"
   },
   "email_composer": {
     "read_receipt_on": "Solicitare confirmare de citire (faceți clic pentru a dezactiva)",
diff --git a/locales/ru/common.json b/locales/ru/common.json
index f0523221..7626b082 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -565,7 +565,8 @@
       "add_to_contacts": "Добавить в контакты",
       "copied": "Скопировано!",
       "copy_failed": "Не удалось скопировать"
-    }
+    },
+    "send_now": "Send now"
   },
   "email_composer": {
     "read_receipt_on": "Запрошено уведомление о прочтении (нажмите, чтобы отключить)",
diff --git a/locales/tr/common.json b/locales/tr/common.json
index 922075d5..9bc809bd 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -565,7 +565,8 @@
       "add_to_contacts": "Kişilere ekle",
       "copied": "Kopyalandı!",
       "copy_failed": "Kopyalanamadı"
-    }
+    },
+    "send_now": "Send now"
   },
   "email_composer": {
     "read_receipt_on": "Okundu bilgisi istendi (devre dışı bırakmak için tıklayın)",
diff --git a/locales/uk/common.json b/locales/uk/common.json
index 57c192d7..0c168bc8 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -565,7 +565,8 @@
       "add_to_contacts": "Додати до контактів",
       "copied": "Скопійовано!",
       "copy_failed": "Не вдалося скопіювати"
-    }
+    },
+    "send_now": "Send now"
   },
   "email_composer": {
     "read_receipt_on": "Запитано сповіщення про прочитання (натисніть, щоб вимкнути)",
diff --git a/locales/zh/common.json b/locales/zh/common.json
index f672f599..43cb4faf 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -565,7 +565,8 @@
       "add_to_contacts": "添加到联系人",
       "copied": "已复制！",
       "copy_failed": "复制失败"
-    }
+    },
+    "send_now": "Send now"
   },
   "email_composer": {
     "read_receipt_on": "已请求已读回执（点击以关闭）",