@@ -9,6 +9,7 @@ import { Skeleton } from "@/components/ui/skeleton"
 import { AiSummary } from "@/components/ai/ai-summary"
 import { ApiClientError } from "@/lib/api-client"
 import { firstName } from "@/lib/inbox/format"
+import { keysFor, type ShortcutAction } from "@/lib/inbox/shortcuts"
 import type { ComposingKind, ConversationDetail } from "@/lib/inbox/types"
 import { cn } from "@/lib/utils"
 import { useThread } from "@/hooks/inbox/queries"
@@ -72,7 +73,7 @@ function TypingIndicator({ conversationId }: { conversationId: string }) {
 }
 
 export function ConversationView({ id, box }: { id: string; box: string }) {
-  const { slug, shortcutsEnabled } = useInbox()
+  const { slug, shortcutsEnabled, shortcutScheme } = useInbox()
   const router = useRouter()
   const { find, run } = useConversationActions()
   const { data: thread, error, isPending } = useThread(slug, id)
@@ -104,23 +105,27 @@ export function ConversationView({ id, box }: { id: string; box: string }) {
   }, [title])
 
   const writable = !!conv && conv.level !== "read" && conv.kind === "email"
+  const k = (action: ShortcutAction) => keysFor(shortcutScheme, action)
   useHotkeys(
     [
-      { keys: ["Escape"], when: () => !inboxUI.get().selected.size, handler: () => cmd?.back() },
-      { keys: ["e"], when: () => writable, handler: () => cmd?.toggleStatus() },
-      { keys: ["s"], handler: () => cmd?.toggleStar() },
-      { keys: ["h"], when: () => writable, handler: () => inboxUI.set({ picker: "snooze" }) },
-      { keys: ["l"], when: () => writable, handler: () => inboxUI.set({ picker: "label" }) },
-      { keys: ["i"], when: () => writable, handler: () => inboxUI.set({ picker: "assign" }) },
-      { keys: ["m"], when: () => writable, handler: () => cmd?.assignToMe() },
-      { keys: ["u"], handler: () => cmd?.markUnread() },
-      { keys: ["#", "shift+#"], when: () => writable, handler: () => cmd?.toggleTrash() },
-      { keys: ["!", "shift+!"], when: () => writable, handler: () => cmd?.toggleSpam() },
-      { keys: ["r"], when: () => writable, handler: () => inboxUI.openComposer(id, "reply") },
-      { keys: ["a"], when: () => writable, handler: () => inboxUI.openComposer(id, "reply_all") },
-      { keys: ["f"], when: () => writable, handler: () => inboxUI.openComposer(id, "forward") },
-      { keys: ["c"], handler: () => inboxUI.openComposer(id, "comment") },
-      { keys: ["shift+p"], when: () => writable, handler: () => cmd?.togglePriority() },
+      { keys: k("back"), when: () => !inboxUI.get().selected.size, handler: () => cmd?.back() },
+      { keys: k("close"), when: () => writable, handler: () => cmd?.toggleStatus() },
+      { keys: k("star"), handler: () => cmd?.toggleStar() },
+      { keys: k("snooze"), when: () => writable, handler: () => inboxUI.set({ picker: "snooze" }) },
+      { keys: k("label"), when: () => writable, handler: () => inboxUI.set({ picker: "label" }) },
+      { keys: k("assign"), when: () => writable, handler: () => inboxUI.set({ picker: "assign" }) },
+      { keys: k("moveTeam"), when: () => writable, handler: () => inboxUI.set({ picker: "team" }) },
+      { keys: k("assignMe"), when: () => writable, handler: () => cmd?.assignToMe() },
+      { keys: k("mute"), handler: () => cmd?.toggleMute() },
+      { keys: k("markRead"), handler: () => cmd?.markRead() },
+      { keys: k("markUnread"), handler: () => cmd?.markUnread() },
+      { keys: k("trash"), when: () => writable, handler: () => cmd?.toggleTrash() },
+      { keys: k("spam"), when: () => writable, handler: () => cmd?.toggleSpam() },
+      { keys: k("reply"), when: () => writable, handler: () => inboxUI.openComposer(id, "reply") },
+      { keys: k("replyAll"), when: () => writable, handler: () => inboxUI.openComposer(id, "reply_all") },
+      { keys: k("forward"), when: () => writable, handler: () => inboxUI.openComposer(id, "forward") },
+      { keys: k("comment"), handler: () => inboxUI.openComposer(id, "comment") },
+      { keys: k("priority"), when: () => writable, handler: () => cmd?.togglePriority() },
     ],
     shortcutsEnabled && !!conv
   )
 
@@ -78,6 +78,7 @@ export function useConversationCommands(conv: ConversationDetail | undefined, bo
         run([conv.id], { read: false })
         router.push(listHref)
       },
+      markRead: () => run([conv.id], { read: true }),
       toggleSpam: () => apply({ spam: !conv.isSpam }, conv.isSpam ? "Marked as not spam" : "Marked as spam"),
       toggleTrash: () => apply({ trash: !conv.isTrash }, conv.isTrash ? "Restored from trash" : "Moved to trash"),
       deleteForever: () => del.mutate(),
 
@@ -5,6 +5,7 @@ import { useQuery } from "@tanstack/react-query"
 import { api } from "@/lib/api-client"
 import { useOrg } from "@/components/app/org-provider"
 import { inboxKeys } from "@/hooks/inbox/queries"
+import { schemeFromPreference, type ShortcutScheme } from "@/lib/inbox/shortcuts"
 import type { AccountSummary, Bootstrap, LabelSummary, MemberSummary, SignatureSummary, TeamSummary } from "@/lib/inbox/types"
 
 /**
@@ -26,6 +27,7 @@ export type InboxContextValue = {
   /** Addresses of accounts I can see (to tell "me" apart from customers) */
   ownAddresses: Set<string>
   shortcutsEnabled: boolean
+  shortcutScheme: ShortcutScheme
 }
 
 const Ctx = createContext<InboxContextValue | null>(null)
@@ -50,7 +52,7 @@ export function InboxProvider({ slug, initialBootstrap, children }: { slug: stri
       own.add(a.email.toLowerCase())
       for (const al of a.aliases) own.add(al.toLowerCase())
     }
-    const prefs = bootstrap.me.preferences as { shortcuts?: string }
+    const shortcuts = schemeFromPreference((bootstrap.me.preferences as { shortcuts?: string }).shortcuts)
     return {
       slug,
       meId: user.id,
@@ -62,7 +64,8 @@ export function InboxProvider({ slug, initialBootstrap, children }: { slug: stri
       team: byId(bootstrap.teams),
       signature: byId(bootstrap.signatures),
       ownAddresses: own,
-      shortcutsEnabled: prefs.shortcuts !== "off",
+      shortcutsEnabled: shortcuts.enabled,
+      shortcutScheme: shortcuts.scheme,
     }
   }, [bootstrap, slug, user.id])
 
 
@@ -19,6 +19,7 @@ import {
 import { Skeleton } from "@/components/ui/skeleton"
 import { useOrg } from "@/components/app/org-provider"
 import { defaultStatus, parseBox, supportsStatusFilter, type ListFilters, type StatusFilter } from "@/lib/inbox/boxes"
+import { keysFor } from "@/lib/inbox/shortcuts"
 import type { ConversationListItem } from "@/lib/inbox/types"
 import { cn } from "@/lib/utils"
 import { inboxKeys, useConversationList } from "@/hooks/inbox/queries"
@@ -52,7 +53,7 @@ function RowSkeleton() {
 }
 
 export function ConversationList({ box }: { box: string }) {
-  const { slug, shortcutsEnabled } = useInbox()
+  const { slug, shortcutsEnabled, shortcutScheme } = useInbox()
   const { can } = useOrg()
   const router = useRouter()
   const qc = useQueryClient()
@@ -189,22 +190,22 @@ export function ConversationList({ box }: { box: string }) {
   }
   useHotkeys(
     [
-      { keys: ["j", "ArrowDown"], handler: () => move(1) },
-      { keys: ["k", "ArrowUp"], handler: () => move(-1) },
+      { keys: keysFor(shortcutScheme, "next"), handler: () => move(1) },
+      { keys: keysFor(shortcutScheme, "prev"), handler: () => move(-1) },
       {
-        keys: ["Enter", "o"],
+        keys: keysFor(shortcutScheme, "open"),
         when: () => !openId && !!inboxUI.get().cursorId,
         handler: () => router.push(hrefFor(inboxUI.get().cursorId!)),
       },
       {
-        keys: ["x"],
+        keys: keysFor(shortcutScheme, "select"),
         handler: () => {
           const id = openId ?? inboxUI.get().cursorId ?? ids[0]
           const item = items.find((i) => i.id === id)
           if (item) toggleSelect(item, false)
         },
       },
-      { keys: ["mod+a"], when: () => !openId, handler: () => inboxUI.set({ selected: new Set(ids) }) },
+      { keys: keysFor(shortcutScheme, "selectAll"), when: () => !openId, handler: () => inboxUI.set({ selected: new Set(ids) }) },
       { keys: ["Escape"], when: () => inboxUI.get().selected.size > 0, handler: () => inboxUI.clearSelection() },
     ],
     shortcutsEnabled
 
@@ -1,8 +1,8 @@
 "use client"
 
-import { useEffect } from "react"
+import { Suspense, useEffect } from "react"
 import dynamic from "next/dynamic"
-import { useRouter } from "next/navigation"
+import { usePathname, useRouter, useSearchParams } from "next/navigation"
 import { PanelLeft } from "lucide-react"
 import { Sheet, SheetContent, SheetDescription, SheetTitle } from "@/components/ui/sheet"
 import { Button } from "@/components/ui/button"
@@ -11,6 +11,8 @@ import { inboxUI, useInboxUI } from "@/hooks/inbox/store"
 import { useHotkeys } from "@/hooks/inbox/use-hotkeys"
 import { usePersistentState } from "@/hooks/inbox/use-persistent-state"
 import { useRealtime } from "@/hooks/inbox/use-realtime"
+import { parseAddresses } from "@/lib/inbox/format"
+import { keysFor, type ShortcutAction } from "@/lib/inbox/shortcuts"
 import type { Bootstrap } from "@/lib/inbox/types"
 import { InboxProvider, useInbox } from "./inbox-provider"
 import { ResizeHandle } from "./resize-handle"
@@ -37,7 +39,7 @@ export function MailShell({ slug, bootstrap, children }: { slug: string; bootstr
 }
 
 function ShellInner({ children }: { children: React.ReactNode }) {
-  const { slug, meId, bootstrap, shortcutsEnabled } = useInbox()
+  const { slug, meId, bootstrap, shortcutsEnabled, shortcutScheme } = useInbox()
   const router = useRouter()
   const [width, setWidth] = usePersistentState("dispatch:sidebar:width", SIDEBAR.default)
   const [collapsed, setCollapsed] = usePersistentState("dispatch:sidebar:collapsed", false)
@@ -72,28 +74,29 @@ function ShellInner({ children }: { children: React.ReactNode }) {
 
   const go = (box: string) => router.push(`/w/${slug}/${box}`)
   const firstTeam = bootstrap.teams.find((t) => t.isMember) ?? bootstrap.teams[0]
+  const k = (action: ShortcutAction) => keysFor(shortcutScheme, action)
+  const togglePalette = () => inboxUI.set((s) => ({ paletteOpen: !s.paletteOpen, paletteQuery: "" }))
   useHotkeys(
     [
-      { keys: ["mod+k"], allowInInput: true, handler: () => inboxUI.set((s) => ({ paletteOpen: !s.paletteOpen, paletteQuery: "" })) },
-      { keys: ["/"], handler: () => inboxUI.set({ paletteOpen: true, paletteQuery: "" }) },
-      { keys: ["n"], handler: () => inboxUI.openCompose() },
-      { keys: ["?", "shift+?"], handler: () => inboxUI.set({ shortcutsOpen: true }) },
-      { keys: ["g i"], handler: () => go("inbox") },
-      { keys: ["g a"], handler: () => go("assigned") },
-      { keys: ["g s"], handler: () => go("starred") },
-      { keys: ["g d"], handler: () => go("drafts") },
-      { keys: ["g m"], handler: () => go("mentions") },
-      { keys: ["g c"], handler: () => go("chats") },
-      { keys: ["g t"], handler: () => (firstTeam ? go(`team.${firstTeam.id}`) : go("unassigned")) },
-      { keys: ["mod+shift+n"], allowInInput: true, handler: () => inboxUI.set({ newChatOpen: true }) },
+      { keys: ["mod+k"], allowInInput: true, handler: togglePalette },
+      { keys: k("search").filter((key) => key !== "mod+k"), handler: () => inboxUI.set({ paletteOpen: true, paletteQuery: "" }) },
+      { keys: k("compose"), handler: () => inboxUI.openCompose() },
+      { keys: [...k("help"), "shift+?"], handler: () => inboxUI.set({ shortcutsOpen: true }) },
+      { keys: k("goInbox"), handler: () => go("inbox") },
+      { keys: k("goAssigned"), handler: () => go("assigned") },
+      { keys: k("goStarred"), handler: () => go("starred") },
+      { keys: k("goDrafts"), handler: () => go("drafts") },
+      { keys: k("goMentions"), handler: () => go("mentions") },
+      { keys: k("goChats"), handler: () => go("chats") },
+      { keys: k("goSent"), handler: () => go("sent") },
+      { keys: k("goAll"), handler: () => go("all") },
+      { keys: k("goTeam"), handler: () => (firstTeam ? go(`team.${firstTeam.id}`) : go("unassigned")) },
+      { keys: k("newChat"), allowInInput: true, handler: () => inboxUI.set({ newChatOpen: true }) },
     ],
     shortcutsEnabled
   )
   // ⌘K must work even with shortcuts turned off.
-  useHotkeys(
-    [{ keys: ["mod+k"], allowInInput: true, handler: () => inboxUI.set((s) => ({ paletteOpen: !s.paletteOpen, paletteQuery: "" })) }],
-    !shortcutsEnabled
-  )
+  useHotkeys([{ keys: ["mod+k"], allowInInput: true, handler: togglePalette }], !shortcutsEnabled)
 
   return (
     <div className="flex h-full min-h-0 bg-background">
@@ -135,6 +138,9 @@ function ShellInner({ children }: { children: React.ReactNode }) {
       </Sheet>
 
       <main className="flex h-full min-w-0 flex-1 flex-col">{children}</main>
+      <Suspense>
+        <ComposeFromUrl />
+      </Suspense>
 
       {paletteOpen && <CommandPalette />}
       {composeOpen && <ComposeDialog />}
@@ -144,6 +150,24 @@ function ShellInner({ children }: { children: React.ReactNode }) {
   )
 }
 
+/** `?compose=<email>` (links from contacts etc.) opens a new message to that address. */
+function ComposeFromUrl() {
+  const params = useSearchParams()
+  const router = useRouter()
+  const pathname = usePathname()
+  const to = params.get("compose")
+  useEffect(() => {
+    if (!to) return
+    const emails = parseAddresses(to)
+    inboxUI.openCompose(emails.length ? { to: emails } : undefined)
+    const next = new URLSearchParams(params.toString())
+    next.delete("compose")
+    const qs = next.toString()
+    router.replace(`${pathname}${qs ? `?${qs}` : ""}`, { scroll: false })
+  }, [to, params, pathname, router])
+  return null
+}
+
 /** Hamburger that opens the sidebar sheet below `lg` (also when the desktop sidebar is collapsed). */
 export function MobileNavButton({ className }: { className?: string }) {
   return (
 
@@ -5,64 +5,32 @@ import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } f
 import { Kbd } from "@/components/ui/kbd"
 import { inboxUI, useInboxUI } from "@/hooks/inbox/store"
 import { shortcutLabel } from "@/hooks/inbox/use-hotkeys"
+import { SHORTCUTS, type ShortcutAction, type ShortcutGroup, type ShortcutScheme } from "@/lib/inbox/shortcuts"
+import { useInbox } from "./inbox-provider"
 
 type Shortcut = { keys: string[]; label: string }
 type Group = { title: string; items: Shortcut[] }
 
-const GROUPS: Group[] = [
-  {
-    title: "Navigation",
-    items: [
-      { keys: ["j", "ArrowDown"], label: "Next conversation" },
-      { keys: ["k", "ArrowUp"], label: "Previous conversation" },
-      { keys: ["Enter", "o"], label: "Open conversation" },
-      { keys: ["Escape"], label: "Back to the list" },
-      { keys: ["g i"], label: "Go to Inbox" },
-      { keys: ["g a"], label: "Go to Assigned to me" },
-      { keys: ["g s"], label: "Go to Starred" },
-      { keys: ["g d"], label: "Go to Drafts" },
-      { keys: ["g m"], label: "Go to Mentions" },
-      { keys: ["g c"], label: "Go to Chats" },
-      { keys: ["g t"], label: "Go to your team" },
-      { keys: ["/", "mod+k"], label: "Search & commands" },
-    ],
-  },
-  {
-    title: "Conversation",
-    items: [
-      { keys: ["e"], label: "Close / reopen" },
-      { keys: ["r"], label: "Reply" },
-      { keys: ["a"], label: "Reply all" },
-      { keys: ["f"], label: "Forward" },
-      { keys: ["c"], label: "Comment" },
-      { keys: ["s"], label: "Star" },
-      { keys: ["h"], label: "Snooze" },
-      { keys: ["l"], label: "Labels" },
-      { keys: ["i"], label: "Assign" },
-      { keys: ["m"], label: "Assign to me" },
-      { keys: ["u"], label: "Mark as unread" },
-      { keys: ["#"], label: "Move to trash" },
-      { keys: ["!"], label: "Mark as spam" },
-      { keys: ["x"], label: "Select" },
-    ],
-  },
-  {
-    title: "Composer",
-    items: [
-      { keys: ["mod+Enter"], label: "Send" },
-      { keys: ["mod+shift+Enter"], label: "Send & close" },
-      { keys: ["Escape"], label: "Close the composer" },
-    ],
-  },
-  {
-    title: "General",
-    items: [
-      { keys: ["n"], label: "New message" },
-      { keys: ["mod+shift+n"], label: "New chat" },
-      { keys: ["?"], label: "Keyboard shortcuts" },
-    ],
-  },
-]
+const COMPOSER: Group = {
+  title: "Composer",
+  items: [
+    { keys: ["mod+Enter"], label: "Send" },
+    { keys: ["mod+shift+Enter"], label: "Send & close" },
+    { keys: ["Escape"], label: "Close the composer" },
+  ],
+}
+
+/** Help groups for the active scheme, from the shared shortcut table. */
+function groupsFor(scheme: ShortcutScheme): Group[] {
+  const order: ShortcutGroup[] = ["Navigation", "Conversation", "General"]
+  const groups = order.map((title) => ({
+    title,
+    items: (Object.keys(SHORTCUTS) as ShortcutAction[])
+      .filter((a) => SHORTCUTS[a].group === title && SHORTCUTS[a][scheme].length > 0)
+      .map((a) => ({ keys: SHORTCUTS[a][scheme], label: SHORTCUTS[a].label })),
+  }))
+  return [groups[0]!, groups[1]!, COMPOSER, groups[2]!]
+}
 
 function Keys({ combo }: { combo: string }) {
   const parts = shortcutLabel(combo)
@@ -81,18 +49,26 @@ function Keys({ combo }: { combo: string }) {
 /** "?" — every keyboard shortcut of the inbox, grouped. */
 export function ShortcutsDialog() {
   const open = useInboxUI((s) => s.shortcutsOpen)
+  const { shortcutScheme, shortcutsEnabled } = useInbox()
+  const groups = groupsFor(shortcutScheme)
   return (
     <Dialog open={open} onOpenChange={(o) => (o ? undefined : inboxUI.set({ shortcutsOpen: false }))}>
       <DialogContent className="flex max-h-[min(44rem,calc(100dvh-2rem))] flex-col gap-0 overflow-hidden p-0 sm:max-w-3xl">
         <DialogHeader className="border-b px-5 py-4">
           <DialogTitle className="text-base font-semibold tracking-tight">
             Keyboard shortcuts <span className="text-quiet">for flying through your inbox</span>
           </DialogTitle>
-          <DialogDescription className="text-[13px]">Shortcuts are paused while you type in a field.</DialogDescription>
+          <DialogDescription className="text-[13px]">
+            {!shortcutsEnabled
+              ? "Keyboard shortcuts are turned off — only ⌘K / Ctrl K works."
+              : shortcutScheme === "gmail"
+                ? "Gmail-compatible scheme. Shortcuts are paused while you type in a field."
+                : "Shortcuts are paused while you type in a field."}
+          </DialogDescription>
         </DialogHeader>
         <div className="scrollbar-thin min-h-0 flex-1 overflow-y-auto px-5 py-4">
           <div className="gap-x-10 md:columns-2">
-            {GROUPS.map((group) => (
+            {groups.map((group) => (
               <section key={group.title} aria-labelledby={`shortcuts-${group.title}`} className="mb-6 break-inside-avoid last:mb-0">
                 <h3 id={`shortcuts-${group.title}`} className="mb-2 font-mono text-[11px] tracking-wider text-muted-foreground uppercase">
                   {group.title}
@@ -117,7 +93,7 @@ export function ShortcutsDialog() {
           </div>
         </div>
         <p className="border-t bg-muted/40 px-5 py-3 text-xs text-muted-foreground">
-          You can turn keyboard shortcuts off in Settings → Profile.
+          Switch between the Dispatch and Gmail schemes, or turn shortcuts off, in Settings → Profile.
         </p>
       </DialogContent>
     </Dialog>