zele 0.3.14 → 0.3.16

package/src/gmail-client.ts

@@ -78,10 +78,16 @@ export interface ThreadListItem {
   snippet: string
   subject: string
   from: Sender
+  to: Sender[]
+  cc: Sender[]
   date: string
   labelIds: string[]
   unread: boolean
+  starred: boolean
   messageCount: number
+  inReplyTo: string | null
+  hasAttachments: boolean
+  listUnsubscribe: string | null
 }
 
 export interface ThreadListResult {
@@ -173,6 +179,15 @@ function sanitizeSnippet(snippet: string): string {
     .trim()
 }
 
+/**
+ * Sanitize header values to prevent CRLF injection attacks.
+ * The mimetext library does not sanitize custom header values, so newlines
+ * in In-Reply-To or References could inject arbitrary headers.
+ */
+function sanitizeHeaderValue(value: string): string {
+  return value.replace(/[\r\n]/g, ' ').trim()
+}
+
 function encodeBase64Url(data: string | Buffer) {
   const buf = typeof data === 'string' ? Buffer.from(data) : data
   return buf.toString('base64').replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '')
@@ -205,6 +220,24 @@ function gmailBoundary<T>(email: string, fn: () => Promise<T>) {
   })
 }
 
+/**
+ * Known folder names that map to Gmail system folders/labels.
+ * Used to validate custom label names and prevent query injection.
+ */
+const KNOWN_FOLDERS = new Set([
+  'inbox',
+  'sent',
+  'trash',
+  'bin',
+  'spam',
+  'drafts',
+  'draft',
+  'starred',
+  'archive',
+  'snoozed',
+  'all',
+])
+
 export class GmailClient {
   private gmail: gmail_v1.Gmail
   private labelIdCache: Record<string, string> = {}
@@ -779,7 +812,8 @@ export class GmailClient {
     )
     if (messageIds instanceof Error) return messageIds
     if (messageIds.length === 0) return
-    await this.batchModifyMessages(messageIds, { removeLabelIds: ['UNREAD'] })
+    const mod = await this.batchModifyMessages(messageIds, { removeLabelIds: ['UNREAD'] })
+    if (mod instanceof Error) return mod
     await this.invalidateAfterThreadMutation(threadIds)
   }
 
@@ -789,7 +823,8 @@ export class GmailClient {
     )
     if (messageIds instanceof Error) return messageIds
     if (messageIds.length === 0) return
-    await this.batchModifyMessages(messageIds, { addLabelIds: ['UNREAD'] })
+    const mod = await this.batchModifyMessages(messageIds, { addLabelIds: ['UNREAD'] })
+    if (mod instanceof Error) return mod
     await this.invalidateAfterThreadMutation(threadIds)
   }
 
@@ -797,7 +832,8 @@ export class GmailClient {
     const messageIds = await this.getMessageIdsForThreads(threadIds)
     if (messageIds instanceof Error) return messageIds
     if (messageIds.length === 0) return
-    await this.batchModifyMessages(messageIds, { addLabelIds: ['STARRED'] })
+    const mod = await this.batchModifyMessages(messageIds, { addLabelIds: ['STARRED'] })
+    if (mod instanceof Error) return mod
     await this.invalidateAfterThreadMutation(threadIds)
   }
 
@@ -807,7 +843,8 @@ export class GmailClient {
     )
     if (messageIds instanceof Error) return messageIds
     if (messageIds.length === 0) return
-    await this.batchModifyMessages(messageIds, { removeLabelIds: ['STARRED'] })
+    const mod = await this.batchModifyMessages(messageIds, { removeLabelIds: ['STARRED'] })
+    if (mod instanceof Error) return mod
     await this.invalidateAfterThreadMutation(threadIds)
   }
 
@@ -834,10 +871,11 @@ export class GmailClient {
     if (messageIds instanceof Error) return messageIds
     if (messageIds.length === 0) return
 
-    await this.batchModifyMessages(messageIds, {
+    const mod = await this.batchModifyMessages(messageIds, {
       addLabelIds: resolvedAdd.filter((r): r is string => typeof r === 'string'),
       removeLabelIds: resolvedRemove,
     })
+    if (mod instanceof Error) return mod
     await this.invalidateAfterThreadMutation(threadIds)
   }
 
@@ -865,7 +903,28 @@ export class GmailClient {
     const messageIds = await this.getMessageIdsForThreads(threadIds)
     if (messageIds instanceof Error) return messageIds
     if (messageIds.length === 0) return
-    await this.batchModifyMessages(messageIds, { removeLabelIds: ['INBOX'] })
+    const mod = await this.batchModifyMessages(messageIds, { removeLabelIds: ['INBOX'] })
+    if (mod instanceof Error) return mod
+    await this.invalidateAfterThreadMutation(threadIds)
+  }
+
+  async markAsSpam({ threadIds }: { threadIds: string[] }): Promise<void | AuthError | ApiError> {
+    const messageIds = await this.getMessageIdsForThreads(threadIds)
+    if (messageIds instanceof Error) return messageIds
+    if (messageIds.length === 0) return
+    const mod = await this.batchModifyMessages(messageIds, { addLabelIds: ['SPAM'], removeLabelIds: ['INBOX'] })
+    if (mod instanceof Error) return mod
+    await this.invalidateAfterThreadMutation(threadIds)
+  }
+
+  async unmarkSpam({ threadIds }: { threadIds: string[] }): Promise<void | AuthError | ApiError> {
+    const messageIds = await this.getMessageIdsForThreads(threadIds, (labelIds) =>
+      labelIds.includes('SPAM'),
+    )
+    if (messageIds instanceof Error) return messageIds
+    if (messageIds.length === 0) return
+    const mod = await this.batchModifyMessages(messageIds, { removeLabelIds: ['SPAM'], addLabelIds: ['INBOX'] })
+    if (mod instanceof Error) return mod
     await this.invalidateAfterThreadMutation(threadIds)
   }
 
@@ -892,10 +951,11 @@ export class GmailClient {
       const threadIds = res.threads.map((t) => t.id)
       const messageIds = await this.getMessageIdsForThreads(threadIds)
       if (messageIds instanceof Error) return messageIds
-      await this.batchModifyMessages(messageIds, {
+      const mod = await this.batchModifyMessages(messageIds, {
         addLabelIds: ['TRASH'],
         removeLabelIds: ['SPAM', 'INBOX'],
       })
+      if (mod instanceof Error) return mod
 
       totalDeleted += threadIds.length
       pageToken = res.nextPageToken ?? undefined
@@ -994,6 +1054,61 @@ export class GmailClient {
     await this.invalidateLabels()
   }
 
+  // =========================================================================
+  // Filters
+  // =========================================================================
+
+  async listFilters(): Promise<{ parsed: gmail_v1.Schema$Filter[] } | AuthError | ApiError> {
+    const res = await gmailBoundary(this.account?.email ?? 'unknown', () =>
+      withRetry(() => this.gmail.users.settings.filters.list({ userId: 'me' })),
+    )
+    if (res instanceof Error) return res
+    return { parsed: res.data.filter ?? [] }
+  }
+
+  async createFilter(opts: {
+    from?: string
+    query?: string
+    addLabelIds?: string[]
+    removeLabelIds?: string[]
+  }): Promise<gmail_v1.Schema$Filter | AuthError | ApiError> {
+    const criteria: gmail_v1.Schema$FilterCriteria = {}
+    if (opts.from) criteria.from = opts.from
+    if (opts.query) criteria.query = opts.query
+
+    const action: gmail_v1.Schema$FilterAction = {}
+    if (opts.addLabelIds?.length) action.addLabelIds = opts.addLabelIds
+    if (opts.removeLabelIds?.length) action.removeLabelIds = opts.removeLabelIds
+
+    const res = await gmailBoundary(this.account?.email ?? 'unknown', () =>
+      withRetry(() =>
+        this.gmail.users.settings.filters.create({
+          userId: 'me',
+          requestBody: { criteria, action },
+        }),
+      ),
+    )
+    if (res instanceof Error) return res
+    return res.data
+  }
+
+  async deleteFilter(filterId: string): Promise<void | AuthError | ApiError> {
+    const res = await gmailBoundary(this.account?.email ?? 'unknown', () =>
+      withRetry(() =>
+        this.gmail.users.settings.filters.delete({
+          userId: 'me',
+          id: filterId,
+        }),
+      ),
+    )
+    if (res instanceof Error) return res
+  }
+
+  /** Resolve a label name to its ID, auto-creating if missing. Public wrapper for filter commands. */
+  async resolveLabel(nameOrId: string): Promise<string | AuthError | ApiError> {
+    return this.resolveLabelId(nameOrId)
+  }
+
   // =========================================================================
   // Label counts (unread counts per folder/label)
   // =========================================================================
@@ -1233,16 +1348,47 @@ export class GmailClient {
       }
     }
 
+    // Parse recipients from latest message
+    const toHeader = getHeader('to') ?? ''
+    const ccHeaders = headers
+      .filter((h) => h.name?.toLowerCase() === 'cc')
+      .map((h) => h.value ?? '')
+      .filter((v) => v.length > 0)
+
+    // Check if any non-draft message in the thread is a reply (has In-Reply-To header)
+    const inReplyTo =
+      nonDraftMessages
+        .map(
+          (m) =>
+            m.payload?.headers?.find((h) => h.name?.toLowerCase() === 'in-reply-to')?.value ??
+            null,
+        )
+        .find((v) => v !== null) ?? null
+
+    // Check if any message has attachments (non-inline)
+    const hasAttachments = messages.some((m) => this.hasNonInlineAttachments(m.payload))
+
+    // List-Unsubscribe from latest message
+    const listUnsubscribe = getHeader('list-unsubscribe') ?? null
+
     return {
       id: raw.id ?? '',
       historyId: raw.historyId ?? null,
       snippet: sanitizeSnippet(latest?.snippet ?? ''),
       subject: (getHeader('subject') ?? '(no subject)').replace(/"/g, '').trim(),
       from: displayFrom,
+      to: toHeader ? parseAddressList(toHeader) : [],
+      cc: ccHeaders.length > 0
+        ? ccHeaders.filter((h) => h.trim().length > 0).flatMap((h) => parseAddressList(h))
+        : [],
       date: getHeader('date') ?? '',
       labelIds: allLabels,
       unread: allLabels.includes('UNREAD'),
+      starred: allLabels.includes('STARRED'),
       messageCount: nonDraftMessages.length,
+      inReplyTo,
+      hasAttachments,
+      listUnsubscribe,
     }
   }
 
@@ -1366,6 +1512,24 @@ export class GmailClient {
     return results
   }
 
+  /** Quick check: does the message payload tree contain any non-inline attachments?
+   *  Checks the root part itself (some messages have attachment metadata there)
+   *  then recurses into child parts. */
+  private hasNonInlineAttachments(part: gmail_v1.Schema$MessagePart | undefined): boolean {
+    if (!part) return false
+    if (part.filename && part.filename.length > 0 && part.body?.attachmentId) {
+      const disposition =
+        part.headers?.find((h) => h.name?.toLowerCase() === 'content-disposition')?.value ?? ''
+      const hasContentId = part.headers?.some((h) => h.name?.toLowerCase() === 'content-id')
+      const isInline = disposition.toLowerCase().includes('inline')
+      if (!isInline || !hasContentId) return true
+    }
+    for (const child of part.parts ?? []) {
+      if (this.hasNonInlineAttachments(child)) return true
+    }
+    return false
+  }
+
   async getEmailAliases(): Promise<Array<{ email: string; name?: string; primary: boolean }> | AuthError | ApiError> {
     const profile = await this.getProfile()
     if (profile instanceof Error) return profile
@@ -1615,7 +1779,7 @@ export class GmailClient {
     })
 
     if (inReplyTo) {
-      msg.setHeader('In-Reply-To', inReplyTo)
+      msg.setHeader('In-Reply-To', sanitizeHeaderValue(inReplyTo))
     }
 
     if (references) {
@@ -1623,6 +1787,7 @@ export class GmailClient {
         .split(' ')
         .filter(Boolean)
         .map((ref) => {
+          ref = sanitizeHeaderValue(ref)
           if (!ref.startsWith('<')) ref = `<${ref}`
           if (!ref.endsWith('>')) ref = `${ref}>`
           return ref
@@ -1707,7 +1872,21 @@ export class GmailClient {
 
     // For non-inbox folders, use Gmail search syntax.
     // Caller-provided labelIds are preserved as additional filters.
-    switch (folder) {
+
+    // Normalize folder name to lowercase for consistent matching
+    const normalizedFolder = folder.toLowerCase()
+
+    // Validate custom label names to prevent query injection.
+    // Gmail query operators like "OR", "from:", parentheses, etc. could manipulate search results.
+    // Known folders are handled by the switch cases below; custom labels must be safe characters only.
+    // Slashes are allowed for nested labels (e.g., "work/projects").
+    if (!KNOWN_FOLDERS.has(normalizedFolder) && !/^[\w\/-]+$/.test(normalizedFolder)) {
+      throw new Error(
+        `Invalid folder/label name: "${folder}". Use alphanumeric characters, underscores, hyphens, and slashes only.`,
+      )
+    }
+
+    switch (normalizedFolder) {
       case 'sent':
         q = `in:sent ${q}`.trim()
         break
@@ -1735,8 +1914,8 @@ export class GmailClient {
         q = `in:anywhere ${q}`.trim()
         break
       default:
-        // Treat as a label name
-        q = `label:${folder} ${q}`.trim()
+        // Treat as a label name (use normalized for consistency)
+        q = `label:${normalizedFolder} ${q}`.trim()
         break
     }
 
@@ -1779,22 +1958,25 @@ export class GmailClient {
   private async batchModifyMessages(
     messageIds: string[],
     body: { addLabelIds?: string[]; removeLabelIds?: string[] },
-  ) {
+  ): Promise<void | AuthError | ApiError> {
     if (messageIds.length === 0) return
 
     // Gmail batchModify accepts up to 1000 IDs
     const chunkSize = 1000
     for (let i = 0; i < messageIds.length; i += chunkSize) {
       const chunk = messageIds.slice(i, i + chunkSize)
-      await withRetry(() =>
-        this.gmail.users.messages.batchModify({
-          userId: 'me',
-          requestBody: {
-            ids: chunk,
-            ...body,
-          },
-        }),
+      const res = await gmailBoundary(this.account?.email ?? 'unknown', () =>
+        withRetry(() =>
+          this.gmail.users.messages.batchModify({
+            userId: 'me',
+            requestBody: {
+              ids: chunk,
+              ...body,
+            },
+          }),
+        ),
       )
+      if (res instanceof Error) return res
     }
   }
 

package/src/mail-tui.test.ts

@@ -0,0 +1,170 @@
+// E2E test for the mail TUI mailbox folder switching.
+// Uses tuistory to launch the TUI via termcast dev and verify folder filter actions.
+
+import path from 'path'
+import { test, expect, afterEach } from 'vitest'
+import { launchTerminal, type TerminalSession } from 'tuistory'
+
+const PROJECT_ROOT = path.resolve(import.meta.dirname, '..')
+
+let session: TerminalSession
+
+afterEach(() => {
+  session?.close()
+})
+
+/**
+ * Navigate down in the actions panel until the cursor line contains the target text.
+ * Returns true if found, false if we hit maxSteps without finding it.
+ */
+async function navigateToAction(
+  session: TerminalSession,
+  target: string,
+  maxSteps = 25,
+): Promise<boolean> {
+  for (let i = 0; i < maxSteps; i++) {
+    const text = await session.text({ trimEnd: true })
+    // tuistory renders the cursor line with › prefix
+    const lines = text.split('\n')
+    const cursorLine = lines.find((l) => l.includes('›') && l.includes(target))
+    if (cursorLine) return true
+    await session.press('down')
+  }
+  return false
+}
+
+/**
+ * Extract just the visible portion of the actions panel overlay from a terminal snapshot.
+ * Strips the background list content and returns only action items.
+ */
+function extractActionsPanel(text: string): string {
+  const lines = text.split('\n')
+  const panelLines: string[] = []
+  let inPanel = false
+  for (const line of lines) {
+    if (line.includes('Actions') && line.includes('esc')) inPanel = true
+    if (inPanel) {
+      // Extract the content between the box-drawing borders
+      const match = line.match(/│\s*(.*?)\s*│/)
+      if (match) {
+        panelLines.push(match[1]!.trimEnd())
+      }
+    }
+    if (inPanel && line.includes('╰')) break
+  }
+  return panelLines.filter((l) => l.length > 0).join('\n')
+}
+
+test('mailbox folder filter switches between folders', async () => {
+  session = await launchTerminal({
+    command: 'termcast',
+    args: ['dev'],
+    cols: 120,
+    rows: 36,
+    cwd: PROJECT_ROOT,
+  })
+
+  // Wait for the TUI to render with inbox
+  await session.waitForText('Search', { timeout: 20000 })
+  const initialScreen = await session.text({ trimEnd: true })
+  expect(initialScreen).toContain('Search Inbox...')
+
+  // Open actions panel and navigate to "Sent" action
+  await session.press(['ctrl', 'k'])
+  await session.waitForText('Actions', { timeout: 5000 })
+
+  const foundSent = await navigateToAction(session, 'Sent')
+  expect(foundSent).toBe(true)
+
+  // Snapshot the actions panel with cursor on Sent
+  const actionsWithSent = extractActionsPanel(await session.text({ trimEnd: true }))
+  expect(actionsWithSent).toMatchInlineSnapshot(`
+    "Actions                                                          esc
+    > Search actions...
+    Copy Thread ID
+    Copy Subject
+    Copy Sender Email
+    ⌧ Trash                                                 ⌃BACKSPACE
+    Mailbox                                                             ▀
+    ✓ Inbox
+    ›○ Sent
+    ○ Starred
+    ○ Drafts
+    ↵ select   ↑↓ navigate"
+  `)
+
+  await session.press('enter')
+
+  // Verify the screen updated to Sent folder
+  await session.waitForText('Search Sent', { timeout: 15000 })
+  const sentScreen = await session.text({ trimEnd: true })
+  expect(sentScreen).toContain('Search Sent...')
+
+  // Now switch back to Inbox via actions panel
+  await session.press(['ctrl', 'k'])
+  await session.waitForText('Actions', { timeout: 5000 })
+
+  const foundInbox = await navigateToAction(session, 'Inbox')
+  expect(foundInbox).toBe(true)
+
+  // Snapshot the actions panel with cursor on Inbox (should show checkmark on Sent now)
+  const actionsWithInbox = extractActionsPanel(await session.text({ trimEnd: true }))
+  expect(actionsWithInbox).toMatchInlineSnapshot(`
+    "Actions                                                          esc
+    > Search actions...
+    Copy Thread ID
+    Copy Subject
+    Copy Sender Email
+    ⌧ Trash                                                 ⌃BACKSPACE
+    Mailbox                                                             ▀
+    ›○ Inbox
+    ✓ Sent
+    ○ Starred
+    ○ Drafts
+    ↵ select   ↑↓ navigate"
+  `)
+
+  await session.press('enter')
+
+  // Verify switched back to Inbox
+  await session.waitForText('Search Inbox', { timeout: 15000 })
+  const inboxScreen = await session.text({ trimEnd: true })
+  expect(inboxScreen).toContain('Search Inbox...')
+}, 60000)
+
+test('actions panel lists mailbox folder options', async () => {
+  session = await launchTerminal({
+    command: 'termcast',
+    args: ['dev'],
+    cols: 120,
+    rows: 36,
+    cwd: PROJECT_ROOT,
+  })
+
+  await session.waitForText('Search', { timeout: 20000 })
+
+  // Open actions panel
+  await session.press(['ctrl', 'k'])
+  await session.waitForText('Actions', { timeout: 5000 })
+
+  // Navigate down to Mailbox section
+  const foundStarred = await navigateToAction(session, 'Starred')
+  expect(foundStarred).toBe(true)
+
+  // Snapshot the Mailbox section visible in the actions panel
+  const actionsText = extractActionsPanel(await session.text({ trimEnd: true }))
+  expect(actionsText).toMatchInlineSnapshot(`
+    "Actions                                                          esc
+    > Search actions...
+    Copy Thread ID
+    Copy Subject
+    Copy Sender Email
+    ⌧ Trash                                                 ⌃BACKSPACE
+    Mailbox                                                             ▀
+    ✓ Inbox
+    ○ Sent
+    ›○ Starred
+    ○ Drafts
+    ↵ select   ↑↓ navigate"
+  `)
+}, 30000)

package/src/mail-tui.tsx

@@ -78,6 +78,17 @@ const ACCOUNT_COLORS = [
 const ADD_ACCOUNT = '__add_account__'
 const MANAGE_ACCOUNTS = '__manage_accounts__'
 
+const FOLDER_OPTIONS = [
+  { id: 'inbox', label: 'Inbox', icon: Icon.Envelope },
+  { id: 'sent', label: 'Sent', icon: Icon.PaperAirplane },
+  { id: 'starred', label: 'Starred', icon: Icon.Star },
+  { id: 'drafts', label: 'Drafts', icon: Icon.Pencil },
+  { id: 'archive', label: 'Archive', icon: Icon.Tray },
+  { id: 'spam', label: 'Spam', icon: Icon.ExclamationMark },
+  { id: 'trash', label: 'Trash', icon: Icon.Trash },
+  { id: 'all', label: 'All Mail', icon: Icon.List },
+] as const
+
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------
@@ -399,10 +410,19 @@ function ComposeForm({ mode, initialAccount, accounts, onSent }: ComposeFormProp
         ? 'Reply All'
         : 'Reply'
 
-  const bodyPlaceholder =
-    mode.type === 'forward'
-      ? 'Add a message (optional)...'
-      : 'Type your reply...'
+  const bodyPlaceholder = mode.type === 'forward'
+    ? `Add a message (optional)...
+
+---
+
+Best,
+Name`
+    : `Type your reply...
+
+---
+
+Best,
+Name`
 
   const handleSubmit = async (values: { to?: string; body?: string }) => {
     // Validate based on mode
@@ -700,6 +720,11 @@ export default function Command() {
     'all',
     { cacheNamespace: CACHE_NAMESPACE },
   )
+  const [activeFolder, setActiveFolder] = useCachedState(
+    'activeFolder',
+    'inbox' as string,
+    { cacheNamespace: CACHE_NAMESPACE },
+  )
   const [searchText, setSearchText] = useState('')
   const [isShowingDetail, setIsShowingDetail] = useCachedState(
     'isShowingDetail',
@@ -732,7 +757,7 @@ export default function Command() {
     pagination,
     revalidate,
   } = useCachedPromise(
-    (query: string, account: string) => {
+    (query: string, account: string, folder: string) => {
       return async ({ cursor }: { page: number; cursor?: MailCursor }) => {
         const accountFilter = account === 'all' ? undefined : [account]
         const clients = await getClients(accountFilter)
@@ -744,6 +769,7 @@ export default function Command() {
           const { email, client } = clients[0]!
           const result = await client.listThreads({
             query: query || undefined,
+            folder,
             maxResults: pageSize,
             pageToken: pageToken || undefined,
           })
@@ -784,6 +810,7 @@ export default function Command() {
 
             const result = await client.listThreads({
               query: query || undefined,
+              folder,
               maxResults: pageSize,
               pageToken: previousByAccount[email] ?? undefined,
             })
@@ -833,7 +860,7 @@ export default function Command() {
         }
       }
     },
-    [searchText, selectedAccount, pageSize],
+    [searchText, selectedAccount, activeFolder, pageSize],
     { keepPreviousData: true },
   )
 
@@ -933,7 +960,7 @@ export default function Command() {
       isLoading={isLoading || accounts.isLoading || isMutating}
       isShowingDetail={isShowingDetail}
       spacingMode={LIST_SPACING_MODE}
-      searchBarPlaceholder='Search emails...'
+      searchBarPlaceholder={`Search ${FOLDER_OPTIONS.find((f) => f.id === activeFolder)?.label ?? 'emails'}...`}
       onSearchTextChange={setSearchText}
       throttle
       pagination={pagination ? { ...pagination, pageSize } : undefined}
@@ -990,7 +1017,7 @@ export default function Command() {
             // Detail panel: latest message body as markdown
             const detail = isShowingDetail ? (
               <List.Item.Detail
-                markdown={`# ${thread.subject}\n\n${thread.snippet}`}
+                markdown={`\n\n${thread.snippet}`}
                 metadata={
                   <List.Item.Detail.Metadata>
                     <List.Item.Detail.Metadata.Label
@@ -1107,6 +1134,16 @@ export default function Command() {
                             onAction={() => setSelectedThreads([])}
                           />
                         </ActionPanel.Section>
+                        <ActionPanel.Section title='Mailbox'>
+                          {FOLDER_OPTIONS.map((f) => (
+                            <Action
+                              key={f.id}
+                              title={f.label}
+                              icon={activeFolder === f.id ? Icon.CheckCircle : Icon.Circle}
+                              onAction={() => setActiveFolder(f.id)}
+                            />
+                          ))}
+                        </ActionPanel.Section>
                         <ActionPanel.Section>
                           <Action
                             title='Refresh'
@@ -1157,7 +1194,7 @@ export default function Command() {
                           <Action
                             title={thread.unread ? 'Mark as Read' : 'Mark as Unread'}
                             icon={thread.unread ? Icon.Eye : Icon.EyeDisabled}
-                            shortcut={{ modifiers: ['ctrl'], key: 'u' }}
+                            // shortcut={{ modifiers: ['ctrl'], key: 'u' }}
                             onAction={() => withMutation(async () => {
                               const { client } = await getClient([thread.account])
                               const result = thread.unread
@@ -1285,6 +1322,16 @@ export default function Command() {
                             })}
                           />
                         </ActionPanel.Section>
+                        <ActionPanel.Section title='Mailbox'>
+                          {FOLDER_OPTIONS.map((f) => (
+                            <Action
+                              key={f.id}
+                              title={f.label}
+                              icon={activeFolder === f.id ? Icon.CheckCircle : Icon.Circle}
+                              onAction={() => setActiveFolder(f.id)}
+                            />
+                          ))}
+                        </ActionPanel.Section>
                         <ActionPanel.Section>
                           <Action
                             title='Refresh'