From dd322d4c9da0fb77b9733bde1a09cd71eef5b944 Mon Sep 17 00:00:00 2001
From: Lucas Gaitzsch <lucas@gaitzsch.dev>
Date: Wed, 20 May 2026 20:04:46 +0200
Subject: [PATCH] some fixes

---
 app/[locale]/page.tsx             | 12 ++++++------
 components/email/email-viewer.tsx |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/[locale]/page.tsx b/app/[locale]/page.tsx
index 6dc585d6..63b7a410 100644
--- a/app/[locale]/page.tsx
+++ b/app/[locale]/page.tsx
@@ -113,6 +113,7 @@ export default function Home() {
   const { identities } = useIdentityStore();
   useIdentitySync();
   const trustedSendersAddressBook = useSettingsStore((state) => state.trustedSendersAddressBook);
+  const sendDelaySeconds = useSettingsStore((state) => state.sendDelaySeconds);
   const { loadTrustedSendersBook, trustedSendersLoaded } = useContactStore();
 
   // Load trusted senders address book when feature is enabled
@@ -1107,7 +1108,6 @@ export default function Home() {
       if (result.scheduled) {
         await refreshScheduledMetadata(client);
         if (isScheduledView) await fetchScheduledEmails(client);
-        toast.success(t('email_viewer.scheduled_send_created'));
         return;
       }
 
@@ -1263,9 +1263,10 @@ export default function Home() {
 
     lastUndoToastSubmissionRef.current = pendingUndoSend.submissionId;
     const pending = pendingUndoSend;
+    const undoDurationMs = Math.max(sendDelaySeconds, 8) * 1000;
 
-    toast.info(t('email_viewer.undo_send_scheduled'), {
-      duration: 8000,
+    toast.success(t('email_viewer.scheduled_send_created'), {
+      duration: undoDurationMs,
       action: {
         label: t('email_viewer.undo_send'),
         onClick: () => {
@@ -1289,11 +1290,11 @@ export default function Home() {
       if (current?.submissionId === pending.submissionId) {
         clearPendingUndoSend();
       }
-    }, 8000);
+    }, undoDurationMs);
 
     return () => clearTimeout(timer);
   // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [cancelUndoSend, clearPendingUndoSend, client, fetchScheduledEmails, isScheduledView, pendingUndoSend?.submissionId, t]);
+  }, [cancelUndoSend, clearPendingUndoSend, client, fetchScheduledEmails, isScheduledView, pendingUndoSend?.submissionId, sendDelaySeconds, t]);
 
   const handleReplyAll = async () => {
     if (selectedEmail) {
@@ -2812,7 +2813,6 @@ export default function Home() {
                       await refreshScheduledMetadata(client);
                       if (isScheduledView) await fetchScheduledEmails(client);
                     }
-                    toast.success(t('email_viewer.scheduled_send_created'));
                     setShowComposer(false);
                     setPendingDraft(null);
                   }}
diff --git a/components/email/email-viewer.tsx b/components/email/email-viewer.tsx
index 2a87f893..58ae5ad7 100644
--- a/components/email/email-viewer.tsx
+++ b/components/email/email-viewer.tsx
@@ -4821,7 +4821,7 @@ export function EmailViewer({
         {/* Draft Banner */}
         {isDraft && (
           <div className="border-b border-border bg-warning/10">
-            <div className="max-w-4xl mx-auto px-6 py-2.5 flex items-center justify-between">
+            <div className="px-6 py-2.5 flex items-center justify-between">
               <div className="flex items-center gap-2 text-warning">
                 <File className="w-4 h-4" />
                 <span className="text-sm font-medium">{t('draft_banner')}</span>