From 802b19916c7ec6ad17e408635397d686f6b29724 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Thu, 24 Sep 2026 18:33:18 +0200
Subject: [PATCH] fix: hide the schedule button when the server can't schedule
 sends

---
 src/screens/ComposeScreen.tsx | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/screens/ComposeScreen.tsx b/src/screens/ComposeScreen.tsx
index 78758e6e..27d16725 100644
--- a/src/screens/ComposeScreen.tsx
+++ b/src/screens/ComposeScreen.tsx
@@ -2170,14 +2170,17 @@ export default function ComposeScreen({ route, navigation }: Props) {
           >
             <Paperclip size={20} color={c.text} />
           </Pressable>
-          <Pressable
-            onPress={() => setScheduleSheetOpen(true)}
-            style={styles.headerBtn}
-            hitSlop={8}
-            disabled={!canSend}
-          >
-            <Clock size={20} color={canSend ? c.text : c.textMuted} />
-          </Pressable>
+          {/* Only offer scheduling when the server can hold the message (webmail parity). */}
+          {jmapClient.hasDelayedSend() && (
+            <Pressable
+              onPress={() => setScheduleSheetOpen(true)}
+              style={styles.headerBtn}
+              hitSlop={8}
+              disabled={!canSend}
+            >
+              <Clock size={20} color={canSend ? c.text : c.textMuted} />
+            </Pressable>
+          )}
           <Button
             variant="default"
             size="sm"
@@ -2462,11 +2465,6 @@ export default function ComposeScreen({ route, navigation }: Props) {
             <Text style={styles.modalTitle}>
               {t('email_composer.schedule_send', 'Schedule send')}
             </Text>
-            {!jmapClient.hasDelayedSend() && (
-              <Text style={styles.scheduleWarning}>
-                {t('email_composer.schedule_unsupported_body', 'This mail server does not support scheduled send.')}
-              </Text>
-            )}
             {schedulePresets.map((preset) => (
               <Pressable
                 key={preset.label}