diff --git a/web/Compose.tsx b/web/Compose.tsx
index f484525..2f17964 100644
--- a/web/Compose.tsx
+++ b/web/Compose.tsx
@@ -70,6 +70,7 @@ const RecipientInput = ({
           {suggestions.map((s) => (
             <button
               key={s.address}
+              type="button"
               onMouseDown={(ev) => {
                 ev.preventDefault();
                 pick(s.address);
@@ -215,7 +216,10 @@ export const ComposeModal = () => {
     setDraft(null);
   };
 
-  const send = async () => {
+  // The body is a contenteditable div, not an <input>/<textarea>, so it never triggers a native
+  // Enter-to-submit — only the To/Cc/Bcc/Subject fields do, which is the point.
+  const send = async (ev?: React.FormEvent) => {
+    ev?.preventDefault();
     if (!to.trim()) {
       toast.error('Add at least one recipient');
       return;
@@ -286,115 +290,132 @@ export const ComposeModal = () => {
             Drop images to inline · other files attach
           </div>
         )}
-        <div className="flex items-center border-b px-4 py-2.5 pr-10">
-          <DialogTitle className="text-sm font-semibold">{/^re:/i.test(subject) ? 'Reply' : 'New message'}</DialogTitle>
-        </div>
+        {/* A real <form>: Enter in To/Cc/Bcc/Subject sends, matching every other single-line field.
+            `contents` keeps it out of the flex layout — the fields around it don't know it's there. */}
+        <form onSubmit={send} className="contents">
+          <div className="flex items-center border-b px-4 py-2.5 pr-10">
+            <DialogTitle className="text-sm font-semibold">
+              {/^re:/i.test(subject) ? 'Reply' : 'New message'}
+            </DialogTitle>
+          </div>
 
-        <div className="flex items-center border-b">
-          <span className="pl-4 text-xs opacity-50">To</span>
-          <div className="flex-1">
-            <RecipientInput value={to} onChange={setTo} placeholder="Recipients" autoFocus />
-          </div>
-          <div className="flex items-center gap-2 px-3">
-            {!showCc && (
-              <button onClick={() => setShowCc(true)} className="text-xs opacity-50 hover:opacity-100 cursor-pointer">
-                Cc
-              </button>
-            )}
-            {!showBcc && (
-              <button onClick={() => setShowBcc(true)} className="text-xs opacity-50 hover:opacity-100 cursor-pointer">
-                Bcc
-              </button>
-            )}
-          </div>
-        </div>
-        {showCc && (
           <div className="flex items-center border-b">
-            <span className="pl-4 text-xs opacity-50">Cc</span>
+            <span className="pl-4 text-xs opacity-50">To</span>
             <div className="flex-1">
-              <RecipientInput value={cc} onChange={setCc} placeholder="Cc recipients" />
+              <RecipientInput value={to} onChange={setTo} placeholder="Recipients" autoFocus />
             </div>
-          </div>
-        )}
-        {showBcc && (
-          <div className="flex items-center border-b">
-            <span className="pl-4 text-xs opacity-50">Bcc</span>
-            <div className="flex-1">
-              <RecipientInput value={bcc} onChange={setBcc} placeholder="Bcc recipients" />
-            </div>
-          </div>
-        )}
-        <input
-          value={subject}
-          onChange={(ev) => setSubject(ev.target.value)}
-          placeholder="Subject"
-          className="border-b bg-transparent px-4 py-2 text-sm outline-none placeholder:opacity-40"
-        />
-        <div className="relative flex-1 overflow-hidden">
-          {bodyEmpty && (
-            <div className="pointer-events-none absolute left-4 top-3 text-sm opacity-40">Write your message…</div>
-          )}
-          <div
-            ref={editorRef}
-            contentEditable
-            onInput={refreshEmpty}
-            onPaste={onEditorPaste}
-            className="h-full overflow-y-auto px-4 py-3 text-sm outline-none [&_img]:my-1 [&_img]:rounded"
-          />
-        </div>
-
-        {files.length > 0 && (
-          <div className="flex flex-wrap gap-1.5 border-t px-4 py-2">
-            {files.map((f, i) => (
-              <span key={`${f.name}-${i}`} className="flex items-center gap-1.5 rounded bg-accent px-2 py-1 text-xs">
-                <Paperclip className="h-3 w-3 opacity-60" />
-                <span className="max-w-[16rem] truncate">{f.name}</span>
-                <span className="opacity-50">{fmtSize(f.size)}</span>
+            <div className="flex items-center gap-2 px-3">
+              {!showCc && (
                 <button
-                  onClick={() => setFiles((prev) => prev.filter((_, idx) => idx !== i))}
-                  className="opacity-50 hover:opacity-100 cursor-pointer"
-                  title="Remove"
+                  type="button"
+                  onClick={() => setShowCc(true)}
+                  className="text-xs opacity-50 hover:opacity-100 cursor-pointer"
                 >
-                  <X className="h-3 w-3" />
+                  Cc
                 </button>
-              </span>
-            ))}
+              )}
+              {!showBcc && (
+                <button
+                  type="button"
+                  onClick={() => setShowBcc(true)}
+                  className="text-xs opacity-50 hover:opacity-100 cursor-pointer"
+                >
+                  Bcc
+                </button>
+              )}
+            </div>
           </div>
-        )}
-
-        <div className="flex items-center justify-end gap-2 border-t px-4 py-2.5">
+          {showCc && (
+            <div className="flex items-center border-b">
+              <span className="pl-4 text-xs opacity-50">Cc</span>
+              <div className="flex-1">
+                <RecipientInput value={cc} onChange={setCc} placeholder="Cc recipients" />
+              </div>
+            </div>
+          )}
+          {showBcc && (
+            <div className="flex items-center border-b">
+              <span className="pl-4 text-xs opacity-50">Bcc</span>
+              <div className="flex-1">
+                <RecipientInput value={bcc} onChange={setBcc} placeholder="Bcc recipients" />
+              </div>
+            </div>
+          )}
           <input
-            ref={fileInput}
-            type="file"
-            multiple
-            className="hidden"
-            onChange={(ev) => {
-              if (ev.target.files?.length) addAttachments(ev.target.files);
-              ev.target.value = '';
-            }}
+            value={subject}
+            onChange={(ev) => setSubject(ev.target.value)}
+            placeholder="Subject"
+            className="border-b bg-transparent px-4 py-2 text-sm outline-none placeholder:opacity-40"
           />
-          <button
-            onClick={() => fileInput.current?.click()}
-            className="mr-auto flex items-center gap-1.5 rounded-md px-2 py-1.5 text-sm opacity-60 hover:opacity-100 cursor-pointer"
-            title="Attach files"
-          >
-            <Paperclip className="h-4 w-4" />
-          </button>
-          <button
-            onClick={close}
-            className="rounded-md px-4 py-1.5 text-sm opacity-60 hover:opacity-100 cursor-pointer"
-          >
-            Cancel
-          </button>
-          <button
-            onClick={send}
-            disabled={sending}
-            className="flex items-center gap-1.5 rounded-md bg-duck-teal px-4 py-1.5 text-sm font-medium text-white hover:bg-duck-teal/90 disabled:opacity-50 cursor-pointer"
-          >
-            {sending ? <Loader2 className="h-3.5 w-3.5 animate-spin" /> : <Send className="h-3.5 w-3.5" />}
-            Send
-          </button>
-        </div>
+          <div className="relative flex-1 overflow-hidden">
+            {bodyEmpty && (
+              <div className="pointer-events-none absolute left-4 top-3 text-sm opacity-40">Write your message…</div>
+            )}
+            <div
+              ref={editorRef}
+              contentEditable
+              onInput={refreshEmpty}
+              onPaste={onEditorPaste}
+              className="h-full overflow-y-auto px-4 py-3 text-sm outline-none [&_img]:my-1 [&_img]:rounded"
+            />
+          </div>
+
+          {files.length > 0 && (
+            <div className="flex flex-wrap gap-1.5 border-t px-4 py-2">
+              {files.map((f, i) => (
+                <span key={`${f.name}-${i}`} className="flex items-center gap-1.5 rounded bg-accent px-2 py-1 text-xs">
+                  <Paperclip className="h-3 w-3 opacity-60" />
+                  <span className="max-w-[16rem] truncate">{f.name}</span>
+                  <span className="opacity-50">{fmtSize(f.size)}</span>
+                  <button
+                    type="button"
+                    onClick={() => setFiles((prev) => prev.filter((_, idx) => idx !== i))}
+                    className="opacity-50 hover:opacity-100 cursor-pointer"
+                    title="Remove"
+                  >
+                    <X className="h-3 w-3" />
+                  </button>
+                </span>
+              ))}
+            </div>
+          )}
+
+          <div className="flex items-center justify-end gap-2 border-t px-4 py-2.5">
+            <input
+              ref={fileInput}
+              type="file"
+              multiple
+              className="hidden"
+              onChange={(ev) => {
+                if (ev.target.files?.length) addAttachments(ev.target.files);
+                ev.target.value = '';
+              }}
+            />
+            <button
+              type="button"
+              onClick={() => fileInput.current?.click()}
+              className="mr-auto flex items-center gap-1.5 rounded-md px-2 py-1.5 text-sm opacity-60 hover:opacity-100 cursor-pointer"
+              title="Attach files"
+            >
+              <Paperclip className="h-4 w-4" />
+            </button>
+            <button
+              type="button"
+              onClick={close}
+              className="rounded-md px-4 py-1.5 text-sm opacity-60 hover:opacity-100 cursor-pointer"
+            >
+              Cancel
+            </button>
+            <button
+              type="submit"
+              disabled={sending}
+              className="flex items-center gap-1.5 rounded-md bg-duck-teal px-4 py-1.5 text-sm font-medium text-white hover:bg-duck-teal/90 disabled:opacity-50 cursor-pointer"
+            >
+              {sending ? <Loader2 className="h-3.5 w-3.5 animate-spin" /> : <Send className="h-3.5 w-3.5" />}
+              Send
+            </button>
+          </div>
+        </form>
       </DialogContent>
     </Dialog>
   );
diff --git a/web/EmailAccounts.tsx b/web/EmailAccounts.tsx
index 4ffb675..bc4e024 100644
--- a/web/EmailAccounts.tsx
+++ b/web/EmailAccounts.tsx
@@ -85,7 +85,8 @@ export const EmailAccounts = () => {
     }
   };
 
-  const handleGmailOAuth = async () => {
+  const handleGmailOAuth = async (ev?: React.FormEvent) => {
+    ev?.preventDefault();
     setSaving(true);
     try {
       const status = await client.get<{ connected: boolean; email: string | null }>('/integrations/google/status');
@@ -116,7 +117,8 @@ export const EmailAccounts = () => {
     }
   };
 
-  const handlePasswordSubmit = async () => {
+  const handlePasswordSubmit = async (ev?: React.FormEvent) => {
+    ev?.preventDefault();
     if (!form.email.trim() || !form.password.trim()) return;
     setSaving(true);
     try {
@@ -304,7 +306,10 @@ export const EmailAccounts = () => {
 
       {/* Gmail OAuth form */}
       {activeForm === 'gmail-oauth' && (
-        <div className="grid gap-3 rounded-lg border border-duck-dark/10 dark:border-foreground/10 p-4">
+        <form
+          onSubmit={handleGmailOAuth}
+          className="grid gap-3 rounded-lg border border-duck-dark/10 dark:border-foreground/10 p-4"
+        >
           <p className="text-sm font-medium text-duck-dark dark:text-foreground">Add Gmail (OAuth)</p>
           <input
             type="text"
@@ -317,16 +322,19 @@ export const EmailAccounts = () => {
             <Button type="button" variant="ghost" onClick={resetForm} className="h-9 cursor-pointer">
               Cancel
             </Button>
-            <Button type="button" onClick={handleGmailOAuth} disabled={saving} className="h-9 flex-1 cursor-pointer">
+            <Button type="submit" disabled={saving} className="h-9 flex-1 cursor-pointer">
               {saving ? <Loader2 className="h-4 w-4 animate-spin" /> : 'Connect & Add'}
             </Button>
           </div>
-        </div>
+        </form>
       )}
 
       {/* Gmail App Password form */}
       {activeForm === 'gmail-password' && (
-        <div className="grid gap-3 rounded-lg border border-duck-dark/10 dark:border-foreground/10 p-4">
+        <form
+          onSubmit={handlePasswordSubmit}
+          className="grid gap-3 rounded-lg border border-duck-dark/10 dark:border-foreground/10 p-4"
+        >
           <p className="text-sm font-medium text-duck-dark dark:text-foreground">Add Gmail (App Password)</p>
           <div className="text-xs text-duck-dark/50 dark:text-foreground/50 grid gap-1.5">
             <p>To create an App Password:</p>
@@ -373,20 +381,22 @@ export const EmailAccounts = () => {
               Cancel
             </Button>
             <Button
-              type="button"
-              onClick={handlePasswordSubmit}
+              type="submit"
               disabled={!form.email.trim() || !form.password.trim() || saving}
               className="h-9 flex-1 cursor-pointer"
             >
               {saving ? <Loader2 className="h-4 w-4 animate-spin" /> : 'Test & Save'}
             </Button>
           </div>
-        </div>
+        </form>
       )}
 
       {/* Generic IMAP form */}
       {activeForm === 'imap' && (
-        <div className="grid gap-3 rounded-lg border border-duck-dark/10 dark:border-foreground/10 p-4">
+        <form
+          onSubmit={handlePasswordSubmit}
+          className="grid gap-3 rounded-lg border border-duck-dark/10 dark:border-foreground/10 p-4"
+        >
           <p className="text-sm font-medium text-duck-dark dark:text-foreground">Add IMAP Account</p>
           <input
             type="email"
@@ -439,15 +449,14 @@ export const EmailAccounts = () => {
               Cancel
             </Button>
             <Button
-              type="button"
-              onClick={handlePasswordSubmit}
+              type="submit"
               disabled={!form.email.trim() || !form.password.trim() || !form.imapHost.trim() || saving}
               className="h-9 flex-1 cursor-pointer"
             >
               {saving ? <Loader2 className="h-4 w-4 animate-spin" /> : 'Test & Save'}
             </Button>
           </div>
-        </div>
+        </form>
       )}
 
       {/* Add account button */}