diff --git a/app/(main)/[locale]/apps/[[...segments]]/page.tsx b/app/(main)/[locale]/apps/[[...segments]]/page.tsx
new file mode 100644
index 000000000..bd91cb2f0
--- /dev/null
+++ b/app/(main)/[locale]/apps/[[...segments]]/page.tsx
@@ -0,0 +1,26 @@
+import { PluginPageApp } from "@/components/plugins/plugin-page-app";
+import { generateLiteSegmentParams } from "@/lib/lite-static-params";
+
+// Pages plugins add with api.ui.setPages: /apps/<pluginId>/<pageId>[/<path>].
+// Anything after the page id reaches the plugin's `app-page` slot as `path`.
+// A catch-all rather than [pluginId]/[pageId] so the static Lite export can
+// prerender the bare route; plugins never run in Lite, so it only ever shows
+// the "not available" note there (lib/lite-static-params.ts).
+export const generateStaticParams = generateLiteSegmentParams;
+
+function decodeOnce(segment: string): string {
+  try {
+    return decodeURIComponent(segment);
+  } catch {
+    return segment;
+  }
+}
+
+export default async function PluginPageRoute({
+  params,
+}: {
+  params: Promise<{ segments?: string[] }>;
+}) {
+  const { segments } = await params;
+  return <PluginPageApp linkSegments={(segments ?? []).map(decodeOnce)} />;
+}
diff --git a/app/(main)/[locale]/layout.tsx b/app/(main)/[locale]/layout.tsx
index 5e6f64cac..b4e444621 100644
--- a/app/(main)/[locale]/layout.tsx
+++ b/app/(main)/[locale]/layout.tsx
@@ -9,8 +9,11 @@ import { ProtocolLaunchHandlerProvider } from "@/components/protocol/protocol-la
 import { ProInterfaceRedirect } from "@/components/pro/pro-interface-redirect";
 import { ImpersonationReconciler } from "@/components/impersonation/impersonation-reconciler";
 import { PluginDialogHost } from "@/components/plugins/plugin-dialog-host";
+import { CommandPaletteHost } from "@/components/command-palette/command-palette";
+import { PluginConnectDialog } from "@/components/plugins/plugin-connect-dialog";
 import { QuickRuleHost } from "@/components/filters/quick-rule-host";
 import { PluginConsentDialog } from "@/components/plugins/plugin-consent-dialog";
+import { PluginAppEvents } from "@/components/providers/plugin-app-events";
 import { PluginOAuthCallbackListener } from "@/components/providers/plugin-oauth-callback-listener";
 import { PWAInstallPrompt } from "@/components/pwa-install-prompt";
 import { PushNotificationPrompt } from "@/components/push-notification-prompt";
@@ -56,9 +59,12 @@ export default async function LocaleLayout({
                   <ImpersonationReconciler />
                   {children}
                   <PluginDialogHost />
+                  <CommandPaletteHost />
+                  <PluginConnectDialog />
                   <QuickRuleHost />
                   <PluginConsentDialog />
                   <PluginOAuthCallbackListener />
+                  <PluginAppEvents />
                   <PWAInstallPrompt />
                   <PushNotificationPrompt />
                 </ProtocolLaunchHandlerProvider>
diff --git a/app/(main)/admin/_tabs/plugin-approvals-panel.tsx b/app/(main)/admin/_tabs/plugin-approvals-panel.tsx
new file mode 100644
index 000000000..51fe96758
--- /dev/null
+++ b/app/(main)/admin/_tabs/plugin-approvals-panel.tsx
@@ -0,0 +1,192 @@
+'use client';
+
+import { useCallback, useEffect, useState } from 'react';
+import { AlertTriangle, Check, Code, Loader2, ShieldCheck, X } from '@/components/icons';
+import { apiFetch } from '@/lib/browser-navigation';
+import { HIGH_RISK_PERMISSIONS } from '@/lib/plugin-sandbox/permission-text';
+
+interface ApprovalEntry {
+  pluginId: string;
+  bundleHash: string;
+  status: 'pending' | 'approved' | 'denied';
+  manifest: {
+    name?: string;
+    version?: string;
+    author?: string;
+    description?: string;
+    permissions?: string[];
+    httpOrigins?: string[];
+    apiPostPaths?: string[];
+  };
+  requestedBy: string;
+  requestedAt: string;
+  decidedAt?: string;
+}
+
+interface SourceView {
+  entry: ApprovalEntry;
+  code?: string;
+  warnings?: string[];
+  error?: string;
+}
+
+const STATUS_STYLE: Record<ApprovalEntry['status'], string> = {
+  pending: 'bg-orange-100 text-orange-700 dark:bg-orange-950/30 dark:text-orange-400',
+  approved: 'bg-emerald-100 text-emerald-700 dark:bg-emerald-950/30 dark:text-emerald-400',
+  denied: 'bg-muted text-muted-foreground',
+};
+
+/**
+ * Plugins users installed themselves and asked to have approved. The admin
+ * decides on the package the user uploaded: its manifest and code are read
+ * on the server, and the approval is pinned to that exact package.
+ */
+export function PluginApprovalsPanel() {
+  const [entries, setEntries] = useState<ApprovalEntry[] | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  const [busy, setBusy] = useState<string | null>(null);
+  const [source, setSource] = useState<SourceView | null>(null);
+
+  const load = useCallback(async () => {
+    try {
+      const res = await apiFetch('/api/admin/plugin-approvals');
+      if (!res.ok) throw new Error(`HTTP ${res.status}`);
+      const data = await res.json() as { entries: ApprovalEntry[] };
+      setEntries([...data.entries].sort((a, b) =>
+        Number(b.status === 'pending') - Number(a.status === 'pending') || b.requestedAt.localeCompare(a.requestedAt)));
+      setError(null);
+    } catch (e) {
+      setError(`Could not load approval requests (${(e as Error).message})`);
+    }
+  }, []);
+
+  useEffect(() => { void load(); }, [load]);
+
+  async function decide(entry: ApprovalEntry, decision: 'approved' | 'denied' | 'revoke') {
+    const key = `${entry.pluginId}:${entry.bundleHash}`;
+    setBusy(key);
+    try {
+      const res = decision === 'revoke'
+        ? await apiFetch(`/api/admin/plugin-approvals?pluginId=${encodeURIComponent(entry.pluginId)}&bundleHash=${encodeURIComponent(entry.bundleHash)}`, { method: 'DELETE' })
+        : await apiFetch('/api/admin/plugin-approvals', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ pluginId: entry.pluginId, bundleHash: entry.bundleHash, decision }),
+          });
+      if (!res.ok) throw new Error(`HTTP ${res.status}`);
+      await load();
+    } catch (e) {
+      setError(`Could not save the decision (${(e as Error).message})`);
+    } finally {
+      setBusy(null);
+    }
+  }
+
+  async function viewSource(entry: ApprovalEntry) {
+    setSource({ entry });
+    try {
+      const res = await apiFetch(`/api/admin/plugin-approvals/source?pluginId=${encodeURIComponent(entry.pluginId)}&bundleHash=${encodeURIComponent(entry.bundleHash)}`);
+      const data = await res.json();
+      if (!res.ok) throw new Error(data.error ?? `HTTP ${res.status}`);
+      setSource({ entry, code: data.code, warnings: data.warnings });
+    } catch (e) {
+      setSource({ entry, error: (e as Error).message });
+    }
+  }
+
+  const pending = entries?.filter((e) => e.status === 'pending').length ?? 0;
+
+  return (
+    <div className="border border-border rounded-lg">
+      <div className="px-4 py-3 border-b border-border bg-muted/30">
+        <div className="flex items-center gap-2">
+          <ShieldCheck className="w-4 h-4 text-muted-foreground" />
+          <h2 className="text-sm font-medium text-foreground">Approval Requests</h2>
+          {pending > 0 && (
+            <span className="text-xs px-1.5 py-0.5 rounded bg-orange-100 text-orange-700 dark:bg-orange-950/30 dark:text-orange-400">{pending} waiting</span>
+          )}
+        </div>
+        <p className="text-xs text-muted-foreground mt-0.5">Plugins users installed themselves. Read the code before you approve: an approved plugin runs in that user&apos;s mail.</p>
+      </div>
+
+      {error && <div className="px-4 py-2 text-sm text-destructive">{error}</div>}
+
+      {entries === null ? (
+        <div className="p-6 text-center text-sm text-muted-foreground"><Loader2 className="inline w-4 h-4 animate-spin" /></div>
+      ) : entries.length === 0 ? (
+        <div className="p-6 text-center text-sm text-muted-foreground">No requests yet</div>
+      ) : (
+        <div className="divide-y divide-border">
+          {entries.map((entry) => {
+            const key = `${entry.pluginId}:${entry.bundleHash}`;
+            const perms = entry.manifest.permissions ?? [];
+            return (
+              <div key={key} className="px-4 py-3 space-y-2">
+                <div className="flex flex-wrap items-center gap-x-2 gap-y-1">
+                  <span className="text-sm font-medium text-foreground">{entry.manifest.name ?? entry.pluginId}</span>
+                  <span className="text-xs text-muted-foreground">v{entry.manifest.version}</span>
+                  <span className={`text-xs px-1.5 py-0.5 rounded ${STATUS_STYLE[entry.status]}`}>{entry.status}</span>
+                </div>
+                {entry.manifest.description && <p className="text-xs text-muted-foreground">{entry.manifest.description}</p>}
+                <div className="text-xs text-muted-foreground">
+                  {entry.pluginId} · by {entry.manifest.author ?? 'unknown'} · requested by {entry.requestedBy} on {new Date(entry.requestedAt).toLocaleString()}
+                </div>
+                {perms.length > 0 && (
+                  <div className="flex flex-wrap gap-1">
+                    {perms.map((p) => (
+                      <span key={p} className={`text-[11px] px-1.5 py-0.5 rounded font-mono ${HIGH_RISK_PERMISSIONS.has(p) ? 'bg-warning/15 text-foreground' : 'bg-muted text-muted-foreground'}`}>{p}</span>
+                    ))}
+                  </div>
+                )}
+                {[...(entry.manifest.httpOrigins ?? []), ...(entry.manifest.apiPostPaths ?? [])].length > 0 && (
+                  <div className="text-xs text-muted-foreground break-all">
+                    Can send data to: {[...(entry.manifest.httpOrigins ?? []), ...(entry.manifest.apiPostPaths ?? [])].join(', ')}
+                  </div>
+                )}
+                <div className="flex flex-wrap gap-2 pt-1">
+                  <button type="button" onClick={() => viewSource(entry)} className="inline-flex items-center gap-1.5 h-7 px-3 rounded-md border border-border text-xs hover:bg-accent">
+                    <Code className="w-3.5 h-3.5" /> View code
+                  </button>
+                  {entry.status !== 'approved' && (
+                    <button type="button" disabled={busy === key} onClick={() => decide(entry, 'approved')} className="inline-flex items-center gap-1.5 h-7 px-3 rounded-md bg-emerald-600 text-white text-xs font-medium hover:bg-emerald-700 disabled:opacity-50">
+                      <Check className="w-3.5 h-3.5" /> Approve
+                    </button>
+                  )}
+                  {entry.status !== 'denied' && (
+                    <button type="button" disabled={busy === key} onClick={() => decide(entry, 'denied')} className="inline-flex items-center gap-1.5 h-7 px-3 rounded-md bg-muted text-foreground text-xs font-medium hover:bg-accent disabled:opacity-50">
+                      <X className="w-3.5 h-3.5" /> Deny
+                    </button>
+                  )}
+                  {entry.status !== 'pending' && (
+                    <button type="button" disabled={busy === key} onClick={() => decide(entry, 'revoke')} className="inline-flex items-center gap-1.5 h-7 px-3 rounded-md text-xs text-muted-foreground hover:text-destructive disabled:opacity-50">
+                      Forget decision
+                    </button>
+                  )}
+                </div>
+              </div>
+            );
+          })}
+        </div>
+      )}
+
+      {source && (
+        <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/50 p-4" onMouseDown={(e) => { if (e.target === e.currentTarget) setSource(null); }}>
+          <div role="dialog" aria-modal="true" aria-label="Plugin code" className="flex max-h-[90vh] w-full max-w-4xl flex-col rounded-lg border border-border bg-background shadow-xl">
+            <div className="flex items-center justify-between border-b border-border px-4 py-3">
+              <span className="text-sm font-medium">{source.entry.manifest.name ?? source.entry.pluginId} v{source.entry.manifest.version}</span>
+              <button type="button" onClick={() => setSource(null)} aria-label="Close" className="rounded p-1 hover:bg-accent"><X className="h-4 w-4" /></button>
+            </div>
+            {source.warnings && source.warnings.length > 0 && (
+              <div className="flex items-start gap-2 border-b border-border px-4 py-2 text-xs text-foreground">
+                <AlertTriangle className="mt-0.5 h-3.5 w-3.5 text-warning" /> {source.warnings.join('; ')}
+              </div>
+            )}
+            <pre className="min-h-0 flex-1 overflow-auto p-4 text-[11px] leading-relaxed font-mono whitespace-pre-wrap break-all">
+              {source.error ?? source.code ?? 'Loading…'}
+            </pre>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/app/(main)/admin/_tabs/plugins.tsx b/app/(main)/admin/_tabs/plugins.tsx
index 55b25b642..908820b7e 100644
--- a/app/(main)/admin/_tabs/plugins.tsx
+++ b/app/(main)/admin/_tabs/plugins.tsx
@@ -6,6 +6,7 @@ import type { SettingsPolicy } from '@/lib/admin/types';
 import { DEFAULT_POLICY } from '@/lib/admin/types';
 import { apiFetch } from '@/lib/browser-navigation';
 import { PluginConfigPanel } from './plugin-config-panel';
+import { PluginApprovalsPanel } from './plugin-approvals-panel';
 
 interface PluginEntry {
   id: string;
@@ -374,6 +375,8 @@ export function PluginsTab() {
         </div>
       </div>
 
+      {pluginsUploadEnabled && <PluginApprovalsPanel />}
+
       <div className="border border-border rounded-lg">
         <div className="px-4 py-3 border-b border-border bg-muted/30">
           <div className="flex items-center gap-2">
diff --git a/app/(sandbox)/layout.tsx b/app/(sandbox)/layout.tsx
index 45dfe9386..032544b81 100644
--- a/app/(sandbox)/layout.tsx
+++ b/app/(sandbox)/layout.tsx
@@ -1,14 +1,15 @@
 import type { Metadata } from 'next';
 import type { ReactNode } from 'react';
+import './plugin-kit.css';
 
 // The plugin sandbox iframe runs with an opaque origin (the `sandbox`
 // attribute in production excludes `allow-same-origin` for isolation). Any
-// asset request from this layout - bundled fonts, globals.css, etc. - is then
-// cross-origin from the "null" origin to the host origin and gets blocked
-// (fonts in particular require CORS). So this layout is intentionally minimal:
-// no font imports, no CSS imports. Plugins ship their own styles, and both the
-// plugin bundle and all host API calls travel over the postMessage RPC bridge,
-// so the sandbox never fetches same-origin assets itself.
+// asset request from this layout is then cross-origin from the "null" origin
+// to the host origin. Fonts need CORS, so there are no font imports. The one
+// stylesheet is plugin-kit.css, the styles of the plugin UI kit: Next serves
+// it from /_next/static, which answers with Access-Control-Allow-Origin: *
+// (next.config.ts), and the sandbox CSP allows styles from 'self'. Plugin
+// bundles and host API calls travel over the postMessage RPC bridge.
 
 export const metadata: Metadata = {
   title: 'Plugin sandbox',
@@ -19,6 +20,11 @@ export default function PluginSandboxLayout({ children }: { children: ReactNode
   return (
     <html lang="en">
       <body style={{ margin: 0, padding: 0, background: 'transparent' }}>
+        {/* next dev puts its indicator into every document, so each plugin
+            slot showed its own badge. Plugins have no use for it. */}
+        {process.env.NODE_ENV === 'development' && (
+          <style>{'nextjs-portal{display:none!important}'}</style>
+        )}
         {children}
       </body>
     </html>
diff --git a/app/(sandbox)/plugin-kit.css b/app/(sandbox)/plugin-kit.css
new file mode 100644
index 000000000..6265d9eae
--- /dev/null
+++ b/app/(sandbox)/plugin-kit.css
@@ -0,0 +1,76 @@
+/* Styles for the plugin UI kit (lib/plugin-sandbox/ui-kit), loaded into
+   every plugin iframe. Built from the same Tailwind classes as the app's own
+   components, so a kit Button is the app's Button. Only the kit's sources
+   are scanned, which keeps the file small.
+
+   No Tailwind preflight: plugins written before the kit style plain HTML
+   elements and rely on the browser's defaults. The kit's elements get the
+   same reset through the .bk class each kit component puts on its root. */
+
+@layer theme, base, components, utilities;
+@import "tailwindcss/theme.css" layer(theme);
+@import "tailwindcss/utilities.css" layer(utilities) source(none);
+@import "../theme-inline.css";
+
+@source "../../lib/plugin-sandbox/ui-kit";
+@source "../../components/ui/button.tsx";
+@source "../../components/ui/input.tsx";
+@source "../../components/files/file-icons.tsx";
+
+
+@layer base {
+  /* Tailwind's preflight, limited to the kit's own elements. :where() keeps
+     it at zero specificity, so every utility still wins. */
+  :where(.bk, .bk *, .bk ::before, .bk ::after) {
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+    border: 0 solid var(--color-border);
+  }
+  :where(button.bk, input.bk, select.bk, textarea.bk, .bk button, .bk input, .bk select, .bk textarea) {
+    font: inherit;
+    font-feature-settings: inherit;
+    letter-spacing: inherit;
+    color: inherit;
+    background-color: transparent;
+    border-radius: 0;
+    opacity: 1;
+  }
+  :where(button.bk, select.bk, [role="button"].bk, [role="switch"].bk, [role="checkbox"].bk, .bk button, .bk select, .bk [role="button"], .bk [role="tab"], .bk [role="switch"], .bk [role="checkbox"], .bk [role="option"]):not(:disabled, [aria-disabled="true"]) {
+    cursor: pointer;
+  }
+  :where(button.bk:disabled, select.bk:disabled, .bk[aria-disabled="true"], .bk button:disabled, .bk select:disabled, .bk [aria-disabled="true"]) {
+    cursor: not-allowed;
+  }
+  :where(.bk h1, .bk h2, .bk h3, .bk h4) {
+    font-size: inherit;
+    font-weight: inherit;
+  }
+  :where(a.bk, .bk a) {
+    color: inherit;
+    text-decoration: inherit;
+  }
+  :where(.bk ol, .bk ul) {
+    list-style: none;
+  }
+  :where(.bk img, .bk svg) {
+    display: block;
+    vertical-align: middle;
+  }
+  :where(.bk input::placeholder, .bk textarea::placeholder) {
+    color: var(--color-muted-foreground);
+    opacity: 1;
+  }
+  :where(.bk table) {
+    border-collapse: collapse;
+    text-indent: 0;
+  }
+  /* Same as globals.css: native option lists only follow these. */
+  :where(.bk option, .bk optgroup) {
+    background-color: var(--color-popover);
+    color: var(--color-popover-foreground);
+  }
+  :where(.dark .bk select) {
+    color-scheme: dark;
+  }
+}
diff --git a/app/api/admin/marketplace/[slug]/route.ts b/app/api/admin/marketplace/[slug]/route.ts
index d62bacf60..3896f05fd 100644
--- a/app/api/admin/marketplace/[slug]/route.ts
+++ b/app/api/admin/marketplace/[slug]/route.ts
@@ -5,8 +5,7 @@ import {
   getPluginRegistry,
   getThemeRegistry,
 } from '@/lib/admin/plugin-registry';
-import JSZip from 'jszip';
-import { MAX_PLUGIN_SIZE, MAX_THEME_SIZE } from '@/lib/plugin-types';
+import { openPackage, readManifest, readText } from '@/lib/extension-package';
 import { configManager } from '@/lib/admin/config-manager';
 
 async function getDirectoryUrl(): Promise<string> {
@@ -79,61 +78,28 @@ export async function GET(
         } else {
           const buffer = await bundleRes.arrayBuffer();
           bundleSize = buffer.byteLength;
-          const maxSize = type === 'theme' ? MAX_THEME_SIZE : MAX_PLUGIN_SIZE;
-          if (buffer.byteLength > maxSize) {
-            bundleError = `Bundle exceeds ${type === 'theme' ? '1 MB' : '5 MB'} size limit`;
-          } else {
-            const zip = await JSZip.loadAsync(buffer);
+          // Opening the preview must not inflate an arbitrary bundle in
+          // full: every read goes through the capped package reader.
+          const pkg = await openPackage(buffer, type === 'theme' ? 'theme' : 'plugin');
+          try {
+            manifest = await readManifest(pkg);
+          } catch (err) {
+            bundleError = err instanceof Error ? err.message : 'Invalid manifest.json in bundle';
+          }
 
-            // Detect optional root directory inside the ZIP.
-            const entries = Object.keys(zip.files);
-            const topDirs = new Set(entries.map((e) => e.split('/')[0]));
-            let root = '';
-            if (topDirs.size === 1) {
-              const dir = [...topDirs][0];
-              if (zip.files[dir + '/'] || entries.some((e) => e.startsWith(dir + '/'))) {
-                root = dir + '/';
-              }
-            }
-
-            const manifestFile = zip.file(root + 'manifest.json');
-            if (!manifestFile) {
-              bundleError = 'Bundle missing manifest.json';
-            } else {
-              try {
-                manifest = JSON.parse(await manifestFile.async('string'));
-              } catch {
-                bundleError = 'Invalid manifest.json in bundle';
-              }
-            }
-
-            if (manifest) {
-              if (type === 'theme') {
-                const cssFile = zip.file(root + 'theme.css');
-                if (cssFile) {
-                  const css = await cssFile.async('string');
-                  sourcePreview = {
-                    name: 'theme.css',
-                    content: css.length > MAX_PREVIEW_SOURCE_LEN
-                      ? css.slice(0, MAX_PREVIEW_SOURCE_LEN)
-                      : css,
-                    truncated: css.length > MAX_PREVIEW_SOURCE_LEN,
-                  };
-                }
-              } else {
-                const entrypoint = (manifest.entrypoint as string) || 'index.js';
-                const jsFile = zip.file(root + entrypoint);
-                if (jsFile) {
-                  const code = await jsFile.async('string');
-                  sourcePreview = {
-                    name: entrypoint,
-                    content: code.length > MAX_PREVIEW_SOURCE_LEN
-                      ? code.slice(0, MAX_PREVIEW_SOURCE_LEN)
-                      : code,
-                    truncated: code.length > MAX_PREVIEW_SOURCE_LEN,
-                  };
-                }
-              }
+          if (manifest) {
+            const name = type === 'theme'
+              ? 'theme.css'
+              : (typeof manifest.entrypoint === 'string' && manifest.entrypoint) || 'index.js';
+            const content = await readText(pkg, name);
+            if (content !== null) {
+              sourcePreview = {
+                name,
+                content: content.length > MAX_PREVIEW_SOURCE_LEN
+                  ? content.slice(0, MAX_PREVIEW_SOURCE_LEN)
+                  : content,
+                truncated: content.length > MAX_PREVIEW_SOURCE_LEN,
+              };
             }
           }
         }
diff --git a/app/api/admin/marketplace/__tests__/route.test.ts b/app/api/admin/marketplace/__tests__/route.test.ts
new file mode 100644
index 000000000..747e39e3c
--- /dev/null
+++ b/app/api/admin/marketplace/__tests__/route.test.ts
@@ -0,0 +1,100 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { NextRequest } from 'next/server';
+import JSZip from 'jszip';
+
+vi.mock('@/lib/admin/session', () => ({
+  requireAdminAuth: vi.fn(async () => ({ session: { sub: 'admin' } })),
+  getClientIP: () => '127.0.0.1',
+}));
+vi.mock('@/lib/admin/audit', () => ({ auditLog: vi.fn(async () => {}) }));
+vi.mock('@/lib/admin/config-manager', () => ({
+  configManager: {
+    ensureLoaded: vi.fn(async () => {}),
+    get: vi.fn(() => 'https://extensions.test'),
+  },
+}));
+
+const registry = new Map<string, Record<string, unknown>>();
+vi.mock('@/lib/admin/plugin-registry', () => ({
+  savePlugin: vi.fn(async (p: Record<string, unknown>) => { registry.set(p.id as string, p); }),
+  saveTheme: vi.fn(async () => {}),
+  getPlugin: vi.fn(async (id: string) => registry.get(id) ?? null),
+  getTheme: vi.fn(async () => null),
+  getPluginRegistry: vi.fn(async () => ({ plugins: [...registry.values()] })),
+  getThemeRegistry: vi.fn(async () => ({ themes: [] })),
+}));
+vi.mock('@/lib/admin/csp-frame-origins', async (orig) => ({
+  ...(await orig<typeof import('@/lib/admin/csp-frame-origins')>()),
+  invalidateFrameOriginsCache: vi.fn(),
+}));
+
+import { POST } from '../route';
+
+async function bundle(manifest: Record<string, unknown>, code = 'module.exports = {};'): Promise<ArrayBuffer> {
+  const zip = new JSZip();
+  zip.file('manifest.json', JSON.stringify(manifest));
+  zip.file('index.js', code);
+  const buf = await zip.generateAsync({ type: 'uint8array' });
+  return buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength) as ArrayBuffer;
+}
+
+function install(body: Record<string, unknown>) {
+  return POST(new NextRequest('http://localhost/api/admin/marketplace', {
+    method: 'POST',
+    body: JSON.stringify(body),
+    headers: { 'content-type': 'application/json' },
+  }));
+}
+
+const MANIFEST = {
+  name: 'Pretty Dates', version: '1.0.0', author: 'x', description: 'd',
+  type: 'hook', permissions: ['email:read'], entrypoint: 'index.js',
+};
+
+beforeEach(() => {
+  registry.clear();
+});
+afterEach(() => {
+  vi.unstubAllGlobals();
+});
+
+describe('POST /api/admin/marketplace', () => {
+  it('installs a plugin under its directory slug', async () => {
+    vi.stubGlobal('fetch', vi.fn(async () => new Response(await bundle({ ...MANIFEST, id: 'pretty-dates' }))));
+
+    const res = await install({ slug: 'pretty-dates', version: '1.0.0', type: 'plugin' });
+
+    expect(res.status).toBe(200);
+    expect(registry.has('pretty-dates')).toBe(true);
+  });
+
+  it('refuses a ZIP bomb from the directory', async () => {
+    const zip = new JSZip();
+    zip.file('manifest.json', JSON.stringify({ ...MANIFEST, id: 'pretty-dates' }));
+    zip.file('index.js', new Uint8Array(30 * 1024 * 1024));
+    const bytes = await zip.generateAsync({ type: 'uint8array', compression: 'DEFLATE' });
+    vi.stubGlobal('fetch', vi.fn(async () => new Response(bytes as BodyInit)));
+
+    const res = await install({ slug: 'pretty-dates', version: '1.0.0', type: 'plugin' });
+
+    expect(res.status).toBe(400);
+    expect(registry.size).toBe(0);
+  });
+
+  it('refuses a bundle whose manifest id differs from the slug', async () => {
+    // Otherwise a directory entry can overwrite another installed plugin,
+    // inheriting its enabled and force-enabled state, while the admin UI
+    // (which keys install status by slug) still shows "not installed".
+    registry.set('pgp-plugin', { id: 'pgp-plugin', forceEnabled: true, version: '2.0.0' });
+    vi.stubGlobal('fetch', vi.fn(async () => new Response(await bundle({ ...MANIFEST, id: 'pgp-plugin' }))));
+
+    const res = await install({ slug: 'pretty-dates', version: '1.0.0', type: 'plugin' });
+
+    expect(res.status).toBe(400);
+    expect((await res.json()).error).toMatch(/does not match/);
+    expect(registry.get('pgp-plugin')?.version).toBe('2.0.0');
+  });
+});
diff --git a/app/api/admin/marketplace/route.ts b/app/api/admin/marketplace/route.ts
index b218c4ea3..61abf34f6 100644
--- a/app/api/admin/marketplace/route.ts
+++ b/app/api/admin/marketplace/route.ts
@@ -9,18 +9,18 @@ import {
   getTheme,
   getPluginRegistry,
   getThemeRegistry,
+  themeCSSResolver,
   type ServerPlugin,
   type ServerTheme,
 } from '@/lib/admin/plugin-registry';
+import { invalidateFrameOriginsCache } from '@/lib/admin/csp-frame-origins';
 import {
-  sanitizeFrameOrigins,
-  sanitizeHttpOrigins,
-  sanitizeApiPostPaths,
-  invalidateFrameOriginsCache,
-} from '@/lib/admin/csp-frame-origins';
-import JSZip from 'jszip';
-import { MAX_PLUGIN_SIZE, MAX_THEME_SIZE, ALL_PERMISSIONS } from '@/lib/plugin-types';
-import { sanitizeThemeCSS } from '@/lib/theme-loader';
+  EXTENSION_ID_RE,
+  ExtensionPackageError,
+  readPluginPackage,
+  readThemePackage,
+  suspiciousCode,
+} from '@/lib/extension-package';
 import { configManager } from '@/lib/admin/config-manager';
 
 async function getDirectoryUrl(): Promise<string> {
@@ -123,6 +123,14 @@ export async function POST(request: NextRequest) {
       return NextResponse.json({ error: 'Invalid type' }, { status: 400 });
     }
 
+    // The slug becomes a file name and the registry key; it must be a plain id.
+    if (typeof slug !== 'string' || !EXTENSION_ID_RE.test(slug)) {
+      return NextResponse.json(
+        { error: 'Invalid id: must be lowercase alphanumeric with hyphens, min 2 chars' },
+        { status: 400 },
+      );
+    }
+
     // Download the bundle from the directory
     const directoryUrl = await getDirectoryUrl();
     const bundleUrl = new URL(`/api/v1/bundle/${encodeURIComponent(slug)}/${encodeURIComponent(version)}`, directoryUrl);
@@ -138,92 +146,41 @@ export async function POST(request: NextRequest) {
     }
 
     const buffer = await bundleRes.arrayBuffer();
-    const maxSize = type === 'theme' ? MAX_THEME_SIZE : MAX_PLUGIN_SIZE;
-
-    if (buffer.byteLength > maxSize) {
-      return NextResponse.json(
-        { error: `Bundle exceeds ${type === 'theme' ? '1 MB' : '5 MB'} size limit` },
-        { status: 400 }
-      );
-    }
-
-    // Parse the ZIP
-    let zip: JSZip;
-    try {
-      zip = await JSZip.loadAsync(buffer);
-    } catch {
-      return NextResponse.json({ error: 'Invalid ZIP file from directory' }, { status: 400 });
-    }
-
-    // Find root directory
-    const entries = Object.keys(zip.files);
-    const topDirs = new Set(entries.map(e => e.split('/')[0]));
-    let root = '';
-    if (topDirs.size === 1) {
-      const dir = [...topDirs][0];
-      if (zip.files[dir + '/'] || entries.some(e => e.startsWith(dir + '/'))) {
-        root = dir + '/';
-      }
-    }
-
-    // Read manifest
-    const manifestFile = zip.file(root + 'manifest.json');
-    if (!manifestFile) {
-      return NextResponse.json({ error: 'Bundle missing manifest.json' }, { status: 400 });
-    }
-
-    let manifest: Record<string, unknown>;
-    try {
-      manifest = JSON.parse(await manifestFile.async('string'));
-    } catch {
-      return NextResponse.json({ error: 'Invalid manifest.json in bundle' }, { status: 400 });
-    }
-
     const now = new Date().toISOString();
 
-    // Resolve and strictly validate the id used as a filename. Marketplace
-    // bundles are authored by a third-party publisher; without this an id
-    // like "../../foo" causes savePlugin/saveTheme to write outside the
-    // plugins/themes dir via path.join.
-    const resolvedId = typeof manifest.id === 'string' && manifest.id ? manifest.id : slug;
-    if (typeof resolvedId !== 'string' || !/^[a-z0-9][a-z0-9-]*[a-z0-9]$/.test(resolvedId)) {
-      return NextResponse.json(
-        { error: 'Invalid id: must be lowercase alphanumeric with hyphens, min 2 chars' },
-        { status: 400 },
-      );
-    }
-
     if (type === 'theme') {
-      // Read theme.css
-      const cssFile = zip.file(root + 'theme.css');
-      if (!cssFile) {
-        return NextResponse.json({ error: 'Theme bundle missing theme.css' }, { status: 400 });
+      const read = await readThemePackage(buffer, { resolveExtends: await themeCSSResolver() });
+      if (!read.valid || !read.manifest) {
+        return NextResponse.json({ error: read.errors.join('; ') }, { status: 400 });
       }
-
-      let css = await cssFile.async('string');
-
-      // Sanitize unconditionally: the safety check is advisory, and the
-      // sanitizer is also what drops rules outside :root and .dark.
-      const warnings: string[] = [];
-      const sanitized = sanitizeThemeCSS(css);
-      css = sanitized.css;
-      warnings.push(...sanitized.warnings);
+      const manifest = read.manifest;
+      // The slug is what the admin picked and what install status is keyed
+      // on. A bundle that names another id would install over whatever
+      // already uses that id, keeping its enabled and force-enabled state.
+      if (manifest.id !== slug) {
+        return NextResponse.json(
+          { error: `Bundle id "${String(manifest.id)}" does not match the directory entry "${slug}"` },
+          { status: 400 },
+        );
+      }
+      const resolvedId = slug;
+      const { css, skin, warnings } = read;
 
       const existingTheme = await getTheme(resolvedId);
       const isUpdate = existingTheme !== null;
 
       const theme: ServerTheme = {
         id: resolvedId,
-        name: (manifest.name as string) || slug,
+        name: manifest.name || slug,
         // Prefer the directory-published version (what we requested) over
         // manifest.version. Publishers sometimes forget to bump the version
         // inside the bundle's manifest.json; trusting it would make the
         // update never appear to "stick" — the registry would keep showing
         // the older version even after a successful update.
-        version: version || (manifest.version as string),
-        author: (manifest.author as string) || 'Unknown',
-        description: (manifest.description as string) || '',
-        variants: (manifest.variants as string[]) || ['light', 'dark'],
+        version: version || manifest.version,
+        author: manifest.author || 'Unknown',
+        description: manifest.description || '',
+        variants: manifest.variants,
         enabled: existingTheme?.enabled ?? true,
         ...(existingTheme?.forceEnabled !== undefined
           ? { forceEnabled: existingTheme.forceEnabled }
@@ -232,7 +189,7 @@ export async function POST(request: NextRequest) {
         updatedAt: now,
       };
 
-      await saveTheme(theme, css);
+      await saveTheme(theme, css, skin);
       await auditLog(
         isUpdate ? 'marketplace.update_theme' : 'marketplace.install_theme',
         {
@@ -246,148 +203,82 @@ export async function POST(request: NextRequest) {
       );
 
       return NextResponse.json({ success: true, theme, warnings, updated: isUpdate });
-    } else {
-      // Plugin installation
-      // Read entrypoint JS
-      const entrypoint = (manifest.entrypoint as string) || 'index.js';
-      const jsFile = zip.file(root + entrypoint);
-      if (!jsFile) {
-        return NextResponse.json({ error: `Bundle missing entrypoint: ${entrypoint}` }, { status: 400 });
-      }
-
-      const code = await jsFile.async('string');
-
-      // Block plugins with dangerous JS patterns
-      const DANGEROUS_JS_PATTERNS = [
-        { pattern: /\beval\s*\(/g, label: 'eval()' },
-        { pattern: /\bnew\s+Function\s*\(/g, label: 'new Function()' },
-        { pattern: /document\.cookie/g, label: 'document.cookie' },
-        { pattern: /document\.write/g, label: 'document.write' },
-        { pattern: /innerHTML\s*=/g, label: 'innerHTML assignment' },
-      ];
-      const dangerousFindings: string[] = [];
-      for (const { pattern, label } of DANGEROUS_JS_PATTERNS) {
-        if (pattern.test(code)) dangerousFindings.push(label);
-        pattern.lastIndex = 0;
-      }
-      if (dangerousFindings.length > 0) {
-        return NextResponse.json(
-          { error: `Plugin rejected: contains ${dangerousFindings.join(', ')}. These patterns are not allowed for security reasons.` },
-          { status: 400 },
-        );
-      }
-
-      // Validate permissions
-      const permissions = Array.isArray(manifest.permissions) ? manifest.permissions as string[] : [];
-      const validPerms = new Set(ALL_PERMISSIONS as readonly string[]);
-      const unknownPerms = permissions.filter(p => !validPerms.has(p));
-
-      const warnings: string[] = [];
-      if (unknownPerms.length > 0) {
-        warnings.push(`Unknown permissions: ${unknownPerms.join(', ')}`);
-      }
-
-      // Plugins may declare iframe origins they need for embedded content.
-      // Anything that doesn't pass strict origin validation is silently
-      // dropped - the plugin still installs, but those origins are not
-      // added to the host CSP.
-      const declaredFrameOrigins = sanitizeFrameOrigins(manifest.frameOrigins);
-      const droppedFrameOrigins = Array.isArray(manifest.frameOrigins)
-        ? (manifest.frameOrigins as unknown[]).filter(
-            (v) => typeof v !== 'string' || !declaredFrameOrigins.includes(v),
-          )
-        : [];
-      if (droppedFrameOrigins.length > 0) {
-        warnings.push(
-          `Ignored invalid frameOrigins: ${droppedFrameOrigins.join(', ')}`,
-        );
-      }
-
-      const declaredHttpOrigins = sanitizeHttpOrigins(manifest.httpOrigins);
-      const droppedHttpOrigins = Array.isArray(manifest.httpOrigins)
-        ? (manifest.httpOrigins as unknown[]).filter(
-            (v) => typeof v !== 'string' || !declaredHttpOrigins.includes(v),
-          )
-        : [];
-      if (droppedHttpOrigins.length > 0) {
-        warnings.push(
-          `Ignored invalid httpOrigins: ${droppedHttpOrigins.join(', ')}`,
-        );
-      }
-
-      const declaredApiPostPaths = sanitizeApiPostPaths(manifest.apiPostPaths);
-      const droppedApiPostPaths = Array.isArray(manifest.apiPostPaths)
-        ? (manifest.apiPostPaths as unknown[]).filter(
-            (v) => typeof v !== 'string' || !declaredApiPostPaths.includes(v),
-          )
-        : [];
-      if (droppedApiPostPaths.length > 0) {
-        warnings.push(
-          `Ignored invalid apiPostPaths: ${droppedApiPostPaths.join(', ')}`,
-        );
-      }
-
-      const existingPlugin = await getPlugin(resolvedId);
-      const isUpdate = existingPlugin !== null;
-
-      const plugin: ServerPlugin = {
-        id: resolvedId,
-        name: (manifest.name as string) || slug,
-        // See theme branch: trust the directory-published version, not
-        // manifest.version, so updates actually stick in the registry.
-        version: version || (manifest.version as string),
-        author: (manifest.author as string) || 'Unknown',
-        description: (manifest.description as string) || '',
-        type: (manifest.type as string) || 'hook',
-        ...(manifest.tier === 'privileged' ? { tier: 'privileged' } : {}),
-        permissions,
-        entrypoint,
-        enabled: existingPlugin?.enabled ?? true,
-        ...(existingPlugin?.forceEnabled !== undefined
-          ? { forceEnabled: existingPlugin.forceEnabled }
-          : {}),
-        installedAt: existingPlugin?.installedAt ?? now,
-        updatedAt: now,
-        ...(manifest.configSchema && typeof manifest.configSchema === 'object'
-          ? { configSchema: manifest.configSchema as ServerPlugin['configSchema'] }
-          : {}),
-        ...(manifest.settingsSchema && typeof manifest.settingsSchema === 'object'
-          ? { settingsSchema: manifest.settingsSchema as ServerPlugin['settingsSchema'] }
-          : {}),
-        ...(declaredFrameOrigins.length > 0
-          ? { frameOrigins: declaredFrameOrigins }
-          : {}),
-        ...(declaredHttpOrigins.length > 0
-          ? { httpOrigins: declaredHttpOrigins }
-          : {}),
-        ...(declaredApiPostPaths.length > 0
-          ? { apiPostPaths: declaredApiPostPaths }
-          : {}),
-        ...(manifest.locales && typeof manifest.locales === 'object'
-          ? { locales: manifest.locales as ServerPlugin['locales'] }
-          : {}),
-
-      };
-
-      await savePlugin(plugin, code);
-      invalidateFrameOriginsCache();
-      await auditLog(
-        isUpdate ? 'marketplace.update_plugin' : 'marketplace.install_plugin',
-        {
-          id: plugin.id,
-          name: plugin.name,
-          version: plugin.version,
-          slug,
-          frameOrigins: declaredFrameOrigins,
-          httpOrigins: declaredHttpOrigins,
-          apiPostPaths: declaredApiPostPaths,
-          ...(isUpdate ? { previousVersion: existingPlugin.version } : {}),
-        },
-        ip,
-      );
-
-      return NextResponse.json({ success: true, plugin, warnings, updated: isUpdate });
     }
+
+    // Plugin installation
+    let pkg;
+    try {
+      pkg = await readPluginPackage(buffer, {
+        appVersion: process.env.NEXT_PUBLIC_APP_VERSION,
+        expectedId: slug,
+      });
+    } catch (err) {
+      if (err instanceof ExtensionPackageError) {
+        // Same wording the admin UI already shows for an id mismatch.
+        const message = err.message.replace(/Package id "([^"]*)" does not match "([^"]*)"/, 'Bundle id "$1" does not match the directory entry "$2"');
+        return NextResponse.json({ error: message }, { status: 400 });
+      }
+      throw err;
+    }
+    const { manifest, code } = pkg;
+
+    // Block plugins with dangerous JS patterns
+    const suspicious = suspiciousCode(code);
+    if (suspicious.length > 0) {
+      return NextResponse.json(
+        { error: `Plugin rejected: contains ${suspicious.join(', ')}. These patterns are not allowed for security reasons.` },
+        { status: 400 },
+      );
+    }
+
+    const existingPlugin = await getPlugin(slug);
+    const isUpdate = existingPlugin !== null;
+
+    const plugin: ServerPlugin = {
+      id: slug,
+      name: manifest.name,
+      // See theme branch: trust the directory-published version, not
+      // manifest.version, so updates actually stick in the registry.
+      version: version || manifest.version,
+      author: manifest.author,
+      description: manifest.description,
+      type: manifest.type,
+      ...(manifest.tier === 'privileged' ? { tier: 'privileged' } : {}),
+      permissions: manifest.permissions,
+      entrypoint: manifest.entrypoint,
+      enabled: existingPlugin?.enabled ?? true,
+      ...(existingPlugin?.forceEnabled !== undefined
+        ? { forceEnabled: existingPlugin.forceEnabled }
+        : {}),
+      installedAt: existingPlugin?.installedAt ?? now,
+      updatedAt: now,
+      ...(manifest.configSchema ? { configSchema: manifest.configSchema } : {}),
+      ...(manifest.settingsSchema ? { settingsSchema: manifest.settingsSchema } : {}),
+      ...(manifest.frameOrigins ? { frameOrigins: manifest.frameOrigins } : {}),
+      ...(manifest.httpOrigins ? { httpOrigins: manifest.httpOrigins } : {}),
+      ...(manifest.apiPostPaths ? { apiPostPaths: manifest.apiPostPaths } : {}),
+      ...(manifest.locales ? { locales: manifest.locales } : {}),
+      ...(manifest.credentials ? { credentials: manifest.credentials } : {}),
+    };
+
+    await savePlugin(plugin, code);
+    invalidateFrameOriginsCache();
+    await auditLog(
+      isUpdate ? 'marketplace.update_plugin' : 'marketplace.install_plugin',
+      {
+        id: plugin.id,
+        name: plugin.name,
+        version: plugin.version,
+        slug,
+        frameOrigins: plugin.frameOrigins ?? [],
+        httpOrigins: plugin.httpOrigins ?? [],
+        apiPostPaths: plugin.apiPostPaths ?? [],
+        ...(isUpdate ? { previousVersion: existingPlugin.version } : {}),
+      },
+      ip,
+    );
+
+    return NextResponse.json({ success: true, plugin, warnings: pkg.warnings, updated: isUpdate });
   } catch (error) {
     logger.error('Marketplace install error', { error: error instanceof Error ? error.message : 'Unknown error' });
     return NextResponse.json({ error: 'Installation failed' }, { status: 500 });
diff --git a/app/api/admin/plugin-approvals/source/route.ts b/app/api/admin/plugin-approvals/source/route.ts
new file mode 100644
index 000000000..c966124e1
--- /dev/null
+++ b/app/api/admin/plugin-approvals/source/route.ts
@@ -0,0 +1,34 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { requireAdminAuth } from '@/lib/admin/session';
+import { logger } from '@/lib/logger';
+import { readApprovalBundle } from '@/lib/admin/plugin-approvals';
+import { readPluginPackage } from '@/lib/extension-package';
+
+/**
+ * GET /api/admin/plugin-approvals/source?pluginId=…&bundleHash=…
+ *
+ * The manifest and code of a plugin a user asked to have approved, read
+ * from the ZIP they uploaded, so the admin decides on what will actually run.
+ */
+export async function GET(request: NextRequest) {
+  try {
+    const result = await requireAdminAuth(request);
+    if ('error' in result) return result.error;
+
+    const pluginId = request.nextUrl.searchParams.get('pluginId') ?? '';
+    const bundleHash = request.nextUrl.searchParams.get('bundleHash') ?? '';
+    if (!/^[a-z0-9][a-z0-9-]*[a-z0-9]$/.test(pluginId) || !/^[a-f0-9]{64}$/.test(bundleHash)) {
+      return NextResponse.json({ error: 'invalid pluginId or bundleHash' }, { status: 400 });
+    }
+    const zip = await readApprovalBundle(pluginId, bundleHash);
+    if (!zip) return NextResponse.json({ error: 'No package stored for this request' }, { status: 404 });
+    const pkg = await readPluginPackage(zip);
+    return NextResponse.json(
+      { manifest: pkg.manifest, code: pkg.code, warnings: pkg.warnings },
+      { headers: { 'Cache-Control': 'no-store' } },
+    );
+  } catch (err) {
+    logger.error('plugin-approvals source GET', { error: err instanceof Error ? err.message : String(err) });
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
diff --git a/app/api/admin/plugins/[id]/bundle/__tests__/route.test.ts b/app/api/admin/plugins/[id]/bundle/__tests__/route.test.ts
new file mode 100644
index 000000000..7c73cd2a3
--- /dev/null
+++ b/app/api/admin/plugins/[id]/bundle/__tests__/route.test.ts
@@ -0,0 +1,36 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { NextRequest } from 'next/server';
+
+let signedIn = false;
+vi.mock('@/lib/auth/instance-details', () => ({ canSeeInstanceDetails: vi.fn(async () => signedIn) }));
+vi.mock('@/lib/admin/plugin-dev', () => ({ getDevPlugin: vi.fn(async () => null), readDevBundle: vi.fn() }));
+vi.mock('@/lib/admin/plugin-registry', () => ({
+  getPlugin: vi.fn(async () => ({ id: 'demo', enabled: true, bundleHash: 'h' })),
+  getPluginBundle: vi.fn(async () => 'module.exports = {}'),
+  getPluginSignature: vi.fn(async () => 'sig'),
+}));
+vi.mock('@/lib/admin/plugin-signing', () => ({ signBytes: vi.fn(async () => 'sig') }));
+
+import { GET } from '../route';
+
+function get() {
+  return GET(new NextRequest('http://localhost/api/admin/plugins/demo/bundle'), { params: Promise.resolve({ id: 'demo' }) });
+}
+
+beforeEach(() => { signedIn = false; });
+
+describe('GET plugin bundle', () => {
+  it('does not hand plugin code to someone who is not signed in', async () => {
+    expect((await get()).status).toBe(401);
+  });
+
+  it('serves it to a signed-in user with its signature', async () => {
+    signedIn = true;
+    const res = await get();
+    expect(res.status).toBe(200);
+    expect(res.headers.get('x-bundle-signature')).toBe('sig');
+  });
+});
diff --git a/app/api/admin/plugins/[id]/bundle/route.ts b/app/api/admin/plugins/[id]/bundle/route.ts
index f2a4fc687..06b398ae5 100644
--- a/app/api/admin/plugins/[id]/bundle/route.ts
+++ b/app/api/admin/plugins/[id]/bundle/route.ts
@@ -1,7 +1,8 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { getPluginBundle, getPlugin } from '@/lib/admin/plugin-registry';
+import { getPluginBundle, getPlugin, getPluginSignature } from '@/lib/admin/plugin-registry';
 import { getDevPlugin, readDevBundle } from '@/lib/admin/plugin-dev';
 import { signBytes } from '@/lib/admin/plugin-signing';
+import { canSeeInstanceDetails } from '@/lib/auth/instance-details';
 
 async function safeSign(code: string): Promise<string | null> {
   try { return await signBytes(code); } catch { return null; }
@@ -10,13 +11,18 @@ async function safeSign(code: string): Promise<string | null> {
 /**
  * GET /api/admin/plugins/[id]/bundle - Serve plugin JS bundle
  *
- * Public endpoint so the client-side plugin loader can fetch bundles.
+ * Serves bundles to signed-in users so the client-side plugin loader can fetch them.
  * Only serves plugins that exist in the registry and are enabled.
  */
 export async function GET(
   request: NextRequest,
   { params }: { params: Promise<{ id: string }> },
 ) {
+  // Bundles are delivered to signed-in users only, like the plugin list
+  // that names them (/api/plugins).
+  if (!(await canSeeInstanceDetails(request))) {
+    return NextResponse.json({ error: 'Not authenticated' }, { status: 401 });
+  }
   try {
     const { id } = await params;
 
@@ -65,7 +71,7 @@ export async function GET(
     };
     if (etag) headers['ETag'] = etag;
 
-    const signature = await safeSign(code);
+    const signature = await getPluginSignature(id, code);
     if (signature) headers['X-Bundle-Signature'] = signature;
 
     if (etag && request.headers.get('if-none-match') === etag) {
diff --git a/app/api/admin/plugins/[id]/config/__tests__/route.test.ts b/app/api/admin/plugins/[id]/config/__tests__/route.test.ts
new file mode 100644
index 000000000..24e6c94b3
--- /dev/null
+++ b/app/api/admin/plugins/[id]/config/__tests__/route.test.ts
@@ -0,0 +1,43 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { NextRequest } from 'next/server';
+
+let admin = true;
+vi.mock('@/lib/admin/session', async () => {
+  const { NextResponse } = await import('next/server');
+  return { requireAdminAuth: async () => (admin ? { ok: true } : { error: NextResponse.json({}, { status: 401 }) }) };
+});
+vi.mock('@/lib/stalwart/credentials', () => ({ getStalwartCredentials: async () => ({ username: 'alice@example.org' }) }));
+vi.mock('@/lib/admin/plugin-registry', () => ({
+  getPlugin: async () => ({ id: 'paperless', configSchema: { serverUrl: { type: 'string' }, apiToken: { type: 'secret' } } }),
+}));
+vi.mock('@/lib/admin/plugin-dev', () => ({ getDevPlugin: async () => null }));
+vi.mock('@/lib/admin/plugin-config', () => ({
+  getPluginConfig: async () => ({ serverUrl: 'https://paperless.example.org', apiToken: 'secret-token' }),
+  setPluginConfig: vi.fn(), deletePluginConfigKey: vi.fn(),
+}));
+
+import { GET } from '../route';
+
+function get(query = '') {
+  return GET(new NextRequest(`http://localhost/api/admin/plugins/paperless/config${query}`), { params: Promise.resolve({ id: 'paperless' }) });
+}
+
+beforeEach(() => { admin = true; });
+
+describe('GET plugin config', () => {
+  it('gives an admin every field', async () => {
+    expect(await (await get()).json()).toEqual({ serverUrl: 'https://paperless.example.org', apiToken: 'secret-token' });
+  });
+
+  it('never gives secrets with ?public=1, even to an admin (what plugins use)', async () => {
+    expect(await (await get('?public=1')).json()).toEqual({ serverUrl: 'https://paperless.example.org' });
+  });
+
+  it('gives a user only the fields that aren\'t secrets', async () => {
+    admin = false;
+    expect(await (await get()).json()).toEqual({ serverUrl: 'https://paperless.example.org' });
+  });
+});
diff --git a/app/api/admin/plugins/[id]/config/route.ts b/app/api/admin/plugins/[id]/config/route.ts
index e8c5e9a00..7e75f1e61 100644
--- a/app/api/admin/plugins/[id]/config/route.ts
+++ b/app/api/admin/plugins/[id]/config/route.ts
@@ -34,8 +34,12 @@ export async function GET(
       return NextResponse.json({ error: 'Invalid plugin ID' }, { status: 400 });
     }
 
+    // ?public=1: only the fields any signed-in user may see, even for an
+    // admin. The plugin API uses it so a plugin never gets secrets just
+    // because the user is also signed in to the admin dashboard.
+    const publicOnly = request.nextUrl.searchParams.get('public') === '1';
     const adminAuth = await requireAdminAuth(request);
-    const isAdmin = !('error' in adminAuth);
+    const isAdmin = !publicOnly && !('error' in adminAuth);
 
     if (!isAdmin) {
       const creds = await getStalwartCredentials(request);
diff --git a/app/api/admin/plugins/__tests__/route.test.ts b/app/api/admin/plugins/__tests__/route.test.ts
new file mode 100644
index 000000000..9d2ce079b
--- /dev/null
+++ b/app/api/admin/plugins/__tests__/route.test.ts
@@ -0,0 +1,127 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { NextRequest } from 'next/server';
+import JSZip from 'jszip';
+
+vi.mock('@/lib/admin/session', () => ({
+  requireAdminAuth: vi.fn(async () => ({ session: { sub: 'admin' } })),
+  getClientIP: () => '127.0.0.1',
+}));
+vi.mock('@/lib/admin/audit', () => ({ auditLog: vi.fn(async () => {}) }));
+
+let policy: Record<string, unknown>;
+vi.mock('@/lib/admin/config-manager', () => ({
+  configManager: {
+    ensureLoaded: vi.fn(async () => {}),
+    get: vi.fn(),
+    getPolicy: vi.fn(() => policy),
+    setPolicy: vi.fn(async (p: Record<string, unknown>) => { policy = p; }),
+  },
+}));
+
+const registry = new Map<string, Record<string, unknown>>();
+const removedConfig: string[] = [];
+vi.mock('@/lib/admin/plugin-registry', () => ({
+  savePlugin: vi.fn(async (p: Record<string, unknown>) => { registry.set(p.id as string, p); }),
+  getPlugin: vi.fn(async (id: string) => registry.get(id) ?? null),
+  getPluginRegistry: vi.fn(async () => ({ plugins: [...registry.values()] })),
+  deletePlugin: vi.fn(async (id: string) => registry.delete(id)),
+}));
+vi.mock('@/lib/admin/plugin-config', () => ({
+  deletePluginConfig: vi.fn(async (id: string) => { removedConfig.push(id); }),
+}));
+vi.mock('@/lib/admin/plugin-dev', () => ({ listDevPlugins: vi.fn(async () => []) }));
+vi.mock('@/lib/admin/csp-frame-origins', async (orig) => ({
+  ...(await orig<typeof import('@/lib/admin/csp-frame-origins')>()),
+  invalidateFrameOriginsCache: vi.fn(),
+}));
+
+import { DELETE, POST } from '../route';
+
+const MANIFEST = {
+  id: 'demo-plugin', name: 'Demo', version: '1.0.0', author: 'me', description: 'd',
+  type: 'hook', permissions: ['email:read'], entrypoint: 'index.js',
+};
+
+async function upload(files: Record<string, string | Uint8Array>) {
+  const zip = new JSZip();
+  for (const [n, d] of Object.entries(files)) zip.file(n, d);
+  const bytes = await zip.generateAsync({ type: 'uint8array', compression: 'DEFLATE' });
+  const form = new FormData();
+  form.append('file', new File([bytes as BlobPart], 'p.zip', { type: 'application/zip' }));
+  return POST(new NextRequest('http://localhost/api/admin/plugins', { method: 'POST', body: form }));
+}
+
+beforeEach(() => {
+  registry.clear();
+  removedConfig.length = 0;
+  policy = { forceEnabledPlugins: [] };
+});
+
+describe('POST /api/admin/plugins', () => {
+  it('installs a valid plugin with its locales', async () => {
+    const res = await upload({
+      'manifest.json': JSON.stringify({ ...MANIFEST, locales: { de: { hi: 'Hallo' } } }),
+      'index.js': 'module.exports = {}',
+    });
+
+    expect(res.status).toBe(200);
+    expect(registry.get('demo-plugin')?.locales).toEqual({ de: { hi: 'Hallo' } });
+  });
+
+  it('refuses permissions given as a string', async () => {
+    const res = await upload({
+      'manifest.json': JSON.stringify({ ...MANIFEST, permissions: 'crypto:full email:send', tier: 'privileged' }),
+      'index.js': '',
+    });
+
+    expect(res.status).toBe(400);
+    expect(registry.size).toBe(0);
+  });
+
+  it('refuses a ZIP bomb instead of inflating it', async () => {
+    const res = await upload({
+      'manifest.json': JSON.stringify(MANIFEST),
+      'index.js': new Uint8Array(30 * 1024 * 1024),
+    });
+
+    expect(res.status).toBe(400);
+    expect((await res.json()).error).toMatch(/once unpacked/);
+  });
+
+  it('refuses an invalid settings schema', async () => {
+    const res = await upload({
+      'manifest.json': JSON.stringify({ ...MANIFEST, settingsSchema: { m: { type: 'select', label: 'M', default: 'a', options: 'a,b' } } }),
+      'index.js': '',
+    });
+
+    expect(res.status).toBe(400);
+  });
+});
+
+describe('re-uploading and deleting', () => {
+  it('keeps a plugin the admin disabled disabled when a new version is uploaded', async () => {
+    registry.set('demo-plugin', { id: 'demo-plugin', enabled: false, forceEnabled: true });
+
+    await upload({ 'manifest.json': JSON.stringify({ ...MANIFEST, version: '1.1.0' }), 'index.js': '' });
+
+    expect(registry.get('demo-plugin')).toMatchObject({ version: '1.1.0', enabled: false, forceEnabled: true });
+  });
+
+  it('drops the config and the forced flag when a plugin is deleted', async () => {
+    registry.set('demo-plugin', { id: 'demo-plugin' });
+    policy = { forceEnabledPlugins: ['demo-plugin', 'other'] };
+
+    const res = await DELETE(new NextRequest('http://localhost/api/admin/plugins', {
+      method: 'DELETE',
+      body: JSON.stringify({ id: 'demo-plugin' }),
+      headers: { 'content-type': 'application/json' },
+    }));
+
+    expect(res.status).toBe(200);
+    expect(removedConfig).toEqual(['demo-plugin']);
+    expect(policy.forceEnabledPlugins).toEqual(['other']);
+  });
+});
diff --git a/app/api/admin/plugins/route.ts b/app/api/admin/plugins/route.ts
index a62c4bf81..7e0306515 100644
--- a/app/api/admin/plugins/route.ts
+++ b/app/api/admin/plugins/route.ts
@@ -3,31 +3,17 @@ import { requireAdminAuth, getClientIP } from '@/lib/admin/session';
 import { auditLog } from '@/lib/admin/audit';
 import { logger } from '@/lib/logger';
 import {
+  getPlugin,
   getPluginRegistry,
   savePlugin,
   deletePlugin as removePlugin,
   type ServerPlugin,
 } from '@/lib/admin/plugin-registry';
 import { listDevPlugins } from '@/lib/admin/plugin-dev';
-import {
-  sanitizeFrameOrigins,
-  sanitizeHttpOrigins,
-  sanitizeApiPostPaths,
-  invalidateFrameOriginsCache,
-} from '@/lib/admin/csp-frame-origins';
-
-// Server-side extraction using the same validation logic
-// ZIP parsing needs to happen on the server for admin-uploaded plugins
-import JSZip from 'jszip';
-import { MAX_PLUGIN_SIZE, ALL_PERMISSIONS, ALLOWED_PLUGIN_FILES } from '@/lib/plugin-types';
-
-const SUSPICIOUS_JS_PATTERNS = [
-  { pattern: /\beval\s*\(/g, label: 'eval()' },
-  { pattern: /\bnew\s+Function\s*\(/g, label: 'new Function()' },
-  { pattern: /document\.cookie/g, label: 'document.cookie' },
-  { pattern: /document\.write/g, label: 'document.write' },
-  { pattern: /innerHTML\s*=/g, label: 'innerHTML assignment' },
-];
+import { invalidateFrameOriginsCache } from '@/lib/admin/csp-frame-origins';
+import { cleanUpDeletedPlugin } from '@/lib/admin/extension-cleanup';
+import { ExtensionPackageError, readPluginPackage, suspiciousCode } from '@/lib/extension-package';
+import { MAX_PLUGIN_SIZE } from '@/lib/plugin-types';
 
 /**
  * GET /api/admin/plugins - List all admin-managed plugins
@@ -79,141 +65,64 @@ export async function POST(request: NextRequest) {
       return NextResponse.json({ error: 'Plugin ZIP exceeds 5 MB size limit' }, { status: 400 });
     }
 
-    // Extract and validate ZIP
-    let zip: JSZip;
+    let pkg;
     try {
-      const buffer = await file.arrayBuffer();
-      zip = await JSZip.loadAsync(buffer);
-    } catch {
-      return NextResponse.json({ error: 'Invalid ZIP file' }, { status: 400 });
-    }
-
-    // Find root
-    const entries = Object.keys(zip.files);
-    const topDirs = new Set(entries.map(e => e.split('/')[0]));
-    let root = '';
-    if (topDirs.size === 1) {
-      const dir = [...topDirs][0];
-      if (zip.files[dir + '/'] || entries.some(e => e.startsWith(dir + '/'))) {
-        root = dir + '/';
+      pkg = await readPluginPackage(await file.arrayBuffer(), {
+        appVersion: process.env.NEXT_PUBLIC_APP_VERSION,
+      });
+    } catch (err) {
+      if (err instanceof ExtensionPackageError) {
+        return NextResponse.json({ error: err.message }, { status: 400 });
       }
+      throw err;
     }
+    const { manifest, code } = pkg;
 
-    // Read manifest
-    const manifestFile = zip.file(root + 'manifest.json');
-    if (!manifestFile) {
-      return NextResponse.json({ error: 'Missing manifest.json' }, { status: 400 });
-    }
-
-    let manifest: Record<string, unknown>;
-    try {
-      manifest = JSON.parse(await manifestFile.async('string'));
-    } catch {
-      return NextResponse.json({ error: 'Invalid manifest.json' }, { status: 400 });
-    }
-
-    // Validate manifest
-    const errors: string[] = [];
-    if (!manifest.id || typeof manifest.id !== 'string') errors.push('Missing or invalid "id"');
-    if (!manifest.name || typeof manifest.name !== 'string') errors.push('Missing or invalid "name"');
-    if (!manifest.version || typeof manifest.version !== 'string') errors.push('Missing or invalid "version"');
-    if (!manifest.author || typeof manifest.author !== 'string') errors.push('Missing or invalid "author"');
-    if (!manifest.entrypoint || typeof manifest.entrypoint !== 'string') errors.push('Missing or invalid "entrypoint"');
-
-    const validTypes = ['ui-extension', 'sidebar-app', 'hook'];
-    if (!validTypes.includes(manifest.type as string)) {
-      errors.push(`Invalid type. Must be one of: ${validTypes.join(', ')}`);
-    }
-
-    if (manifest.id && typeof manifest.id === 'string' && !/^[a-z0-9][a-z0-9-]*[a-z0-9]$/.test(manifest.id)) {
-      errors.push('ID must be lowercase alphanumeric with hyphens, min 2 chars');
-    }
-
-    if (manifest.permissions && Array.isArray(manifest.permissions)) {
-      const validPerms = new Set(ALL_PERMISSIONS as readonly string[]);
-      const unknown = (manifest.permissions as string[]).filter(p => !validPerms.has(p));
-      if (unknown.length > 0) errors.push(`Unknown permissions: ${unknown.join(', ')}`);
-    }
-
-    if (errors.length > 0) {
-      return NextResponse.json({ error: errors.join('; ') }, { status: 400 });
-    }
-
-    // Check file extensions
-    for (const [filePath, entry] of Object.entries(zip.files)) {
-      if (entry.dir) continue;
-      const ext = filePath.lastIndexOf('.') >= 0 ? filePath.slice(filePath.lastIndexOf('.')).toLowerCase() : '';
-      if (ext && !ALLOWED_PLUGIN_FILES.has(ext)) {
-        errors.push(`Disallowed file type: ${filePath}`);
-      }
-    }
-    if (errors.length > 0) {
-      return NextResponse.json({ error: errors.join('; ') }, { status: 400 });
-    }
-
-    // Read entrypoint code
-    const entryFile = zip.file(root + (manifest.entrypoint as string));
-    if (!entryFile) {
-      return NextResponse.json({ error: `Missing entrypoint: ${manifest.entrypoint}` }, { status: 400 });
-    }
-    const code = await entryFile.async('string');
-
-    // Security: block plugins containing dangerous JS patterns
-    const warnings: string[] = [];
-    for (const { pattern, label } of SUSPICIOUS_JS_PATTERNS) {
-      if (pattern.test(code)) warnings.push(`Contains ${label}`);
-      pattern.lastIndex = 0;
-    }
-    if (warnings.length > 0) {
+    // Admin uploads reach every user, so the patterns a user upload only
+    // warns about are refused here.
+    const suspicious = suspiciousCode(code);
+    if (suspicious.length > 0) {
       return NextResponse.json(
-        { error: `Plugin rejected: ${warnings.join(', ')}. These patterns are not allowed for security reasons.` },
+        { error: `Plugin rejected: contains ${suspicious.join(', ')}. These patterns are not allowed for security reasons.` },
         { status: 400 },
       );
     }
 
-    const declaredFrameOrigins = sanitizeFrameOrigins(manifest.frameOrigins);
-    const declaredHttpOrigins = sanitizeHttpOrigins(manifest.httpOrigins);
-    const declaredApiPostPaths = sanitizeApiPostPaths(manifest.apiPostPaths);
-
+    // A new upload of an installed plugin is an update: keep whether the
+    // admin had it enabled or forced instead of switching it on for everyone.
+    const existing = await getPlugin(manifest.id);
     const now = new Date().toISOString();
     const plugin: ServerPlugin = {
-      id: manifest.id as string,
-      name: manifest.name as string,
-      version: manifest.version as string,
-      author: manifest.author as string,
-      description: (manifest.description as string) || '',
-      type: manifest.type as string,
+      id: manifest.id,
+      name: manifest.name,
+      version: manifest.version,
+      author: manifest.author,
+      description: manifest.description,
+      type: manifest.type,
       ...(manifest.tier === 'privileged' ? { tier: 'privileged' } : {}),
-      permissions: (manifest.permissions as string[]) || [],
-      entrypoint: manifest.entrypoint as string,
-      enabled: true,
-      ...(manifest.configSchema && typeof manifest.configSchema === 'object'
-        ? { configSchema: manifest.configSchema as ServerPlugin['configSchema'] }
-        : {}),
-      ...(manifest.settingsSchema && typeof manifest.settingsSchema === 'object'
-        ? { settingsSchema: manifest.settingsSchema as ServerPlugin['settingsSchema'] }
-        : {}),
-      ...(manifest.locales && typeof manifest.locales === 'object'
-        ? { locales: manifest.locales as ServerPlugin['locales'] }
-        : {}),
-      ...(declaredFrameOrigins.length > 0
-        ? { frameOrigins: declaredFrameOrigins }
-        : {}),
-      ...(declaredHttpOrigins.length > 0
-        ? { httpOrigins: declaredHttpOrigins }
-        : {}),
-      ...(declaredApiPostPaths.length > 0
-        ? { apiPostPaths: declaredApiPostPaths }
-        : {}),
+      permissions: manifest.permissions,
+      entrypoint: manifest.entrypoint,
+      enabled: existing?.enabled ?? true,
+      ...(existing?.forceEnabled !== undefined ? { forceEnabled: existing.forceEnabled } : {}),
+      ...(manifest.configSchema ? { configSchema: manifest.configSchema } : {}),
+      ...(manifest.settingsSchema ? { settingsSchema: manifest.settingsSchema } : {}),
+      ...(manifest.locales ? { locales: manifest.locales } : {}),
+      ...(manifest.frameOrigins ? { frameOrigins: manifest.frameOrigins } : {}),
+      ...(manifest.httpOrigins ? { httpOrigins: manifest.httpOrigins } : {}),
+      ...(manifest.apiPostPaths ? { apiPostPaths: manifest.apiPostPaths } : {}),
+      ...(manifest.credentials ? { credentials: manifest.credentials } : {}),
       installedAt: now,
       updatedAt: now,
     };
+    const declaredFrameOrigins = plugin.frameOrigins ?? [];
+    const declaredHttpOrigins = plugin.httpOrigins ?? [];
+    const declaredApiPostPaths = plugin.apiPostPaths ?? [];
 
     await savePlugin(plugin, code);
     invalidateFrameOriginsCache();
     await auditLog('plugin.install', { id: plugin.id, name: plugin.name, version: plugin.version, frameOrigins: declaredFrameOrigins, httpOrigins: declaredHttpOrigins, apiPostPaths: declaredApiPostPaths }, ip);
 
-    return NextResponse.json({ plugin });
+    return NextResponse.json({ plugin, warnings: pkg.warnings });
   } catch (error) {
     logger.error('Plugin install error', { error: error instanceof Error ? error.message : 'Unknown error' });
     return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
@@ -291,6 +200,7 @@ export async function DELETE(request: NextRequest) {
     if (!removed) {
       return NextResponse.json({ error: 'Plugin not found' }, { status: 404 });
     }
+    await cleanUpDeletedPlugin(id);
 
     invalidateFrameOriginsCache();
     await auditLog('plugin.delete', { id }, ip);
diff --git a/app/api/admin/themes/[id]/css/route.ts b/app/api/admin/themes/[id]/css/route.ts
index 347ccfaad..ad154a470 100644
--- a/app/api/admin/themes/[id]/css/route.ts
+++ b/app/api/admin/themes/[id]/css/route.ts
@@ -1,46 +1,13 @@
-import { NextRequest, NextResponse } from 'next/server';
-import { getThemeCSS, getThemeRegistry } from '@/lib/admin/plugin-registry';
-import { logger } from '@/lib/logger';
+import { NextRequest } from 'next/server';
+import { serveThemeAsset } from '@/lib/admin/theme-asset';
 
 /**
- * GET /api/admin/themes/[id]/css - Serve theme CSS to clients
+ * GET /api/admin/themes/[id]/css - Serve a theme's CSS to clients
  */
 export async function GET(
   _request: NextRequest,
   { params }: { params: Promise<{ id: string }> }
 ) {
-  try {
-    const { id } = await params;
-
-    // Validate ID format
-    if (!/^[a-z0-9][a-z0-9-]*[a-z0-9]$/.test(id)) {
-      return NextResponse.json({ error: 'Invalid theme ID' }, { status: 400 });
-    }
-
-    // Verify theme exists and is enabled
-    const registry = await getThemeRegistry();
-    const theme = registry.themes.find(t => t.id === id);
-    if (!theme) {
-      return NextResponse.json({ error: 'Theme not found' }, { status: 404 });
-    }
-    if (!theme.enabled) {
-      return NextResponse.json({ error: 'Theme is disabled' }, { status: 403 });
-    }
-
-    const css = await getThemeCSS(id);
-    if (!css) {
-      return NextResponse.json({ error: 'Theme CSS not found' }, { status: 404 });
-    }
-
-    return new NextResponse(css, {
-      headers: {
-        'Content-Type': 'text/css; charset=utf-8',
-        'Cache-Control': 'public, max-age=3600',
-        'X-Content-Type-Options': 'nosniff',
-      },
-    });
-  } catch (error) {
-    logger.error('Theme CSS serve error', { error: error instanceof Error ? error.message : 'Unknown error' });
-    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
-  }
+  const { id } = await params;
+  return serveThemeAsset(id, 'css');
 }
diff --git a/app/api/admin/themes/[id]/skin/route.ts b/app/api/admin/themes/[id]/skin/route.ts
new file mode 100644
index 000000000..c292e44e5
--- /dev/null
+++ b/app/api/admin/themes/[id]/skin/route.ts
@@ -0,0 +1,13 @@
+import { NextRequest } from 'next/server';
+import { serveThemeAsset } from '@/lib/admin/theme-asset';
+
+/**
+ * GET /api/admin/themes/[id]/skin - Serve a theme's skin (Theme API v2 component CSS) to clients
+ */
+export async function GET(
+  _request: NextRequest,
+  { params }: { params: Promise<{ id: string }> }
+) {
+  const { id } = await params;
+  return serveThemeAsset(id, 'skin');
+}
diff --git a/app/api/admin/themes/__tests__/route.test.ts b/app/api/admin/themes/__tests__/route.test.ts
new file mode 100644
index 000000000..89a60618a
--- /dev/null
+++ b/app/api/admin/themes/__tests__/route.test.ts
@@ -0,0 +1,90 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { NextRequest } from 'next/server';
+
+vi.mock('@/lib/admin/session', () => ({
+  requireAdminAuth: vi.fn(async () => ({ session: { sub: 'admin' } })),
+  getClientIP: () => '127.0.0.1',
+}));
+vi.mock('@/lib/admin/audit', () => ({ auditLog: vi.fn(async () => {}) }));
+
+let policy: Record<string, unknown>;
+vi.mock('@/lib/admin/config-manager', () => ({
+  configManager: {
+    ensureLoaded: vi.fn(async () => {}),
+    get: vi.fn(),
+    getPolicy: vi.fn(() => policy),
+    setPolicy: vi.fn(async (p: Record<string, unknown>) => { policy = p; }),
+  },
+}));
+const saved: Array<{ theme: Record<string, unknown>; css: string; skin: string | null }> = [];
+vi.mock('@/lib/admin/plugin-registry', () => ({
+  deleteTheme: vi.fn(async () => true),
+  themeCSSResolver: vi.fn(async () => () => null),
+  saveTheme: vi.fn(async (theme: Record<string, unknown>, css: string, skin: string | null) => { saved.push({ theme, css, skin }); }),
+  getTheme: vi.fn(async () => null),
+  getThemeRegistry: vi.fn(async () => ({ themes: [] })),
+}));
+
+import JSZip from 'jszip';
+import { DELETE, POST } from '../route';
+
+function del(id: string) {
+  return DELETE(new NextRequest('http://localhost/api/admin/themes', {
+    method: 'DELETE',
+    body: JSON.stringify({ id }),
+    headers: { 'content-type': 'application/json' },
+  }));
+}
+
+beforeEach(() => {
+  saved.length = 0;
+  policy = { forceEnabledThemes: ['corp', 'other'], forceEnabledPlugins: [] };
+});
+
+describe('DELETE /api/admin/themes', () => {
+  it('stops forcing a theme once it is deleted', async () => {
+    const res = await del('corp');
+
+    expect(res.status).toBe(200);
+    expect(policy.forceEnabledThemes).toEqual(['other']);
+  });
+});
+
+describe('POST /api/admin/themes', () => {
+  it('refuses a theme.css that unpacks past the limit', async () => {
+    const zip = new JSZip();
+    zip.file('manifest.json', JSON.stringify({ id: 'big', name: 'Big', version: '1.0.0', author: 'a', type: 'theme', variants: ['light'] }));
+    zip.file('theme.css', new Uint8Array(30 * 1024 * 1024));
+    const bytes = await zip.generateAsync({ type: 'uint8array', compression: 'DEFLATE' });
+    const form = new FormData();
+    form.append('file', new File([bytes as BlobPart], 't.zip'));
+
+    const res = await POST(new NextRequest('http://localhost/api/admin/themes', { method: 'POST', body: form }));
+
+    expect(res.status).toBe(400);
+    expect((await res.json()).error).toMatch(/once unpacked/);
+  });
+});
+
+describe('POST /api/admin/themes with Theme API v2', () => {
+  it('installs a tokens-only theme with a skin', async () => {
+    const zip = new JSZip();
+    zip.file('manifest.json', JSON.stringify({
+      id: 'ocean', name: 'Ocean', version: '1.0.0', author: 'a', type: 'theme', variants: ['light', 'dark'],
+      apiVersion: 2, tokens: { light: { '--color-primary': '#0066cc' }, dark: { '--color-primary': '#66aaff' } },
+    }));
+    zip.file('skin.css', '.message-list { border-radius: 8px; }');
+    const bytes = await zip.generateAsync({ type: 'uint8array' });
+    const form = new FormData();
+    form.append('file', new File([bytes as BlobPart], 'ocean.zip'));
+
+    const res = await POST(new NextRequest('http://localhost/api/admin/themes', { method: 'POST', body: form }));
+
+    expect(res.status).toBe(200);
+    expect(saved[0].css).toContain('#0066cc');
+    expect(saved[0].skin).toContain('border-radius');
+  });
+});
diff --git a/app/api/admin/themes/route.ts b/app/api/admin/themes/route.ts
index f600d09b6..3950021aa 100644
--- a/app/api/admin/themes/route.ts
+++ b/app/api/admin/themes/route.ts
@@ -3,15 +3,16 @@ import { requireAdminAuth, getClientIP } from '@/lib/admin/session';
 import { auditLog } from '@/lib/admin/audit';
 import { logger } from '@/lib/logger';
 import {
+  getTheme,
   getThemeRegistry,
   saveTheme,
   deleteTheme as removeTheme,
+  themeCSSResolver,
   type ServerTheme,
 } from '@/lib/admin/plugin-registry';
+import { forgetExtensionInPolicy } from '@/lib/admin/extension-cleanup';
 
-import JSZip from 'jszip';
-import { MAX_THEME_SIZE } from '@/lib/plugin-types';
-import { sanitizeThemeCSS } from '@/lib/theme-loader';
+import { readThemePackage } from '@/lib/extension-package';
 
 /**
  * GET /api/admin/themes - List all admin-managed themes
@@ -47,98 +48,30 @@ export async function POST(request: NextRequest) {
       return NextResponse.json({ error: 'Missing file' }, { status: 400 });
     }
 
-    if (file.size > MAX_THEME_SIZE) {
-      return NextResponse.json({ error: 'Theme ZIP exceeds 1 MB size limit' }, { status: 400 });
+    const read = await readThemePackage(await file.arrayBuffer(), {
+      resolveExtends: await themeCSSResolver(),
+    });
+    if (!read.valid || !read.manifest) {
+      return NextResponse.json({ error: read.errors.join('; ') }, { status: 400 });
     }
+    const { manifest, css, skin, warnings } = read;
 
-    // Extract and validate ZIP
-    let zip: JSZip;
-    try {
-      const buffer = await file.arrayBuffer();
-      zip = await JSZip.loadAsync(buffer);
-    } catch {
-      return NextResponse.json({ error: 'Invalid ZIP file' }, { status: 400 });
-    }
-
-    // Find root
-    const entries = Object.keys(zip.files);
-    const topDirs = new Set(entries.map(e => e.split('/')[0]));
-    let root = '';
-    if (topDirs.size === 1) {
-      const dir = [...topDirs][0];
-      if (zip.files[dir + '/'] || entries.some(e => e.startsWith(dir + '/'))) {
-        root = dir + '/';
-      }
-    }
-
-    // Read manifest
-    const manifestFile = zip.file(root + 'manifest.json');
-    if (!manifestFile) {
-      return NextResponse.json({ error: 'Missing manifest.json' }, { status: 400 });
-    }
-
-    let manifest: Record<string, unknown>;
-    try {
-      manifest = JSON.parse(await manifestFile.async('string'));
-    } catch {
-      return NextResponse.json({ error: 'Invalid manifest.json' }, { status: 400 });
-    }
-
-    // Validate manifest
-    const errors: string[] = [];
-    if (!manifest.id || typeof manifest.id !== 'string') errors.push('Missing or invalid "id"');
-    if (!manifest.name || typeof manifest.name !== 'string') errors.push('Missing or invalid "name"');
-    if (!manifest.version || typeof manifest.version !== 'string') errors.push('Missing or invalid "version"');
-    if (!manifest.author || typeof manifest.author !== 'string') errors.push('Missing or invalid "author"');
-
-    if (manifest.type !== 'theme') {
-      errors.push(`Expected type "theme", got "${manifest.type}"`);
-    }
-
-    if (manifest.id && typeof manifest.id === 'string' && !/^[a-z0-9][a-z0-9-]*[a-z0-9]$/.test(manifest.id)) {
-      errors.push('ID must be lowercase alphanumeric with hyphens, min 2 chars');
-    }
-
-    if (!manifest.variants || !Array.isArray(manifest.variants) || manifest.variants.length === 0) {
-      errors.push('Missing or empty "variants" array');
-    } else {
-      const valid = manifest.variants.every((v: unknown) => v === 'light' || v === 'dark');
-      if (!valid) errors.push('Variants must be "light" or "dark"');
-    }
-
-    if (errors.length > 0) {
-      return NextResponse.json({ error: errors.join('; ') }, { status: 400 });
-    }
-
-    // Read theme.css
-    const cssFile = zip.file(root + 'theme.css');
-    if (!cssFile) {
-      return NextResponse.json({ error: 'Missing theme.css' }, { status: 400 });
-    }
-
-    let css = await cssFile.async('string');
-
-    // Sanitize unconditionally: the safety check is advisory, and the
-    // sanitizer is also what drops rules outside :root and .dark.
-    const warnings: string[] = [];
-    const sanitized = sanitizeThemeCSS(css);
-    css = sanitized.css;
-    warnings.push(...sanitized.warnings);
-
+    const existing = await getTheme(manifest.id);
     const now = new Date().toISOString();
     const theme: ServerTheme = {
-      id: manifest.id as string,
-      name: manifest.name as string,
-      version: manifest.version as string,
-      author: manifest.author as string,
-      description: (manifest.description as string) || '',
-      variants: manifest.variants as string[],
-      enabled: true,
-      installedAt: now,
+      id: manifest.id,
+      name: manifest.name,
+      version: manifest.version,
+      author: manifest.author,
+      description: manifest.description || '',
+      variants: manifest.variants,
+      enabled: existing?.enabled ?? true,
+      ...(existing?.forceEnabled !== undefined ? { forceEnabled: existing.forceEnabled } : {}),
+      installedAt: existing?.installedAt ?? now,
       updatedAt: now,
     };
 
-    await saveTheme(theme, css);
+    await saveTheme(theme, css, skin);
     await auditLog('theme.install', { id: theme.id, name: theme.name, version: theme.version, warnings }, ip);
 
     return NextResponse.json({ theme, warnings });
@@ -205,6 +138,7 @@ export async function DELETE(request: NextRequest) {
     if (!removed) {
       return NextResponse.json({ error: 'Theme not found' }, { status: 404 });
     }
+    await forgetExtensionInPolicy('theme', id);
 
     await auditLog('theme.delete', { id }, ip);
     return NextResponse.json({ success: true });
diff --git a/app/api/plugin-approval-status/__tests__/route.test.ts b/app/api/plugin-approval-status/__tests__/route.test.ts
new file mode 100644
index 000000000..7d0ba7970
--- /dev/null
+++ b/app/api/plugin-approval-status/__tests__/route.test.ts
@@ -0,0 +1,98 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { NextRequest } from 'next/server';
+import JSZip from 'jszip';
+
+vi.mock('next/headers', () => ({ cookies: async () => ({ get: () => undefined }) }));
+vi.mock('@/lib/stalwart/auth-context', () => ({
+  readStalwartAuthContextFromStore: (_store: unknown, slot: number) => (slot === 0 ? { username: currentUser } : null),
+}));
+vi.mock('@/lib/security/same-origin', () => ({ rejectCrossOriginRequest: () => null }));
+
+let currentUser = 'alice@example.org';
+const entries: Array<Record<string, unknown>> = [];
+const bundles = new Map<string, Uint8Array>();
+vi.mock('@/lib/admin/plugin-approvals', async (orig) => {
+  const real = await orig<typeof import('@/lib/admin/plugin-approvals')>();
+  return {
+    ...real,
+    getApprovalStatus: vi.fn(async () => ({ status: 'not-requested' })),
+    requestApproval: vi.fn(async (pluginId: string, bundleHash: string, manifest: unknown, requestedBy: string) => {
+      const pending = entries.filter((e) => e.status === 'pending' && e.requestedBy === requestedBy).length;
+      if (pending >= real.MAX_PENDING_PER_USER) throw new real.ApprovalLimitError('too many');
+      const entry = { pluginId, bundleHash, manifest, requestedBy, status: 'pending', requestedAt: 'now' };
+      entries.push(entry);
+      return entry;
+    }),
+    saveApprovalBundle: vi.fn(async (id: string, hash: string, zip: Uint8Array) => { bundles.set(`${id}:${hash}`, zip); }),
+  };
+});
+
+import { POST } from '../route';
+import { packageHash, checkPluginManifest } from '@/lib/extension-package';
+
+const MANIFEST = {
+  id: 'my-plugin', name: 'Mine', version: '1.0.0', author: 'me', description: 'd',
+  type: 'hook', permissions: ['email:read'], entrypoint: 'index.js',
+};
+
+async function zipOf(manifest: Record<string, unknown>, code = 'module.exports = {}') {
+  const zip = new JSZip();
+  zip.file('manifest.json', JSON.stringify(manifest));
+  zip.file('index.js', code);
+  return zip.generateAsync({ type: 'uint8array' });
+}
+
+async function submit(bytes: Uint8Array) {
+  const form = new FormData();
+  form.append('file', new File([bytes as BlobPart], 'p.zip'));
+  return POST(new NextRequest('http://localhost/api/plugin-approval-status', { method: 'POST', body: form }));
+}
+
+beforeEach(() => {
+  entries.length = 0;
+  bundles.clear();
+  currentUser = 'alice@example.org';
+});
+
+describe('POST /api/plugin-approval-status', () => {
+  it('pins the request to the hash of the code and manifest it read itself', async () => {
+    const res = await submit(await zipOf(MANIFEST));
+    const body = await res.json();
+
+    const expected = await packageHash(checkPluginManifest(MANIFEST).manifest!, 'module.exports = {}');
+    expect(res.status).toBe(200);
+    expect(body.bundleHash).toBe(expected);
+    expect(entries[0].manifest).toMatchObject({ name: 'Mine', permissions: ['email:read'] });
+    expect(bundles.has(`my-plugin:${expected}`)).toBe(true);
+  });
+
+  it('gives the same code with wider permissions a different hash', async () => {
+    const narrow = await (await submit(await zipOf(MANIFEST))).json();
+    const wide = await (await submit(await zipOf({ ...MANIFEST, permissions: ['email:read', 'http:fetch'], httpOrigins: ['https://evil.example'] }))).json();
+
+    expect(wide.bundleHash).not.toBe(narrow.bundleHash);
+  });
+
+  it('refuses the old form where the client named the hash and manifest', async () => {
+    const res = await POST(new NextRequest('http://localhost/api/plugin-approval-status', {
+      method: 'POST',
+      body: JSON.stringify({ pluginId: 'my-plugin', bundleHash: 'a'.repeat(64), manifest: { permissions: [] } }),
+      headers: { 'content-type': 'application/json' },
+    }));
+
+    expect(res.status).toBe(400);
+    expect(entries).toHaveLength(0);
+  });
+
+  it('limits how many requests one user can have open', async () => {
+    for (let i = 0; i < 10; i++) {
+      expect((await submit(await zipOf({ ...MANIFEST, id: `p-${i}x` }))).status).toBe(200);
+    }
+    const res = await submit(await zipOf({ ...MANIFEST, id: 'one-more' }));
+
+    expect(res.status).toBe(429);
+  });
+});
diff --git a/app/api/plugin-approval-status/route.ts b/app/api/plugin-approval-status/route.ts
index 08f99867e..d33f659c6 100644
--- a/app/api/plugin-approval-status/route.ts
+++ b/app/api/plugin-approval-status/route.ts
@@ -6,7 +6,14 @@ import { sessionCookieName } from '@/lib/auth/session-cookie';
 import { readStalwartAuthContextFromStore } from '@/lib/stalwart/auth-context';
 import { MAX_ACCOUNT_SLOTS } from '@/lib/account-utils';
 import { logger } from '@/lib/logger';
-import { getApprovalStatus, requestApproval, type ApprovalEntry } from '@/lib/admin/plugin-approvals';
+import {
+  ApprovalLimitError,
+  getApprovalStatus,
+  requestApproval,
+  saveApprovalBundle,
+  type ApprovalEntry,
+} from '@/lib/admin/plugin-approvals';
+import { ExtensionPackageError, packageHash, readPluginPackage } from '@/lib/extension-package';
 
 /**
  * GET /api/plugin-approval-status?pluginId=X&bundleHash=Y
@@ -15,8 +22,9 @@ import { getApprovalStatus, requestApproval, type ApprovalEntry } from '@/lib/ad
  * they want to enable. The client uses this BEFORE running `enablePlugin`
  * when the `requirePluginApproval` policy is set.
  *
- * POST same path with body `{ pluginId, bundleHash, manifest }` creates a
- * pending approval entry (or returns the existing one).
+ * POST same path with the plugin ZIP as multipart `file` creates a pending
+ * approval entry (or returns the existing one) for the package hash the
+ * server computes, and keeps the ZIP for the admin to review.
  */
 
 async function resolveUsername(): Promise<string | null> {
@@ -67,26 +75,55 @@ export async function POST(request: NextRequest) {
     const username = await resolveUsername();
     if (!username) return NextResponse.json({ error: 'unauthenticated' }, { status: 401 });
 
-    let body: unknown;
-    try { body = await request.json(); } catch { body = null; }
-    const b = (body ?? {}) as { pluginId?: unknown; bundleHash?: unknown; manifest?: unknown };
-    if (!isValidId(b.pluginId) || !isValidHash(b.bundleHash)) {
-      return NextResponse.json({ error: 'invalid pluginId or bundleHash' }, { status: 400 });
+    // The request carries the package itself. The admin reviews the code
+    // and manifest the server read from it, and the approval is pinned to
+    // the hash the server computed, not to anything the client claims.
+    let file: File | null = null;
+    try {
+      const form = await request.formData();
+      const value = form.get('file');
+      file = value instanceof File ? value : null;
+    } catch { /* not multipart */ }
+    if (!file) {
+      return NextResponse.json({ error: 'Send the plugin ZIP as "file"' }, { status: 400 });
     }
+    const bytes = new Uint8Array(await file.arrayBuffer());
 
-    const m = (b.manifest ?? {}) as Record<string, unknown>;
-    const manifest: ApprovalEntry['manifest'] = {
-      name: typeof m.name === 'string' ? m.name.slice(0, 200) : undefined,
-      version: typeof m.version === 'string' ? m.version.slice(0, 64) : undefined,
-      author: typeof m.author === 'string' ? m.author.slice(0, 200) : undefined,
-      description: typeof m.description === 'string' ? m.description.slice(0, 500) : undefined,
-      permissions: Array.isArray(m.permissions) ? (m.permissions as unknown[]).filter((x): x is string => typeof x === 'string').slice(0, 50) : undefined,
-      httpOrigins: Array.isArray(m.httpOrigins) ? (m.httpOrigins as unknown[]).filter((x): x is string => typeof x === 'string').slice(0, 20) : undefined,
-      apiPostPaths: Array.isArray(m.apiPostPaths) ? (m.apiPostPaths as unknown[]).filter((x): x is string => typeof x === 'string').slice(0, 20) : undefined,
+    let pkg;
+    try {
+      pkg = await readPluginPackage(bytes, { appVersion: process.env.NEXT_PUBLIC_APP_VERSION });
+    } catch (err) {
+      if (err instanceof ExtensionPackageError) return NextResponse.json({ error: err.message }, { status: 400 });
+      throw err;
+    }
+    const { manifest, code } = pkg;
+    const hash = await packageHash(manifest, code);
+
+    const snapshot: ApprovalEntry['manifest'] = {
+      name: manifest.name,
+      version: manifest.version,
+      author: manifest.author,
+      description: manifest.description,
+      permissions: manifest.permissions,
+      httpOrigins: manifest.httpOrigins,
+      apiPostPaths: manifest.apiPostPaths,
     };
 
-    const entry = await requestApproval(b.pluginId as string, b.bundleHash as string, manifest, username);
-    return NextResponse.json({ status: entry.status, requestedAt: entry.requestedAt, decidedAt: entry.decidedAt });
+    let entry: ApprovalEntry;
+    try {
+      entry = await requestApproval(manifest.id, hash, snapshot, username);
+    } catch (err) {
+      if (err instanceof ApprovalLimitError) return NextResponse.json({ error: err.message }, { status: 429 });
+      throw err;
+    }
+    if (entry.status === 'pending') await saveApprovalBundle(manifest.id, hash, bytes);
+    return NextResponse.json({
+      pluginId: manifest.id,
+      bundleHash: hash,
+      status: entry.status,
+      requestedAt: entry.requestedAt,
+      decidedAt: entry.decidedAt,
+    });
   } catch (err) {
     logger.error('plugin-approval-status POST', { error: err instanceof Error ? err.message : String(err) });
     return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
diff --git a/app/api/plugin-proxy/route.ts b/app/api/plugin-proxy/route.ts
new file mode 100644
index 000000000..a7d941c4c
--- /dev/null
+++ b/app/api/plugin-proxy/route.ts
@@ -0,0 +1,83 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { configManager } from '@/lib/admin/config-manager';
+import { rejectCrossOriginRequest } from '@/lib/security/same-origin';
+import { getStalwartCredentials } from '@/lib/stalwart/credentials';
+import { CREDENTIAL_ID_RE } from '@/lib/plugin-secrets/credentials';
+import { ProxyError, proxyRequest, type CaptureSpec } from '@/lib/plugin-secrets/proxy';
+
+const PLUGIN_ID_RE = /^[a-z0-9][a-z0-9-]*[a-z0-9]$/;
+const FIELD_RE = /^[A-Za-z_][A-Za-z0-9_]{0,63}$/;
+
+function parseCapture(raw: string | null): CaptureSpec | null | undefined {
+  if (!raw) return undefined;
+  try {
+    const v = JSON.parse(raw) as Record<string, unknown>;
+    if (typeof v.secret !== 'string' || !FIELD_RE.test(v.secret)) return null;
+    if (v.username !== undefined && (typeof v.username !== 'string' || !FIELD_RE.test(v.username))) return null;
+    return { secret: v.secret, ...(typeof v.username === 'string' ? { username: v.username } : {}) };
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * POST /api/plugin-proxy?plugin=<id>&credential=<id>&url=<target>
+ *
+ * Forwards a plugin's request to `url` with the named credential added. The
+ * target method goes in `X-Bulwark-Method` (default GET); the request body
+ * and headers are passed through, minus cookies, auth and transport headers.
+ * `X-Bulwark-Capture: {"secret":"appPassword","username":"loginName"}` stores
+ * those JSON fields of the response as the credential instead of returning
+ * them (Nextcloud Login Flow v2).
+ *
+ * Called by the host page on a plugin's behalf, never by the sandboxed
+ * plugin itself (its iframe has an opaque origin and is refused here).
+ */
+export async function POST(request: NextRequest) {
+  const crossOrigin = rejectCrossOriginRequest(request);
+  if (crossOrigin) return crossOrigin;
+
+  await configManager.ensureLoaded();
+  if (!configManager.getPolicy().features.pluginsEnabled) {
+    return NextResponse.json({ error: 'Plugins are turned off', code: 'disabled' }, { status: 403 });
+  }
+
+  const creds = await getStalwartCredentials(request);
+  if (!creds) return NextResponse.json({ error: 'Not authenticated', code: 'unauthenticated' }, { status: 401 });
+
+  const params = request.nextUrl.searchParams;
+  const pluginId = params.get('plugin') ?? '';
+  const credentialId = params.get('credential') ?? '';
+  const url = params.get('url') ?? '';
+  if (!PLUGIN_ID_RE.test(pluginId) || !CREDENTIAL_ID_RE.test(credentialId) || !url) {
+    return NextResponse.json({ error: 'plugin, credential and url are required', code: 'bad_request' }, { status: 400 });
+  }
+  const capture = parseCapture(request.headers.get('x-bulwark-capture'));
+  if (capture === null) {
+    return NextResponse.json({ error: 'Invalid X-Bulwark-Capture header', code: 'bad_capture' }, { status: 400 });
+  }
+
+  try {
+    return await proxyRequest({
+      user: { username: creds.username, serverUrl: creds.serverUrl },
+      pluginId,
+      credentialId,
+      url,
+      method: request.headers.get('x-bulwark-method') ?? 'GET',
+      headers: request.headers,
+      body: request.body,
+      capture,
+      signal: request.signal,
+    });
+  } catch (error) {
+    if (error instanceof ProxyError) {
+      // Marks the proxy's own refusals, so the plugin can tell them from the
+      // upstream server's errors.
+      const headers: Record<string, string> = { 'cache-control': 'no-store', 'x-bulwark-proxy-error': error.code };
+      const retryAfter = (error as ProxyError & { retryAfter?: number }).retryAfter;
+      if (retryAfter) headers['retry-after'] = String(retryAfter);
+      return NextResponse.json({ error: error.message, code: error.code }, { status: error.status, headers });
+    }
+    return NextResponse.json({ error: 'Internal server error', code: 'internal' }, { status: 500 });
+  }
+}
diff --git a/app/api/plugin-secrets/__tests__/route.test.ts b/app/api/plugin-secrets/__tests__/route.test.ts
new file mode 100644
index 000000000..c99c310c9
--- /dev/null
+++ b/app/api/plugin-secrets/__tests__/route.test.ts
@@ -0,0 +1,131 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { NextRequest } from 'next/server';
+
+let signedIn = true;
+let pluginsEnabled = true;
+let sameOrigin = true;
+vi.mock('@/lib/stalwart/credentials', () => ({
+  getStalwartCredentials: async () => (signedIn ? { username: 'alice@example.org', serverUrl: 'https://mail.example.org', authHeader: 'x' } : null),
+}));
+vi.mock('@/lib/admin/config-manager', () => ({
+  configManager: { ensureLoaded: async () => {}, getPolicy: () => ({ features: { pluginsEnabled } }) },
+}));
+vi.mock('@/lib/security/same-origin', async () => {
+  const { NextResponse } = await import('next/server');
+  return { rejectCrossOriginRequest: () => (sameOrigin ? null : NextResponse.json({}, { status: 403 })) };
+});
+const store = new Map<string, Record<string, unknown>>();
+vi.mock('@/lib/plugin-secrets/vault', () => ({
+  VaultFullError: class extends Error {},
+  putUserCredential: vi.fn(async (_u: unknown, pluginId: string, credentialId: string, input: Record<string, unknown>) => {
+    store.set(`${pluginId}/${credentialId}`, input);
+  }),
+  listUserCredentials: vi.fn(async () => []),
+  deleteUserCredentials: vi.fn(async () => {}),
+}));
+const proxied: unknown[] = [];
+vi.mock('@/lib/plugin-secrets/proxy', async (orig) => {
+  const real = await orig<typeof import('@/lib/plugin-secrets/proxy')>();
+  return {
+    ...real,
+    proxyRequest: vi.fn(async (input: unknown) => { proxied.push(input); return new Response('ok'); }),
+    adminCredentialStatus: vi.fn(async () => [{ credentialId: 'shared', configured: true }]),
+    adminCredentialOrigins: vi.fn(async () => ['https://paperless.example.com']),
+  };
+});
+
+import { GET as listCredentials, POST as saveCredential } from '../route';
+import { POST as proxy } from '../../plugin-proxy/route';
+
+const VALID = {
+  pluginId: 'nextcloud', credentialId: 'cloud', label: 'Nextcloud',
+  origin: 'https://cloud.example.org/index.php', inject: { type: 'basic' }, username: 'alice', secret: 'app-pw',
+};
+
+function save(body: unknown) {
+  return saveCredential(new NextRequest('http://localhost/api/plugin-secrets', { method: 'POST', body: JSON.stringify(body) }));
+}
+
+function proxyCall(query: string, headers: Record<string, string> = {}) {
+  return proxy(new NextRequest(`http://localhost/api/plugin-proxy?${query}`, { method: 'POST', headers }));
+}
+
+beforeEach(() => {
+  signedIn = true;
+  pluginsEnabled = true;
+  sameOrigin = true;
+  store.clear();
+  proxied.length = 0;
+});
+
+describe('GET /api/plugin-secrets', () => {
+  it("names the servers of set-up admin credentials for one plugin, for the host page's link check", async () => {
+    const res = await listCredentials(new NextRequest('http://localhost/api/plugin-secrets?plugin=paperless'));
+    expect(await res.json()).toMatchObject({ admin: [{ credentialId: 'shared', configured: true }], adminOrigins: ['https://paperless.example.com'] });
+    const all = await listCredentials(new NextRequest('http://localhost/api/plugin-secrets'));
+    expect((await all.json()).adminOrigins).toEqual([]);
+  });
+});
+
+describe('POST /api/plugin-secrets', () => {
+  it('stores a credential for the server origin only', async () => {
+    const res = await save(VALID);
+
+    expect(res.status).toBe(200);
+    expect(store.get('nextcloud/cloud')).toMatchObject({ origin: 'https://cloud.example.org', secret: 'app-pw', username: 'alice' });
+  });
+
+  it.each([
+    ['a plain http server', { origin: 'http://cloud.example.org' }],
+    ['a header the proxy owns', { inject: { type: 'header', name: 'Cookie' } }],
+    ['a secret with a line break', { secret: 'a\r\nX-Evil: 1' }],
+    ['a bad plugin id', { pluginId: '../x' }],
+  ])('refuses %s', async (_name, change) => {
+    const res = await save({ ...VALID, ...change });
+
+    expect(res.status).toBe(400);
+    expect(store.size).toBe(0);
+  });
+
+  it('refuses without a session, with plugins off, or from another site', async () => {
+    signedIn = false;
+    expect((await save(VALID)).status).toBe(401);
+    signedIn = true;
+    pluginsEnabled = false;
+    expect((await save(VALID)).status).toBe(403);
+    pluginsEnabled = true;
+    sameOrigin = false;
+    expect((await save(VALID)).status).toBe(403);
+    expect(store.size).toBe(0);
+  });
+});
+
+describe('POST /api/plugin-proxy', () => {
+  it('passes the request on with the method and capture header', async () => {
+    const res = await proxyCall('plugin=nextcloud&credential=cloud&url=https%3A%2F%2Fcloud.example.org%2Flogin%2Fv2%2Fpoll', {
+      'x-bulwark-method': 'POST', 'x-bulwark-capture': '{"secret":"appPassword","username":"loginName"}',
+    });
+
+    expect(res.status).toBe(200);
+    expect(proxied[0]).toMatchObject({
+      pluginId: 'nextcloud', credentialId: 'cloud', method: 'POST',
+      url: 'https://cloud.example.org/login/v2/poll',
+      capture: { secret: 'appPassword', username: 'loginName' },
+      user: { username: 'alice@example.org' },
+    });
+  });
+
+  it('refuses without a session, from another site, or with a broken capture header', async () => {
+    signedIn = false;
+    expect((await proxyCall('plugin=nextcloud&credential=cloud&url=https%3A%2F%2Fa.example')).status).toBe(401);
+    signedIn = true;
+    sameOrigin = false;
+    expect((await proxyCall('plugin=nextcloud&credential=cloud&url=https%3A%2F%2Fa.example')).status).toBe(403);
+    sameOrigin = true;
+    expect((await proxyCall('plugin=nextcloud&credential=cloud&url=https%3A%2F%2Fa.example', { 'x-bulwark-capture': '{"secret":"a.b"}' })).status).toBe(400);
+    expect(proxied).toEqual([]);
+  });
+});
diff --git a/app/api/plugin-secrets/route.ts b/app/api/plugin-secrets/route.ts
new file mode 100644
index 000000000..0e67b59ff
--- /dev/null
+++ b/app/api/plugin-secrets/route.ts
@@ -0,0 +1,108 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { configManager } from '@/lib/admin/config-manager';
+import { rejectCrossOriginRequest } from '@/lib/security/same-origin';
+import { getStalwartCredentials } from '@/lib/stalwart/credentials';
+import { CREDENTIAL_ID_RE, checkInject, credentialOrigin } from '@/lib/plugin-secrets/credentials';
+import { adminCredentialOrigins, adminCredentialStatus } from '@/lib/plugin-secrets/proxy';
+import {
+  VaultFullError,
+  deleteUserCredentials,
+  listUserCredentials,
+  putUserCredential,
+  type VaultUser,
+} from '@/lib/plugin-secrets/vault';
+
+const PLUGIN_ID_RE = /^[a-z0-9][a-z0-9-]*[a-z0-9]$/;
+const MAX_SECRET_LENGTH = 4096;
+const NO_STORE = { 'cache-control': 'no-store' };
+
+async function currentUser(request: NextRequest): Promise<VaultUser | NextResponse> {
+  await configManager.ensureLoaded();
+  if (!configManager.getPolicy().features.pluginsEnabled) {
+    return NextResponse.json({ error: 'Plugins are turned off' }, { status: 403 });
+  }
+  const creds = await getStalwartCredentials(request);
+  if (!creds) return NextResponse.json({ error: 'Not authenticated' }, { status: 401 });
+  return { username: creds.username, serverUrl: creds.serverUrl };
+}
+
+/** GET /api/plugin-secrets[?plugin=<id>] - the user's connected accounts, without secrets. */
+export async function GET(request: NextRequest) {
+  const user = await currentUser(request);
+  if (user instanceof NextResponse) return user;
+  const pluginId = request.nextUrl.searchParams.get('plugin') ?? undefined;
+  if (pluginId !== undefined && !PLUGIN_ID_RE.test(pluginId)) {
+    return NextResponse.json({ error: 'Invalid plugin id' }, { status: 400 });
+  }
+  const credentials = await listUserCredentials(user, pluginId);
+  // For one plugin, also say which of its admin credentials are set up, and
+  // on which servers: the host page checks the links a plugin shows against
+  // them (the plugin itself only gets yes/no, see proxyAccounts).
+  const [admin, adminOrigins] = pluginId
+    ? await Promise.all([adminCredentialStatus(pluginId), adminCredentialOrigins(pluginId)])
+    : [[], []];
+  return NextResponse.json({ credentials, admin, adminOrigins }, { headers: NO_STORE });
+}
+
+/**
+ * POST /api/plugin-secrets - connect an account for a plugin.
+ * Body: { pluginId, credentialId, label, origin, inject, username?, secret? }
+ *
+ * Sent by the host's own "Connect" dialog, where the user typed the secret
+ * and saw which plugin and which server it is for. Without `secret` it only
+ * records the approved server, for a sign-in flow that fills the secret in
+ * later through the proxy.
+ */
+export async function POST(request: NextRequest) {
+  const crossOrigin = rejectCrossOriginRequest(request);
+  if (crossOrigin) return crossOrigin;
+  const user = await currentUser(request);
+  if (user instanceof NextResponse) return user;
+
+  let body: Record<string, unknown>;
+  try {
+    body = await request.json();
+  } catch {
+    return NextResponse.json({ error: 'Invalid request body' }, { status: 400 });
+  }
+  const { pluginId, credentialId, label, username, secret } = body;
+  const origin = credentialOrigin(body.origin);
+  const inject = checkInject(body.inject);
+  if (typeof pluginId !== 'string' || !PLUGIN_ID_RE.test(pluginId)) return bad('Invalid plugin id');
+  if (typeof credentialId !== 'string' || !CREDENTIAL_ID_RE.test(credentialId)) return bad('Invalid credential id');
+  if (typeof label !== 'string' || !label.trim() || label.length > 80) return bad('Invalid label');
+  if (!origin) return bad('The server address must start with https://');
+  if (!inject) return bad('Invalid inject');
+  if (username !== undefined && (typeof username !== 'string' || username.length > 256 || /[\r\n]/.test(username))) return bad('Invalid username');
+  if (secret !== undefined && (typeof secret !== 'string' || !secret || secret.length > MAX_SECRET_LENGTH || /[\r\n]/.test(secret))) return bad('Invalid secret');
+
+  try {
+    await putUserCredential(user, pluginId, credentialId, {
+      origin, inject, label: label.trim(),
+      ...(typeof username === 'string' && username ? { username } : {}),
+      ...(typeof secret === 'string' ? { secret } : {}),
+    });
+  } catch (error) {
+    if (error instanceof VaultFullError) return NextResponse.json({ error: error.message }, { status: 409 });
+    throw error;
+  }
+  return NextResponse.json({ ok: true }, { headers: NO_STORE });
+}
+
+/** DELETE /api/plugin-secrets?plugin=<id>[&credential=<id>] - disconnect. */
+export async function DELETE(request: NextRequest) {
+  const crossOrigin = rejectCrossOriginRequest(request);
+  if (crossOrigin) return crossOrigin;
+  const user = await currentUser(request);
+  if (user instanceof NextResponse) return user;
+  const pluginId = request.nextUrl.searchParams.get('plugin') ?? '';
+  const credentialId = request.nextUrl.searchParams.get('credential') ?? undefined;
+  if (!PLUGIN_ID_RE.test(pluginId)) return bad('Invalid plugin id');
+  if (credentialId !== undefined && !CREDENTIAL_ID_RE.test(credentialId)) return bad('Invalid credential id');
+  await deleteUserCredentials(user, pluginId, credentialId);
+  return NextResponse.json({ ok: true }, { headers: NO_STORE });
+}
+
+function bad(error: string) {
+  return NextResponse.json({ error }, { status: 400 });
+}
diff --git a/app/api/plugins/route.ts b/app/api/plugins/route.ts
index 8332d1da9..238ecc0e7 100644
--- a/app/api/plugins/route.ts
+++ b/app/api/plugins/route.ts
@@ -63,6 +63,8 @@ export async function GET(request: NextRequest) {
       httpOrigins: p.httpOrigins,
       // Surface so clients can enforce api.http.post path allowlists.
       apiPostPaths: p.apiPostPaths,
+      // Which credentials the plugin may use through the proxy; no secrets.
+      credentials: p.credentials,
       // Per-user settings schema, captured from the manifest at upload/load
       // time so the client can render the settings UI without re-parsing.
       settingsSchema: p.settingsSchema,
@@ -82,6 +84,8 @@ export async function GET(request: NextRequest) {
         description: t.description,
         variants: t.variants,
         forceEnabled: t.forceEnabled || false,
+        hasSkin: t.hasSkin || false,
+        contentHash: t.contentHash,
       }));
 
     return NextResponse.json(
diff --git a/app/globals.css b/app/globals.css
index 5d0db0a5f..2c1008564 100644
--- a/app/globals.css
+++ b/app/globals.css
@@ -1,7 +1,7 @@
 @import "tailwindcss";
 @import "tw-animate-css";
 
-@custom-variant dark (&:where(.dark, .dark *));
+@import "./theme-inline.css";
 
 :root {
   font-size: var(--font-size-base);
@@ -123,46 +123,6 @@
   --color-chart-5: #a78bfa;
 }
 
-@theme inline {
-  --color-border: var(--color-border);
-  --color-input: var(--color-input);
-  --color-ring: var(--color-ring);
-  --color-background: var(--color-background);
-  --color-foreground: var(--color-foreground);
-  --color-primary: var(--color-primary);
-  --color-primary-foreground: var(--color-primary-foreground);
-  --color-secondary: var(--color-secondary);
-  --color-secondary-foreground: var(--color-secondary-foreground);
-  --color-muted: var(--color-muted);
-  --color-muted-foreground: var(--color-muted-foreground);
-  --color-accent: var(--color-accent);
-  --color-accent-foreground: var(--color-accent-foreground);
-  --color-destructive: var(--color-destructive);
-  --color-destructive-foreground: var(--color-destructive-foreground);
-  --color-popover: var(--color-popover);
-  --color-popover-foreground: var(--color-popover-foreground);
-  --color-sidebar: var(--color-sidebar);
-  --color-sidebar-foreground: var(--color-sidebar-foreground);
-  --color-sidebar-border: var(--color-sidebar-border);
-  --color-sidebar-accent: var(--color-sidebar-accent);
-  --color-sidebar-accent-foreground: var(--color-sidebar-accent-foreground);
-  --color-card: var(--color-card);
-  --color-card-foreground: var(--color-card-foreground);
-  --color-success: var(--color-success);
-  --color-success-foreground: var(--color-success-foreground);
-  --color-warning: var(--color-warning);
-  --color-warning-foreground: var(--color-warning-foreground);
-  --color-info: var(--color-info);
-  --color-info-foreground: var(--color-info-foreground);
-  --color-selection: var(--color-selection);
-  --color-selection-foreground: var(--color-selection-foreground);
-  --color-unread: var(--color-unread);
-  --color-chart-1: var(--color-chart-1);
-  --color-chart-2: var(--color-chart-2);
-  --color-chart-3: var(--color-chart-3);
-  --color-chart-4: var(--color-chart-4);
-  --color-chart-5: var(--color-chart-5);
-}
 
 * {
   border-color: var(--color-border);
diff --git a/app/theme-inline.css b/app/theme-inline.css
new file mode 100644
index 000000000..32ab34fc7
--- /dev/null
+++ b/app/theme-inline.css
@@ -0,0 +1,46 @@
+/* Shared by the app (globals.css) and the plugin UI kit (sandbox
+   plugin-kit.css): the dark variant and the mapping from the theme tokens to
+   Tailwind colours, so both generate the same utilities. */
+
+@custom-variant dark (&:where(.dark, .dark *));
+
+@theme inline {
+  --color-border: var(--color-border);
+  --color-input: var(--color-input);
+  --color-ring: var(--color-ring);
+  --color-background: var(--color-background);
+  --color-foreground: var(--color-foreground);
+  --color-primary: var(--color-primary);
+  --color-primary-foreground: var(--color-primary-foreground);
+  --color-secondary: var(--color-secondary);
+  --color-secondary-foreground: var(--color-secondary-foreground);
+  --color-muted: var(--color-muted);
+  --color-muted-foreground: var(--color-muted-foreground);
+  --color-accent: var(--color-accent);
+  --color-accent-foreground: var(--color-accent-foreground);
+  --color-destructive: var(--color-destructive);
+  --color-destructive-foreground: var(--color-destructive-foreground);
+  --color-popover: var(--color-popover);
+  --color-popover-foreground: var(--color-popover-foreground);
+  --color-sidebar: var(--color-sidebar);
+  --color-sidebar-foreground: var(--color-sidebar-foreground);
+  --color-sidebar-border: var(--color-sidebar-border);
+  --color-sidebar-accent: var(--color-sidebar-accent);
+  --color-sidebar-accent-foreground: var(--color-sidebar-accent-foreground);
+  --color-card: var(--color-card);
+  --color-card-foreground: var(--color-card-foreground);
+  --color-success: var(--color-success);
+  --color-success-foreground: var(--color-success-foreground);
+  --color-warning: var(--color-warning);
+  --color-warning-foreground: var(--color-warning-foreground);
+  --color-info: var(--color-info);
+  --color-info-foreground: var(--color-info-foreground);
+  --color-selection: var(--color-selection);
+  --color-selection-foreground: var(--color-selection-foreground);
+  --color-unread: var(--color-unread);
+  --color-chart-1: var(--color-chart-1);
+  --color-chart-2: var(--color-chart-2);
+  --color-chart-3: var(--color-chart-3);
+  --color-chart-4: var(--color-chart-4);
+  --color-chart-5: var(--color-chart-5);
+}
diff --git a/components/__tests__/keyboard-shortcuts-palette.test.tsx b/components/__tests__/keyboard-shortcuts-palette.test.tsx
new file mode 100644
index 000000000..b4e6c02ed
--- /dev/null
+++ b/components/__tests__/keyboard-shortcuts-palette.test.tsx
@@ -0,0 +1,37 @@
+import { act, render, screen } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
+
+const pro = vi.hoisted(() => ({ active: false }));
+vi.mock('@/components/pro/pro-interface-redirect', () => ({ useProInterfaceActive: () => pro.active }));
+vi.mock('@/components/tour/tour-provider', () => ({ useTour: () => ({ startTour: vi.fn() }) }));
+
+const { KeyboardShortcutsModal } = await import('../keyboard-shortcuts-modal');
+const { resetActions, setPluginActions } = await import('@/lib/plugin-sandbox/actions');
+
+describe('keyboard shortcuts help', () => {
+  it('lists Ctrl+K as the command palette outside the Pro shell', () => {
+    pro.active = false;
+    render(<KeyboardShortcutsModal isOpen onClose={() => {}} />);
+    expect(screen.getByText('command_palette.open')).toBeInTheDocument();
+    expect(screen.queryByText('shortcuts.global.global_search')).toBeNull();
+  });
+
+  it('lists Ctrl+K as global search in the Pro shell', () => {
+    pro.active = true;
+    render(<KeyboardShortcutsModal isOpen onClose={() => {}} />);
+    expect(screen.getByText('shortcuts.global.global_search')).toBeInTheDocument();
+    expect(screen.queryByText('command_palette.open')).toBeNull();
+  });
+
+  it("lists a plugin's composer button shortcut under the composer, with the plugin's name", () => {
+    act(() => setPluginActions('assistant', 'Writing assistant', 'composer-toolbar-actions', [
+      { id: 'ask', label: 'Assistant', shortcut: 'Ctrl+Shift+Y' },
+      { id: 'quiet', label: 'No key' },
+    ]));
+    render(<KeyboardShortcutsModal isOpen onClose={() => {}} />);
+    expect(screen.getByText('Assistant (Writing assistant)')).toBeInTheDocument();
+    expect(screen.getByText('Ctrl+Shift+Y')).toBeInTheDocument();
+    expect(screen.queryByText(/No key/)).toBeNull();
+    act(() => resetActions());
+  });
+});
diff --git a/components/__tests__/plugin-app-events.test.tsx b/components/__tests__/plugin-app-events.test.tsx
new file mode 100644
index 000000000..75790e086
--- /dev/null
+++ b/components/__tests__/plugin-app-events.test.tsx
@@ -0,0 +1,95 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { act, render } from '@testing-library/react';
+import { appLifecycleHooks, clearAllHooks, routerHooks } from '@/lib/plugin-hooks';
+import { usePluginStore } from '@/stores/plugin-store';
+import { useAuthStore } from '@/stores/auth-store';
+
+let pathname = '/';
+vi.mock('next/navigation', () => ({ usePathname: () => pathname }));
+
+import { PluginAppEvents, PLUGIN_INTERVAL_MS } from '../providers/plugin-app-events';
+
+function listen<T extends { register: (id: string, fn: (...a: unknown[]) => unknown) => unknown }>(bus: T) {
+  const fn = vi.fn();
+  bus.register('test', fn);
+  return fn;
+}
+
+beforeEach(() => {
+  clearAllHooks();
+  pathname = '/';
+  usePluginStore.setState({ initialized: false, initializePlugins: vi.fn().mockResolvedValue(undefined) });
+  useAuthStore.setState({ isAuthenticated: false });
+});
+afterEach(() => {
+  vi.useRealTimers();
+});
+
+describe('app events for plugins', () => {
+  // These used to live in the mail view and stopped on every other page.
+  it('reports the network and tab state on any page', () => {
+    const online = listen(appLifecycleHooks.onOnline);
+    const visibility = listen(appLifecycleHooks.onVisibilityChange);
+    render(<PluginAppEvents />);
+
+    act(() => { window.dispatchEvent(new Event('online')); });
+    act(() => { document.dispatchEvent(new Event('visibilitychange')); });
+
+    expect(online).toHaveBeenCalledTimes(1);
+    expect(visibility).toHaveBeenCalledWith({ visible: true });
+  });
+
+  it('reports unhandled errors', () => {
+    const errors = listen(appLifecycleHooks.onAppError);
+    render(<PluginAppEvents />);
+
+    act(() => { window.dispatchEvent(new ErrorEvent('error', { message: 'boom' })); });
+
+    expect(errors).toHaveBeenCalledWith({ message: 'boom' });
+  });
+
+  it('ticks once a minute', () => {
+    vi.useFakeTimers();
+    const tick = listen(appLifecycleHooks.onInterval);
+    render(<PluginAppEvents />);
+
+    act(() => { vi.advanceTimersByTime(PLUGIN_INTERVAL_MS * 2 + 10); });
+
+    expect(tick).toHaveBeenCalledTimes(2);
+  });
+
+  it('says the app is ready once, after sign-in and plugin start', () => {
+    const ready = listen(appLifecycleHooks.onAppReady);
+    const { rerender } = render(<PluginAppEvents />);
+    expect(ready).not.toHaveBeenCalled();
+
+    act(() => {
+      useAuthStore.setState({ isAuthenticated: true });
+      usePluginStore.setState({ initialized: true });
+    });
+    rerender(<PluginAppEvents />);
+    act(() => { usePluginStore.setState({ initialized: false }); });
+    act(() => { usePluginStore.setState({ initialized: true }); });
+
+    expect(ready).toHaveBeenCalledTimes(1);
+  });
+
+  it('starts the plugins once the user is signed in, on any page', () => {
+    render(<PluginAppEvents />);
+    expect(usePluginStore.getState().initializePlugins).not.toHaveBeenCalled();
+
+    act(() => { useAuthStore.setState({ isAuthenticated: true }); });
+
+    expect(usePluginStore.getState().initializePlugins).toHaveBeenCalledTimes(1);
+  });
+
+  it('reports navigation between pages', () => {
+    const navigate = listen(routerHooks.onNavigate);
+    const { rerender } = render(<PluginAppEvents />);
+
+    pathname = '/calendar';
+    rerender(<PluginAppEvents />);
+
+    expect(navigate).toHaveBeenCalledWith({ path: '/calendar', from: '/' });
+  });
+});
diff --git a/components/__tests__/plugin-oauth-callback-listener.test.tsx b/components/__tests__/plugin-oauth-callback-listener.test.tsx
index 6b738810c..2c84da6d9 100644
--- a/components/__tests__/plugin-oauth-callback-listener.test.tsx
+++ b/components/__tests__/plugin-oauth-callback-listener.test.tsx
@@ -2,6 +2,7 @@ import { authHooks } from "@/lib/plugin-hooks";
 import {
     PLUGIN_OAUTH_EVENT,
     PLUGIN_OAUTH_STORAGE_KEY,
+    createOAuthState,
 } from "@/lib/plugin-oauth";
 import { act, render } from "@testing-library/react";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
@@ -25,6 +26,8 @@ function emitStorageEvent(newValue: string | null) {
   });
 }
 
+let STATE = "";
+
 describe("PluginOAuthCallbackListener", () => {
   let handler: (payload: unknown) => Promise<void>;
   let disposable: { dispose: () => void };
@@ -35,6 +38,7 @@ describe("PluginOAuthCallbackListener", () => {
     mockUsePathname.mockReturnValue("/en/mail");
     handler = vi.fn<(payload: unknown) => Promise<void>>().mockResolvedValue(undefined);
     disposable = authHooks.onOAuthCallback.register("test-plugin", handler);
+    STATE = createOAuthState("test-plugin");
   });
 
   afterEach(() => {
@@ -43,14 +47,14 @@ describe("PluginOAuthCallbackListener", () => {
 
   it("delivers a success payload via the storage event", () => {
     const { unmount } = render(<PluginOAuthCallbackListener />);
-    const payload = { code: "abc", state: "xyz", receivedAt: 1 };
+    const payload = { code: "abc", state: STATE, receivedAt: 1 };
     localStorage.setItem(PLUGIN_OAUTH_STORAGE_KEY, JSON.stringify(payload));
 
     emitStorageEvent(JSON.stringify(payload));
 
     expect(handler).toHaveBeenCalledOnce();
     expect(handler).toHaveBeenCalledWith(
-      expect.objectContaining({ code: "abc", state: "xyz" }),
+      expect.objectContaining({ code: "abc", state: STATE }),
     );
     // Best-effort cleanup after delivery
     expect(localStorage.getItem(PLUGIN_OAUTH_STORAGE_KEY)).toBeNull();
@@ -59,14 +63,14 @@ describe("PluginOAuthCallbackListener", () => {
 
   it("delivers an error payload (denial) with state", () => {
     const { unmount } = render(<PluginOAuthCallbackListener />);
-    const payload = { state: "xyz", error: "access_denied", receivedAt: 1 };
+    const payload = { state: STATE, error: "access_denied", receivedAt: 1 };
     localStorage.setItem(PLUGIN_OAUTH_STORAGE_KEY, JSON.stringify(payload));
 
     emitStorageEvent(JSON.stringify(payload));
 
     expect(handler).toHaveBeenCalledOnce();
     expect(handler).toHaveBeenCalledWith(
-      expect.objectContaining({ state: "xyz", error: "access_denied" }),
+      expect.objectContaining({ state: STATE, error: "access_denied" }),
     );
     unmount();
   });
@@ -74,7 +78,7 @@ describe("PluginOAuthCallbackListener", () => {
   it("does nothing on the callback route", () => {
     mockUsePathname.mockReturnValue("/en/plugins/oauth/callback");
     const { unmount } = render(<PluginOAuthCallbackListener />);
-    const payload = { code: "abc", state: "xyz", receivedAt: 1 };
+    const payload = { code: "abc", state: STATE, receivedAt: 1 };
     localStorage.setItem(PLUGIN_OAUTH_STORAGE_KEY, JSON.stringify(payload));
 
     emitStorageEvent(JSON.stringify(payload));
@@ -95,7 +99,7 @@ describe("PluginOAuthCallbackListener", () => {
 
     emitStorageEvent("not json");
     emitStorageEvent(JSON.stringify({ foo: "bar" }));
-    emitStorageEvent(JSON.stringify({ code: 123, state: "xyz" }));
+    emitStorageEvent(JSON.stringify({ code: 123, state: STATE }));
     emitStorageEvent(null);
 
     expect(handler).not.toHaveBeenCalled();
@@ -119,7 +123,7 @@ describe("PluginOAuthCallbackListener", () => {
     try {
       vi.setSystemTime(0);
       const { unmount } = render(<PluginOAuthCallbackListener />);
-      const payload = { code: "abc", state: "xyz", receivedAt: 1 };
+      const payload = { code: "abc", state: STATE, receivedAt: 1 };
       localStorage.setItem(PLUGIN_OAUTH_STORAGE_KEY, JSON.stringify(payload));
 
       emitStorageEvent(JSON.stringify(payload));
@@ -127,10 +131,10 @@ describe("PluginOAuthCallbackListener", () => {
 
       expect(handler).toHaveBeenCalledOnce();
 
-      // Outside the dedup window the same payload is delivered again
+      // A state is used once: replaying it later delivers nothing either.
       vi.setSystemTime(61_000);
       emitStorageEvent(JSON.stringify(payload));
-      expect(handler).toHaveBeenCalledTimes(2);
+      expect(handler).toHaveBeenCalledOnce();
 
       unmount();
     } finally {
@@ -140,7 +144,7 @@ describe("PluginOAuthCallbackListener", () => {
 
   it("delivers same-tab custom events", () => {
     const { unmount } = render(<PluginOAuthCallbackListener />);
-    const payload = { code: "abc", state: "xyz", receivedAt: 1 };
+    const payload = { code: "abc", state: STATE, receivedAt: 1 };
 
     act(() => {
       window.dispatchEvent(
@@ -150,7 +154,7 @@ describe("PluginOAuthCallbackListener", () => {
 
     expect(handler).toHaveBeenCalledOnce();
     expect(handler).toHaveBeenCalledWith(
-      expect.objectContaining({ code: "abc", state: "xyz" }),
+      expect.objectContaining({ code: "abc", state: STATE }),
     );
     unmount();
   });
@@ -159,7 +163,7 @@ describe("PluginOAuthCallbackListener", () => {
     const { unmount } = render(<PluginOAuthCallbackListener />);
     unmount();
 
-    const payload = { code: "abc", state: "xyz", receivedAt: 1 };
+    const payload = { code: "abc", state: STATE, receivedAt: 1 };
     localStorage.setItem(PLUGIN_OAUTH_STORAGE_KEY, JSON.stringify(payload));
     emitStorageEvent(JSON.stringify(payload));
     act(() => {
@@ -170,4 +174,29 @@ describe("PluginOAuthCallbackListener", () => {
 
     expect(handler).not.toHaveBeenCalled();
   });
+
+  it("delivers the code only to the plugin that started the flow", () => {
+    // Every plugin with http:fetch used to receive every code.
+    const other = vi.fn<(payload: unknown) => Promise<void>>().mockResolvedValue(undefined);
+    const otherDisposable = authHooks.onOAuthCallback.register("other-plugin", other);
+    const { unmount } = render(<PluginOAuthCallbackListener />);
+
+    emitStorageEvent(JSON.stringify({ code: "abc", state: STATE, receivedAt: 1 }));
+
+    expect(handler).toHaveBeenCalledOnce();
+    expect(other).not.toHaveBeenCalled();
+    otherDisposable.dispose();
+    unmount();
+  });
+
+  it("drops a callback whose state no plugin created", () => {
+    const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
+    const { unmount } = render(<PluginOAuthCallbackListener />);
+
+    emitStorageEvent(JSON.stringify({ code: "abc", state: "made-up", receivedAt: 1 }));
+
+    expect(handler).not.toHaveBeenCalled();
+    warn.mockRestore();
+    unmount();
+  });
 });
diff --git a/components/calendar/__tests__/calendar-plugin-surfaces.test.tsx b/components/calendar/__tests__/calendar-plugin-surfaces.test.tsx
new file mode 100644
index 000000000..b1d0063c1
--- /dev/null
+++ b/components/calendar/__tests__/calendar-plugin-surfaces.test.tsx
@@ -0,0 +1,254 @@
+import { render, screen, fireEvent, waitFor, act, cleanup } from '@testing-library/react';
+import { describe, it, expect, vi, afterEach } from 'vitest';
+import { EventModal } from '../event-modal';
+import { EventDetailPopover } from '../event-detail-popover';
+import { CalendarWeekView } from '../calendar-week-view';
+import { CalendarDayView } from '../calendar-day-view';
+import { CalendarMonthView } from '../calendar-month-view';
+import { MiniCalendar } from '../mini-calendar';
+import { resetDayLabels, setDayLabels } from '@/lib/plugin-sandbox/day-labels';
+import { clearSlotOffers, framePropsOf, offerSlots } from '@/components/plugins/__tests__/fake-slot-offer';
+import type { Calendar, CalendarEvent } from '@/lib/jmap/types';
+
+// Plugin surfaces in the calendar: a section in an event's details and in
+// its form, and the labels and dots plugins put on days.
+
+vi.mock('@/components/plugins/plugin-iframe-slot', () => import('@/components/plugins/__tests__/fake-slot-offer'));
+
+const calendars = [
+  { id: 'cal-1', name: 'Work', color: '#123456', isDefault: true, myRights: { mayWriteAll: true, mayWriteOwn: true } },
+] as unknown as Calendar[];
+
+const existing = {
+  id: 'e1',
+  uid: 'uid-1',
+  title: 'Planning',
+  start: '2026-10-12T10:00:00',
+  duration: 'PT1H',
+  timeZone: null,
+  showWithoutTime: false,
+  calendarIds: { 'cal-1': true },
+} as unknown as CalendarEvent;
+
+afterEach(() => {
+  cleanup();
+  clearSlotOffers();
+  resetDayLabels();
+});
+
+describe('calendar-event-detail', () => {
+  it('shows the event in the detail popover', () => {
+    offerSlots('p1', ['calendar-event-detail']);
+    render(
+      <EventDetailPopover
+        event={existing}
+        calendar={calendars[0]}
+        anchorRect={new DOMRect(100, 100, 50, 20)}
+        onEdit={vi.fn()}
+        onDelete={vi.fn()}
+        onDuplicate={vi.fn()}
+        onClose={vi.fn()}
+        onSaveNote={vi.fn()}
+      />,
+    );
+
+    const frame = screen.getByTestId('plugin-frame-calendar-event-detail');
+    expect(framePropsOf(frame).event).toMatchObject({ id: 'e1', uid: 'uid-1', title: 'Planning', calendarId: 'cal-1' });
+  });
+
+  it('moves the popover up when the plugin section makes it taller, so it stays in the window', () => {
+    let resize: (() => void) | null = null;
+    vi.stubGlobal('ResizeObserver', class {
+      constructor(cb: () => void) { resize = cb; }
+      observe() {}
+      unobserve() {}
+      disconnect() {}
+    });
+    Object.defineProperty(window, 'innerHeight', { value: 800, configurable: true });
+    Object.defineProperty(window, 'innerWidth', { value: 1280, configurable: true });
+    let height = 200;
+    const spy = vi.spyOn(HTMLElement.prototype, 'offsetHeight', 'get').mockImplementation(function (this: HTMLElement) {
+      return this.getAttribute('role') === 'dialog' ? height : 0;
+    });
+    try {
+      offerSlots('p1', ['calendar-event-detail']);
+      // An event at 14:00 in the week view of a 1280x800 window.
+      render(
+        <EventDetailPopover
+          event={existing}
+          calendar={calendars[0]}
+          anchorRect={new DOMRect(600, 520, 120, 60)}
+          onEdit={vi.fn()}
+          onDelete={vi.fn()}
+          onDuplicate={vi.fn()}
+          onClose={vi.fn()}
+          onSaveNote={vi.fn()}
+        />,
+      );
+      const popover = screen.getByRole('dialog');
+      expect(popover.style.top).toBe('520px');
+
+      height = 420;
+      act(() => resize?.());
+      expect(popover.style.top).toBe(`${800 - 420 - 12}px`);
+    } finally {
+      spy.mockRestore();
+      vi.unstubAllGlobals();
+    }
+  });
+
+  it('shows the event in the modal view, and not in the form', () => {
+    offerSlots('p1', ['calendar-event-detail']);
+    render(<EventModal event={existing} calendars={calendars} onSave={vi.fn()} onClose={vi.fn()} />);
+
+    expect(framePropsOf(screen.getByTestId('plugin-frame-calendar-event-detail')).event).toMatchObject({ id: 'e1', title: 'Planning' });
+
+    fireEvent.click(screen.getByText('events.edit'));
+    expect(screen.queryByTestId('plugin-frame-calendar-event-detail')).toBeNull();
+  });
+
+  it('renders nothing when no plugin offers it', () => {
+    render(<EventModal event={existing} calendars={calendars} onSave={vi.fn()} onClose={vi.fn()} />);
+    expect(document.querySelector('[data-plugin-slot]')).toBeNull();
+  });
+});
+
+describe('calendar-event-form', () => {
+  it('hands the plugin the form state of an edited event and follows the fields', async () => {
+    offerSlots('p1', ['calendar-event-form']);
+    render(<EventModal event={existing} calendars={calendars} onSave={vi.fn()} onClose={vi.fn()} />);
+    expect(screen.queryByTestId('plugin-frame-calendar-event-form')).toBeNull();
+
+    fireEvent.click(screen.getByText('events.edit'));
+    const frame = screen.getByTestId('plugin-frame-calendar-event-form');
+    expect(framePropsOf(frame).event).toMatchObject({
+      id: 'e1', uid: 'uid-1', calendarId: 'cal-1', title: 'Planning', start: '2026-10-12T10:00:00', duration: 'PT1H', isAllDay: false,
+    });
+
+    fireEvent.change(screen.getByPlaceholderText('form.title'), { target: { value: 'Planning v2' } });
+    await waitFor(() => {
+      expect(framePropsOf(screen.getByTestId('plugin-frame-calendar-event-form')).event).toMatchObject({ title: 'Planning v2' });
+    });
+  });
+
+  it('gives a new event an empty id', () => {
+    offerSlots('p1', ['calendar-event-form']);
+    render(
+      <EventModal
+        calendars={calendars}
+        defaultDate={new Date('2026-10-12T10:00:00')}
+        defaultEndDate={new Date('2026-10-12T11:30:00')}
+        defaultCalendarId="cal-1"
+        onSave={vi.fn()}
+        onClose={vi.fn()}
+      />,
+    );
+
+    expect(framePropsOf(screen.getByTestId('plugin-frame-calendar-event-form')).event).toMatchObject({
+      id: '', uid: '', calendarId: 'cal-1', duration: 'PT1H30M', participants: [],
+    });
+  });
+
+  it('renders nothing when no plugin offers it', () => {
+    render(<EventModal calendars={calendars} onSave={vi.fn()} onClose={vi.fn()} />);
+    expect(document.querySelector('[data-plugin-slot]')).toBeNull();
+  });
+});
+
+describe('calendar-day-header and mini-calendar-marks', () => {
+  const week = {
+    focus: { date: new Date(2026, 8, 9), nonce: 0 },
+    windowKey: 'week:2026-09-07',
+    rangeStart: new Date(2026, 8, 7),
+    rangeEnd: new Date(2026, 8, 13),
+    selectedDate: new Date(2026, 8, 9),
+    events: [],
+    calendars,
+    onSelectDate: vi.fn(),
+    onSelectEvent: vi.fn(),
+    onCreateAtTime: vi.fn(),
+  };
+
+  function headerOf(dayKey: string): HTMLElement {
+    const header = document.querySelector<HTMLElement>(`[role="columnheader"][data-day="${dayKey}"], [data-day="${dayKey}"] [role="columnheader"]`);
+    if (!header) throw new Error(`no header for ${dayKey}`);
+    return header;
+  }
+
+  it('puts a label under the day name in the week view', () => {
+    render(<CalendarWeekView {...week} />);
+    expect(document.querySelector('[data-plugin-surface="calendar-day-header"]')).toBeNull();
+
+    act(() => setDayLabels('hol', 'Holidays', [{ date: '2026-09-09', text: 'Feast day', title: 'A feast' }]));
+
+    const label = headerOf('2026-09-09').querySelector<HTMLElement>('[data-plugin-surface="calendar-day-header"]');
+    expect(label).toHaveTextContent('Feast day');
+    expect(label?.title).toBe('A feast (Holidays)');
+    expect(headerOf('2026-09-10').querySelector('[data-plugin-surface="calendar-day-header"]')).toBeNull();
+  });
+
+  it('puts a label under the day name in the day view', () => {
+    act(() => setDayLabels('hol', 'Holidays', [{ date: '2026-09-09', text: 'Feast day' }]));
+    render(<CalendarDayView {...week} windowKey="day:2026-09-09" rangeStart={new Date(2026, 8, 9)} rangeEnd={new Date(2026, 8, 9)} />);
+
+    expect(headerOf('2026-09-09').querySelector('[data-plugin-surface="calendar-day-header"]')).toHaveTextContent('Feast day');
+  });
+
+  it('shows the label in the month cell header, as a dot on phones', () => {
+    act(() => setDayLabels('hol', 'Holidays', [
+      { date: '2026-09-09', text: 'Feast day' },
+      { date: '2026-09-10', dot: true, title: 'Dot only' },
+    ]));
+    const month = { ...week, windowKey: 'month:2026-09-09', rangeStart: new Date(2026, 7, 31), rangeEnd: new Date(2026, 9, 4) };
+    const { unmount } = render(<CalendarMonthView {...month} />);
+
+    const labels = document.querySelectorAll('[data-plugin-surface="calendar-day-header"]');
+    expect(labels).toHaveLength(1);
+    expect(labels[0]).toHaveTextContent('Feast day');
+    expect(labels[0].closest('[role="gridcell"]')?.getAttribute('aria-label')).toMatch(/9/);
+    unmount();
+
+    render(<CalendarMonthView {...month} isMobile />);
+    const dots = [...document.querySelectorAll<HTMLElement>('[data-plugin-surface="calendar-day-header"]')];
+    expect(dots).toHaveLength(2);
+    for (const dot of dots) expect(dot).toHaveAttribute('data-compact');
+    expect(dots[0].closest('[role="gridcell"]')?.getAttribute('aria-label')).toMatch(/9/);
+    expect(dots[0].title).toBe('Feast day (Holidays)');
+    expect(dots[1].title).toBe('Dot only (Holidays)');
+  });
+
+  it('marks days with a dot in the small month calendar', () => {
+    render(
+      <MiniCalendar selectedDate={new Date(2026, 8, 1)} displayMonth={new Date(2026, 8, 1)} onSelectDate={vi.fn()} onChangeMonth={vi.fn()} />,
+    );
+    expect(document.querySelector('[data-plugin-surface="mini-calendar-marks"]')).toBeNull();
+
+    act(() => setDayLabels('hol', 'Holidays', [
+      { date: '2026-09-09', dot: true, title: 'A feast' },
+      { date: '2026-09-10', text: 'Text only' },
+    ]));
+
+    const dots = document.querySelectorAll('[data-plugin-surface="mini-calendar-marks"]');
+    expect(dots).toHaveLength(1);
+    expect(dots[0].closest('button')).toHaveTextContent('9');
+    expect(dots[0].closest('button')).toHaveTextContent('A feast');
+  });
+
+  it('keeps the dot visible on today, whose filled circle has white text', () => {
+    vi.useFakeTimers({ toFake: ['Date'] });
+    vi.setSystemTime(new Date(2026, 8, 9, 12));
+    try {
+      act(() => setDayLabels('hol', 'Holidays', [{ date: '2026-09-09', dot: true, title: 'A feast' }]));
+      render(
+        <MiniCalendar selectedDate={new Date(2026, 8, 1)} displayMonth={new Date(2026, 8, 1)} onSelectDate={vi.fn()} onChangeMonth={vi.fn()} />,
+      );
+      const dot = document.querySelector<HTMLElement>('[data-plugin-surface="mini-calendar-marks"]')!;
+      expect(dot.closest('button')).toHaveAttribute('aria-current', 'date');
+      // Its own colour, not the button's text colour, which is white on today.
+      expect(dot.className).not.toMatch(/bg-current/);
+      expect(dot.className).toMatch(/ring-background/);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+});
diff --git a/components/calendar/__tests__/event-modal-open-hooks.test.tsx b/components/calendar/__tests__/event-modal-open-hooks.test.tsx
new file mode 100644
index 000000000..00c4e44ca
--- /dev/null
+++ b/components/calendar/__tests__/event-modal-open-hooks.test.tsx
@@ -0,0 +1,66 @@
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { describe, it, expect, vi, afterEach } from 'vitest';
+import { EventModal } from '../event-modal';
+import { calendarFormHooks, calendarHooks, clearAllHooks } from '@/lib/plugin-hooks';
+import type { Calendar, CalendarEvent } from '@/lib/jmap/types';
+
+// Opening an event for reading fires onCalendarEventOpen once; opening the
+// form (a new event, or Edit on an open one) fires onCalendarEventFormOpen.
+
+const calendars = [
+  { id: 'cal-1', name: 'Work', isDefault: true, myRights: { mayWriteAll: true, mayWriteOwn: true } },
+] as unknown as Calendar[];
+
+const existing = {
+  id: 'e1',
+  uid: 'uid-1',
+  title: 'Planning',
+  start: '2026-10-12T10:00:00',
+  duration: 'PT1H',
+  timeZone: null,
+  showWithoutTime: false,
+  calendarIds: { 'cal-1': true },
+} as unknown as CalendarEvent;
+
+afterEach(() => clearAllHooks());
+
+describe('EventModal open hooks', () => {
+  it('reports an existing event opened for reading, and the form when Edit is pressed', async () => {
+    const opened = vi.fn();
+    const formOpened = vi.fn();
+    calendarHooks.onCalendarEventOpen.register('t', opened);
+    calendarFormHooks.onCalendarEventFormOpen.register('t', formOpened);
+
+    render(<EventModal event={existing} calendars={calendars} onSave={vi.fn()} onClose={vi.fn()} />);
+
+    await waitFor(() => expect(opened).toHaveBeenCalledTimes(1));
+    expect(opened.mock.calls[0][0]).toMatchObject({ id: 'e1', title: 'Planning', calendarId: 'cal-1' });
+    expect(formOpened).not.toHaveBeenCalled();
+
+    fireEvent.click(screen.getByText('events.edit'));
+    await waitFor(() => expect(formOpened).toHaveBeenCalledTimes(1));
+    expect(formOpened.mock.calls[0][0]).toMatchObject({ title: 'Planning', calendarId: 'cal-1', uid: 'uid-1', isAllDay: false });
+    expect(opened).toHaveBeenCalledTimes(1);
+  });
+
+  it('reports the form for a new event, and no event open', async () => {
+    const opened = vi.fn();
+    const formOpened = vi.fn();
+    calendarHooks.onCalendarEventOpen.register('t', opened);
+    calendarFormHooks.onCalendarEventFormOpen.register('t', formOpened);
+
+    render(
+      <EventModal
+        calendars={calendars}
+        defaultDate={new Date('2026-10-12T10:00:00')}
+        defaultCalendarId="cal-1"
+        onSave={vi.fn()}
+        onClose={vi.fn()}
+      />,
+    );
+
+    await waitFor(() => expect(formOpened).toHaveBeenCalledTimes(1));
+    expect(formOpened.mock.calls[0][0]).toMatchObject({ calendarId: 'cal-1', uid: undefined, attendees: [] });
+    expect(opened).not.toHaveBeenCalled();
+  });
+});
diff --git a/components/calendar/__tests__/task-plugin-surfaces.test.tsx b/components/calendar/__tests__/task-plugin-surfaces.test.tsx
new file mode 100644
index 000000000..473f460e5
--- /dev/null
+++ b/components/calendar/__tests__/task-plugin-surfaces.test.tsx
@@ -0,0 +1,110 @@
+import { render, screen, fireEvent, act, cleanup } from '@testing-library/react';
+import { describe, it, expect, vi, afterEach, beforeEach } from 'vitest';
+import { TaskModal } from '../task-modal';
+import { TaskToolbar } from '../task-toolbar';
+import { filterTasksForList } from '../task-list-view';
+import { resetActions, setActionDispatcher, setPluginActions } from '@/lib/plugin-sandbox/actions';
+import { clearSlotOffers, framePropsOf, offerSlots } from '@/components/plugins/__tests__/fake-slot-offer';
+import type { Calendar, CalendarTask } from '@/lib/jmap/types';
+
+// Plugin surfaces for tasks: a section in a task's details and buttons in
+// the task list toolbar acting on the tasks the list shows.
+
+vi.mock('@/components/plugins/plugin-iframe-slot', () => import('@/components/plugins/__tests__/fake-slot-offer'));
+
+const calendars = [{ id: 'cal-1', name: 'Tasks', isShared: false }] as unknown as Calendar[];
+
+function makeTask(id: string, overrides: Partial<CalendarTask> = {}): CalendarTask {
+  return {
+    id,
+    '@type': 'Task',
+    uid: `uid-${id}`,
+    title: `Task ${id}`,
+    description: '',
+    due: null,
+    showWithoutTime: true,
+    priority: 0,
+    progress: 'needs-action',
+    calendarIds: { 'cal-1': true },
+    alerts: null,
+    ...overrides,
+  } as unknown as CalendarTask;
+}
+
+const dispatch = vi.fn().mockResolvedValue(undefined);
+
+beforeEach(() => {
+  dispatch.mockClear();
+  setActionDispatcher(dispatch);
+});
+
+afterEach(() => {
+  cleanup();
+  clearSlotOffers();
+  resetActions();
+  setActionDispatcher(null);
+});
+
+describe('task-detail-section', () => {
+  it('shows an open task to the plugin', () => {
+    offerSlots('p1', ['task-detail-section']);
+    render(<TaskModal task={makeTask('t1', { priority: 5 })} calendars={calendars} onSave={vi.fn()} onClose={vi.fn()} />);
+
+    const frame = screen.getByTestId('plugin-frame-task-detail-section');
+    expect(framePropsOf(frame).task).toMatchObject({ id: 't1', uid: 'uid-t1', title: 'Task t1', priority: 5, calendarId: 'cal-1', isComplete: false });
+  });
+
+  it('is not shown for a new task or without a plugin', () => {
+    offerSlots('p1', ['task-detail-section']);
+    const { unmount } = render(<TaskModal calendars={calendars} onSave={vi.fn()} onClose={vi.fn()} />);
+    expect(screen.queryByTestId('plugin-frame-task-detail-section')).toBeNull();
+    unmount();
+
+    clearSlotOffers();
+    render(<TaskModal task={makeTask('t1')} calendars={calendars} onSave={vi.fn()} onClose={vi.fn()} />);
+    expect(document.querySelector('[data-plugin-slot]')).toBeNull();
+  });
+});
+
+describe('task-list-actions', () => {
+  const toolbar = {
+    filter: 'all' as const,
+    showCompleted: false,
+    onFilterChange: vi.fn(),
+    onShowCompletedChange: vi.fn(),
+    onCreateTask: vi.fn(),
+  };
+
+  it('puts plugin buttons after the create button and sends the listed task ids', async () => {
+    act(() => setPluginActions('pm', 'Planner', 'task-list-actions', [{ id: 'plan', label: 'Plan my day' }]));
+    render(<TaskToolbar {...toolbar} taskIds={['t2', 't1']} />);
+
+    const button = screen.getByRole('button', { name: 'Plan my day' });
+    expect(screen.getByText('tasks.create').compareDocumentPosition(button) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
+
+    await act(async () => { fireEvent.click(button); });
+    expect(dispatch).toHaveBeenCalledWith('pm', 'task-list-actions', 'plan', { taskIds: ['t2', 't1'] });
+  });
+
+  it('draws icon-only buttons when compact', () => {
+    act(() => setPluginActions('pm', 'Planner', 'task-list-actions', [{ id: 'plan', label: 'Plan my day' }]));
+    render(<TaskToolbar {...toolbar} taskIds={[]} compact />);
+    expect(screen.getByRole('button', { name: 'Plan my day' })).not.toHaveTextContent('Plan my day');
+  });
+
+  it('renders nothing without a plugin', () => {
+    render(<TaskToolbar {...toolbar} taskIds={['t1']} />);
+    expect(document.querySelector('[data-plugin-actions]')).toBeNull();
+  });
+
+  it('lists the ids the task list shows, in its order', () => {
+    const tasks = [
+      makeTask('done', { progress: 'completed' }),
+      makeTask('later', { due: '2030-01-02' }),
+      makeTask('other-cal', { calendarIds: { 'cal-2': true } }),
+      makeTask('soon', { due: '2030-01-01' }),
+    ];
+    expect(filterTasksForList(tasks, ['cal-1'], 'all', false).map((t) => t.id)).toEqual(['soon', 'later']);
+    expect(filterTasksForList(tasks, ['cal-1'], 'all', true).map((t) => t.id)).toEqual(['soon', 'later', 'done']);
+  });
+});
diff --git a/components/calendar/calendar-app.tsx b/components/calendar/calendar-app.tsx
index 9d5b6e4e6..d3b17fe01 100644
--- a/components/calendar/calendar-app.tsx
+++ b/components/calendar/calendar-app.tsx
@@ -25,7 +25,7 @@ import { CalendarMonthView } from "@/components/calendar/calendar-month-view";
 import { CalendarWeekView } from "@/components/calendar/calendar-week-view";
 import { CalendarDayView } from "@/components/calendar/calendar-day-view";
 import { CalendarAgendaView } from "@/components/calendar/calendar-agenda-view";
-import { TaskListView } from "@/components/calendar/task-list-view";
+import { TaskListView, filterTasksForList } from "@/components/calendar/task-list-view";
 import { TaskToolbar } from "@/components/calendar/task-toolbar";
 import { TaskModal } from "@/components/calendar/task-modal";
 import { MiniCalendar } from "@/components/calendar/mini-calendar";
@@ -97,6 +97,8 @@ import { findMeetingLink } from "@/lib/event-links";
 import { useDocumentTitle } from "@/hooks/use-document-title";
 import { MvTopBar } from "@/components/layout/mv-top-bar";
 import { useMountainViewShell } from "@/hooks/use-mountain-view-shell";
+import { calendarHooks } from "@/lib/plugin-hooks";
+import { eventToView } from "@/lib/plugin-projection";
 
 type PendingScopeAction =
   | { type: "edit"; event: CalendarEvent; updates: Partial<CalendarEvent>; sendScheduling?: boolean }
@@ -707,6 +709,9 @@ export function CalendarApp({ linkSegments: routeSegments }: CalendarAppProps =
     setDetailPinned(true);
     setDetailEvent(event);
     setDetailAnchorRect(anchorRect);
+    // A click opens the event's card; the hover preview does not count as
+    // opening it. The editor reports its own opens (event-modal).
+    void calendarHooks.onCalendarEventOpen.emit(eventToView(event));
   }, [isMobile, closeDetail, openEditModal]);
 
   const {
@@ -1206,7 +1211,10 @@ export function CalendarApp({ linkSegments: routeSegments }: CalendarAppProps =
             delete (newEventData as Record<string, unknown>).uid;
             delete (newEventData as Record<string, unknown>).recurrenceId;
             try {
-              await createEvent(client, newEventData, sendScheduling);
+              // null when the save failed or a plugin stopped it: either way
+              // the truncated master has to be restored.
+              const created = await createEvent(client, newEventData, sendScheduling);
+              if (!created) throw new Error("The new series was not created");
             } catch (createError) {
               debug.error("Failed to create new series, rolling back master truncation:", createError);
               try {
@@ -1480,6 +1488,12 @@ export function CalendarApp({ linkSegments: routeSegments }: CalendarAppProps =
     return filtered;
   }, [events, selectedCalendarIds, showBirthdayCalendar, birthdayEvents]);
 
+  // The tasks the task list shows; plugin buttons in its toolbar act on them.
+  const listedTaskIds = useMemo(
+    () => filterTasksForList(taskStore.tasks, selectedCalendarIds, taskStore.filter, taskStore.showCompleted).map((task) => task.id),
+    [taskStore.tasks, selectedCalendarIds, taskStore.filter, taskStore.showCompleted],
+  );
+
   // Tasks on the month, week and day grids follow the calendar filter like
   // the events do (#1107).
   const calendarTasks = useMemo(() => {
@@ -1671,6 +1685,8 @@ export function CalendarApp({ linkSegments: routeSegments }: CalendarAppProps =
                 onFilterChange={taskStore.setFilter}
                 onShowCompletedChange={taskStore.setShowCompleted}
                 onCreateTask={openCreateTaskModal}
+                taskIds={listedTaskIds}
+                compact={isMobile}
               />
               <TaskListView
                 tasks={taskStore.tasks}
diff --git a/components/calendar/calendar-day-view.tsx b/components/calendar/calendar-day-view.tsx
index a111549e5..da1a8e942 100644
--- a/components/calendar/calendar-day-view.tsx
+++ b/components/calendar/calendar-day-view.tsx
@@ -20,6 +20,7 @@ import { useScrollWindow, getScrollStart, setScrollStart, scrollToStart } from "
 import { dayKey, type ScrollWindowViewProps } from "@/lib/calendar-scroll-window";
 import type { PendingEventPreview } from "./event-modal";
 import { readableTextOn } from "@/lib/color-transform";
+import { PluginDayLabel } from "./plugin-day-label";
 
 interface CalendarDayViewProps extends ScrollWindowViewProps {
   selectedDate: Date;
@@ -334,6 +335,7 @@ export function CalendarDayView({
                     >
                       {format(day, "d")}
                     </div>
+                    <PluginDayLabel surface="calendar-day-header" date={key} className="w-full" />
                   </div>
 
                   {hasAllDayArea && (
diff --git a/components/calendar/calendar-month-view.tsx b/components/calendar/calendar-month-view.tsx
index 31ba69a59..cd413898a 100644
--- a/components/calendar/calendar-month-view.tsx
+++ b/components/calendar/calendar-month-view.tsx
@@ -18,6 +18,7 @@ import { toast } from "@/stores/toast-store";
 import { useCalendarLocale } from "@/hooks/use-calendar-locale";
 import { useScrollWindow } from "@/hooks/use-scroll-window";
 import { dayKey, parseDayKey, type ScrollWindowViewProps } from "@/lib/calendar-scroll-window";
+import { PluginDayLabel } from "./plugin-day-label";
 
 interface CalendarMonthViewProps extends ScrollWindowViewProps {
   selectedDate: Date;
@@ -379,6 +380,8 @@ export function CalendarMonthView({
                     >
                       {formatDayNumber(day)}
                     </button>
+                    {/* Phones have no room for the text: a dot stands in for it. */}
+                    <PluginDayLabel surface="calendar-day-header" date={key} compact={isMobile} className={isMobile ? undefined : "min-w-0 flex-1"} />
                   </div>
                   {isMobile && !showChips ? (
                     <div className="flex items-center justify-center gap-0.5 flex-wrap">
diff --git a/components/calendar/calendar-week-view.tsx b/components/calendar/calendar-week-view.tsx
index 2a342a034..d7f63c9d4 100644
--- a/components/calendar/calendar-week-view.tsx
+++ b/components/calendar/calendar-week-view.tsx
@@ -23,6 +23,7 @@ import { useScrollWindow, getScrollStart, setScrollStart, scrollToStart } from "
 import { dayKey, type ScrollWindowViewProps } from "@/lib/calendar-scroll-window";
 import type { PendingEventPreview } from "./event-modal";
 import { readableTextOn } from "@/lib/color-transform";
+import { PluginDayLabel } from "./plugin-day-label";
 
 interface CalendarWeekViewProps extends ScrollWindowViewProps {
   selectedDate: Date;
@@ -436,6 +437,7 @@ export function CalendarWeekView({
                 >
                   {format(day, "d")}
                 </button>
+                <PluginDayLabel surface="calendar-day-header" date={dayKey(day)} className="w-full px-1 text-center" />
               </div>
             );
           })}
diff --git a/components/calendar/event-detail-popover.tsx b/components/calendar/event-detail-popover.tsx
index e7c573d4c..4ab0eba77 100644
--- a/components/calendar/event-detail-popover.tsx
+++ b/components/calendar/event-detail-popover.tsx
@@ -25,6 +25,8 @@ import { canUserRsvp, getEventEditability, type EditabilityContext } from "@/lib
 import { useFormatEventDate } from "@/hooks/use-format-event-date";
 import { useContactNameResolver } from "@/hooks/use-contact-name-resolver";
 import { findMeetingLink, locationAction, mapsUrl, primaryLocationName } from "@/lib/event-links";
+import { PluginSlot } from "@/components/plugins/plugin-slot";
+import { eventToView } from "@/lib/plugin-projection";
 
 interface EventDetailPopoverProps {
   event: CalendarEvent;
@@ -52,13 +54,18 @@ const POPOVER_GAP = 8;
 const VIEWPORT_MARGIN = 12;
 const MAX_HEIGHT = 480;
 
+/** As tall as MAX_HEIGHT, but never taller than the window. */
+function maxPopoverHeight(): number {
+  return Math.max(0, Math.min(MAX_HEIGHT, window.innerHeight - 2 * VIEWPORT_MARGIN));
+}
+
 function computePosition(
   anchorRect: DOMRect,
   popoverHeight: number
 ): { top: number; left: number } {
   const vw = window.innerWidth;
   const vh = window.innerHeight;
-  const clampedHeight = Math.min(popoverHeight, MAX_HEIGHT);
+  const clampedHeight = Math.min(popoverHeight, maxPopoverHeight());
 
   const clampTop = (top: number) =>
     Math.min(Math.max(VIEWPORT_MARGIN, top), vh - clampedHeight - VIEWPORT_MARGIN);
@@ -145,6 +152,7 @@ export function EventDetailPopover({
   // Invitations (Teams above all) leave virtualLocations empty and bury the
   // join URL in the description; surface it as the meeting link anyway.
   const meeting = useMemo(() => findMeetingLink(event), [event]);
+  const pluginProps = useMemo(() => ({ event: eventToView(event) }), [event]);
   const virtualLocation = meeting?.uri ?? null;
 
   // A URL opens as a link, a location that only names the service joins the
@@ -223,6 +231,19 @@ export function EventDetailPopover({
     if (!ready) requestAnimationFrame(() => setReady(true));
   }, [anchorRect, noteExpanded, showDeleteConfirm, ready]);
 
+  // Content that grows after the popover was placed (a plugin section reports
+  // its height a moment later) moves it again, so it stays in the window.
+  useEffect(() => {
+    const node = popoverRef.current;
+    if (!node || isMobile || typeof ResizeObserver === "undefined") return;
+    const observer = new ResizeObserver(() => {
+      const next = computePosition(anchorRect, node.offsetHeight);
+      setPosition((prev) => (prev && prev.top === next.top && prev.left === next.left ? prev : next));
+    });
+    observer.observe(node);
+    return () => observer.disconnect();
+  }, [anchorRect, isMobile]);
+
   useEffect(() => {
     const handleKey = (e: KeyboardEvent) => {
       if (e.key === "Escape") onClose();
@@ -299,14 +320,14 @@ export function EventDetailPopover({
         "fixed z-[60] bg-background border border-border shadow-xl overflow-hidden transition-[opacity,transform] duration-150 ease-out",
         isMobile
           ? "inset-0 rounded-none flex flex-col"
-          : "rounded-lg"
+          : "rounded-lg flex flex-col"
       )}
       style={isMobile ? {
         opacity: 1,
         transform: "none",
       } : {
         width: POPOVER_WIDTH,
-        maxHeight: MAX_HEIGHT,
+        maxHeight: maxPopoverHeight(),
         top: position?.top ?? -9999,
         left: position?.left ?? -9999,
         opacity: ready ? 1 : 0,
@@ -410,7 +431,7 @@ export function EventDetailPopover({
       {/* Content */}
       <div className={cn(
         "px-4 py-2 space-y-2.5 overflow-y-auto",
-        isMobile ? "flex-1" : ""
+        isMobile ? "flex-1" : "min-h-0"
       )} style={isMobile ? undefined : { maxHeight: MAX_HEIGHT - 140 }}>
         {/* Date & Time */}
         <div className="flex items-start gap-2.5">
@@ -580,6 +601,8 @@ export function EventDetailPopover({
             </p>
           </div>
         )}
+
+        <PluginSlot name="calendar-event-detail" className="w-full" extraProps={pluginProps} />
       </div>
 
       {/* Quick Note */}
diff --git a/components/calendar/event-modal.tsx b/components/calendar/event-modal.tsx
index 340ba2e52..6a0b5b4f3 100644
--- a/components/calendar/event-modal.tsx
+++ b/components/calendar/event-modal.tsx
@@ -39,7 +39,8 @@ import {
   calendarHooks,
   type CalendarEventFormSavePatch,
 } from "@/lib/plugin-hooks";
-import type { ConflictWarning } from "@/lib/plugin-types";
+import type { CalendarEventView, ConflictWarning } from "@/lib/plugin-types";
+import { eventToView } from "@/lib/plugin-projection";
 
 export interface PendingEventPreview {
   start: Date;
@@ -418,6 +419,82 @@ export function EventModal({
     return () => { cancelled = true; clearTimeout(t); };
   }, [title, description, startDate, startTime, endDate, endTime, allDay, location, virtualLocation, calendarId, event?.uid, attendees]);
 
+  // Plugins hear about an existing event opened for reading once per event,
+  // and about the form each time it opens (new event, or view -> edit).
+  const reportedOpenRef = useRef<string | null>(null);
+  useEffect(() => {
+    if (!event || mode !== "view" || reportedOpenRef.current === event.id) return;
+    reportedOpenRef.current = event.id;
+    void calendarHooks.onCalendarEventOpen.emit(eventToView(event));
+  }, [event, mode]);
+
+  useEffect(() => {
+    if (mode !== "edit" || calendarFormHooks.onCalendarEventFormOpen.size === 0) return;
+    void calendarFormHooks.onCalendarEventFormOpen.emit({
+      title,
+      description,
+      start: allDay ? `${startDate}T00:00:00` : `${startDate}T${startTime}:00`,
+      end: allDay ? `${endDate}T23:59:59` : `${endDate}T${endTime}:00`,
+      isAllDay: allDay,
+      location,
+      virtualLocation,
+      calendarId,
+      uid: event?.uid,
+      attendees: attendees.map((a) => a.email),
+    });
+    // Only the opening counts; the fields are read as they are at that moment.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [mode]);
+
+  // calendar-event-detail: the event as plugins see it, in the read views.
+  const eventDetailProps = useMemo(() => (event ? { event: eventToView(event) } : null), [event]);
+
+  // calendar-event-form: the form's current state in the same shape. Typing
+  // would hand the plugin iframe new props on every key, so the view settles
+  // for half a second first.
+  const formEventView = useMemo<CalendarEventView>(() => {
+    const startStr = allDay ? `${startDate}T00:00:00` : `${startDate}T${startTime || "00:00"}:00`;
+    const start = new Date(startStr);
+    let duration = event?.duration ?? "PT1H";
+    if (!isNaN(start.getTime())) {
+      if (allDay) {
+        const inclusiveEnd = new Date(`${endDate}T00:00:00`);
+        if (!isNaN(inclusiveEnd.getTime())) duration = buildAllDayDuration(start, inclusiveEnd < start ? start : inclusiveEnd);
+      } else {
+        const end = new Date(`${endDate}T${endTime || "00:00"}:00`);
+        if (!isNaN(end.getTime())) duration = buildDuration(start, end);
+      }
+    }
+    const base = event ? eventToView(event) : null;
+    return {
+      id: event?.id ?? "",
+      uid: event?.uid ?? "",
+      calendarId,
+      title,
+      description,
+      start: startStr,
+      duration,
+      timeZone: getEffectiveTimeZone(),
+      utcStart: null,
+      utcEnd: null,
+      isAllDay: allDay,
+      location,
+      status: base?.status ?? "confirmed",
+      participants: attendees.map((a) => {
+        const known = base?.participants.find((p) => p.email.toLowerCase() === a.email.toLowerCase());
+        return known ?? { name: a.name, email: a.email, role: "attendee", status: "needs-action" };
+      }),
+      isRecurring: recurrence !== "none",
+      keywords: base?.keywords ?? [],
+    };
+  }, [event, calendarId, title, description, startDate, startTime, endDate, endTime, allDay, location, attendees, recurrence]);
+  const [settledFormEvent, setSettledFormEvent] = useState(formEventView);
+  useEffect(() => {
+    const timer = setTimeout(() => setSettledFormEvent(formEventView), 500);
+    return () => clearTimeout(timer);
+  }, [formEventView]);
+  const eventFormProps = useMemo(() => ({ event: settledFormEvent }), [settledFormEvent]);
+
   // Report live preview to parent for grid outline
   useEffect(() => {
     if (!onPreviewChange || isEdit) return;
@@ -795,6 +872,8 @@ export function EventModal({
                 </div>
               </div>
             )}
+
+            {eventDetailProps && <PluginSlot name="calendar-event-detail" className="w-full" extraProps={eventDetailProps} />}
           </div>
         </div>
 
@@ -972,6 +1051,8 @@ export function EventModal({
                 </p>
               </div>
             )}
+
+            {eventDetailProps && <PluginSlot name="calendar-event-detail" className="w-full" extraProps={eventDetailProps} />}
           </div>
         </div>
 
@@ -1319,6 +1400,8 @@ export function EventModal({
               </label>
             </div>
           )}
+
+          <PluginSlot name="calendar-event-form" className="w-full" extraProps={eventFormProps} />
         </div>
       </div>
 
diff --git a/components/calendar/mini-calendar.tsx b/components/calendar/mini-calendar.tsx
index 03bc55dc8..cd7a9e8bc 100644
--- a/components/calendar/mini-calendar.tsx
+++ b/components/calendar/mini-calendar.tsx
@@ -12,6 +12,7 @@ import { getEventDayBounds } from "@/lib/calendar-utils";
 import { displayNow } from "@/lib/timezone";
 import type { CalendarEvent } from "@/lib/jmap/types";
 import { useCalendarLocale } from "@/hooks/use-calendar-locale";
+import { PluginDayLabel } from "./plugin-day-label";
 
 type PickerView = "days" | "months" | "years";
 
@@ -199,6 +200,7 @@ export function MiniCalendar({
                   {hasEvent && !selected && !today && (
                     <span className="absolute bottom-0.5 left-1/2 -translate-x-1/2 w-1 h-1 rounded-full bg-primary" />
                   )}
+                  <PluginDayLabel surface="mini-calendar-marks" date={format(day, "yyyy-MM-dd")} />
                 </button>
               </Fragment>
             );
diff --git a/components/calendar/plugin-day-label.tsx b/components/calendar/plugin-day-label.tsx
new file mode 100644
index 000000000..5fc22e768
--- /dev/null
+++ b/components/calendar/plugin-day-label.tsx
@@ -0,0 +1,85 @@
+"use client";
+
+import { useSyncExternalStore } from "react";
+import { cn } from "@/lib/utils";
+import { dayLabelsByDate, subscribeDayLabels, type RegisteredDayLabel } from "@/lib/plugin-sandbox/day-labels";
+
+const NONE: RegisteredDayLabel[] = [];
+const EMPTY_MAP = new Map<string, RegisteredDayLabel[]>();
+
+/** The labels plugins put on one day (api.ui.setDayLabels). */
+export function useDayLabels(date: string): RegisteredDayLabel[] {
+  const byDate = useSyncExternalStore(subscribeDayLabels, dayLabelsByDate, () => EMPTY_MAP);
+  return byDate.get(date) ?? NONE;
+}
+
+function tooltip(labels: RegisteredDayLabel[]): string {
+  return labels.map((l) => `${l.title ?? l.text ?? ""} (${l.pluginName})`.trim()).join("\n");
+}
+
+interface PluginDayLabelProps {
+  /**
+   * calendar-day-header: the label text under a day's name (day, week and
+   * month views). mini-calendar-marks: a dot on the day in the small month
+   * calendar; the parent must be positioned.
+   */
+  surface: "calendar-day-header" | "mini-calendar-marks";
+  /** YYYY-MM-DD */
+  date: string;
+  className?: string;
+  /**
+   * calendar-day-header only: no room for text (the phone month view), so a
+   * dot stands for the day's labels; their text is its tooltip and is read
+   * out by screen readers.
+   */
+  compact?: boolean;
+}
+
+/** What plugins put on a calendar day. Renders nothing without labels. */
+export function PluginDayLabel({ surface, date, className, compact }: PluginDayLabelProps) {
+  const labels = useDayLabels(date);
+
+  if (surface === "mini-calendar-marks") {
+    const marks = labels.filter((l) => l.dot);
+    if (marks.length === 0) return null;
+    return (
+      <>
+        <span
+          aria-hidden="true"
+          data-plugin-surface="mini-calendar-marks"
+          title={tooltip(marks)}
+          className={cn("pointer-events-none absolute top-0 end-0 h-1.5 w-1.5 rounded-full bg-muted-foreground ring-1 ring-background", className)}
+        />
+        <span className="sr-only">{marks.map((l) => l.title ?? l.text ?? l.pluginName).join(", ")}</span>
+      </>
+    );
+  }
+
+  if (compact) {
+    const shown = labels.filter((l) => l.text || l.dot);
+    if (shown.length === 0) return null;
+    return (
+      <span
+        data-plugin-surface="calendar-day-header"
+        data-compact=""
+        title={tooltip(shown)}
+        className={cn("inline-flex flex-shrink-0", className)}
+      >
+        <span aria-hidden="true" className="block h-1.5 w-1.5 rounded-full bg-muted-foreground" />
+        <span className="sr-only">{shown.map((l) => l.text ?? l.title ?? l.pluginName).join(", ")}</span>
+      </span>
+    );
+  }
+
+  const withText = labels.filter((l) => l.text);
+  if (withText.length === 0) return null;
+  return (
+    <div
+      data-plugin-surface="calendar-day-header"
+      title={tooltip(withText)}
+      className={cn("max-w-full truncate text-[10px] leading-tight text-muted-foreground", className)}
+    >
+      {withText.map((l) => l.text).join(" · ")}
+    </div>
+  );
+}
diff --git a/components/calendar/task-list-view.tsx b/components/calendar/task-list-view.tsx
index 8d896f181..6a2bf81b9 100644
--- a/components/calendar/task-list-view.tsx
+++ b/components/calendar/task-list-view.tsx
@@ -62,6 +62,60 @@ function getDueDateLabel(due: string, showWithoutTime: boolean, t: ReturnType<ty
   };
 }
 
+/** The tasks the list shows, in its order: filtered by calendar and status. */
+export function filterTasksForList(
+  tasks: CalendarTask[],
+  selectedCalendarIds: string[],
+  filter: TaskViewFilter,
+  showCompleted: boolean,
+): CalendarTask[] {
+  let result = tasks.filter(task => {
+    const calIds = Object.keys(task.calendarIds);
+    return calIds.some(id => selectedCalendarIds.includes(id));
+  });
+
+  if (!showCompleted) {
+    result = result.filter(task => task.progress !== "completed" && task.progress !== "cancelled");
+  }
+
+  switch (filter) {
+    case "pending":
+      result = result.filter(task => task.progress === "needs-action" || task.progress === "in-process");
+      break;
+    case "completed":
+      result = result.filter(task => task.progress === "completed");
+      break;
+    case "overdue":
+      result = result.filter(task => {
+        if (!task.due || task.progress === "completed" || task.progress === "cancelled") return false;
+        return isBefore(parseISO(task.due), displayNow()) && !isDisplayToday(parseISO(task.due));
+      });
+      break;
+  }
+
+  // Sort: overdue first, then by due date (no due date last), then by priority
+  result.sort((a, b) => {
+    // Completed tasks at the bottom
+    if (a.progress === "completed" && b.progress !== "completed") return 1;
+    if (a.progress !== "completed" && b.progress === "completed") return -1;
+
+    // Tasks with due dates before those without
+    if (a.due && !b.due) return -1;
+    if (!a.due && b.due) return 1;
+    if (a.due && b.due) {
+      const dateCompare = new Date(a.due).getTime() - new Date(b.due).getTime();
+      if (dateCompare !== 0) return dateCompare;
+    }
+
+    // Higher priority first (lower number = higher priority, but 0 = no priority goes last)
+    const aPri = a.priority || 10;
+    const bPri = b.priority || 10;
+    return aPri - bPri;
+  });
+
+  return result;
+}
+
 export function TaskListView({
   tasks,
   calendars,
@@ -77,53 +131,10 @@ export function TaskListView({
   const timeFormat = useSettingsStore((s) => s.timeFormat);
   const [quickAddTitle, setQuickAddTitle] = useState("");
 
-  const filteredTasks = useMemo(() => {
-    let result = tasks.filter(task => {
-      const calIds = Object.keys(task.calendarIds);
-      return calIds.some(id => selectedCalendarIds.includes(id));
-    });
-
-    if (!showCompleted) {
-      result = result.filter(task => task.progress !== "completed" && task.progress !== "cancelled");
-    }
-
-    switch (filter) {
-      case "pending":
-        result = result.filter(task => task.progress === "needs-action" || task.progress === "in-process");
-        break;
-      case "completed":
-        result = result.filter(task => task.progress === "completed");
-        break;
-      case "overdue":
-        result = result.filter(task => {
-          if (!task.due || task.progress === "completed" || task.progress === "cancelled") return false;
-          return isBefore(parseISO(task.due), displayNow()) && !isDisplayToday(parseISO(task.due));
-        });
-        break;
-    }
-
-    // Sort: overdue first, then by due date (no due date last), then by priority
-    result.sort((a, b) => {
-      // Completed tasks at the bottom
-      if (a.progress === "completed" && b.progress !== "completed") return 1;
-      if (a.progress !== "completed" && b.progress === "completed") return -1;
-
-      // Tasks with due dates before those without
-      if (a.due && !b.due) return -1;
-      if (!a.due && b.due) return 1;
-      if (a.due && b.due) {
-        const dateCompare = new Date(a.due).getTime() - new Date(b.due).getTime();
-        if (dateCompare !== 0) return dateCompare;
-      }
-
-      // Higher priority first (lower number = higher priority, but 0 = no priority goes last)
-      const aPri = a.priority || 10;
-      const bPri = b.priority || 10;
-      return aPri - bPri;
-    });
-
-    return result;
-  }, [tasks, selectedCalendarIds, filter, showCompleted]);
+  const filteredTasks = useMemo(
+    () => filterTasksForList(tasks, selectedCalendarIds, filter, showCompleted),
+    [tasks, selectedCalendarIds, filter, showCompleted],
+  );
 
   const handleToggle = useCallback((e: React.MouseEvent, task: CalendarTask) => {
     e.stopPropagation();
diff --git a/components/calendar/task-modal.tsx b/components/calendar/task-modal.tsx
index 8e648c490..ad2d32052 100644
--- a/components/calendar/task-modal.tsx
+++ b/components/calendar/task-modal.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useState, useEffect, useCallback, useRef } from "react";
+import { useState, useEffect, useCallback, useRef, useMemo } from "react";
 import { useTranslations } from "next-intl";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
@@ -8,6 +8,8 @@ import { X, Trash2, CalendarDays, Bell, Flag } from "@/components/icons";
 import { format, parseISO } from "date-fns";
 
 import type { CalendarTask, Calendar, CalendarEventAlert } from "@/lib/jmap/types";
+import { PluginSlot } from "@/components/plugins/plugin-slot";
+import { taskToView } from "@/lib/plugin-projection";
 
 interface TaskModalProps {
   task?: CalendarTask | null;
@@ -48,6 +50,8 @@ export function TaskModal({
   const t = useTranslations("calendar");
   const isEdit = !!task;
   const titleRef = useRef<HTMLInputElement>(null);
+  // task-detail-section: the saved task, for an existing task only.
+  const pluginTaskProps = useMemo(() => (task ? { task: taskToView(task) } : null), [task]);
 
   const writableCalendars = calendars.filter(c => !c.isShared || c.myRights?.mayWriteAll || c.myRights?.mayWriteOwn);
   const defaultCalendarId = writableCalendars[0]?.id ?? calendars[0]?.id ?? "";
@@ -302,6 +306,8 @@ export function TaskModal({
             <option value="1440">{t("tasks.alert_1day")}</option>
           </select>
         </div>
+
+        {pluginTaskProps && <PluginSlot name="task-detail-section" className="w-full" extraProps={pluginTaskProps} />}
       </div>
 
       {/* Footer */}
diff --git a/components/calendar/task-toolbar.tsx b/components/calendar/task-toolbar.tsx
index 0619d464f..7accbe05d 100644
--- a/components/calendar/task-toolbar.tsx
+++ b/components/calendar/task-toolbar.tsx
@@ -1,9 +1,11 @@
 "use client";
 
+import { useMemo } from "react";
 import { useTranslations } from "next-intl";
 import { Plus } from "@/components/icons";
 import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
+import { PluginActions } from "@/components/plugins/plugin-actions";
 import type { TaskViewFilter } from "@/stores/task-store";
 
 interface TaskToolbarProps {
@@ -12,8 +14,14 @@ interface TaskToolbarProps {
   onFilterChange: (filter: TaskViewFilter) => void;
   onShowCompletedChange: (show: boolean) => void;
   onCreateTask: () => void;
+  /** The tasks the list shows, in order: what plugin buttons here act on. */
+  taskIds?: string[];
+  /** Icon-only plugin buttons (phones). */
+  compact?: boolean;
 }
 
+const NO_IDS: string[] = [];
+
 const FILTERS: TaskViewFilter[] = ["all", "pending", "completed", "overdue"];
 
 export function TaskToolbar({
@@ -22,8 +30,11 @@ export function TaskToolbar({
   onFilterChange,
   onShowCompletedChange,
   onCreateTask,
+  taskIds = NO_IDS,
+  compact,
 }: TaskToolbarProps) {
   const t = useTranslations("calendar");
+  const pluginContext = useMemo(() => ({ taskIds }), [taskIds]);
 
   return (
     <div className="flex items-center gap-2 px-4 py-2 border-b border-border flex-wrap">
@@ -60,6 +71,8 @@ export function TaskToolbar({
         <Plus className="w-4 h-4 me-1" />
         {t("tasks.create")}
       </Button>
+
+      <PluginActions surface="task-list-actions" context={pluginContext} compact={compact} />
     </div>
   );
 }
diff --git a/components/command-palette/__tests__/command-palette.test.tsx b/components/command-palette/__tests__/command-palette.test.tsx
new file mode 100644
index 000000000..b7869b0bb
--- /dev/null
+++ b/components/command-palette/__tests__/command-palette.test.tsx
@@ -0,0 +1,174 @@
+import React from 'react';
+import { act, fireEvent, render, screen } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { resetActions, setActionDispatcher, setPluginActions } from '@/lib/plugin-sandbox/actions';
+
+const nav = vi.hoisted(() => ({ pathname: '/', push: vi.fn() }));
+
+vi.mock('next-intl', () => ({
+  useTranslations: () => (key: string, params?: Record<string, string>) =>
+    params ? `${key}(${Object.values(params).join(',')})` : key,
+  useLocale: () => 'en',
+}));
+vi.mock('@/i18n/navigation', () => ({
+  useRouter: () => ({ push: nav.push, back: vi.fn(), replace: vi.fn() }),
+  usePathname: () => nav.pathname,
+  Link: ({ children }: { children: React.ReactNode }) => children,
+}));
+vi.mock('@/components/keyboard-shortcuts-modal', () => ({
+  KeyboardShortcutsModal: ({ isOpen }: { isOpen: boolean }) => (isOpen ? <div>shortcuts help</div> : null),
+}));
+
+const { CommandPaletteHost } = await import('../command-palette');
+const { useAuthStore } = await import('@/stores/auth-store');
+const { useThemeStore } = await import('@/stores/theme-store');
+const appCommands = await import('@/lib/app-commands');
+
+const dispatch = vi.fn().mockResolvedValue(undefined);
+const pressCtrlK = (target: Element = document.body) =>
+  act(() => { fireEvent.keyDown(target, { key: 'k', code: 'KeyK', ctrlKey: true }); });
+
+beforeEach(() => {
+  nav.pathname = '/';
+  nav.push.mockClear();
+  resetActions();
+  dispatch.mockClear();
+  setActionDispatcher(dispatch);
+  useAuthStore.setState({ isAuthenticated: true, client: null } as never);
+});
+afterEach(() => {
+  appCommands.parkAppCommand(null as never);
+});
+
+describe('command palette', () => {
+  it('opens on Ctrl+K with the search field focused, and closes on Escape', () => {
+    render(<CommandPaletteHost />);
+    expect(screen.queryByRole('dialog')).toBeNull();
+
+    pressCtrlK();
+    expect(screen.getByRole('dialog', { name: 'title' })).toBeInTheDocument();
+    const input = screen.getByRole('combobox');
+    expect(input).toHaveFocus();
+    expect(input).toHaveAttribute('aria-controls', screen.getByRole('listbox').id);
+
+    act(() => { fireEvent.keyDown(input, { key: 'Escape' }); });
+    expect(screen.queryByRole('dialog')).toBeNull();
+  });
+
+  it('opens from a menu entry (phones)', () => {
+    render(<CommandPaletteHost />);
+    act(() => appCommands.openCommandPalette());
+    expect(screen.getByRole('dialog')).toBeInTheDocument();
+  });
+
+  it('leaves Ctrl+K alone while typing in a field', () => {
+    render(<><input aria-label="other field" /><CommandPaletteHost /></>);
+    pressCtrlK(screen.getByLabelText('other field'));
+    expect(screen.queryByRole('dialog')).toBeNull();
+  });
+
+  it('leaves Ctrl+K to global search in the Pro shell, and does nothing signed out', () => {
+    nav.pathname = '/pro';
+    const { unmount } = render(<CommandPaletteHost />);
+    pressCtrlK();
+    expect(screen.queryByRole('dialog')).toBeNull();
+    unmount();
+
+    nav.pathname = '/';
+    useAuthStore.setState({ isAuthenticated: false } as never);
+    render(<CommandPaletteHost />);
+    pressCtrlK();
+    expect(screen.queryByRole('dialog')).toBeNull();
+  });
+
+  it('lists the app commands and no plugin group without plugin entries', () => {
+    render(<CommandPaletteHost />);
+    pressCtrlK();
+
+    const labels = screen.getAllByRole('option').map((o) => o.textContent);
+    expect(labels).toContain('go_to(mail)');
+    expect(labels).toContain('go_to(settings)');
+    expect(labels).toContain('compose');
+    expect(labels).toContain('shortcuts');
+    expect(screen.queryByText('group_plugins')).toBeNull();
+  });
+
+  it('shows plugin entries with the plugin name and runs them with Enter', async () => {
+    act(() => setPluginActions('jira', 'Jira', 'command-palette', [{ id: 'new-issue', label: 'Create issue' }]));
+    render(<CommandPaletteHost />);
+    pressCtrlK();
+
+    expect(screen.getByText('group_plugins')).toBeInTheDocument();
+    const option = screen.getByRole('option', { name: /Create issue/ });
+    expect(option).toHaveTextContent('Jira');
+
+    const input = screen.getByRole('combobox');
+    act(() => { fireEvent.change(input, { target: { value: 'issue' } }); });
+    expect(screen.getAllByRole('option')).toHaveLength(1);
+    expect(screen.getByRole('option')).toHaveAttribute('aria-selected', 'true');
+    expect(input).toHaveAttribute('aria-activedescendant', screen.getByRole('option').id);
+
+    await act(async () => { fireEvent.keyDown(input, { key: 'Enter' }); });
+    expect(dispatch).toHaveBeenCalledWith('jira', 'command-palette', 'new-issue', {});
+    expect(screen.queryByRole('dialog')).toBeNull();
+  });
+
+  it('finds plugin entries by plugin name too', () => {
+    act(() => setPluginActions('jira', 'Jira', 'command-palette', [{ id: 'new-issue', label: 'Create issue' }]));
+    render(<CommandPaletteHost />);
+    pressCtrlK();
+    act(() => { fireEvent.change(screen.getByRole('combobox'), { target: { value: 'jir' } }); });
+    expect(screen.getAllByRole('option').map((o) => o.getAttribute('data-command-id'))).toEqual(['plugin:jira:new-issue']);
+  });
+
+  it('moves with the arrow keys and wraps around', () => {
+    render(<CommandPaletteHost />);
+    pressCtrlK();
+    const input = screen.getByRole('combobox');
+    const options = () => screen.getAllByRole('option');
+
+    expect(options()[0]).toHaveAttribute('aria-selected', 'true');
+    act(() => { fireEvent.keyDown(input, { key: 'ArrowDown' }); });
+    expect(options()[1]).toHaveAttribute('aria-selected', 'true');
+    act(() => { fireEvent.keyDown(input, { key: 'ArrowUp' }); });
+    act(() => { fireEvent.keyDown(input, { key: 'ArrowUp' }); });
+    expect(options()[options().length - 1]).toHaveAttribute('aria-selected', 'true');
+  });
+
+  it('navigates with a go-to command', () => {
+    render(<CommandPaletteHost />);
+    pressCtrlK();
+    act(() => { fireEvent.click(screen.getByRole('option', { name: 'go_to(settings)' })); });
+    expect(nav.push).toHaveBeenCalledWith('/settings');
+  });
+
+  it('hands compose to the mail page, or opens mail first and parks it', () => {
+    const taken = vi.fn((e: Event) => e.preventDefault());
+    window.addEventListener('bulwark:app-command', taken);
+    render(<CommandPaletteHost />);
+    pressCtrlK();
+    act(() => { fireEvent.click(screen.getByRole('option', { name: 'compose' })); });
+    expect(taken).toHaveBeenCalled();
+    expect(nav.push).not.toHaveBeenCalled();
+    window.removeEventListener('bulwark:app-command', taken);
+
+    pressCtrlK();
+    act(() => { fireEvent.click(screen.getByRole('option', { name: 'compose' })); });
+    expect(nav.push).toHaveBeenCalledWith('/');
+    expect(appCommands.peekParkedAppCommand()).toBe('compose');
+  });
+
+  it('switches the theme and shows the keyboard shortcuts', () => {
+    useThemeStore.setState({ resolvedTheme: 'light' } as never);
+    const setTheme = vi.fn();
+    useThemeStore.setState({ setTheme } as never);
+    render(<CommandPaletteHost />);
+    pressCtrlK();
+    act(() => { fireEvent.click(screen.getByRole('option', { name: 'theme_dark' })); });
+    expect(setTheme).toHaveBeenCalledWith('dark');
+
+    pressCtrlK();
+    act(() => { fireEvent.click(screen.getByRole('option', { name: 'shortcuts' })); });
+    expect(screen.getByText('shortcuts help')).toBeInTheDocument();
+  });
+});
diff --git a/components/command-palette/command-palette.tsx b/components/command-palette/command-palette.tsx
new file mode 100644
index 000000000..d3c4b8d4d
--- /dev/null
+++ b/components/command-palette/command-palette.tsx
@@ -0,0 +1,288 @@
+"use client";
+
+import { useCallback, useEffect, useId, useMemo, useRef, useState } from "react";
+import { useTranslations } from "next-intl";
+import {
+  BookUser,
+  Calendar,
+  HardDrive,
+  Keyboard,
+  Mail,
+  Moon,
+  PenLine,
+  Puzzle,
+  Search,
+  Settings,
+  Sun,
+  iconForName,
+} from "@/components/icons";
+import type { AppIcon } from "@/components/icons";
+import { usePathname, useRouter } from "@/i18n/navigation";
+import { useAuthStore } from "@/stores/auth-store";
+import { useCalendarStore } from "@/stores/calendar-store";
+import { usePolicyStore } from "@/stores/policy-store";
+import { useThemeStore } from "@/stores/theme-store";
+import { usePluginActions } from "@/components/plugins/plugin-actions";
+import { KeyboardShortcutsModal } from "@/components/keyboard-shortcuts-modal";
+import { runAction } from "@/lib/plugin-sandbox/actions";
+import { COMMAND_PALETTE_OPEN_EVENT, parkAppCommand, requestAppCommand, type AppCommand } from "@/lib/app-commands";
+import { isEditableEventTarget } from "@/lib/keyboard";
+import { useFocusTrap } from "@/hooks/use-focus-trap";
+import { cn } from "@/lib/utils";
+
+interface PaletteCommand {
+  id: string;
+  label: string;
+  icon: AppIcon;
+  /** Shown after the label: the plugin that added the entry. */
+  source?: string;
+  group: "navigation" | "actions" | "plugins";
+  run: () => void;
+}
+
+/** The action surface plugins declare palette entries on (api.ui.setActions). */
+const surface = "command-palette";
+
+/** Surfaces where the palette does not take Ctrl+K: the Pro shell uses it for global search. */
+const isProShell = (pathname: string) => pathname === "/pro" || pathname.startsWith("/pro/");
+
+/**
+ * The command palette (Ctrl+K / ⌘K): a searchable list of the app's own
+ * commands and of the entries plugins declare for `command-palette`.
+ * Mounted once in the locale layout; it only listens while signed in.
+ */
+export function CommandPaletteHost() {
+  const isAuthenticated = useAuthStore((s) => s.isAuthenticated);
+  const pathname = usePathname();
+  const [open, setOpen] = useState(false);
+  const [showShortcuts, setShowShortcuts] = useState(false);
+  const enabled = isAuthenticated && !isProShell(pathname);
+
+  useEffect(() => {
+    if (!enabled) return;
+    const onKeyDown = (event: KeyboardEvent) => {
+      if (!(event.ctrlKey || event.metaKey) || event.altKey || event.shiftKey) return;
+      // event.code: the K key on any keyboard layout, Latin or not.
+      if (event.code !== "KeyK" && event.key.toLowerCase() !== "k") return;
+      if (isEditableEventTarget(event)) return;
+      event.preventDefault();
+      setOpen((v) => !v);
+    };
+    const onOpen = () => setOpen(true);
+    window.addEventListener("keydown", onKeyDown);
+    window.addEventListener(COMMAND_PALETTE_OPEN_EVENT, onOpen);
+    return () => {
+      window.removeEventListener("keydown", onKeyDown);
+      window.removeEventListener(COMMAND_PALETTE_OPEN_EVENT, onOpen);
+    };
+  }, [enabled]);
+
+  useEffect(() => {
+    if (!enabled) setOpen(false);
+  }, [enabled]);
+
+  return (
+    <>
+      {open && <CommandPalette onClose={() => setOpen(false)} onShowShortcuts={() => setShowShortcuts(true)} />}
+      <KeyboardShortcutsModal isOpen={showShortcuts} onClose={() => setShowShortcuts(false)} />
+    </>
+  );
+}
+
+function CommandPalette({ onClose, onShowShortcuts }: { onClose: () => void; onShowShortcuts: () => void }) {
+  const t = useTranslations("command_palette");
+  const tSidebar = useTranslations("sidebar");
+  const router = useRouter();
+  const pathname = usePathname();
+  const listId = useId();
+  const optionId = (index: number) => `${listId}-option-${index}`;
+  const [query, setQuery] = useState("");
+  const [active, setActive] = useState(0);
+  const listRef = useRef<HTMLUListElement>(null);
+
+  const client = useAuthStore((s) => s.client);
+  const supportsCalendar = useCalendarStore((s) => s.supportsCalendar);
+  const isFeatureEnabled = usePolicyStore((s) => s.isFeatureEnabled);
+  const resolvedTheme = useThemeStore((s) => s.resolvedTheme);
+  const pluginActions = usePluginActions(surface);
+
+  const dialogRef = useFocusTrap({ isActive: true, onEscape: onClose, restoreFocus: true });
+
+  const commands = useMemo<PaletteCommand[]>(() => {
+    const go = (href: string) => () => router.push(href);
+    // Compose and search belong to the mail page: run there, or open mail first.
+    const onMail = (command: AppCommand) => () => {
+      if (requestAppCommand(command)) return;
+      parkAppCommand(command);
+      router.push("/");
+    };
+    const list: PaletteCommand[] = [
+      { id: "go-mail", group: "navigation", icon: Mail, label: t("go_to", { name: tSidebar("mail") }), run: go("/") },
+    ];
+    if (supportsCalendar && isFeatureEnabled("calendarEnabled")) {
+      list.push({ id: "go-calendar", group: "navigation", icon: Calendar, label: t("go_to", { name: tSidebar("calendar") }), run: go("/calendar") });
+    }
+    if ((client?.supportsContacts?.() ?? false) && isFeatureEnabled("contactsEnabled")) {
+      list.push({ id: "go-contacts", group: "navigation", icon: BookUser, label: t("go_to", { name: tSidebar("contacts") }), run: go("/contacts") });
+    }
+    if ((client?.supportsFiles?.() ?? false) && isFeatureEnabled("filesEnabled")) {
+      list.push({ id: "go-files", group: "navigation", icon: HardDrive, label: t("go_to", { name: tSidebar("files") }), run: go("/files") });
+    }
+    list.push(
+      { id: "go-settings", group: "navigation", icon: Settings, label: t("go_to", { name: tSidebar("settings") }), run: go("/settings") },
+      { id: "compose", group: "actions", icon: PenLine, label: t("compose"), run: onMail("compose") },
+      { id: "search", group: "actions", icon: Search, label: t("search"), run: onMail("search") },
+      {
+        id: "theme",
+        group: "actions",
+        icon: resolvedTheme === "dark" ? Sun : Moon,
+        label: resolvedTheme === "dark" ? t("theme_light") : t("theme_dark"),
+        run: () => useThemeStore.getState().setTheme(resolvedTheme === "dark" ? "light" : "dark"),
+      },
+      { id: "shortcuts", group: "actions", icon: Keyboard, label: t("shortcuts"), run: onShowShortcuts },
+    );
+    for (const action of pluginActions) {
+      list.push({
+        id: `plugin:${action.pluginId}:${action.id}`,
+        group: "plugins",
+        icon: iconForName(action.icon) ?? Puzzle,
+        label: action.label,
+        source: action.pluginName,
+        run: () => { void runAction(action, surface, {}); },
+      });
+    }
+    return list;
+  }, [client, supportsCalendar, isFeatureEnabled, resolvedTheme, pluginActions, router, t, tSidebar, onShowShortcuts]);
+
+  const needle = query.trim().toLowerCase();
+  const visible = needle
+    ? commands.filter((c) => c.label.toLowerCase().includes(needle) || (c.source?.toLowerCase().includes(needle) ?? false))
+    : commands;
+  const activeIndex = visible.length === 0 ? -1 : Math.min(active, visible.length - 1);
+
+  // Close when the page changes underneath (a "go to" command ran).
+  const startPath = useRef(pathname);
+  useEffect(() => {
+    if (pathname !== startPath.current) onClose();
+  }, [pathname, onClose]);
+
+  useEffect(() => {
+    if (activeIndex < 0) return;
+    const node = listRef.current?.querySelector<HTMLElement>(`[data-index="${activeIndex}"]`);
+    node?.scrollIntoView?.({ block: "nearest" });
+  }, [activeIndex]);
+
+  const runCommand = useCallback((command: PaletteCommand) => {
+    onClose();
+    command.run();
+  }, [onClose]);
+
+  const onKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
+    if (event.key === "ArrowDown") {
+      event.preventDefault();
+      if (visible.length) setActive((activeIndex + 1) % visible.length);
+    } else if (event.key === "ArrowUp") {
+      event.preventDefault();
+      if (visible.length) setActive((activeIndex - 1 + visible.length) % visible.length);
+    } else if (event.key === "Home") {
+      event.preventDefault();
+      setActive(0);
+    } else if (event.key === "End") {
+      event.preventDefault();
+      setActive(Math.max(0, visible.length - 1));
+    } else if (event.key === "Enter") {
+      event.preventDefault();
+      if (activeIndex >= 0) runCommand(visible[activeIndex]);
+    } else if ((event.ctrlKey || event.metaKey) && (event.code === "KeyK" || event.key.toLowerCase() === "k")) {
+      event.preventDefault();
+      onClose();
+    }
+  };
+
+  const groupLabel = (group: PaletteCommand["group"]) =>
+    group === "navigation" ? t("group_navigation") : group === "actions" ? t("group_actions") : t("group_plugins");
+
+  return (
+    <div
+      className="fixed inset-0 z-[60] flex items-start justify-center bg-black/50 p-4 pt-[12vh] max-sm:p-0 max-sm:pt-0"
+      onMouseDown={(e) => { if (e.target === e.currentTarget) onClose(); }}
+    >
+      <div
+        ref={dialogRef}
+        role="dialog"
+        aria-modal="true"
+        aria-label={t("title")}
+        className={cn(
+          "w-full max-w-xl overflow-hidden rounded-lg border border-border bg-background text-foreground shadow-xl",
+          "max-sm:h-full max-sm:max-w-none max-sm:rounded-none max-sm:border-0 max-sm:pt-[env(safe-area-inset-top)]",
+          "flex flex-col",
+        )}
+      >
+        <div className="flex items-center gap-2 border-b border-border px-3">
+          <Search className="h-4 w-4 flex-shrink-0 text-muted-foreground" />
+          <input
+            type="text"
+            role="combobox"
+            aria-expanded="true"
+            aria-controls={listId}
+            aria-autocomplete="list"
+            aria-activedescendant={activeIndex >= 0 ? optionId(activeIndex) : undefined}
+            aria-label={t("title")}
+            value={query}
+            onChange={(e) => { setQuery(e.target.value); setActive(0); }}
+            onKeyDown={onKeyDown}
+            placeholder={t("placeholder")}
+            autoComplete="off"
+            spellCheck={false}
+            className="h-12 flex-1 min-w-0 bg-transparent text-sm text-foreground placeholder:text-muted-foreground focus:outline-none"
+          />
+          <kbd className="hidden sm:inline-flex items-center rounded border border-border bg-muted px-1.5 py-0.5 font-mono text-[10px] text-muted-foreground">Esc</kbd>
+        </div>
+        <ul
+          ref={listRef}
+          id={listId}
+          role="listbox"
+          aria-label={t("title")}
+          className="max-h-[60vh] max-sm:max-h-none max-sm:flex-1 overflow-y-auto py-1"
+        >
+          {visible.length === 0 && (
+            <li role="presentation" className="px-4 py-6 text-center text-sm text-muted-foreground">{t("no_results")}</li>
+          )}
+          {visible.map((command, index) => {
+            const Icon = command.icon;
+            const showGroup = index === 0 || visible[index - 1].group !== command.group;
+            return (
+              <li key={command.id} role="presentation">
+                {showGroup && (
+                  <div aria-hidden="true" className="px-3 pt-2 pb-1 text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">
+                    {groupLabel(command.group)}
+                  </div>
+                )}
+                <div
+                  id={optionId(index)}
+                  role="option"
+                  aria-selected={index === activeIndex}
+                  data-index={index}
+                  data-command-id={command.id}
+                  onMouseMove={() => { if (index !== activeIndex) setActive(index); }}
+                  onMouseDown={(e) => e.preventDefault()}
+                  onClick={() => runCommand(command)}
+                  className={cn(
+                    "mx-1 flex cursor-pointer items-center gap-2.5 rounded-md px-2.5 py-2 text-sm max-sm:min-h-[44px]",
+                    index === activeIndex ? "bg-muted text-foreground" : "text-foreground/90",
+                  )}
+                >
+                  <Icon className="h-4 w-4 flex-shrink-0 text-muted-foreground" />
+                  <span className="flex-1 min-w-0 truncate">{command.label}</span>
+                  {command.source && (
+                    <span className="flex-shrink-0 truncate max-w-[40%] text-xs text-muted-foreground">{command.source}</span>
+                  )}
+                </div>
+              </li>
+            );
+          })}
+        </ul>
+      </div>
+    </div>
+  );
+}
diff --git a/components/contacts/__tests__/contact-detail.test.tsx b/components/contacts/__tests__/contact-detail.test.tsx
index 27f5ce962..a908f69f9 100644
--- a/components/contacts/__tests__/contact-detail.test.tsx
+++ b/components/contacts/__tests__/contact-detail.test.tsx
@@ -2,6 +2,7 @@ import { render, screen, fireEvent } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { ContactDetail } from '../contact-detail';
 import type { ContactCard } from '@/lib/jmap/types';
+import { contactHooks, clearAllHooks } from '@/lib/plugin-hooks';
 
 beforeEach(() => {
   Object.assign(navigator, {
@@ -65,3 +66,23 @@ describe('ContactDetail', () => {
     expect(onDelete).toHaveBeenCalledOnce();
   });
 });
+
+describe('ContactDetail plugin hooks', () => {
+  beforeEach(() => clearAllHooks());
+
+  it('tells plugins once when a contact is opened, again for another one', async () => {
+    const opened = vi.fn();
+    contactHooks.onContactOpen.register('test', opened);
+
+    const { rerender } = render(<ContactDetail contact={contact} onEdit={vi.fn()} onDelete={vi.fn()} />);
+    // Same contact with changed data: still the same open contact.
+    rerender(<ContactDetail contact={{ ...contact, notes: {} }} onEdit={vi.fn()} onDelete={vi.fn()} />);
+    rerender(<ContactDetail contact={{ ...contact, id: '2' }} onEdit={vi.fn()} onDelete={vi.fn()} />);
+    rerender(<ContactDetail contact={null} onEdit={vi.fn()} onDelete={vi.fn()} />);
+    await Promise.resolve();
+
+    expect(opened).toHaveBeenCalledTimes(2);
+    expect(opened.mock.calls[0][0]).toMatchObject({ id: '1', fullName: 'Alice Smith', emails: ['alice@example.com'] });
+    expect(opened.mock.calls[1][0]).toMatchObject({ id: '2' });
+  });
+});
diff --git a/components/contacts/__tests__/contacts-plugin-surfaces.test.tsx b/components/contacts/__tests__/contacts-plugin-surfaces.test.tsx
new file mode 100644
index 000000000..2f48b430f
--- /dev/null
+++ b/components/contacts/__tests__/contacts-plugin-surfaces.test.tsx
@@ -0,0 +1,108 @@
+import { render, screen, fireEvent, act, cleanup } from '@testing-library/react';
+import { describe, it, expect, vi, afterEach, beforeEach } from 'vitest';
+import { ContactDetail } from '../contact-detail';
+import { ContactList } from '../contact-list';
+import { resetActions, setActionDispatcher, setPluginActions } from '@/lib/plugin-sandbox/actions';
+import { clearSlotOffers, framePropsOf, offerSlots } from '@/components/plugins/__tests__/fake-slot-offer';
+import type { ContactCard } from '@/lib/jmap/types';
+
+// Plugin surfaces in contacts: a section in a contact's details and buttons
+// in the list's selection toolbar.
+
+vi.mock('@/components/plugins/plugin-iframe-slot', () => import('@/components/plugins/__tests__/fake-slot-offer'));
+
+const alice: ContactCard = {
+  id: '1',
+  uid: 'uid-alice',
+  addressBookIds: { ab1: true },
+  name: { components: [{ kind: 'given', value: 'Alice' }, { kind: 'surname', value: 'Smith' }], isOrdered: true },
+  emails: { e0: { address: 'alice@example.com' } },
+  notes: { n0: { note: 'VIP customer' } },
+};
+const bob: ContactCard = {
+  id: '2',
+  addressBookIds: { ab1: true },
+  name: { components: [{ kind: 'given', value: 'Bob' }, { kind: 'surname', value: 'Jones' }], isOrdered: true },
+};
+
+const dispatch = vi.fn().mockResolvedValue(undefined);
+
+beforeEach(() => {
+  dispatch.mockClear();
+  setActionDispatcher(dispatch);
+});
+
+afterEach(() => {
+  cleanup();
+  clearSlotOffers();
+  resetActions();
+  setActionDispatcher(null);
+});
+
+describe('contact-detail-section', () => {
+  it('shows the contact to the plugin in its details', () => {
+    offerSlots('p1', ['contact-detail-section']);
+    render(<ContactDetail contact={alice} onEdit={vi.fn()} onDelete={vi.fn()} />);
+
+    const frame = screen.getByTestId('plugin-frame-contact-detail-section');
+    expect(framePropsOf(frame).contact).toMatchObject({
+      id: '1', uid: 'uid-alice', addressBookId: 'ab1', firstName: 'Alice', lastName: 'Smith', emails: ['alice@example.com'],
+    });
+    // Below the contact's own fields.
+    expect(screen.getByText('VIP customer').compareDocumentPosition(frame) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
+  });
+
+  it('renders nothing without a plugin or without a contact', () => {
+    const { unmount } = render(<ContactDetail contact={alice} onEdit={vi.fn()} onDelete={vi.fn()} />);
+    expect(document.querySelector('[data-plugin-slot]')).toBeNull();
+    unmount();
+
+    offerSlots('p1', ['contact-detail-section']);
+    render(<ContactDetail contact={null} onEdit={vi.fn()} onDelete={vi.fn()} />);
+    expect(document.querySelector('[data-plugin-slot]')).toBeNull();
+  });
+});
+
+describe('contact-list-actions', () => {
+  const props = {
+    contacts: [alice, bob],
+    selectedContactId: null,
+    searchQuery: '',
+    onSearchChange: vi.fn(),
+    onSelectContact: vi.fn(),
+    onCreateNew: vi.fn(),
+    onToggleSelection: vi.fn(),
+    onSelectRangeContacts: vi.fn(),
+    onSelectAll: vi.fn(),
+    onClearSelection: vi.fn(),
+    onBulkDelete: vi.fn(),
+    onBulkAddToGroup: vi.fn(),
+    onBulkExport: vi.fn(),
+    onEditContact: vi.fn(),
+    onDeleteContact: vi.fn(),
+    onAddContactToGroup: vi.fn(),
+  };
+
+  it('puts plugin buttons in the selection toolbar and sends the selected ids', async () => {
+    act(() => setPluginActions('crm', 'CRM', 'contact-list-actions', [{ id: 'sync', label: 'Sync to CRM' }]));
+    render(<ContactList {...props} selectedContactIds={new Set(['1', '2'])} />);
+
+    const button = screen.getByRole('button', { name: 'Sync to CRM' });
+    // Next to the app's own bulk buttons.
+    expect(button.closest('div.flex-wrap')?.parentElement).toContainElement(screen.getByText('bulk.delete'));
+
+    await act(async () => { fireEvent.click(button); });
+    expect(dispatch).toHaveBeenCalledWith('crm', 'contact-list-actions', 'sync', { contactIds: ['1', '2'] });
+  });
+
+  it('shows no plugin buttons without a selection or without a plugin', () => {
+    act(() => setPluginActions('crm', 'CRM', 'contact-list-actions', [{ id: 'sync', label: 'Sync to CRM' }]));
+    const { unmount } = render(<ContactList {...props} selectedContactIds={new Set()} />);
+    expect(screen.queryByRole('button', { name: 'Sync to CRM' })).toBeNull();
+    unmount();
+
+    resetActions();
+    render(<ContactList {...props} selectedContactIds={new Set(['1'])} />);
+    expect(document.querySelector('[data-plugin-actions]')).toBeNull();
+  });
+});
diff --git a/components/contacts/contact-detail.tsx b/components/contacts/contact-detail.tsx
index babdfc65b..14c66479c 100644
--- a/components/contacts/contact-detail.tsx
+++ b/components/contacts/contact-detail.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useState, useEffect, useRef } from "react";
+import { useState, useEffect, useRef, useMemo } from "react";
 import { useTranslations } from "next-intl";
 import { Mail, Phone, Building, MapPin, StickyNote, Pencil, Trash2, BookUser, Copy, Send, Globe, Cake, KeyRound, Users, Briefcase, Heart, Languages, Calendar, UserCircle, Download, MoreHorizontal, Printer } from "@/components/icons";
 import { Avatar } from "@/components/ui/avatar";
@@ -16,6 +16,8 @@ import { exportContact } from "./contact-export";
 import { printContact } from "./contact-print";
 import { usePluginSlotOffers } from "@/hooks/use-plugin-slot-offers";
 import { PluginSlot } from "@/components/plugins/plugin-slot";
+import { contactHooks } from "@/lib/plugin-hooks";
+import { contactToView } from "@/lib/plugin-projection";
 
 type MoreItem =
   | {
@@ -123,6 +125,17 @@ export function ContactDetail({ contact, onEdit, onDelete, onAddToGroup, onDupli
 
   const cryptoKeys = contact?.cryptoKeys ? Object.values(contact.cryptoKeys) : [];
   const hasCryptoKeysSlotOffers = usePluginSlotOffers('contact-cryptokeys').length > 0;
+  const pluginContactProps = useMemo(() => (contact ? { contact: contactToView(contact) } : null), [contact]);
+
+  // Tell plugins once per contact shown here, not on every edit of that card.
+  const latestContact = useRef(contact);
+  useEffect(() => { latestContact.current = contact; });
+  const openedId = contact?.id;
+  useEffect(() => {
+    const opened = latestContact.current;
+    if (!openedId || !opened) return;
+    void contactHooks.onContactOpen.emit(contactToView(opened));
+  }, [openedId]);
 
   if (!contact) {
     return (
@@ -497,6 +510,10 @@ export function ContactDetail({ contact, onEdit, onDelete, onAddToGroup, onDupli
           </Section>
         )}
 
+        {pluginContactProps && (
+          <PluginSlot name="contact-detail-section" className="w-full py-6" extraProps={pluginContactProps} />
+        )}
+
         <ContactActivity contact={contact} />
 
         {(contact.created || contact.updated) && (
diff --git a/components/contacts/contact-list.tsx b/components/contacts/contact-list.tsx
index 2875279b1..8c0bb12bc 100644
--- a/components/contacts/contact-list.tsx
+++ b/components/contacts/contact-list.tsx
@@ -7,6 +7,7 @@ import { Input } from "@/components/ui/input";
 import { Button } from "@/components/ui/button";
 import { ContactListItem } from "./contact-list-item";
 import { ContactContextMenu } from "./contact-context-menu";
+import { PluginActions } from "@/components/plugins/plugin-actions";
 import { useContextMenu } from "@/hooks/use-context-menu";
 import { cn } from "@/lib/utils";
 import type { AnniversaryDate, ContactCard } from "@/lib/jmap/types";
@@ -268,6 +269,7 @@ export function ContactList({
   }, [sorted, locale, sortByLastName]);
 
   const hasSelection = selectedContactIds.size > 0;
+  const pluginContext = useMemo(() => ({ contactIds: [...selectedContactIds] }), [selectedContactIds]);
   const allSelected = sorted.length > 0 && sorted.every(c => selectedContactIds.has(c.id));
 
   return (
@@ -521,6 +523,7 @@ export function ContactList({
             <Trash2 className="w-3.5 h-3.5 me-1" />
             {t("bulk.delete")}
           </Button>
+          <PluginActions surface="contact-list-actions" context={pluginContext} />
           <Button variant="ghost" size="icon" onClick={onClearSelection} className="h-7 w-7">
             <X className="w-3.5 h-3.5" />
           </Button>
diff --git a/components/contacts/contacts-app.tsx b/components/contacts/contacts-app.tsx
index b72efc7c1..07899ff28 100644
--- a/components/contacts/contacts-app.tsx
+++ b/components/contacts/contacts-app.tsx
@@ -347,7 +347,7 @@ function ContactsAppContent({ linkSegments: routeSegments }: ContactsAppProps =
         if (supportsSync && client) {
           await updateContact(client, contactId, { keywords: updatedKeywords });
         } else {
-          updateLocalContact(contactId, { keywords: updatedKeywords });
+          await updateLocalContact(contactId, { keywords: updatedKeywords });
         }
       }
       const msg = contactIds.length === 1
@@ -427,11 +427,11 @@ function ContactsAppContent({ linkSegments: routeSegments }: ContactsAppProps =
     if (!confirmed) return;
 
     try {
-      if (supportsSync && client) {
-        await deleteContact(client, contactId);
-      } else {
-        deleteLocalContact(contactId);
-      }
+      const deleted = supportsSync && client
+        ? await deleteContact(client, contactId)
+        : await deleteLocalContact(contactId);
+      // A plugin stopped it and has told the user why.
+      if (!deleted) return;
       toast.success(t("toast.deleted"));
       if (selectedContactId === contactId) setView("list");
     } catch (error) {
@@ -468,33 +468,27 @@ function ContactsAppContent({ linkSegments: routeSegments }: ContactsAppProps =
     const { id: _id, uid: _uid, created: _created, updated: _updated, ...rest } = source;
     void _id; void _uid; void _created; void _updated;
     const data: Partial<ContactCard> = JSON.parse(JSON.stringify(rest));
-    if (supportsSync && client) {
-      await createContact(client, data);
-      toast.success(t("toast.created"));
-    } else {
-      const localContact: ContactCard = {
+    const created = supportsSync && client
+      ? await createContact(client, data)
+      : await addLocalContact({
         id: `local-${generateUUID()}`,
         addressBookIds: data.addressBookIds || {},
         ...data,
-      };
-      addLocalContact(localContact);
-      toast.success(t("toast.created"));
-    }
+      });
+    if (created) toast.success(t("toast.created"));
   }, [supportsSync, client, createContact, addLocalContact, t]);
 
   const handleSaveNew = useCallback(async (data: Partial<ContactCard>) => {
-    if (supportsSync && client) {
-      await createContact(client, data);
-      toast.success(t("toast.created"));
-    } else {
-      const localContact: ContactCard = {
+    const created = supportsSync && client
+      ? await createContact(client, data)
+      : await addLocalContact({
         id: `local-${generateUUID()}`,
         addressBookIds: {},
         ...data,
-      };
-      addLocalContact(localContact);
-      toast.success(t("toast.created"));
-    }
+      });
+    // A plugin stopped it: keep the form open with what was typed.
+    if (!created) return;
+    toast.success(t("toast.created"));
     setDefaultBookIdForCreate(undefined);
     setCreatePrefill(undefined);
     if (returnToEmail) {
@@ -508,13 +502,11 @@ function ContactsAppContent({ linkSegments: routeSegments }: ContactsAppProps =
   const handleSaveEdit = useCallback(async (data: Partial<ContactCard>) => {
     if (!selectedContact) return;
 
-    if (supportsSync && client) {
-      await updateContact(client, selectedContact.id, data);
-      toast.success(t("toast.updated"));
-    } else {
-      updateLocalContact(selectedContact.id, data);
-      toast.success(t("toast.updated"));
-    }
+    const updated = supportsSync && client
+      ? await updateContact(client, selectedContact.id, data)
+      : await updateLocalContact(selectedContact.id, data);
+    if (!updated) return;
+    toast.success(t("toast.updated"));
     setView("detail");
   }, [supportsSync, client, selectedContact, updateContact, updateLocalContact, t]);
 
diff --git a/components/email/__tests__/composer-account-switch.test.tsx b/components/email/__tests__/composer-account-switch.test.tsx
index 5da9297d0..a5dfc270e 100644
--- a/components/email/__tests__/composer-account-switch.test.tsx
+++ b/components/email/__tests__/composer-account-switch.test.tsx
@@ -140,6 +140,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -147,7 +155,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-attach-from-files.test.tsx b/components/email/__tests__/composer-attach-from-files.test.tsx
index 938a612f9..475634773 100644
--- a/components/email/__tests__/composer-attach-from-files.test.tsx
+++ b/components/email/__tests__/composer-attach-from-files.test.tsx
@@ -151,6 +151,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -158,7 +166,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onBeforeAttachmentUpload: { intercept: hoisted.beforeAttachmentUpload },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
diff --git a/components/email/__tests__/composer-attachment-list-scroll.test.tsx b/components/email/__tests__/composer-attachment-list-scroll.test.tsx
index 9efbceeb6..af1d5673f 100644
--- a/components/email/__tests__/composer-attachment-list-scroll.test.tsx
+++ b/components/email/__tests__/composer-attachment-list-scroll.test.tsx
@@ -133,13 +133,21 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
     getRecipientSuggestions: { call: async () => [] },
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { intercept: async () => true },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-close-guard.test.tsx b/components/email/__tests__/composer-close-guard.test.tsx
index 85cec8f86..e934e97ee 100644
--- a/components/email/__tests__/composer-close-guard.test.tsx
+++ b/components/email/__tests__/composer-close-guard.test.tsx
@@ -134,6 +134,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -141,7 +149,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-discard.test.tsx b/components/email/__tests__/composer-discard.test.tsx
index f391bd06c..ae7e06c9d 100644
--- a/components/email/__tests__/composer-discard.test.tsx
+++ b/components/email/__tests__/composer-discard.test.tsx
@@ -142,6 +142,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -149,7 +157,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-draft-attachments.test.tsx b/components/email/__tests__/composer-draft-attachments.test.tsx
index 259e74132..460acd1de 100644
--- a/components/email/__tests__/composer-draft-attachments.test.tsx
+++ b/components/email/__tests__/composer-draft-attachments.test.tsx
@@ -132,6 +132,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -139,7 +147,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-format-toggle.test.tsx b/components/email/__tests__/composer-format-toggle.test.tsx
index 8b64cbf66..28f3f029c 100644
--- a/components/email/__tests__/composer-format-toggle.test.tsx
+++ b/components/email/__tests__/composer-format-toggle.test.tsx
@@ -137,6 +137,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -144,7 +152,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-forward-other-account.test.tsx b/components/email/__tests__/composer-forward-other-account.test.tsx
index 4c310c81a..087f5cf34 100644
--- a/components/email/__tests__/composer-forward-other-account.test.tsx
+++ b/components/email/__tests__/composer-forward-other-account.test.tsx
@@ -143,6 +143,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -150,7 +158,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-from-override-envelope.test.tsx b/components/email/__tests__/composer-from-override-envelope.test.tsx
index 93b1a94a7..778a2c1c3 100644
--- a/components/email/__tests__/composer-from-override-envelope.test.tsx
+++ b/components/email/__tests__/composer-from-override-envelope.test.tsx
@@ -136,6 +136,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -143,7 +151,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-identity-template-hooks.test.tsx b/components/email/__tests__/composer-identity-template-hooks.test.tsx
new file mode 100644
index 000000000..7ca0ae9d8
--- /dev/null
+++ b/components/email/__tests__/composer-identity-template-hooks.test.tsx
@@ -0,0 +1,224 @@
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import React from 'react';
+import { EmailComposer } from '../email-composer';
+import { useIdentityStore } from '@/stores/identity-store';
+import { clearAllHooks, identityHooks, templateHooks } from '@/lib/plugin-hooks';
+
+const TEMPLATE = vi.hoisted(() => ({
+  id: 'tpl-1',
+  name: 'Greeting',
+  category: '',
+  subject: 'Hello',
+  body: 'Dear reader',
+  isHTML: false,
+  isFavorite: false,
+  createdAt: '2026-01-01T00:00:00.000Z',
+  updatedAt: '2026-01-01T00:00:00.000Z',
+}));
+
+// ─── Heavy component mocks (mirrors reply-addressing.test.tsx) ────────────────
+
+const editorKeyDown = vi.hoisted(() => vi.fn());
+const toastError = vi.hoisted(() => vi.fn());
+
+vi.mock('@/components/email/rich-text-editor', () => ({
+  RichTextEditor: () => React.createElement('div', {
+    'data-testid': 'rich-text-editor',
+    onKeyDown: (event: React.KeyboardEvent) => {
+      if (!event.defaultPrevented) editorKeyDown();
+    },
+  }),
+}));
+
+vi.mock('@/components/plugins/plugin-slot', () => ({ PluginSlot: () => null }));
+vi.mock('@/components/ui/avatar', () => ({ Avatar: () => null }));
+vi.mock('@/components/identity/sub-address-helper', () => ({ SubAddressHelper: () => null }));
+// The picker hands the composer a template, as choosing one does.
+vi.mock('@/components/templates/template-picker', () => ({
+  TemplatePicker: ({ onSelect }: { onSelect: (t: unknown, v: Record<string, string>) => void }) =>
+    React.createElement('button', { 'data-testid': 'pick-template', onClick: () => onSelect(TEMPLATE, {}) }, 'pick'),
+}));
+vi.mock('@/components/templates/template-form', () => ({ TemplateForm: () => null }));
+vi.mock('@/components/files/file-preview-modal', () => ({ FilePreviewModal: () => null }));
+vi.mock('@/hooks/use-focus-trap', () => ({
+  useFocusTrap: () => ({ current: null }),
+}));
+vi.mock('@/hooks/use-pro-multi-account-identities', () => ({
+  useProMultiAccountIdentities: () => ({ enabled: false, groups: [], allIdentities: [] }),
+  stripCrossAccountIdentityPrefix: (id: string) => ({ localAccountId: null, rawId: id }),
+}));
+
+// ─── Store mocks ──────────────────────────────────────────────────────────────
+
+vi.mock('@/stores/auth-store', () => {
+  const state = {
+    client: null,
+    identities: [],
+    primaryIdentity: null,
+    isAuthenticated: false,
+    isDemoMode: false,
+    activeAccountId: null,
+    connectionLost: false,
+    getClientForAccount: () => undefined,
+    getAllConnectedClients: () => new Map(),
+    syncIdentities: () => {},
+    refreshIdentities: async () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useAuthStore: hook };
+});
+
+vi.mock('@/stores/account-store', () => {
+  const state = { accounts: [], getAccountById: () => undefined };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useAccountStore: hook };
+});
+
+vi.mock('@/stores/email-store', () => {
+  const state = {
+    draftSaveEnabled: false,
+    sendRawEmail: async () => ({ sent: true }),
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useEmailStore: hook };
+});
+
+const updateSetting = vi.fn();
+
+vi.mock('@/stores/settings-store', () => {
+  const state = {
+    timeFormat: '24h',
+    plainTextMode: false,
+    subAddressDelimiter: '+',
+    autoSelectReplyIdentity: true,
+    attachmentReminderEnabled: false,
+    attachmentReminderKeywords: [],
+    emptySubjectWarningEnabled: true,
+    sendDelaySeconds: 0,
+    signaturePosition: 'above_quote',
+    signatureSeparatorEnabled: false,
+    requestReadReceiptDefault: false,
+    addTrustedSender: () => {},
+    trustedSendersAddressBook: null,
+    updateSetting: (...args: unknown[]) => updateSetting(...args),
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useSettingsStore: hook, registerTemplateSyncBridge: () => {} };
+});
+
+vi.mock('@/stores/contact-store', () => {
+  const state = {
+    contacts: [],
+    getAutocomplete: async () => [],
+    addToTrustedSendersBook: async () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useContactStore: hook };
+});
+
+// ─── Misc dependency mocks ────────────────────────────────────────────────────
+
+vi.mock('@/stores/toast-store', () => ({
+  toast: { info: () => {}, error: toastError, success: () => {} },
+}));
+
+vi.mock('@/lib/email-sanitization', () => ({
+  sanitizeSignatureHtml: (v: string) => v,
+  sanitizeEmailHtml: (v: string) => v,
+  sanitizeSignatureHtmlForDisplay: (v: string) => v,
+  sanitizePluginBodyHtml: (v: string) => v,
+  escapeHtml: (v: string) => v,
+  parseHtmlSafely: (html: string) => new DOMParser().parseFromString(html, 'text/html'),
+}));
+
+vi.mock('@/lib/email-threading', () => ({
+  computeReplyThreadingHeaders: () => ({ inReplyTo: [], references: [] }),
+}));
+vi.mock('@/lib/signature-utils', () => ({
+  appendPlainTextSignature: (body: string) => body,
+  getPlainTextSignature: () => '',
+}));
+vi.mock('@/lib/sub-addressing', () => ({ generateSubAddress: () => '' }));
+vi.mock('@/lib/debug', () => ({ debug: { log: () => {}, warn: () => {}, error: () => {} } }));
+vi.mock('@/components/email/quoted-html', () => ({
+  buildQuotedHtmlBlock: () => '',
+  serializeEditorContent: () => '',
+}));
+vi.mock('@/lib/template-utils', async (importOriginal) => ({
+  ...(await importOriginal<typeof import('@/lib/template-utils')>()),
+  substitutePlaceholders: (s: string) => s,
+}));
+
+// ─── Tests ────────────────────────────────────────────────────────────────────
+
+const DATA = {
+  to: '',
+  cc: '',
+  bcc: '',
+  subject: '',
+  body: '',
+  showCc: false,
+  showBcc: false,
+  selectedIdentityId: 'id-me',
+  subAddressTag: '',
+  draftId: null,
+};
+
+const ME = { id: 'id-me', email: 'me@example.com', name: 'Me', mayDelete: false };
+const WORK = { id: 'id-work', email: 'work@example.com', name: 'Work', mayDelete: true, htmlSignature: '<b>W</b>' };
+
+describe('composer plugin hooks for identities and templates', () => {
+  beforeEach(() => {
+    useIdentityStore.setState({ identities: [ME, WORK] });
+  });
+  afterEach(() => clearAllHooks());
+
+  it('tells plugins which From identity the user picked', () => {
+    const selected = vi.fn();
+    identityHooks.onIdentitySelect.register('test', selected);
+    render(<EmailComposer initialData={{ ...DATA, mode: 'compose' }} />);
+
+    fireEvent.change(screen.getByTestId('composer-from'), { target: { value: 'id-work' } });
+
+    expect(selected).toHaveBeenCalledTimes(1);
+    expect(selected).toHaveBeenCalledWith(expect.objectContaining({ id: 'id-work', email: 'work@example.com', htmlSignature: '<b>W</b>' }));
+  });
+
+  it('inserts the template as a plugin rendered it and reports it applied', async () => {
+    const render_ = vi.fn((value: { subject: string; html: string; text: string }, ctx: { templateId: string }) => {
+      expect(ctx).toEqual({ templateId: 'tpl-1' });
+      return { ...value, subject: `[Plugin] ${value.subject}` };
+    });
+    const applied = vi.fn();
+    templateHooks.onTemplateRender.register('test', render_);
+    templateHooks.onTemplateApply.register('test', applied);
+    render(<EmailComposer initialData={{ ...DATA, mode: 'compose' }} />);
+
+    act(() => { fireEvent.keyDown(window, { key: 't' }); });
+    fireEvent.click(await screen.findByTestId('pick-template'));
+
+    await waitFor(() => expect(applied).toHaveBeenCalledTimes(1));
+    expect(render_).toHaveBeenCalledWith(
+      { subject: 'Hello', html: '<p>Dear reader</p>', text: 'Dear reader' },
+      { templateId: 'tpl-1' },
+    );
+    expect(applied).toHaveBeenCalledWith(expect.objectContaining({ id: 'tpl-1', name: 'Greeting' }));
+    expect(screen.getByDisplayValue('[Plugin] Hello')).toBeInTheDocument();
+  });
+});
diff --git a/components/email/__tests__/composer-mention.test.tsx b/components/email/__tests__/composer-mention.test.tsx
index 28cceeb20..c79d871a0 100644
--- a/components/email/__tests__/composer-mention.test.tsx
+++ b/components/email/__tests__/composer-mention.test.tsx
@@ -138,6 +138,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -145,7 +153,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-mobile-formatting.test.tsx b/components/email/__tests__/composer-mobile-formatting.test.tsx
index ca1ffeb69..241a18bfb 100644
--- a/components/email/__tests__/composer-mobile-formatting.test.tsx
+++ b/components/email/__tests__/composer-mobile-formatting.test.tsx
@@ -138,6 +138,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -145,7 +153,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-mv-window.test.tsx b/components/email/__tests__/composer-mv-window.test.tsx
index 5b0407095..739d76da7 100644
--- a/components/email/__tests__/composer-mv-window.test.tsx
+++ b/components/email/__tests__/composer-mv-window.test.tsx
@@ -139,6 +139,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -146,7 +154,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-plugin-attachment-source.test.tsx b/components/email/__tests__/composer-plugin-attachment-source.test.tsx
index f07a6f80a..7128bf0b9 100644
--- a/components/email/__tests__/composer-plugin-attachment-source.test.tsx
+++ b/components/email/__tests__/composer-plugin-attachment-source.test.tsx
@@ -15,6 +15,14 @@ vi.mock('@/components/email/rich-text-editor', () => ({
 // callback the host passed through extraProps - exactly what a real plugin
 // does after it has uploaded a picked file to JMAP itself (api.jmap.uploadBlob).
 // Every other slot renders nothing, matching the rest of the test suite.
+// The composer only renders its plugin row when a plugin offers a slot.
+vi.mock('@/hooks/use-plugin-slot-offers', () => ({
+  usePluginSlotOffers: (slot: string) => (slot === 'composer-attachment-source' ? [{ pluginId: 'p', order: 100 }] : []),
+}));
+const attachState = vi.hoisted(() => ({
+  next: { blobId: 'cloud-blob-1', name: 'vacation.jpg', type: 'image/jpeg', size: 42_000 } as Record<string, unknown>,
+  allow: true,
+}));
 vi.mock('@/components/plugins/plugin-slot', () => ({
   PluginSlot: ({ name, extraProps }: { name: string; extraProps?: Record<string, unknown> }) => {
     if (name !== 'composer-attachment-source') return null;
@@ -26,8 +34,7 @@ vi.mock('@/components/plugins/plugin-slot', () => ({
       {
         type: 'button',
         'data-testid': 'fake-cloud-storage-plugin',
-        onClick: () =>
-          onAttach?.({ blobId: 'cloud-blob-1', name: 'vacation.jpg', type: 'image/jpeg', size: 42_000 }),
+        onClick: () => onAttach?.(attachState.next as never),
       },
       'Attach from cloud storage',
     );
@@ -155,6 +162,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -162,9 +177,10 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
+    onBeforeAttachmentUpload: { intercept: async () => attachState.allow },
   },
   contactHooks: {
     search: { call: async () => [] },
@@ -208,6 +224,29 @@ describe('composer-attachment-source plugin slot', () => {
   afterEach(() => {
     useAuthStore.setState({ client: null });
     vi.clearAllMocks();
+    attachState.next = { blobId: 'cloud-blob-1', name: 'vacation.jpg', type: 'image/jpeg', size: 42_000 };
+    attachState.allow = true;
+  });
+
+  it('ignores something from a plugin that is not an attachment', async () => {
+    attachState.next = { blobId: 'not a blob id', name: 'evil.jpg', type: 'image/jpeg', size: 1 };
+    render(<EmailComposer onClose={vi.fn()} />);
+
+    fireEvent.click(screen.getByTestId('fake-cloud-storage-plugin'));
+
+    await new Promise((r) => setTimeout(r, 50));
+    expect(screen.queryByText('evil.jpg')).not.toBeInTheDocument();
+  });
+
+  it('applies the same attachment checks as a local file', async () => {
+    // A plugin's onBeforeAttachmentUpload guard used to be skipped here.
+    attachState.allow = false;
+    render(<EmailComposer onClose={vi.fn()} />);
+
+    fireEvent.click(screen.getByTestId('fake-cloud-storage-plugin'));
+
+    await new Promise((r) => setTimeout(r, 50));
+    expect(screen.queryByText('vacation.jpg')).not.toBeInTheDocument();
   });
 
   it('adds a plugin-supplied blob as an attachment chip when onAttach is called', async () => {
@@ -231,7 +270,7 @@ describe('composer-attachment-source plugin slot', () => {
 
     render(<EmailComposer onClose={vi.fn()} />);
     fireEvent.click(screen.getByTestId('fake-cloud-storage-plugin'));
-    expect(screen.getByText('vacation.jpg')).toBeInTheDocument();
+    expect(await screen.findByText('vacation.jpg')).toBeInTheDocument();
 
     // Fake timers only from here on - the autosave debounce below needs
     // vi.advanceTimersByTimeAsync, but findBy*'s own internal polling (not
diff --git a/components/email/__tests__/composer-plugin-edit.test.tsx b/components/email/__tests__/composer-plugin-edit.test.tsx
new file mode 100644
index 000000000..1d4c5dfa6
--- /dev/null
+++ b/components/email/__tests__/composer-plugin-edit.test.tsx
@@ -0,0 +1,366 @@
+import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
+import React from 'react';
+import type { Editor } from '@tiptap/core';
+import { undoDepth } from '@tiptap/pm/history';
+import { EmailComposer } from '../email-composer';
+import { buildSignatureBlock } from '../signature-block';
+import { buildQuotedHtmlBlock, serializeEditorContent } from '../quoted-html';
+import { composerHandle } from '@/lib/plugin-sandbox/composer-registry';
+import { resetActions, setActionDispatcher, setPluginActions } from '@/lib/plugin-sandbox/actions';
+
+// The real composer around the real editor, worked on by a plugin through
+// the handle it registers for api.composer: what the plugin reads as the
+// message, and that each change is one step in the editor's history that
+// leaves the signature, the quoted reply and inline images alone.
+
+vi.mock('@/components/ui/avatar', () => ({ Avatar: () => null }));
+
+// ─── Composer dependency mocks (as in composer-close-guard.test.tsx) ──────────
+
+vi.mock('@/components/plugins/plugin-slot', () => ({ PluginSlot: () => null }));
+vi.mock('@/components/identity/sub-address-helper', () => ({ SubAddressHelper: () => null }));
+vi.mock('@/components/templates/template-picker', () => ({ TemplatePicker: () => null }));
+vi.mock('@/components/templates/template-form', () => ({ TemplateForm: () => null }));
+vi.mock('@/components/files/file-preview-modal', () => ({ FilePreviewModal: () => null }));
+vi.mock('@/hooks/use-focus-trap', () => ({
+  useFocusTrap: () => ({ current: null }),
+}));
+vi.mock('@/hooks/use-pro-multi-account-identities', () => ({
+  useProMultiAccountIdentities: () => ({ enabled: false, groups: [], allIdentities: [] }),
+  stripCrossAccountIdentityPrefix: (id: string) => ({ localAccountId: null, rawId: id }),
+}));
+
+// ─── Store mocks ──────────────────────────────────────────────────────────────
+
+vi.mock('@/stores/auth-store', () => {
+  const state = {
+    client: null,
+    identities: [],
+    primaryIdentity: null,
+    isAuthenticated: false,
+    isDemoMode: false,
+    activeAccountId: null,
+    connectionLost: false,
+    getClientForAccount: () => undefined,
+    getAllConnectedClients: () => new Map(),
+    syncIdentities: () => {},
+    refreshIdentities: async () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useAuthStore: hook };
+});
+
+vi.mock('@/stores/identity-store', () => {
+  const state = {
+    identities: [{ id: 'id-me', email: 'me@example.com', name: 'Me' }],
+    defaultIdentityId: 'id-me',
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useIdentityStore: hook };
+});
+
+vi.mock('@/stores/account-store', () => {
+  const state = { accounts: [], getAccountById: () => undefined };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useAccountStore: hook };
+});
+
+vi.mock('@/stores/email-store', () => {
+  const state = {
+    draftSaveEnabled: false,
+    sendRawEmail: async () => ({ sent: true }),
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useEmailStore: hook };
+});
+
+const updateSetting = vi.fn();
+
+vi.mock('@/stores/settings-store', () => {
+  const state = {
+    timeFormat: '24h',
+    plainTextMode: false,
+    subAddressDelimiter: '+',
+    autoSelectReplyIdentity: true,
+    attachmentReminderEnabled: false,
+    attachmentReminderKeywords: [],
+    emptySubjectWarningEnabled: true,
+    recipientMentionsEnabled: true,
+    sendDelaySeconds: 0,
+    signaturePosition: 'above_quote',
+    signatureSeparatorEnabled: false,
+    requestReadReceiptDefault: false,
+    addTrustedSender: () => {},
+    trustedSendersAddressBook: null,
+    updateSetting: (...args: unknown[]) => updateSetting(...args),
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useSettingsStore: hook };
+});
+
+vi.mock('@/stores/contact-store', () => {
+  const state = {
+    contacts: [],
+    getAutocomplete: async () => [],
+    addToTrustedSendersBook: async () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useContactStore: hook };
+});
+
+vi.mock('@/stores/template-store', () => {
+  const state = { templates: [], addTemplate: async () => {} };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useTemplateStore: hook };
+});
+
+// ─── Misc dependency mocks ────────────────────────────────────────────────────
+
+vi.mock('@/stores/toast-store', () => ({
+  toast: { info: () => {}, error: () => {}, success: () => {} },
+}));
+
+vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
+  emailHooks: {
+    onComposerOpen: { call: async () => [] },
+    onBeforeAttachmentUpload: { intercept: async () => true },
+    onRecipientChange: { call: async () => [] },
+    getRecipientSuggestions: { call: async () => [] },
+    onRecipientChipsChange: { transform: async (chips: unknown) => chips },
+    onDraftChange: { emit: () => {} },
+    onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
+    onComposeSend: { takeOver: async () => 'default' },
+    onTransformOutgoingEmail: { transform: async (email: unknown) => email },
+  },
+  contactHooks: {
+    search: { call: async () => [] },
+    onProvideRecipientSuggestions: { transform: async (initial: unknown) => initial },
+  },
+}));
+
+vi.mock('@/lib/email-sanitization', async (orig) => ({
+  ...(await orig<typeof import('@/lib/email-sanitization')>()),
+  sanitizeSignatureHtml: (v: string) => v,
+  sanitizePluginBodyHtml: (v: string) => v,
+  sanitizeEmailHtml: (v: string) => v,
+  parseHtmlSafely: (html: string) => new DOMParser().parseFromString(html, 'text/html'),
+}));
+
+vi.mock('@/lib/email-threading', () => ({
+  computeReplyThreadingHeaders: () => ({ inReplyTo: [], references: [] }),
+}));
+vi.mock('@/lib/signature-utils', () => ({
+  appendPlainTextSignature: (body: string) => body,
+  getPlainTextSignature: () => '',
+}));
+vi.mock('@/lib/sub-addressing', () => ({ generateSubAddress: () => '' }));
+vi.mock('@/lib/debug', () => ({ debug: { log: () => {}, warn: () => {}, error: () => {} } }));
+vi.mock('@/lib/template-utils', () => ({ substitutePlaceholders: (s: string) => s }));
+
+// ─── Tests ────────────────────────────────────────────────────────────────────
+
+const SIGNATURE = buildSignatureBlock('<p>Alice Example<br>ACME Ltd.</p>');
+const QUOTE = buildQuotedHtmlBlock('<p>Can you send the photo?</p>');
+const BODY =
+  '<p>Hello Bob,</p><p>here it is <img src="cid:photo1" data-cid="photo1" alt="photo"></p><p></p>'
+  + SIGNATURE
+  + '<p>On Monday, Bob wrote:</p>'
+  + QUOTE;
+
+const DRAFT = {
+  to: 'Bob Builder <bob@example.com>',
+  cc: '',
+  bcc: '',
+  subject: 'Re: Photo',
+  body: BODY,
+  showCc: false,
+  showBcc: false,
+  selectedIdentityId: 'id-me',
+  subAddressTag: '',
+  mode: 'compose' as const,
+  draftId: null,
+};
+
+const PLUGIN = 'assistant';
+
+/** The real composer; its id comes from a click on a plugin's toolbar button, as for a plugin. */
+async function renderComposer(body = BODY) {
+  const clicks: Record<string, unknown>[] = [];
+  setActionDispatcher(async (_plugin, _surface, _id, context) => { clicks.push(context); });
+  setPluginActions(PLUGIN, 'Assistant', 'composer-toolbar-actions', [{ id: 'ask', label: 'Assistant', icon: 'sparkles', shortcut: 'Ctrl+Shift+Y' }]);
+  render(<EmailComposer initialData={{ ...DRAFT, body }} mode="reply" onClose={vi.fn()} />);
+  const dom = await waitFor(() => {
+    const el = document.querySelector('.ProseMirror') as (HTMLElement & { editor?: Editor }) | null;
+    expect(el?.editor).toBeTruthy();
+    return el!;
+  });
+  const editor = dom.editor!;
+  await waitFor(() => expect(editor.getHTML()).toContain(body.slice(3, 12)));
+  fireEvent.click(screen.getByRole('button', { name: 'Assistant' }));
+  await waitFor(() => expect(clicks).toHaveLength(1));
+  const id = clicks[0].composerId as string;
+  expect(typeof id).toBe('string');
+  return { editor, id, handle: composerHandle(id)!, clicks };
+}
+
+const html = (editor: Editor) => serializeEditorContent(editor);
+
+describe('plugins editing the message being written', () => {
+  const range = Range.prototype as unknown as Record<string, unknown>;
+  const doc = document as unknown as Record<string, unknown>;
+  beforeAll(() => {
+    range.getClientRects = () => [];
+    range.getBoundingClientRect = () => ({ x: 0, y: 0, width: 0, height: 0, top: 0, right: 0, bottom: 0, left: 0 });
+    doc.elementFromPoint = () => null;
+  });
+  afterAll(() => {
+    delete range.getClientRects;
+    delete range.getBoundingClientRect;
+    delete doc.elementFromPoint;
+  });
+  afterEach(() => {
+    resetActions();
+    setActionDispatcher(null);
+  });
+
+  it('reads only the user\'s own text: no signature, no quote header, no quote', async () => {
+    const { handle } = await renderComposer();
+    const body = handle.readBody();
+    expect(body.text).toBe('Hello Bob,\nhere it is');
+    expect(body.html).toContain('cid:photo1');
+    expect(body.html).not.toContain('ACME');
+    expect(body.html).not.toContain('Bob wrote');
+    expect(body.html).not.toContain('Can you send');
+  });
+
+  it('replaces the own text in place, at once, and leaves signature, quote and inline image', async () => {
+    const { editor, handle } = await renderComposer();
+    const before = html(editor);
+    let ok = false;
+    act(() => { ok = handle.replaceBody('<p>Hi Bob, attached.</p>', 'Hi Bob, attached.'); });
+    expect(ok).toBe(true);
+    // Applied to the editor at once, so a plugin reads its own change back.
+    expect(handle.readBody().text).toBe('Hi Bob, attached.');
+
+    const after = html(editor);
+    expect(after).not.toContain('Hello Bob');
+    expect(after.indexOf('Hi Bob, attached.')).toBeLessThan(after.indexOf('data-signature-block-node'));
+    expect(after).toContain('ACME Ltd.');
+    expect(after).toContain('On Monday, Bob wrote:');
+    expect(after).toContain('Can you send the photo?');
+    expect(after).toContain('data-cid="photo1"');
+    // The blank line between the text and the signature stays.
+    expect(after.indexOf('data-cid="photo1"')).toBeLessThan(after.indexOf('data-signature-block-node'));
+    expect(before).not.toBe(after);
+  });
+
+  it("leaves a reply's quote header (On ... wrote:) with the quote when there is no signature above it", async () => {
+    const { editor, handle } = await renderComposer('<p>Thanks, that works.</p><p>On Monday, Bob wrote:</p>' + QUOTE);
+    expect(handle.readBody().text).toBe('Thanks, that works.');
+    act(() => { handle.replaceBody('<p>Thank you, that works for me.</p>', 'Thank you, that works for me.'); });
+    const after = html(editor);
+    expect(after).toContain('Thank you, that works for me.');
+    expect(after).toContain('On Monday, Bob wrote:');
+    expect(after.indexOf('Thank you')).toBeLessThan(after.indexOf('On Monday'));
+  });
+
+  it('is one step in the editor history: one Ctrl+Z brings the old text back', async () => {
+    const { editor, handle } = await renderComposer();
+    const before = html(editor);
+    const depth = undoDepth(editor.state);
+    act(() => { handle.replaceBody('<p>Hi Bob, attached.</p>', 'Hi Bob, attached.'); });
+    expect(undoDepth(editor.state)).toBe(depth + 1);
+    act(() => { editor.commands.undo(); });
+    expect(html(editor)).toBe(before);
+  });
+
+  it('replaces a selection in one step and keeps an image inside it', async () => {
+    const { editor, handle } = await renderComposer();
+    const before = html(editor);
+    // "Hello Bob," up to and including the image.
+    let imageEnd = 0;
+    editor.state.doc.descendants((node, pos) => { if (node.type.name === 'image') imageEnd = pos + node.nodeSize; });
+    act(() => { editor.commands.setTextSelection({ from: 1, to: imageEnd }); });
+    expect(handle.readSelection().text).toContain('Hello Bob,');
+
+    const depth = undoDepth(editor.state);
+    act(() => { handle.replaceSelection('<p>Dear Bob,</p>', 'Dear Bob,', { below: false }); });
+    expect(undoDepth(editor.state)).toBe(depth + 1);
+    const after = html(editor);
+    expect(after).toContain('Dear Bob,');
+    expect(after).not.toContain('Hello Bob');
+    expect(after).toContain('data-cid="photo1"');
+    expect(after).toContain('ACME Ltd.');
+
+    act(() => { editor.commands.undo(); });
+    expect(html(editor)).toBe(before);
+  });
+
+  it('refuses to replace a selection that holds the signature', async () => {
+    const { editor, handle } = await renderComposer();
+    const before = html(editor);
+    act(() => { editor.commands.setTextSelection({ from: 1, to: editor.state.doc.content.size }); });
+    let ok = true;
+    act(() => { ok = handle.replaceSelection('<p>x</p>', 'x', { below: false }); });
+    expect(ok).toBe(false);
+    expect(html(editor)).toBe(before);
+  });
+
+  it('adds below the selection without touching it', async () => {
+    const { editor, handle } = await renderComposer();
+    act(() => { editor.commands.setTextSelection({ from: 1, to: 6 }); });
+    act(() => { handle.replaceSelection('<p>Suggested: Hi Bob</p>', 'Suggested: Hi Bob', { below: true }); });
+    const after = html(editor);
+    expect(after).toContain('Hello Bob,');
+    expect(after.indexOf('Hello Bob,')).toBeLessThan(after.indexOf('Suggested: Hi Bob'));
+    expect(after.indexOf('Suggested: Hi Bob')).toBeLessThan(after.indexOf('data-signature-block-node'));
+  });
+
+  it('runs a plugin button\'s shortcut while typing in the composer', async () => {
+    const { editor, clicks } = await renderComposer();
+    fireEvent.keyDown(editor.view.dom, { key: 'Y', code: 'KeyY', ctrlKey: true, shiftKey: true });
+    await waitFor(() => expect(clicks).toHaveLength(2));
+    expect(clicks[1].composerId).toBe(clicks[0].composerId);
+  });
+
+  it('attaches a file the plugin uploaded, and forgets the composer when it closes', async () => {
+    const { handle, id } = await renderComposer();
+    let ok = false;
+    await act(async () => { ok = await handle.attach({ blobId: 'B1', name: 'report.pdf', type: 'application/pdf', size: 2048 }); });
+    expect(ok).toBe(true);
+    expect(await screen.findByText('report.pdf')).toBeTruthy();
+    cleanup();
+    expect(composerHandle(id)).toBeNull();
+  });
+});
diff --git a/components/email/__tests__/composer-plugin-lifecycle.test.tsx b/components/email/__tests__/composer-plugin-lifecycle.test.tsx
new file mode 100644
index 000000000..ff7c7a0c0
--- /dev/null
+++ b/components/email/__tests__/composer-plugin-lifecycle.test.tsx
@@ -0,0 +1,354 @@
+import { render, screen, fireEvent, act, waitFor } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import React, { useState } from 'react';
+import { EmailComposer } from '../email-composer';
+import { useAuthStore } from '@/stores/auth-store';
+import { emailHooks, clearAllHooks } from '@/lib/plugin-hooks';
+import { resetComposerSessions } from '@/lib/plugin-composer-hooks';
+
+// mail-compose hooks fired by the composer itself: onComposerOpen and
+// onComposerClose once per session (not per remount), onDraftAutoSave after a
+// save the server took, and the onBeforeCompose prefill the host hands in.
+// The hook module is the real one here.
+
+// ─── Heavy component mocks (mirrors reply-addressing.test.tsx) ────────────────
+
+const editorKeyDown = vi.hoisted(() => vi.fn());
+const toastError = vi.hoisted(() => vi.fn());
+
+vi.mock('@/components/email/rich-text-editor', () => ({
+  RichTextEditor: () => React.createElement('div', {
+    'data-testid': 'rich-text-editor',
+    onKeyDown: (event: React.KeyboardEvent) => {
+      if (!event.defaultPrevented) editorKeyDown();
+    },
+  }),
+}));
+
+vi.mock('@/components/plugins/plugin-slot', () => ({ PluginSlot: () => null }));
+vi.mock('@/components/ui/avatar', () => ({ Avatar: () => null }));
+vi.mock('@/components/identity/sub-address-helper', () => ({ SubAddressHelper: () => null }));
+vi.mock('@/components/templates/template-picker', () => ({ TemplatePicker: () => null }));
+vi.mock('@/components/templates/template-form', () => ({ TemplateForm: () => null }));
+vi.mock('@/components/files/file-preview-modal', () => ({ FilePreviewModal: () => null }));
+vi.mock('@/hooks/use-focus-trap', () => ({
+  useFocusTrap: () => ({ current: null }),
+}));
+vi.mock('@/hooks/use-pro-multi-account-identities', () => ({
+  useProMultiAccountIdentities: () => ({ enabled: false, groups: [], allIdentities: [] }),
+  stripCrossAccountIdentityPrefix: (id: string) => ({ localAccountId: null, rawId: id }),
+}));
+
+// ─── Store mocks ──────────────────────────────────────────────────────────────
+
+vi.mock('@/stores/auth-store', () => {
+  const state = {
+    client: null,
+    identities: [],
+    primaryIdentity: null,
+    isAuthenticated: false,
+    isDemoMode: false,
+    activeAccountId: null,
+    connectionLost: false,
+    getClientForAccount: () => undefined,
+    getAllConnectedClients: () => new Map(),
+    syncIdentities: () => {},
+    refreshIdentities: async () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useAuthStore: hook };
+});
+
+vi.mock('@/stores/identity-store', () => {
+  const state = {
+    identities: [{ id: 'id-me', email: 'me@example.com', name: 'Me' }],
+    defaultIdentityId: 'id-me',
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useIdentityStore: hook };
+});
+
+vi.mock('@/stores/account-store', () => {
+  const state = { accounts: [], getAccountById: () => undefined };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useAccountStore: hook };
+});
+
+vi.mock('@/stores/email-store', () => {
+  const state = {
+    draftSaveEnabled: false,
+    sendRawEmail: async () => ({ sent: true }),
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useEmailStore: hook };
+});
+
+const updateSetting = vi.fn();
+
+vi.mock('@/stores/settings-store', () => {
+  const state = {
+    timeFormat: '24h',
+    plainTextMode: false,
+    subAddressDelimiter: '+',
+    autoSelectReplyIdentity: true,
+    attachmentReminderEnabled: false,
+    attachmentReminderKeywords: [],
+    emptySubjectWarningEnabled: true,
+    sendDelaySeconds: 0,
+    signaturePosition: 'above_quote',
+    signatureSeparatorEnabled: false,
+    requestReadReceiptDefault: false,
+    addTrustedSender: () => {},
+    trustedSendersAddressBook: null,
+    updateSetting: (...args: unknown[]) => updateSetting(...args),
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useSettingsStore: hook };
+});
+
+vi.mock('@/stores/contact-store', () => {
+  const state = {
+    contacts: [],
+    getAutocomplete: async () => [],
+    addToTrustedSendersBook: async () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useContactStore: hook };
+});
+
+vi.mock('@/stores/template-store', () => {
+  const state = { templates: [], addTemplate: async () => {} };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useTemplateStore: hook };
+});
+
+// ─── Misc dependency mocks ────────────────────────────────────────────────────
+
+vi.mock('@/stores/toast-store', () => ({
+  toast: { info: () => {}, error: toastError, success: () => {} },
+}));
+
+vi.mock('@/lib/email-sanitization', () => ({
+  sanitizeSignatureHtml: (v: string) => v,
+  sanitizeEmailHtml: (v: string) => v,
+  parseHtmlSafely: (html: string) => new DOMParser().parseFromString(html, 'text/html'),
+}));
+
+vi.mock('@/lib/email-threading', () => ({
+  computeReplyThreadingHeaders: () => ({ inReplyTo: [], references: [] }),
+}));
+vi.mock('@/lib/signature-utils', () => ({
+  appendPlainTextSignature: (body: string) => body,
+  getPlainTextSignature: () => '',
+}));
+vi.mock('@/lib/sub-addressing', () => ({ generateSubAddress: () => '' }));
+vi.mock('@/lib/debug', () => ({ debug: { log: () => {}, warn: () => {}, error: () => {} } }));
+vi.mock('@/components/email/quoted-html', () => ({
+  buildQuotedHtmlBlock: () => '',
+  serializeEditorContent: () => '',
+}));
+vi.mock('@/lib/template-utils', () => ({ substitutePlaceholders: (s: string) => s }));
+
+// ─── Tests ────────────────────────────────────────────────────────────────────
+
+const DRAFT = {
+  to: 'bob@example.com',
+  cc: '',
+  bcc: '',
+  subject: 'Lunch',
+  body: '<p>Hello there</p>',
+  showCc: false,
+  showBcc: false,
+  selectedIdentityId: 'id-me',
+  subAddressTag: '',
+  mode: 'compose' as const,
+  draftId: null,
+};
+
+const flushCloseTimer = () => act(() => new Promise((r) => setTimeout(r, 10)));
+
+const requestCloseRef = { current: null } as React.MutableRefObject<((afterClose?: () => void) => void) | null>;
+
+function Host({ onSend, sessionKey = 's1' }: { onSend?: () => Promise<void>; sessionKey?: string }) {
+  const [open, setOpen] = useState(true);
+  if (!open) return <p>closed</p>;
+  return (
+    <EmailComposer
+      sessionKey={sessionKey}
+      requestCloseRef={requestCloseRef}
+      initialData={DRAFT}
+      onClose={() => setOpen(false)}
+      onSend={async () => {
+        setOpen(false);
+        await onSend?.();
+      }}
+    />
+  );
+}
+
+beforeEach(() => {
+  clearAllHooks();
+  resetComposerSessions();
+  useAuthStore.setState({ client: null });
+});
+
+describe('onComposerOpen / onComposerClose', () => {
+  it('reports the open with the mode and the original message', () => {
+    const opened = vi.fn();
+    emailHooks.onComposerOpen.register('test', opened);
+    render(
+      <EmailComposer
+        mode="reply"
+        sessionKey="r1"
+        sourceEmailId="orig-1"
+        replyTo={{ from: [{ email: 'alice@example.com' }], subject: 'Plans' }}
+      />,
+    );
+    expect(opened).toHaveBeenCalledTimes(1);
+    expect(opened).toHaveBeenCalledWith({ mode: 'reply', inReplyToId: 'orig-1', originalSubject: 'Plans' });
+  });
+
+  it('treats a remount with the same session as the same composer', async () => {
+    const opened = vi.fn();
+    const closed = vi.fn();
+    emailHooks.onComposerOpen.register('test', opened);
+    emailHooks.onComposerClose.register('test', closed);
+
+    const { rerender } = render(<div key="a"><EmailComposer sessionKey="same" initialData={DRAFT} /></div>);
+    // Moved to another parent: React mounts a new composer.
+    rerender(<section key="b"><EmailComposer sessionKey="same" initialData={DRAFT} /></section>);
+    await flushCloseTimer();
+
+    expect(opened).toHaveBeenCalledTimes(1);
+    expect(closed).not.toHaveBeenCalled();
+  });
+
+  it('reports a close without a send', async () => {
+    const closed = vi.fn();
+    emailHooks.onComposerClose.register('test', closed);
+    render(<Host />);
+
+    // Nothing typed: closes without asking.
+    act(() => requestCloseRef.current!());
+    await screen.findByText('closed');
+    await flushCloseTimer();
+
+    expect(closed).toHaveBeenCalledTimes(1);
+    expect(closed).toHaveBeenCalledWith({ draftId: null, sent: false });
+  });
+
+  it('reports a close after a send as sent, even though the host closes mid-send', async () => {
+    const closed = vi.fn();
+    emailHooks.onComposerClose.register('test', closed);
+    render(<Host onSend={() => new Promise((r) => setTimeout(r, 20))} />);
+
+    fireEvent.click(screen.getAllByTestId('composer-send')[0]);
+    await screen.findByText('closed');
+    await act(() => new Promise((r) => setTimeout(r, 50)));
+
+    expect(closed).toHaveBeenCalledTimes(1);
+    expect(closed).toHaveBeenCalledWith(expect.objectContaining({ sent: true }));
+  });
+});
+
+describe('onDraftAutoSave', () => {
+  it('fires after the server took the draft, not when the save fails', async () => {
+    const saved = vi.fn();
+    emailHooks.onDraftAutoSave.register('test', saved);
+    const createDraft = vi.fn().mockRejectedValueOnce(new Error('refused')).mockResolvedValue('draft-7');
+    useAuthStore.setState({
+      client: { createDraft, getEmail: vi.fn(), hasDelayedSend: () => false, getMaxDelayedSend: () => 0 } as never,
+    });
+    const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {});
+    try {
+      render(<EmailComposer initialData={DRAFT} />);
+      fireEvent.change(screen.getByTestId('composer-subject'), { target: { value: 'Lunch?' } });
+      await waitFor(() => expect(createDraft).toHaveBeenCalledTimes(1), { timeout: 4000 });
+      await act(async () => {});
+      expect(saved).not.toHaveBeenCalled();
+
+      fireEvent.change(screen.getByTestId('composer-subject'), { target: { value: 'Lunch on Friday?' } });
+      await waitFor(() => expect(saved).toHaveBeenCalledTimes(1), { timeout: 4000 });
+      expect(saved).toHaveBeenCalledWith({ draftId: 'draft-7', subject: 'Lunch on Friday?' });
+    } finally {
+      consoleError.mockRestore();
+      useAuthStore.setState({ client: null });
+    }
+  }, 15_000);
+});
+
+describe('onBeforeCompose prefill', () => {
+  it('fills the fields of a new message', () => {
+    render(<EmailComposer prefill={{ to: ['carol@example.com'], subject: 'From a plugin' }} />);
+    expect(screen.getByTestId('composer-subject')).toHaveValue('From a plugin');
+    expect(screen.getByText('carol@example.com')).toBeInTheDocument();
+  });
+
+  it('goes over what the host handed in', () => {
+    render(<EmailComposer initialData={DRAFT} prefill={{ subject: 'Changed' }} />);
+    expect(screen.getByTestId('composer-subject')).toHaveValue('Changed');
+    // Fields the plugin left alone stay.
+    expect(screen.getByText('bob@example.com')).toBeInTheDocument();
+  });
+});
+
+describe('onBeforeDraftAutoSave', () => {
+  function withClient(createDraft: ReturnType<typeof vi.fn>) {
+    useAuthStore.setState({
+      client: { createDraft, getEmail: vi.fn(), hasDelayedSend: () => false, getMaxDelayedSend: () => 0 } as never,
+    });
+  }
+
+  it('lets a plugin skip a save while typing', async () => {
+    const before = vi.fn().mockReturnValue(false);
+    emailHooks.onBeforeDraftAutoSave.register('test', before);
+    const createDraft = vi.fn().mockResolvedValue('draft-1');
+    withClient(createDraft);
+    try {
+      render(<EmailComposer initialData={DRAFT} />);
+      fireEvent.change(screen.getByTestId('composer-subject'), { target: { value: 'Lunch?' } });
+      await waitFor(() => expect(before).toHaveBeenCalled(), { timeout: 4000 });
+      await act(async () => {});
+
+      expect(createDraft).not.toHaveBeenCalled();
+    } finally {
+      useAuthStore.setState({ client: null });
+    }
+  }, 15_000);
+
+  it('saves the draft a plugin returns', async () => {
+    emailHooks.onBeforeDraftAutoSave.register('test', (draft: { subject: string }) => ({ ...draft, subject: `[x] ${draft.subject}` }));
+    const createDraft = vi.fn().mockResolvedValue('draft-1');
+    withClient(createDraft);
+    try {
+      render(<EmailComposer initialData={DRAFT} />);
+      fireEvent.change(screen.getByTestId('composer-subject'), { target: { value: 'Lunch?' } });
+      await waitFor(() => expect(createDraft).toHaveBeenCalledTimes(1), { timeout: 4000 });
+
+      expect(createDraft.mock.calls[0][1]).toBe('[x] Lunch?');
+    } finally {
+      useAuthStore.setState({ client: null });
+    }
+  }, 15_000);
+});
diff --git a/components/email/__tests__/composer-plugin-send.test.tsx b/components/email/__tests__/composer-plugin-send.test.tsx
index 0d5b95449..308d766b7 100644
--- a/components/email/__tests__/composer-plugin-send.test.tsx
+++ b/components/email/__tests__/composer-plugin-send.test.tsx
@@ -141,6 +141,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -148,7 +156,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: hoisted.takeOver },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-plugin-surfaces.test.tsx b/components/email/__tests__/composer-plugin-surfaces.test.tsx
new file mode 100644
index 000000000..05772d4f5
--- /dev/null
+++ b/components/email/__tests__/composer-plugin-surfaces.test.tsx
@@ -0,0 +1,481 @@
+import { act, fireEvent, render, screen } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import React from 'react';
+import { EmailComposer } from '../email-composer';
+import { useAuthStore } from '@/stores/auth-store';
+import { checkActions, resetActions, setActionDispatcher, setPluginActions } from '@/lib/plugin-sandbox/actions';
+import { clearOffers, lastSlotProps, offerSlots, slotProps } from '@/components/plugins/__tests__/fake-plugin-offer';
+import { useSettingsStore } from '@/stores/settings-store';
+import { SLOT_CATALOG } from '@/lib/plugin-slot-catalog';
+
+// Plugin surfaces of the composer: frames above and below the message text
+// (fed the draft, at most every 2 seconds), and entries in the Send and
+// Attach menus.
+
+vi.mock('@/components/email/rich-text-editor', () => ({
+  RichTextEditor: () => React.createElement('div', { 'data-testid': 'rich-text-editor' }),
+}));
+vi.mock('@/components/plugins/plugin-iframe-slot', async () => ({
+  PluginIframeSlot: (await import('@/components/plugins/__tests__/fake-plugin-offer')).FakeIframeSlot,
+}));
+
+vi.mock('@/components/identity/sub-address-helper', () => ({ SubAddressHelper: () => null }));
+vi.mock('@/components/templates/template-picker', () => ({ TemplatePicker: () => null }));
+vi.mock('@/components/templates/template-form', () => ({ TemplateForm: () => null }));
+vi.mock('@/components/files/file-preview-modal', () => ({ FilePreviewModal: () => null }));
+vi.mock('@/hooks/use-focus-trap', () => ({
+  useFocusTrap: () => ({ current: null }),
+}));
+vi.mock('@/hooks/use-pro-multi-account-identities', () => ({
+  useProMultiAccountIdentities: () => ({ enabled: false, groups: [], allIdentities: [] }),
+  stripCrossAccountIdentityPrefix: (id: string) => ({ localAccountId: null, rawId: id }),
+}));
+
+// ─── Store mocks ──────────────────────────────────────────────────────────────
+
+vi.mock('@/stores/auth-store', () => {
+  const state = {
+    client: null,
+    identities: [],
+    primaryIdentity: null,
+    isAuthenticated: false,
+    isDemoMode: false,
+    activeAccountId: null,
+    connectionLost: false,
+    getClientForAccount: () => undefined,
+    getAllConnectedClients: () => new Map(),
+    syncIdentities: () => {},
+    refreshIdentities: async () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useAuthStore: hook };
+});
+
+vi.mock('@/stores/identity-store', () => {
+  const state = {
+    identities: [{ id: 'id-me', email: 'me@example.com', name: 'Me' }],
+    defaultIdentityId: 'id-me',
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useIdentityStore: hook };
+});
+
+vi.mock('@/stores/account-store', () => {
+  const state = { accounts: [], getAccountById: () => undefined };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useAccountStore: hook };
+});
+
+vi.mock('@/stores/email-store', () => {
+  const state = {
+    draftSaveEnabled: false,
+    sendRawEmail: async () => ({ sent: true }),
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useEmailStore: hook };
+});
+
+vi.mock('@/stores/settings-store', () => {
+  const state = {
+    timeFormat: '24h',
+    plainTextMode: false,
+    subAddressDelimiter: '+',
+    autoSelectReplyIdentity: true,
+    attachmentReminderEnabled: false,
+    attachmentReminderKeywords: [],
+    emptySubjectWarningEnabled: true,
+    sendDelaySeconds: 0,
+    signaturePosition: 'above_quote',
+    signatureSeparatorEnabled: false,
+    requestReadReceiptDefault: false,
+    addTrustedSender: () => {},
+    trustedSendersAddressBook: null,
+    updateSetting: () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useSettingsStore: hook };
+});
+
+vi.mock('@/stores/contact-store', () => {
+  const state = {
+    contacts: [],
+    getAutocomplete: async () => [],
+    addToTrustedSendersBook: async () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useContactStore: hook };
+});
+
+vi.mock('@/stores/template-store', () => {
+  const state = { templates: [], addTemplate: async () => {} };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useTemplateStore: hook };
+});
+
+// ─── Misc dependency mocks ────────────────────────────────────────────────────
+
+vi.mock('@/stores/toast-store', () => ({
+  toast: { info: () => {}, error: () => {}, success: () => {} },
+}));
+
+vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
+  emailHooks: {
+    onComposerOpen: { call: async () => [] },
+    onRecipientChange: { call: async () => [] },
+    getRecipientSuggestions: { call: async () => [] },
+    onRecipientChipsChange: { transform: async (chips: unknown) => chips },
+    onDraftChange: { emit: () => {} },
+    onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
+    onComposeSend: { takeOver: async () => 'default' },
+    onTransformOutgoingEmail: { transform: async (email: unknown) => email },
+    onBeforeAttachmentUpload: { intercept: async () => true },
+  },
+  contactHooks: {
+    search: { call: async () => [] },
+    onProvideRecipientSuggestions: { transform: async (initial: unknown) => initial },
+  },
+}));
+
+vi.mock('@/lib/email-sanitization', () => ({
+  sanitizeSignatureHtml: (v: string) => v,
+  sanitizeEmailHtml: (v: string) => v,
+  parseHtmlSafely: (html: string) => new DOMParser().parseFromString(html, 'text/html'),
+}));
+
+vi.mock('@/lib/email-threading', () => ({
+  computeReplyThreadingHeaders: () => ({ inReplyTo: [], references: [] }),
+}));
+vi.mock('@/lib/signature-utils', () => ({
+  appendPlainTextSignature: (body: string) => body,
+  getPlainTextSignature: () => '',
+  plainTextBodyHasSignature: () => false,
+  plainTextBodyWithoutSignature: (body: string) => body,
+}));
+vi.mock('@/lib/sub-addressing', () => ({ generateSubAddress: () => '' }));
+vi.mock('@/lib/debug', () => ({ debug: { log: () => {}, warn: () => {}, error: () => {} } }));
+vi.mock('@/components/email/quoted-html', () => ({
+  buildQuotedHtmlBlock: () => '',
+  serializeEditorContent: () => '',
+}));
+vi.mock('@/lib/template-utils', () => ({ substitutePlaceholders: (s: string) => s }));
+
+// ─── Tests ────────────────────────────────────────────────────────────────────
+
+const DRAFT = {
+  to: 'bob@example.com',
+  cc: '',
+  bcc: '',
+  subject: 'Lunch',
+  body: '<p>Hello there</p>',
+  showCc: false,
+  showBcc: false,
+  selectedIdentityId: 'id-me',
+  subAddressTag: '',
+  mode: 'compose' as const,
+  draftId: null,
+};
+
+const follows = (a: Node, b: Node) => !!(a.compareDocumentPosition(b) & Node.DOCUMENT_POSITION_FOLLOWING);
+const draftOf = (el: HTMLElement) => slotProps(el).draft as { subject: string; to: string[]; htmlBody: string; identityId: string };
+
+const dispatch = vi.fn().mockResolvedValue(undefined);
+
+beforeEach(() => {
+  resetActions();
+  dispatch.mockClear();
+  setActionDispatcher(dispatch);
+  useAuthStore.setState({ client: null });
+});
+
+afterEach(() => {
+  clearOffers();
+  setActionDispatcher(null);
+  vi.useRealTimers();
+});
+
+describe('composer-above-body and composer-below-body', () => {
+  it('put the frames around the message text with the draft', () => {
+    offerSlots('p1', ['composer-above-body', 'composer-below-body']);
+    render(<EmailComposer initialData={DRAFT} onClose={vi.fn()} />);
+
+    const above = screen.getByTestId('slot-composer-above-body');
+    const below = screen.getByTestId('slot-composer-below-body');
+    const editor = screen.getByTestId('rich-text-editor');
+    expect(follows(screen.getByTestId('composer-subject'), above)).toBe(true);
+    expect(follows(above, editor)).toBe(true);
+    expect(follows(editor, below)).toBe(true);
+    expect(draftOf(above)).toMatchObject({ subject: 'Lunch', to: ['bob@example.com'], htmlBody: '<p>Hello there</p>', identityId: 'id-me' });
+    expect(draftOf(below).subject).toBe('Lunch');
+  });
+
+  it('send a changed draft only after 2 seconds without changes', () => {
+    offerSlots('p1', ['composer-above-body']);
+    render(<EmailComposer initialData={DRAFT} onClose={vi.fn()} />);
+    vi.useFakeTimers();
+
+    fireEvent.change(screen.getByTestId('composer-subject'), { target: { value: 'Lunch?' } });
+    act(() => { vi.advanceTimersByTime(1000); });
+    fireEvent.change(screen.getByTestId('composer-subject'), { target: { value: 'Lunch at 12?' } });
+    act(() => { vi.advanceTimersByTime(1900); });
+    expect(draftOf(screen.getByTestId('slot-composer-above-body')).subject).toBe('Lunch');
+
+    act(() => { vi.advanceTimersByTime(200); });
+    expect(draftOf(screen.getByTestId('slot-composer-above-body')).subject).toBe('Lunch at 12?');
+  });
+
+  it('let a plugin read the selection and write over it', () => {
+    useSettingsStore.setState({ plainTextMode: true });
+    try {
+      offerSlots('p1', ['composer-above-body']);
+      const { container } = render(<EmailComposer initialData={{ ...DRAFT, body: 'Hello there' }} onClose={vi.fn()} />);
+      const textarea = container.querySelector('textarea') as HTMLTextAreaElement;
+      const props = lastSlotProps('composer-above-body') as { insertText: (t: string) => boolean; getSelectedText: () => string };
+
+      textarea.setSelectionRange(0, 5);
+      expect(props.getSelectedText()).toBe('Hello');
+      act(() => { expect(props.insertText('Hi')).toBe(true); });
+
+      expect(textarea.value).toBe('Hi there');
+      expect(props.insertText('x'.repeat(100_001))).toBe(false);
+    } finally {
+      useSettingsStore.setState({ plainTextMode: false });
+    }
+  });
+
+  it('let a cloud picker put share links into the text', () => {
+    offerSlots('p1', ['composer-attachment-source']);
+    render(<EmailComposer initialData={DRAFT} onClose={vi.fn()} />);
+
+    const props = lastSlotProps('composer-attachment-source');
+    expect(typeof props.onAttach).toBe('function');
+    expect(typeof props.insertText).toBe('function');
+  });
+
+  it('put the attachment source in the plugin button row, where the catalogue says it is', () => {
+    offerSlots('p1', ['composer-attachment-source']);
+    render(<EmailComposer initialData={DRAFT} onClose={vi.fn()} />);
+
+    const frame = screen.getByTestId('slot-composer-attachment-source');
+    expect(frame.closest('[data-composer-plugin-row]')).not.toBeNull();
+    expect(SLOT_CATALOG['composer-attachment-source'].where).toMatch(/plugin row/);
+  });
+
+  it('draw nothing without a plugin', () => {
+    const { container } = render(<EmailComposer initialData={DRAFT} onClose={vi.fn()} />);
+    expect(container.querySelector('[data-plugin-slot="composer-above-body"]')).toBeNull();
+    expect(container.querySelector('[data-plugin-slot="composer-below-body"]')).toBeNull();
+  });
+});
+
+describe('composer-send-menu', () => {
+  it('turns Send into a split button for plugin entries and sends the draft on click', async () => {
+    act(() => setPluginActions('p', 'Later', 'composer-send-menu', [{ id: 'later', label: 'Send with Later' }]));
+    render(<EmailComposer initialData={DRAFT} onClose={vi.fn()} />);
+
+    // The phone and the desktop Send button are both in the DOM.
+    fireEvent.click(screen.getAllByRole('button', { name: 'more_actions' })[0]);
+    expect(screen.queryByRole('menuitem', { name: /schedule_send/ })).toBeNull();
+    await act(async () => { fireEvent.click(screen.getAllByRole('menuitem', { name: 'Send with Later' })[0]); });
+
+    expect(dispatch).toHaveBeenCalledTimes(1);
+    const [pluginId, surface, actionId, context] = dispatch.mock.calls[0];
+    expect([pluginId, surface, actionId]).toEqual(['p', 'composer-send-menu', 'later']);
+    expect((context as { draft: { subject: string } }).draft).toMatchObject({ subject: 'Lunch', to: ['bob@example.com'] });
+    expect(screen.queryByRole('menuitem', { name: 'Send with Later' })).toBeNull();
+  });
+
+  it('lists the entries under Schedule send when the account has it', () => {
+    useAuthStore.setState({
+      client: { hasDelayedSend: () => true, getMaxDelayedSend: () => 30 * 86400, createDraft: vi.fn() } as never,
+    });
+    act(() => setPluginActions('p', 'Later', 'composer-send-menu', [{ id: 'later', label: 'Send with Later' }]));
+    render(<EmailComposer initialData={DRAFT} onClose={vi.fn()} />);
+
+    fireEvent.click(screen.getAllByRole('button', { name: 'schedule_send' })[0]);
+    const schedule = screen.getAllByRole('menuitem', { name: /schedule_send/ })[0];
+    const plugin = screen.getAllByRole('menuitem', { name: 'Send with Later' })[0];
+    expect(follows(schedule, plugin)).toBe(true);
+  });
+
+  it('keeps a plain Send button without plugin entries or scheduled send', () => {
+    render(<EmailComposer initialData={DRAFT} onClose={vi.fn()} />);
+    expect(screen.queryByRole('button', { name: 'more_actions' })).toBeNull();
+    expect(screen.queryByRole('button', { name: 'schedule_send' })).toBeNull();
+  });
+});
+
+describe('composer-options-menu and composer-toolbar-actions', () => {
+  it('lists plugin options in Options, ticked ones as check items counted in the badge', async () => {
+    act(() => setPluginActions('smime', 'S/MIME', 'composer-options-menu', [
+      { id: 'sign', label: 'Sign', checked: true, description: 'With your certificate' },
+      { id: 'encrypt', label: 'Encrypt', checked: false },
+      { id: 'zones', label: 'Insert time in other zones' },
+    ]));
+    render(<EmailComposer initialData={DRAFT} onClose={vi.fn()} />);
+
+    const options = screen.getByTestId('composer-options-menu');
+    expect(options).toHaveTextContent('1');
+    fireEvent.click(options);
+    const sign = screen.getByRole('menuitemcheckbox', { name: /Sign/ });
+    expect(sign).toHaveAttribute('aria-checked', 'true');
+    expect(sign).toHaveTextContent('With your certificate');
+    expect(screen.getByRole('menuitemcheckbox', { name: 'Encrypt' })).toHaveAttribute('aria-checked', 'false');
+
+    await act(async () => { fireEvent.click(screen.getByRole('menuitemcheckbox', { name: 'Encrypt' })); });
+    expect(dispatch).toHaveBeenCalledWith('smime', 'composer-options-menu', 'encrypt', { composerId: expect.any(String) });
+    // A check item leaves the menu open, so several options can be set.
+    expect(screen.getByRole('menuitemcheckbox', { name: /Sign/ })).toBeInTheDocument();
+
+    await act(async () => { fireEvent.click(screen.getByRole('menuitem', { name: 'Insert time in other zones' })); });
+    expect(dispatch).toHaveBeenCalledWith('smime', 'composer-options-menu', 'zones', { composerId: expect.any(String) });
+  });
+
+  it('draws plugin buttons in the bottom bar like Attach, with the shortcut in the tooltip', async () => {
+    act(() => setPluginActions('ai', 'Assistant', 'composer-toolbar-actions', [{ id: 'ask', label: 'Assistant', icon: 'sparkles', shortcut: 'Alt+A' }]));
+    render(<EmailComposer initialData={DRAFT} onClose={vi.fn()} />);
+    const button = screen.getByRole('button', { name: 'Assistant' });
+    expect(button).toHaveAttribute('title', 'Assistant (Alt+A)');
+    expect(button.className).toContain('h-9');
+    // In the bar only when it is wide enough next to the app's own buttons...
+    expect(button.className).toMatch(/(^|\s)hidden(\s|$)/);
+    expect(button.className).toContain('@[44rem]/composer-bar:inline-flex');
+    let bar: HTMLElement | null = button;
+    while (bar && !bar.classList.contains('@container/composer-bar')) bar = bar.parentElement;
+    expect(bar).not.toBeNull();
+    // Not in the plugin frame row above the bar.
+    expect(button.closest('[data-composer-plugin-row]')).toBeNull();
+    await act(async () => { fireEvent.click(button); });
+    expect(dispatch).toHaveBeenCalledWith('ai', 'composer-toolbar-actions', 'ask', { composerId: expect.any(String) });
+
+    // ...and otherwise in the Options menu, which is shown only while narrow.
+    dispatch.mockClear();
+    fireEvent.click(screen.getByTestId('composer-options-menu'));
+    const entry = screen.getByRole('menuitem', { name: 'Assistant' });
+    expect(entry.closest('[data-narrow-only]')!.className).toContain('@[44rem]/composer-bar:hidden');
+    await act(async () => { fireEvent.click(entry); });
+    expect(dispatch).toHaveBeenCalledWith('ai', 'composer-toolbar-actions', 'ask', { composerId: expect.any(String) });
+  });
+
+  it('refuses odd values for checked and description', () => {
+    expect(() => setPluginActions('p', 'P', 'composer-options-menu', checkActions([{ id: 'a', label: 'A', checked: 'yes' }]))).toThrow(/checked must be true or false/);
+    expect(() => checkActions([{ id: 'a', label: 'A', description: 'x'.repeat(121) }])).toThrow(/description/);
+  });
+});
+
+describe('composer-attach-menu', () => {
+  it('turns Attach into a menu for plugin entries', async () => {
+    act(() => setPluginActions('p', 'Cloud', 'composer-attach-menu', [{ id: 'cloud', label: 'From the cloud' }]));
+    render(<EmailComposer initialData={DRAFT} onClose={vi.fn()} />);
+
+    fireEvent.click(screen.getByTestId('composer-attach-menu'));
+    expect(screen.getByRole('menuitem', { name: 'attach_from_device' })).toBeInTheDocument();
+    expect(screen.queryByTestId('composer-attach-from-files')).toBeNull();
+    await act(async () => { fireEvent.click(screen.getByRole('menuitem', { name: 'From the cloud' })); });
+
+    expect(dispatch).toHaveBeenCalledWith('p', 'composer-attach-menu', 'cloud', { composerId: expect.any(String) });
+    expect(screen.queryByRole('menuitem', { name: 'From the cloud' })).toBeNull();
+  });
+
+  it('keeps the plain Attach button without plugin entries', () => {
+    render(<EmailComposer initialData={DRAFT} onClose={vi.fn()} />);
+    expect(screen.queryByTestId('composer-attach-menu')).toBeNull();
+    expect(screen.getByRole('button', { name: 'attach' })).toBeInTheDocument();
+  });
+});
+
+describe('composer-sidebar and composer-sidebar-right', () => {
+  function stubWidth(width: number) {
+    class FixedWidthObserver {
+      constructor(private cb: ResizeObserverCallback) {}
+      observe(el: Element) {
+        if ((el as HTMLElement).dataset.testid !== 'email-composer') return;
+        this.cb([{ target: el, contentRect: { width, height: 700 } } as unknown as ResizeObserverEntry], this as unknown as ResizeObserver);
+      }
+      unobserve() {}
+      disconnect() {}
+    }
+    vi.stubGlobal('ResizeObserver', FixedWidthObserver);
+  }
+  const panel = (side: 'left' | 'right') => document.querySelector<HTMLElement>(`[data-composer-sidebar="${side}"]`)!;
+
+  afterEach(() => {
+    vi.unstubAllGlobals();
+    try {
+      localStorage.removeItem('composerPluginSidebarCollapsed:left');
+      localStorage.removeItem('composerPluginSidebarCollapsed:right');
+    } catch { /* ignore */ }
+  });
+
+  it('give both panels a fixed width beside a wide composer', () => {
+    stubWidth(1400);
+    offerSlots('p1', ['composer-sidebar', 'composer-sidebar-right']);
+    render(<EmailComposer initialData={DRAFT} onClose={vi.fn()} />);
+
+    for (const side of ['left', 'right'] as const) {
+      expect(panel(side).dataset.composerSidebarMode).toBe('docked');
+      expect(panel(side).style.width).toBe('260px');
+    }
+    expect(panel('left')).toContainElement(screen.getByTestId('slot-composer-sidebar'));
+    expect(panel('right')).toContainElement(screen.getByTestId('slot-composer-sidebar-right'));
+  });
+
+  it('fold the right panel, then both, when the composer would get too narrow', () => {
+    stubWidth(900);
+    offerSlots('p1', ['composer-sidebar', 'composer-sidebar-right']);
+    const { unmount } = render(<EmailComposer initialData={DRAFT} onClose={vi.fn()} />);
+    expect(panel('left').dataset.composerSidebarMode).toBe('docked');
+    expect(panel('right').dataset.composerSidebarMode).toBe('folded');
+    expect(screen.queryByTestId('slot-composer-sidebar-right')).toBeNull();
+    unmount();
+
+    // The reading pane of a 1280 px window: an open panel would leave the
+    // composer too narrow for its bottom bar.
+    stubWidth(792);
+    render(<EmailComposer initialData={DRAFT} onClose={vi.fn()} />);
+    expect(panel('left').dataset.composerSidebarMode).toBe('folded');
+    expect(panel('right').dataset.composerSidebarMode).toBe('folded');
+  });
+
+  it('open a folded panel over the composer when there is no room beside it', () => {
+    stubWidth(600);
+    offerSlots('p1', ['composer-sidebar-right']);
+    render(<EmailComposer initialData={DRAFT} onClose={vi.fn()} />);
+
+    fireEvent.click(screen.getByRole('button', { name: 'plugin_panel_show' }));
+    expect(panel('right').dataset.composerSidebarMode).toBe('overlay');
+    expect(panel('right').className).toContain('absolute');
+
+    fireEvent.click(screen.getByRole('button', { name: 'plugin_panel_hide' }));
+    expect(panel('right').dataset.composerSidebarMode).toBe('folded');
+  });
+});
diff --git a/components/email/__tests__/composer-recipient-validation.test.tsx b/components/email/__tests__/composer-recipient-validation.test.tsx
index f7815d517..de2414ee6 100644
--- a/components/email/__tests__/composer-recipient-validation.test.tsx
+++ b/components/email/__tests__/composer-recipient-validation.test.tsx
@@ -142,6 +142,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -149,7 +157,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-reopened-draft-signature.test.tsx b/components/email/__tests__/composer-reopened-draft-signature.test.tsx
index ea61f85dc..3ddd45a2f 100644
--- a/components/email/__tests__/composer-reopened-draft-signature.test.tsx
+++ b/components/email/__tests__/composer-reopened-draft-signature.test.tsx
@@ -138,6 +138,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -145,7 +153,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-reply-draft-threading.test.tsx b/components/email/__tests__/composer-reply-draft-threading.test.tsx
index a820821b5..2e34434c0 100644
--- a/components/email/__tests__/composer-reply-draft-threading.test.tsx
+++ b/components/email/__tests__/composer-reply-draft-threading.test.tsx
@@ -138,6 +138,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -145,7 +153,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-reply-focus.test.tsx b/components/email/__tests__/composer-reply-focus.test.tsx
index 545440f3d..62bb0752e 100644
--- a/components/email/__tests__/composer-reply-focus.test.tsx
+++ b/components/email/__tests__/composer-reply-focus.test.tsx
@@ -145,6 +145,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -152,7 +160,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-schedule-presets.test.tsx b/components/email/__tests__/composer-schedule-presets.test.tsx
index 32c9697ea..954f7507c 100644
--- a/components/email/__tests__/composer-schedule-presets.test.tsx
+++ b/components/email/__tests__/composer-schedule-presets.test.tsx
@@ -143,6 +143,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -150,7 +158,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-send-errors.test.tsx b/components/email/__tests__/composer-send-errors.test.tsx
index 1f2a4fba0..5e791f620 100644
--- a/components/email/__tests__/composer-send-errors.test.tsx
+++ b/components/email/__tests__/composer-send-errors.test.tsx
@@ -142,6 +142,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -149,7 +157,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-send-unmount.test.tsx b/components/email/__tests__/composer-send-unmount.test.tsx
index d2143cf78..2bd02d5e7 100644
--- a/components/email/__tests__/composer-send-unmount.test.tsx
+++ b/components/email/__tests__/composer-send-unmount.test.tsx
@@ -142,6 +142,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -149,7 +157,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-short-pane.test.tsx b/components/email/__tests__/composer-short-pane.test.tsx
index e37e11aa9..db39437d4 100644
--- a/components/email/__tests__/composer-short-pane.test.tsx
+++ b/components/email/__tests__/composer-short-pane.test.tsx
@@ -133,13 +133,21 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
     getRecipientSuggestions: { call: async () => [] },
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-title.test.tsx b/components/email/__tests__/composer-title.test.tsx
index 729a5eace..8f5e80ee9 100644
--- a/components/email/__tests__/composer-title.test.tsx
+++ b/components/email/__tests__/composer-title.test.tsx
@@ -142,6 +142,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -149,7 +157,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/composer-upload-account.test.tsx b/components/email/__tests__/composer-upload-account.test.tsx
index 3b8baf88a..d5a9ab085 100644
--- a/components/email/__tests__/composer-upload-account.test.tsx
+++ b/components/email/__tests__/composer-upload-account.test.tsx
@@ -144,6 +144,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -151,7 +159,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
     onBeforeAttachmentUpload: { intercept: async () => true },
diff --git a/components/email/__tests__/empty-subject-warning.test.tsx b/components/email/__tests__/empty-subject-warning.test.tsx
index c8a020628..4908bc2b9 100644
--- a/components/email/__tests__/empty-subject-warning.test.tsx
+++ b/components/email/__tests__/empty-subject-warning.test.tsx
@@ -142,6 +142,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
@@ -149,7 +157,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
     onRecipientChipsChange: { transform: async (chips: unknown) => chips },
     onDraftChange: { emit: () => {} },
     onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
-    onBeforeEmailSend: { intercept: async () => true },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
     onComposeSend: { takeOver: async () => 'default' },
     onTransformOutgoingEmail: { transform: async (email: unknown) => email },
   },
diff --git a/components/email/__tests__/mail-list-plugin-surfaces.test.tsx b/components/email/__tests__/mail-list-plugin-surfaces.test.tsx
new file mode 100644
index 000000000..cba16b2d7
--- /dev/null
+++ b/components/email/__tests__/mail-list-plugin-surfaces.test.tsx
@@ -0,0 +1,290 @@
+import { act, fireEvent, render, screen, within } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import React from 'react';
+import type { Email, Mailbox } from '@/lib/jmap/types';
+import { resetActions, setActionDispatcher, setPluginActions } from '@/lib/plugin-sandbox/actions';
+import { clearOffers, offerSlots, slotProps } from '@/components/plugins/__tests__/fake-plugin-offer';
+
+// Plugin surfaces of the message list: frames above the list and in the empty
+// list, buttons on each row (hover, and the row menu), and buttons in the
+// toolbar shown while messages are selected.
+
+vi.mock('@/components/plugins/plugin-iframe-slot', async () => ({
+  PluginIframeSlot: (await import('@/components/plugins/__tests__/fake-plugin-offer')).FakeIframeSlot,
+}));
+vi.mock('@/hooks/use-email-drag', () => ({
+  useEmailDrag: () => ({ dragHandlers: {}, isDragging: false }),
+}));
+vi.mock('@/components/ui/avatar', () => ({ Avatar: () => null }));
+vi.mock('@/components/email/rules-menu', () => ({ RulesContextSubMenu: () => null }));
+vi.mock('@/hooks/use-copy-link', () => ({ useCopyLink: () => vi.fn() }));
+vi.mock('@/stores/auth-store', async () => {
+  const { create } = await import('zustand');
+  return {
+    useAuthStore: create(() => ({
+      client: {}, identities: [], username: null, activeAccountId: 'acct-1',
+      getAllConnectedClients: () => new Map(), getClientForAccount: () => null,
+    })),
+  };
+});
+vi.mock('@/stores/account-store', () => {
+  const state = { getAccountById: () => undefined, accounts: [] };
+  return {
+    useAccountStore: Object.assign(
+      (selector?: (s: typeof state) => unknown) => (selector ? selector(state) : state),
+      { getState: () => state },
+    ),
+  };
+});
+
+const { EmailList } = await import('../email-list');
+const { MvListToolbar } = await import('../mv-list-toolbar');
+const { ThreadListItem } = await import('../thread-list-item');
+const { EmailContextMenu } = await import('../email-context-menu');
+const { useEmailStore } = await import('@/stores/email-store');
+const { useUIStore } = await import('@/stores/ui-store');
+const { useSettingsStore } = await import('@/stores/settings-store');
+const { groupEmailsByThread } = await import('@/lib/thread-utils');
+
+const mail = (id: string): Email => ({
+  id,
+  threadId: `thread-${id}`,
+  mailboxIds: { inbox: true },
+  keywords: { $seen: true },
+  size: 1000,
+  receivedAt: '2026-09-30T10:00:00Z',
+  from: [{ name: 'Alice', email: 'alice@example.com' }],
+  subject: `Mail ${id}`,
+  hasAttachment: false,
+});
+
+const mailboxes = [
+  { id: 'inbox', name: 'Inbox', role: 'inbox', myRights: { mayAddItems: true } },
+] as unknown as Mailbox[];
+
+const dispatch = vi.fn().mockResolvedValue(undefined);
+const initialEmailState = useEmailStore.getState();
+
+beforeEach(() => {
+  resetActions();
+  dispatch.mockClear();
+  setActionDispatcher(dispatch);
+  useEmailStore.setState(initialEmailState, true);
+  useEmailStore.setState({ selectedMailbox: 'inbox', mailboxes, emails: [], selectedEmailKeys: new Set<string>() });
+  useUIStore.setState({ isMobile: false, isTablet: false, isDesktop: true });
+  useSettingsStore.setState({ interfaceLayout: 'default', hoverActions: ['delete', 'star'], hoverActionsMode: 'inline' } as never);
+});
+
+afterEach(() => {
+  clearOffers();
+  setActionDispatcher(null);
+});
+
+describe('message-list-header', () => {
+  it('shows the plugin frame above the list with the folder', () => {
+    offerSlots('p1', ['message-list-header']);
+    render(<EmailList emails={[mail('a')]} />);
+
+    const frame = screen.getByTestId('slot-message-list-header');
+    expect(slotProps(frame)).toEqual({ mailboxId: 'inbox', mailboxRole: 'inbox' });
+    // Above the scrolling list, not inside it.
+    expect(frame.closest('[data-tour="email-list"]')).toBeNull();
+  });
+
+  it('draws nothing without a plugin', () => {
+    const { container } = render(<EmailList emails={[mail('a')]} />);
+    expect(container.querySelector('[data-plugin-slot="message-list-header"]')).toBeNull();
+  });
+});
+
+describe('message-list-empty', () => {
+  it('shows the frame under the "no messages" text of an empty list', () => {
+    offerSlots('p1', ['message-list-empty']);
+    render(<EmailList emails={[]} />);
+
+    const frame = screen.getByTestId('slot-message-list-empty');
+    expect(slotProps(frame)).toEqual({ mailboxId: 'inbox', mailboxRole: 'inbox', searching: false });
+    const text = screen.getByText('no_emails_description');
+    expect(text.compareDocumentPosition(frame) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
+  });
+
+  it('says when the empty list is a search', () => {
+    offerSlots('p1', ['message-list-empty']);
+    useEmailStore.setState({ searchQuery: 'invoice' });
+    render(<EmailList emails={[]} />);
+
+    expect(slotProps(screen.getByTestId('slot-message-list-empty')).searching).toBe(true);
+  });
+
+  it('is not there when the list has messages, or without a plugin', () => {
+    offerSlots('p1', ['message-list-empty']);
+    const { unmount } = render(<EmailList emails={[mail('a')]} />);
+    expect(screen.queryByTestId('slot-message-list-empty')).toBeNull();
+    unmount();
+    clearOffers();
+    render(<EmailList emails={[]} />);
+    expect(screen.queryByTestId('slot-message-list-empty')).toBeNull();
+  });
+});
+
+describe('message-bulk-actions', () => {
+  it('adds the plugin buttons to the selection toolbar and sends the selected ids', async () => {
+    const emails = [mail('a'), mail('b'), mail('c')];
+    useEmailStore.setState({ emails, selectedEmailKeys: new Set(['a', 'c']) });
+    act(() => setPluginActions('tasks', 'Tasks', 'message-bulk-actions', [{ id: 'make', label: 'Make tasks' }]));
+    render(<EmailList emails={emails} />);
+
+    const button = screen.getByRole('button', { name: 'Make tasks' });
+    // In the toolbar that holds the app's own batch buttons.
+    const toolbar = screen.getByText('batch_actions.clear_selection', { selector: 'button' }).parentElement!;
+    expect(toolbar).toContainElement(button);
+    await act(async () => { fireEvent.click(button); });
+    expect(dispatch).toHaveBeenCalledWith('tasks', 'message-bulk-actions', 'make', { emailIds: ['a', 'c'] });
+  });
+
+  it('has no plugin buttons without a selection or without a plugin', () => {
+    const emails = [mail('a')];
+    useEmailStore.setState({ emails, selectedEmailKeys: new Set(['a']) });
+    const { unmount } = render(<EmailList emails={emails} />);
+    expect(document.querySelector('[data-plugin-actions="message-bulk-actions"]')).toBeNull();
+    unmount();
+
+    act(() => setPluginActions('tasks', 'Tasks', 'message-bulk-actions', [{ id: 'make', label: 'Make tasks' }]));
+    useEmailStore.setState({ selectedEmailKeys: new Set<string>() });
+    render(<EmailList emails={emails} />);
+    expect(screen.queryByRole('button', { name: 'Make tasks' })).toBeNull();
+  });
+
+  it('puts them behind one "more" button when the list is narrow', async () => {
+    // The list next to an open folder sidebar, or on a phone.
+    class NarrowObserver {
+      constructor(private cb: ResizeObserverCallback) {}
+      observe(el: Element) {
+        this.cb([{ target: el, contentRect: { width: 384, height: 48 } } as unknown as ResizeObserverEntry], this as unknown as ResizeObserver);
+      }
+      unobserve() {}
+      disconnect() {}
+    }
+    vi.stubGlobal('ResizeObserver', NarrowObserver);
+    try {
+      const emails = [mail('a'), mail('b')];
+      useEmailStore.setState({ emails, selectedEmailKeys: new Set(['a', 'b']) });
+      act(() => setPluginActions('tasks', 'Tasks', 'message-bulk-actions', [
+        { id: 'make', label: 'Make tasks' },
+        { id: 'more', label: 'Remind me' },
+      ]));
+      render(<EmailList emails={emails} />);
+
+      expect(screen.queryByRole('button', { name: 'Make tasks' })).toBeNull();
+      // "Clear selection" keeps its name for screen readers but drops the text.
+      const clear = screen.getByRole('button', { name: 'batch_actions.clear_selection' });
+      expect(clear).not.toHaveTextContent('batch_actions.clear_selection');
+
+      fireEvent.click(screen.getByRole('button', { name: 'more_actions' }));
+      const item = await screen.findByRole('menuitem', { name: 'Make tasks' });
+      expect(screen.getByRole('menuitem', { name: 'Remind me' })).toBeInTheDocument();
+      await act(async () => { fireEvent.click(item); });
+      expect(dispatch).toHaveBeenCalledWith('tasks', 'message-bulk-actions', 'make', { emailIds: ['a', 'b'] });
+    } finally {
+      vi.unstubAllGlobals();
+    }
+  });
+
+  it('adds them to the Mountain View toolbar too', async () => {
+    const emails = [mail('a'), mail('b')];
+    useEmailStore.setState({ emails, selectedEmailKeys: new Set(['b']) });
+    act(() => setPluginActions('tasks', 'Tasks', 'message-bulk-actions', [{ id: 'make', label: 'Make tasks' }]));
+    render(<MvListToolbar loadedCount={2} onRefresh={() => {}} />);
+
+    await act(async () => { fireEvent.click(screen.getByRole('button', { name: 'Make tasks' })); });
+    expect(dispatch).toHaveBeenCalledWith('tasks', 'message-bulk-actions', 'make', { emailIds: ['b'] });
+  });
+
+  it('leaves the Mountain View toolbar alone without a selection', () => {
+    useEmailStore.setState({ emails: [mail('a')] });
+    act(() => setPluginActions('tasks', 'Tasks', 'message-bulk-actions', [{ id: 'make', label: 'Make tasks' }]));
+    render(<MvListToolbar loadedCount={1} onRefresh={() => {}} />);
+    expect(screen.queryByRole('button', { name: 'Make tasks' })).toBeNull();
+  });
+});
+
+describe('message-row-actions', () => {
+  const row = (email: Email) => {
+    const [thread] = groupEmailsByThread([email]);
+    return <ThreadListItem thread={thread} isExpanded={false} onToggleExpand={() => {}} onEmailSelect={() => {}} />;
+  };
+
+  it('adds the plugin buttons after the row\'s own hover buttons', async () => {
+    act(() => setPluginActions('p', 'Snooze+', 'message-row-actions', [{ id: 'later', label: 'Later', icon: 'clock' }]));
+    const onSelect = vi.fn();
+    const [thread] = groupEmailsByThread([mail('a')]);
+    render(<ThreadListItem thread={thread} isExpanded={false} onToggleExpand={() => {}} onEmailSelect={onSelect} />);
+
+    const button = screen.getByRole('button', { name: 'Later' });
+    const star = screen.getByTestId('hover-action-star');
+    expect(star.parentElement).toContainElement(button);
+    expect(star.compareDocumentPosition(button) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
+    await act(async () => { fireEvent.click(button); });
+    expect(dispatch).toHaveBeenCalledWith('p', 'message-row-actions', 'later', { emailId: 'a' });
+    // The click is the plugin's, not a row click that opens the message.
+    expect(onSelect).not.toHaveBeenCalled();
+  });
+
+  it('shows them even when the user turned off every quick action', () => {
+    useSettingsStore.setState({ hoverActions: [] } as never);
+    act(() => setPluginActions('p', 'P', 'message-row-actions', [{ id: 'later', label: 'Later' }]));
+    render(row(mail('a')));
+    expect(screen.getByRole('button', { name: 'Later' })).toBeInTheDocument();
+  });
+
+  it('honours the folder roles the plugin asked for', () => {
+    act(() => setPluginActions('p', 'P', 'message-row-actions', [{ id: 'later', label: 'Later', mailboxRoles: ['sent'] }]));
+    render(row(mail('a')));
+    expect(screen.queryByRole('button', { name: 'Later' })).toBeNull();
+  });
+
+  it('draws nothing without a plugin', () => {
+    render(row(mail('a')));
+    expect(document.querySelector('[data-plugin-actions="message-row-actions"]')).toBeNull();
+  });
+
+  const menu = (props: Partial<React.ComponentProps<typeof EmailContextMenu>> = {}) => render(
+    <EmailContextMenu
+      email={mail('a')}
+      position={{ x: 0, y: 0 }}
+      isOpen
+      onClose={props.onClose ?? (() => {})}
+      menuRef={{ current: null }}
+      mailboxes={mailboxes}
+      selectedMailbox="inbox"
+      currentMailboxRole="inbox"
+      {...props}
+    />,
+  );
+
+  it('puts them in the row menu, which is what a long press opens on phones', async () => {
+    act(() => setPluginActions('p', 'Snooze+', 'message-row-actions', [{ id: 'later', label: 'Later' }]));
+    const onClose = vi.fn();
+    menu({ onClose });
+
+    const item = screen.getByRole('menuitem', { name: 'Later' });
+    await act(async () => { fireEvent.click(item); });
+    expect(dispatch).toHaveBeenCalledWith('p', 'message-row-actions', 'later', { emailId: 'a' });
+    expect(onClose).toHaveBeenCalled();
+  });
+
+  it('keeps them out of the menu for a multi-selection, and out of an empty menu', () => {
+    const { unmount } = menu();
+    expect(screen.queryByRole('menuitem', { name: 'Later' })).toBeNull();
+    unmount();
+    act(() => setPluginActions('p', 'P', 'message-row-actions', [{ id: 'later', label: 'Later' }]));
+    menu({ isMultiSelect: true, selectedCount: 3 });
+    expect(screen.queryByRole('menuitem', { name: 'Later' })).toBeNull();
+  });
+
+  it('keeps the menu entries to the folder roles the plugin asked for', () => {
+    act(() => setPluginActions('p', 'P', 'message-row-actions', [{ id: 'later', label: 'Later', mailboxRoles: ['junk'] }]));
+    menu();
+    expect(within(document.body).queryByRole('menuitem', { name: 'Later' })).toBeNull();
+  });
+});
diff --git a/components/email/__tests__/plugin-row-badges.test.tsx b/components/email/__tests__/plugin-row-badges.test.tsx
new file mode 100644
index 000000000..149d9a559
--- /dev/null
+++ b/components/email/__tests__/plugin-row-badges.test.tsx
@@ -0,0 +1,175 @@
+import { render, screen, waitFor, act } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { ThreadListItem } from '../thread-list-item';
+import { clearRowBadgeCache, normalizeBadges, MAX_ROW_BADGES } from '../plugin-row-badges';
+import { useSettingsStore, DEFAULT_KEYWORDS } from '@/stores/settings-store';
+import { useEmailStore } from '@/stores/email-store';
+import { useUIStore } from '@/stores/ui-store';
+import { groupEmailsByThread } from '@/lib/thread-utils';
+import { renderHooks, clearAllHooks } from '@/lib/plugin-hooks';
+import { refreshRowBadges, resetRowBadgeRefresh } from '@/lib/plugin-sandbox/row-badges';
+import type { Email } from '@/lib/jmap/types';
+
+// onEmailListItemRender: plugins add small badges next to a row's subject.
+
+vi.mock('@/hooks/use-email-drag', () => ({
+  useEmailDrag: () => ({ dragHandlers: {}, isDragging: false }),
+}));
+
+vi.mock('@/stores/auth-store', () => {
+  const state = { identities: [], username: null };
+  return {
+    useAuthStore: (selector?: (s: typeof state) => unknown) => (selector ? selector(state) : state),
+  };
+});
+
+vi.mock('@/stores/account-store', () => {
+  const state = { getAccountById: () => undefined };
+  return {
+    useAccountStore: Object.assign(
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (selector: any) => (selector ? selector(state) : state),
+      { getState: () => state },
+    ),
+  };
+});
+
+const makeEmail = (overrides: Partial<Email> = {}): Email => ({
+  id: 'email-1',
+  threadId: 'thread-1',
+  mailboxIds: { inbox: true },
+  keywords: { $seen: true },
+  size: 1000,
+  receivedAt: '2024-01-15T10:00:00Z',
+  from: [{ name: 'Alice', email: 'alice@example.com' }],
+  subject: 'Test Subject',
+  hasAttachment: false,
+  ...overrides,
+});
+
+function row(emails: Email[]) {
+  const [thread] = groupEmailsByThread(emails);
+  return (
+    <ThreadListItem thread={thread} isExpanded={false} onToggleExpand={() => {}} onEmailSelect={() => {}} />
+  );
+}
+
+beforeEach(() => {
+  clearAllHooks();
+  clearRowBadgeCache();
+  resetRowBadgeRefresh();
+  useUIStore.setState({ isMobile: false, isTablet: false, isDesktop: true });
+  useSettingsStore.setState({
+    emailKeywords: [...DEFAULT_KEYWORDS],
+    showPreview: false,
+    mailLayout: 'split',
+    interfaceLayout: 'default',
+  });
+  useEmailStore.setState({ selectedEmailKeys: new Set<string>(), selectedMailbox: 'inbox' });
+});
+
+describe('plugin badges in message-list rows', () => {
+  it('shows the badges a plugin returns, with the email as a plain summary', async () => {
+    const handler = vi.fn(async (badges: unknown[]) => [
+      ...badges,
+      { key: 'enc', label: 'Encrypted', color: '#2563eb', title: 'Signed and encrypted' },
+    ]);
+    renderHooks.onEmailListItemRender.register('test', handler);
+
+    render(row([makeEmail()]));
+
+    const badge = await screen.findByText('Encrypted');
+    expect(badge).toHaveAttribute('title', 'Signed and encrypted');
+    expect(badge.style.borderColor).not.toBe('');
+    expect(handler).toHaveBeenCalledTimes(1);
+    const [initial, ctx] = handler.mock.calls[0] as unknown as [unknown, { email: Record<string, unknown> }];
+    expect(initial).toEqual([]);
+    expect(ctx.email).toMatchObject({ id: 'email-1', subject: 'Test Subject', keywords: ['$seen'] });
+    // A projection, not the store object.
+    expect(ctx.email).not.toHaveProperty('mailboxIds.inbox');
+  });
+
+  it('asks the plugin again when it requests a refresh, at most once a second', async () => {
+    let label = 'Open';
+    const handler = vi.fn(async () => [{ key: 'task', label }]);
+    renderHooks.onEmailListItemRender.register('test', handler);
+    render(row([makeEmail()]));
+    await screen.findByText('Open');
+
+    label = 'Done';
+    act(() => { expect(refreshRowBadges(10_000)).toBe(true); });
+    await screen.findByText('Done');
+    expect(refreshRowBadges(10_500)).toBe(false);
+    expect(handler).toHaveBeenCalledTimes(2);
+  });
+
+  it('shows badges on a conversation row and on the phone layout', async () => {
+    useUIStore.setState({ isMobile: true, isTablet: false, isDesktop: false });
+    renderHooks.onEmailListItemRender.register('test', async () => [{ key: 'k', label: 'Phone badge' }]);
+
+    render(row([
+      makeEmail({ id: 'a', receivedAt: '2024-01-15T10:00:00Z' }),
+      makeEmail({ id: 'b', receivedAt: '2024-01-16T10:00:00Z' }),
+    ]));
+
+    expect(await screen.findByText('Phone badge')).toBeInTheDocument();
+  });
+
+  it('renders the label as text, never as HTML', async () => {
+    renderHooks.onEmailListItemRender.register('test', async () => [
+      { key: 'x', label: '<img src=x onerror=alert(1)>' },
+    ]);
+
+    const { container } = render(row([makeEmail()]));
+
+    expect(await screen.findByText('<img src=x onerror=alert(1)>')).toBeInTheDocument();
+    expect(container.querySelector('img[src="x"]')).toBeNull();
+  });
+
+  it('asks plugins once per message and keyword state, not on every render', async () => {
+    const handler = vi.fn(async () => [{ key: 'k', label: 'Badge' }]);
+    renderHooks.onEmailListItemRender.register('test', handler);
+    const email = makeEmail();
+
+    const view = render(row([email]));
+    await screen.findByText('Badge');
+    view.rerender(row([{ ...email }]));
+    view.unmount();
+    render(row([{ ...email }]));
+    await screen.findByText('Badge');
+    expect(handler).toHaveBeenCalledTimes(1);
+
+    // Marking it unread is a new keyword state: ask again.
+    render(row([{ ...email, keywords: {} }]));
+    await waitFor(() => expect(handler).toHaveBeenCalledTimes(2));
+  });
+
+  it('does nothing without a handler', async () => {
+    const transform = vi.spyOn(renderHooks.onEmailListItemRender, 'transform');
+    render(row([makeEmail()]));
+    await act(async () => {});
+    expect(transform).not.toHaveBeenCalled();
+    expect(screen.queryByTestId('plugin-row-badges')).toBeNull();
+    transform.mockRestore();
+  });
+});
+
+describe('normalizeBadges', () => {
+  it(`keeps at most ${MAX_ROW_BADGES} well-formed badges and drops unsafe colours`, () => {
+    const out = normalizeBadges([
+      { key: 'a', label: 'A', color: 'url(https://evil.example/x.png)' },
+      { key: 'b', label: '' },
+      'nonsense',
+      { key: 'c', label: 'C', color: 'var(--color-warning)' },
+      { key: 'd', label: 'D', color: 'red; background: url(x)' },
+      { key: 'e', label: 'E' },
+      { key: 'f', label: 'F' },
+    ]);
+    expect(out).toEqual([
+      { key: 'a', label: 'A' },
+      { key: 'c', label: 'C', color: 'var(--color-warning)' },
+      { key: 'd', label: 'D' },
+    ]);
+    expect(normalizeBadges(undefined)).toEqual([]);
+  });
+});
diff --git a/components/email/__tests__/reader-plugin-surfaces.test.tsx b/components/email/__tests__/reader-plugin-surfaces.test.tsx
new file mode 100644
index 000000000..36c7f96f3
--- /dev/null
+++ b/components/email/__tests__/reader-plugin-surfaces.test.tsx
@@ -0,0 +1,427 @@
+import { act, fireEvent, render, screen, within } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import React from 'react';
+import type { Email, Mailbox, ThreadGroup } from '@/lib/jmap/types';
+import { resetActions, setActionDispatcher, setPluginActions } from '@/lib/plugin-sandbox/actions';
+import { clearOffers, offerSlots, slotProps } from '@/components/plugins/__tests__/fake-plugin-offer';
+
+// Plugin surfaces of the open message: frames above the subject, under the
+// sender, between new text and quote, above a conversation; buttons in the
+// reader toolbar (More panel on phones); entries in an attachment's menu.
+
+const device = vi.hoisted(() => ({ isMobile: false }));
+vi.mock('@/hooks/use-media-query', () => ({
+  useDeviceDetection: () => ({ isMobile: device.isMobile, isTablet: false, isDesktop: !device.isMobile }),
+  useMediaQuery: () => false,
+  useIsMobile: () => device.isMobile,
+}));
+vi.mock('@/components/tour/tour-provider', () => ({
+  useTour: () => ({ activeTour: null, startTour: vi.fn(), endTour: vi.fn(), registerStep: vi.fn() }),
+}));
+vi.mock('@/components/plugins/plugin-iframe-slot', async () => ({
+  PluginIframeSlot: (await import('@/components/plugins/__tests__/fake-plugin-offer')).FakeIframeSlot,
+}));
+
+class NoopResizeObserver {
+  observe() {}
+  unobserve() {}
+  disconnect() {}
+}
+vi.stubGlobal('ResizeObserver', NoopResizeObserver);
+
+const { EmailViewer } = await import('../email-viewer');
+const { ThreadConversationView } = await import('../thread-conversation-view');
+const { ReaderAboveQuoteSlot, QUOTE_ANCHOR_ATTR } = await import('../reader-plugin-surfaces');
+const { useSettingsStore } = await import('@/stores/settings-store');
+
+const mailboxes = [
+  { id: 'inbox', name: 'Inbox', role: 'inbox', parentId: null, myRights: { mayAddItems: true } },
+] as unknown as Mailbox[];
+
+function mail(overrides: Partial<Email> = {}): Email {
+  return {
+    id: 'e1', blobId: 'b1', threadId: 't1', mailboxIds: { inbox: true }, keywords: { $seen: true },
+    from: [{ name: 'Alice', email: 'alice@example.com' }], to: [{ name: 'Bob', email: 'bob@example.com' }],
+    subject: 'Hello there', receivedAt: '2026-01-01T00:00:00Z', preview: 'Hello', hasAttachment: false, size: 100,
+    textBody: [], htmlBody: [], attachments: [], bodyValues: {},
+    ...overrides,
+  } as unknown as Email;
+}
+
+function textMail(text: string, overrides: Partial<Email> = {}): Email {
+  return mail({
+    textBody: [{ partId: '1', type: 'text/plain' }],
+    bodyValues: { '1': { value: text, isTruncated: false } },
+    ...overrides,
+  } as Partial<Email>);
+}
+
+const REPLY = 'Sounds good, see you then.\n\nOn Monday Bob wrote:\n> Shall we meet at ten?\n> Bob';
+
+function viewer(email: Email, props: Partial<React.ComponentProps<typeof EmailViewer>> = {}) {
+  return render(
+    <EmailViewer email={email} mailboxes={mailboxes} selectedMailbox="inbox" currentMailboxRole="inbox" {...props} />,
+  );
+}
+
+const follows = (a: Node, b: Node) => !!(a.compareDocumentPosition(b) & Node.DOCUMENT_POSITION_FOLLOWING);
+
+const dispatch = vi.fn().mockResolvedValue(undefined);
+const initialSettings = useSettingsStore.getState();
+
+beforeEach(() => {
+  device.isMobile = false;
+  resetActions();
+  dispatch.mockClear();
+  setActionDispatcher(dispatch);
+  useSettingsStore.setState(initialSettings, true);
+});
+
+afterEach(() => {
+  clearOffers();
+  setActionDispatcher(null);
+});
+
+describe('email-detail-sidebar', () => {
+  // Reports a fixed width for whatever it observes, like a 584 px reading pane
+  // (three panes on a laptop).
+  function stubWidth(width: number) {
+    class FixedWidthObserver {
+      constructor(private cb: ResizeObserverCallback) {}
+      observe(el: Element) {
+        this.cb([{ target: el, contentRect: { width } } as unknown as ResizeObserverEntry], this as unknown as ResizeObserver);
+      }
+      unobserve() {}
+      disconnect() {}
+    }
+    vi.stubGlobal('ResizeObserver', FixedWidthObserver);
+  }
+
+  afterEach(() => {
+    vi.stubGlobal('ResizeObserver', NoopResizeObserver);
+    try { localStorage.removeItem('emailDetailSidebarCollapsed'); } catch { /* ignore */ }
+  });
+
+  it('starts collapsed when the message opens into a pane too narrow for it', () => {
+    stubWidth(584);
+    offerSlots('p1', ['email-detail-sidebar']);
+    // The reader mounts empty first, then a message opens.
+    const { rerender } = render(
+      <EmailViewer email={null} mailboxes={mailboxes} selectedMailbox="inbox" currentMailboxRole="inbox" />,
+    );
+    rerender(<EmailViewer email={textMail('Hi')} mailboxes={mailboxes} selectedMailbox="inbox" currentMailboxRole="inbox" />);
+
+    expect(screen.queryByTestId('slot-email-detail-sidebar')).toBeNull();
+    expect(screen.getByRole('button', { name: 'plugin_panel_show' })).toBeInTheDocument();
+  });
+
+  it('lays the panel over the message when opened anyway, instead of squeezing it', () => {
+    stubWidth(584);
+    offerSlots('p1', ['email-detail-sidebar']);
+    viewer(textMail('Hi'));
+
+    fireEvent.click(screen.getByRole('button', { name: 'plugin_panel_show' }));
+    const panel = screen.getByTestId('slot-email-detail-sidebar').closest('[data-plugin-detail-panel]')!;
+    expect(panel.getAttribute('data-plugin-detail-panel')).toBe('overlay');
+    expect(panel.className).toContain('absolute');
+  });
+
+  it('docks next to the message when there is room', () => {
+    stubWidth(1000);
+    offerSlots('p1', ['email-detail-sidebar']);
+    viewer(textMail('Hi'));
+
+    const panel = screen.getByTestId('slot-email-detail-sidebar').closest('[data-plugin-detail-panel]')!;
+    expect(panel.getAttribute('data-plugin-detail-panel')).toBe('docked');
+  });
+});
+
+describe('reader-header and reader-below-subject', () => {
+  it('put the frames above the subject and under the sender, with the message', () => {
+    offerSlots('p1', ['reader-header', 'reader-below-subject']);
+    const { container } = viewer(textMail('Hi'));
+
+    const header = screen.getByTestId('slot-reader-header');
+    const below = screen.getByTestId('slot-reader-below-subject');
+    const subject = screen.getByRole('heading', { name: 'Hello there' });
+    const body = container.querySelector('.email-content-wrapper')!;
+    expect(follows(header, subject)).toBe(true);
+    expect(follows(subject, below)).toBe(true);
+    expect(follows(below, body)).toBe(true);
+    expect((slotProps(header).email as { id: string }).id).toBe('e1');
+    expect((slotProps(below).email as { subject: string }).subject).toBe('Hello there');
+  });
+
+  it('draw nothing without a plugin', () => {
+    const { container } = viewer(textMail('Hi'));
+    expect(container.querySelector('[data-plugin-slot="reader-header"]')).toBeNull();
+    expect(container.querySelector('[data-plugin-slot="reader-below-subject"]')).toBeNull();
+  });
+});
+
+describe('email-footer', () => {
+  it('hands the frame the id of the open message', () => {
+    offerSlots('p1', ['email-footer']);
+    viewer(textMail('Hi'));
+    expect(slotProps(screen.getByTestId('slot-email-footer'))).toEqual({ emailId: 'e1' });
+  });
+});
+
+describe('reader-above-quote', () => {
+  it('sits between the new text of a plain-text reply and its folded quote', () => {
+    offerSlots('p1', ['reader-above-quote']);
+    const { container } = viewer(textMail(REPLY));
+
+    const frame = screen.getByTestId('slot-reader-above-quote');
+    const quote = container.querySelector('.email-content-text details')!;
+    expect(quote).not.toBeNull();
+    expect(follows(frame, quote)).toBe(true);
+    expect(follows(screen.getByText(/Sounds good/), frame)).toBe(true);
+    expect((slotProps(frame).email as { id: string }).id).toBe('e1');
+    // The frame renders inside the anchor, so the anchor must grow with it
+    // instead of letting the frame spill over the quote toggle and the footer.
+    const anchor = container.querySelector<HTMLElement>(`[${QUOTE_ANCHOR_ATTR}]`)!;
+    expect(anchor.contains(frame)).toBe(true);
+    expect(anchor.style.height).toBe('');
+  });
+
+  it('is not mounted for a message without a quote, or without a plugin', () => {
+    offerSlots('p1', ['reader-above-quote']);
+    const { unmount } = viewer(textMail('Just some text.'));
+    expect(screen.queryByTestId('slot-reader-above-quote')).toBeNull();
+    unmount();
+    clearOffers();
+    const { container } = viewer(textMail(REPLY));
+    expect(container.querySelector(`[${QUOTE_ANCHOR_ATTR}]`)).toBeNull();
+  });
+
+  it('lays the frame over an HTML body and makes room for it before the quote toggle', () => {
+    offerSlots('p1', ['reader-above-quote']);
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const iframe = document.createElement('iframe');
+    host.appendChild(iframe);
+    const doc = iframe.contentDocument!;
+    doc.body.innerHTML = '<p>New text</p><button data-quote-toggle>...</button><blockquote type="cite">Old</blockquote>';
+
+    const { unmount } = render(
+      <ReaderAboveQuoteSlot root={doc.body} frame={iframe} extraProps={{ email: { id: 'e1' } }} />,
+      { container: host.appendChild(document.createElement('div')) },
+    );
+
+    const anchor = doc.querySelector(`[${QUOTE_ANCHOR_ATTR}]`)!;
+    expect(anchor.nextElementSibling).toBe(doc.querySelector('[data-quote-toggle]'));
+    const overlay = document.querySelector('[data-plugin-quote-overlay]')!;
+    expect(within(overlay as HTMLElement).getByTestId('slot-reader-above-quote')).toBeInTheDocument();
+    unmount();
+    expect(doc.querySelector(`[${QUOTE_ANCHOR_ATTR}]`)).toBeNull();
+    host.remove();
+  });
+
+  it('shows in a conversation message on phones too', () => {
+    offerSlots('p1', ['reader-above-quote']);
+    const email = textMail(REPLY, { keywords: {} } as Partial<Email>);
+    const thread = { threadKey: 't1', latestEmail: email, emails: [email], emailCount: 1 } as unknown as ThreadGroup;
+    render(<ThreadConversationView thread={thread} emails={[email]} onBack={() => {}} />);
+
+    expect(screen.getByTestId('slot-reader-above-quote')).toBeInTheDocument();
+  });
+});
+
+describe('thread-summary', () => {
+  const conversation = [
+    textMail('First', { id: 'm1', receivedAt: '2026-01-01T00:00:00Z' } as Partial<Email>),
+    textMail('Second', { id: 'm2', receivedAt: '2026-01-02T00:00:00Z' } as Partial<Email>),
+  ];
+
+  it('sits above the messages of the phone conversation view', () => {
+    offerSlots('p1', ['thread-summary']);
+    const thread = { threadKey: 't1', latestEmail: conversation[1], emails: conversation, emailCount: 2 } as unknown as ThreadGroup;
+    render(<ThreadConversationView thread={thread} emails={[conversation[1], conversation[0]]} onBack={() => {}} />);
+
+    const frame = screen.getByTestId('slot-thread-summary');
+    expect(slotProps(frame)).toEqual({ threadId: 't1', emailIds: ['m2', 'm1'] });
+    expect(follows(frame, screen.getAllByText('Alice')[0])).toBe(true);
+  });
+
+  it('sits above a Mountain View conversation', () => {
+    offerSlots('p1', ['thread-summary']);
+    useSettingsStore.setState({ interfaceLayout: 'mountain-view', markAsReadDelay: 0 });
+    viewer(conversation[1], { mvConversation: conversation });
+
+    expect(slotProps(screen.getByTestId('slot-thread-summary'))).toEqual({ threadId: 't1', emailIds: ['m1', 'm2'] });
+  });
+
+  it('draws nothing without a plugin, and nothing for a single message', () => {
+    const thread = { threadKey: 't1', latestEmail: conversation[1], emails: conversation, emailCount: 2 } as unknown as ThreadGroup;
+    const { unmount } = render(<ThreadConversationView thread={thread} emails={conversation} onBack={() => {}} />);
+    expect(screen.queryByTestId('slot-thread-summary')).toBeNull();
+    unmount();
+    offerSlots('p1', ['thread-summary']);
+    viewer(conversation[1]);
+    expect(screen.queryByTestId('slot-thread-summary')).toBeNull();
+  });
+});
+
+describe('reader surfaces in the phone conversation view', () => {
+  const conversation = [
+    textMail('Second', { id: 'm2', subject: 'Re: Plan', receivedAt: '2026-01-02T00:00:00Z' } as Partial<Email>),
+    textMail('First', { id: 'm1', subject: 'Plan', receivedAt: '2026-01-01T00:00:00Z' } as Partial<Email>),
+  ];
+  const thread = { threadKey: 't1', latestEmail: conversation[0], emails: conversation, emailCount: 2 } as unknown as ThreadGroup;
+
+  it('mounts the single reader\'s frames on the unfolded message only', () => {
+    offerSlots('p1', ['reader-header', 'reader-below-subject', 'email-banner', 'email-footer']);
+    render(<ThreadConversationView thread={thread} emails={conversation} onBack={() => {}} />);
+
+    // The latest message is unfolded, the older one (read) is folded.
+    for (const slot of ['reader-header', 'reader-below-subject', 'email-banner'] as const) {
+      const frames = screen.getAllByTestId(`slot-${slot}`);
+      expect(frames).toHaveLength(1);
+      expect((slotProps(frames[0]).email as { id: string }).id).toBe('m2');
+    }
+    const footer = screen.getAllByTestId('slot-email-footer');
+    expect(footer).toHaveLength(1);
+    expect(slotProps(footer[0])).toEqual({ emailId: 'm2' });
+    // Header on top, the body between banner and footer.
+    expect(follows(screen.getByTestId('slot-reader-header'), screen.getByTestId('slot-reader-below-subject'))).toBe(true);
+    expect(follows(screen.getByTestId('slot-email-banner'), screen.getByText('Second'))).toBe(true);
+    expect(follows(screen.getByText('Second'), footer[0])).toBe(true);
+  });
+
+  it('puts plugin reader actions behind a more button on the unfolded message', async () => {
+    act(() => setPluginActions('p', 'Translator', 'reader-actions', [{ id: 'translate', label: 'Translate', mailboxRoles: ['inbox'] }]));
+    const { unmount } = render(<ThreadConversationView thread={thread} emails={conversation} onBack={() => {}} mailboxRole="inbox" />);
+
+    fireEvent.click(screen.getByRole('button', { name: 'more_actions' }));
+    const item = await screen.findByRole('menuitem', { name: 'Translate' });
+    await act(async () => { fireEvent.click(item); });
+    expect(dispatch).toHaveBeenCalledWith('p', 'reader-actions', 'translate', { emailId: 'm2' });
+    unmount();
+
+    // Kept to the folder roles the plugin asked for.
+    render(<ThreadConversationView thread={thread} emails={conversation} onBack={() => {}} mailboxRole="junk" />);
+    expect(screen.queryByRole('button', { name: 'more_actions' })).toBeNull();
+  });
+});
+
+describe('reader-actions', () => {
+  it('adds the plugin buttons to the reader toolbar', async () => {
+    act(() => setPluginActions('p', 'Translator', 'reader-actions', [{ id: 'translate', label: 'Translate' }]));
+    viewer(textMail('Hola'));
+
+    const button = screen.getByRole('button', { name: 'Translate' });
+    expect(button.closest('[data-plugin-actions="reader-actions"]')).not.toBeNull();
+    await act(async () => { fireEvent.click(button); });
+    expect(dispatch).toHaveBeenCalledWith('p', 'reader-actions', 'translate', { emailId: 'e1' });
+  });
+
+  it('keeps to the folder roles the plugin asked for', () => {
+    act(() => setPluginActions('p', 'P', 'reader-actions', [{ id: 'translate', label: 'Translate', mailboxRoles: ['junk'] }]));
+    viewer(textMail('Hola'));
+    expect(screen.queryByRole('button', { name: 'Translate' })).toBeNull();
+  });
+
+  it('puts them in the More panel on phones', async () => {
+    device.isMobile = true;
+    act(() => setPluginActions('p', 'Translator', 'reader-actions', [{ id: 'translate', label: 'Translate' }]));
+    viewer(textMail('Hola'));
+
+    expect(screen.queryByRole('button', { name: 'Translate' })).toBeNull();
+    const item = screen.getByRole('menuitem', { name: 'Translate', hidden: true });
+    await act(async () => { fireEvent.click(item); });
+    expect(dispatch).toHaveBeenCalledWith('p', 'reader-actions', 'translate', { emailId: 'e1' });
+  });
+
+  it('draws nothing without a plugin', () => {
+    const { container } = viewer(textMail('Hola'));
+    expect(container.querySelector('[data-plugin-actions="reader-actions"]')).toBeNull();
+  });
+});
+
+describe('attachment-actions', () => {
+  const withAttachment = () => textMail('See attached', {
+    hasAttachment: true,
+    attachments: [{ partId: '2', blobId: 'blob-pdf', name: 'invoice.pdf', type: 'application/pdf', size: 1234, disposition: 'attachment' }],
+  } as Partial<Email>);
+
+  it('puts the frames next to the chip, not in its hover overlay', () => {
+    offerSlots('p1', ['attachment-actions']);
+    viewer(withAttachment());
+
+    // Desktop chip and phone chip are both in the DOM.
+    const frames = screen.getAllByTestId('slot-attachment-actions');
+    expect(frames.length).toBeGreaterThan(0);
+    for (const frame of frames) {
+      // Nothing between the frame and the page may hide it until hover.
+      for (let el: HTMLElement | null = frame; el; el = el.parentElement) {
+        expect(el.className).not.toMatch(/\bopacity-0\b/);
+      }
+      expect(frame.closest('[data-attachment-name]')).toBeNull();
+      expect(slotProps(frame)).toEqual({
+        attachment: { name: 'invoice.pdf', type: 'application/pdf', size: 1234, blobId: 'blob-pdf', emailId: 'e1' },
+      });
+    }
+  });
+
+  it('keeps the invisible hover overlay from taking taps', () => {
+    viewer(withAttachment());
+    const overlays = [...document.querySelectorAll<HTMLElement>('[data-attachment-name="invoice.pdf"] div')]
+      .filter((d) => /\bopacity-0\b/.test(d.className));
+    expect(overlays.length).toBeGreaterThan(0);
+    for (const overlay of overlays) expect(overlay.className).toMatch(/\bpointer-events-none\b/);
+  });
+
+  it("shows the overlay's buttons to keyboard users who tab into them, not only on hover", () => {
+    viewer(withAttachment());
+    const overlays = [...document.querySelectorAll<HTMLElement>('[data-attachment-name="invoice.pdf"] div')]
+      .filter((d) => /\bopacity-0\b/.test(d.className));
+    expect(overlays.length).toBeGreaterThan(0);
+    for (const overlay of overlays) {
+      expect(overlay.className).toMatch(/\bgroup-focus-within:opacity-100\b/);
+      expect(overlay.className).toMatch(/\bgroup-focus-within:pointer-events-auto\b/);
+    }
+  });
+});
+
+describe('attachment-menu', () => {
+  const withAttachments = () => textMail('See attached', {
+    hasAttachment: true,
+    attachments: [
+      { partId: '2', blobId: 'blob-pdf', name: 'invoice.pdf', type: 'application/pdf', size: 1234, disposition: 'attachment' },
+      { partId: '3', blobId: 'blob-png', name: 'photo.png', type: 'image/png', size: 99, disposition: 'attachment' },
+    ],
+  } as Partial<Email>);
+
+  it('opens the plugin entries from a menu button on the attachment and sends the attachment', async () => {
+    act(() => setPluginActions('p', 'Cloud', 'attachment-menu', [{ id: 'save', label: 'Save to cloud', mimeTypes: ['application/pdf'] }]));
+    viewer(withAttachments());
+
+    // Only the PDF gets the menu (desktop chip and phone chip are both in the DOM).
+    const buttons = document.querySelectorAll('[data-attachment-plugin-menu]');
+    expect(buttons.length).toBeGreaterThan(0);
+    for (const b of buttons) {
+      expect(b.closest('[data-attachment-name]')?.getAttribute('data-attachment-name')).toBe('invoice.pdf');
+    }
+    fireEvent.click(buttons[0]);
+    const item = await screen.findByRole('menuitem', { name: 'Save to cloud' });
+    await act(async () => { fireEvent.click(item); });
+    expect(dispatch).toHaveBeenCalledWith('p', 'attachment-menu', 'save', {
+      emailId: 'e1', blobId: 'blob-pdf', name: 'invoice.pdf', type: 'application/pdf', size: 1234,
+    });
+  });
+
+  it('adds the menu to attachments in a conversation message', () => {
+    act(() => setPluginActions('p', 'Cloud', 'attachment-menu', [{ id: 'save', label: 'Save to cloud' }]));
+    const email = withAttachments();
+    const thread = { threadKey: 't1', latestEmail: email, emails: [email], emailCount: 1 } as unknown as ThreadGroup;
+    render(<ThreadConversationView thread={thread} emails={[email]} onBack={() => {}} />);
+
+    expect(document.querySelectorAll('[data-attachment-plugin-menu]')).toHaveLength(2);
+  });
+
+  it('draws no menu button without a plugin entry', () => {
+    viewer(withAttachments());
+    expect(document.querySelector('[data-attachment-plugin-menu]')).toBeNull();
+  });
+});
diff --git a/components/email/__tests__/recipient-autocomplete.test.tsx b/components/email/__tests__/recipient-autocomplete.test.tsx
index 97c1eb937..af1feb66d 100644
--- a/components/email/__tests__/recipient-autocomplete.test.tsx
+++ b/components/email/__tests__/recipient-autocomplete.test.tsx
@@ -137,6 +137,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
diff --git a/components/email/__tests__/recipient-chip-drag.test.tsx b/components/email/__tests__/recipient-chip-drag.test.tsx
index bfdac74c7..058916079 100644
--- a/components/email/__tests__/recipient-chip-drag.test.tsx
+++ b/components/email/__tests__/recipient-chip-drag.test.tsx
@@ -130,6 +130,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
diff --git a/components/email/__tests__/recipient-paste.test.tsx b/components/email/__tests__/recipient-paste.test.tsx
index 5863db954..3d8a80ca9 100644
--- a/components/email/__tests__/recipient-paste.test.tsx
+++ b/components/email/__tests__/recipient-paste.test.tsx
@@ -129,6 +129,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
diff --git a/components/email/__tests__/reply-addressing.test.tsx b/components/email/__tests__/reply-addressing.test.tsx
index bec2f195b..86330916b 100644
--- a/components/email/__tests__/reply-addressing.test.tsx
+++ b/components/email/__tests__/reply-addressing.test.tsx
@@ -158,6 +158,14 @@ vi.mock('@/stores/toast-store', () => ({
 }));
 
 vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
     onRecipientChange: { call: async () => [] },
diff --git a/components/email/__tests__/viewer-plugin-panel-width.test.tsx b/components/email/__tests__/viewer-plugin-panel-width.test.tsx
new file mode 100644
index 000000000..a16703c47
--- /dev/null
+++ b/components/email/__tests__/viewer-plugin-panel-width.test.tsx
@@ -0,0 +1,78 @@
+import { render, screen, act, fireEvent } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import React from 'react';
+import type { Email, Mailbox } from '@/lib/jmap/types';
+
+// With a plugin panel open at 280 px next to a 300 px message (three panes
+// on a laptop), the subject broke after every few letters. The panel now
+// starts collapsed when it would leave the message under 480 px.
+
+vi.mock('@/hooks/use-media-query', () => ({
+  useDeviceDetection: () => ({ isMobile: false, isTablet: false, isDesktop: true }),
+  useMediaQuery: () => false,
+}));
+vi.mock('@/components/tour/tour-provider', () => ({
+  useTour: () => ({ activeTour: null, startTour: vi.fn(), endTour: vi.fn(), registerStep: vi.fn() }),
+}));
+vi.mock('@/components/plugins/plugin-slot', () => ({
+  PluginSlot: ({ name }: { name: string }) => React.createElement('div', { 'data-testid': `slot-${name}` }),
+}));
+vi.mock('@/hooks/use-plugin-slot-offers', () => ({
+  usePluginSlotOffers: (slot: string) => (slot === 'email-detail-sidebar' ? [{ pluginId: 'notes', order: 100 }] : []),
+}));
+
+let reportWidth = 0;
+const observers: Array<(entries: Array<{ contentRect: { width: number } }>) => void> = [];
+class FakeResizeObserver {
+  constructor(private cb: (entries: Array<{ contentRect: { width: number } }>) => void) { observers.push(cb); }
+  observe() { this.cb([{ contentRect: { width: reportWidth } }]); }
+  unobserve() {}
+  disconnect() {}
+}
+vi.stubGlobal('ResizeObserver', FakeResizeObserver);
+
+const { EmailViewer } = await import('../email-viewer');
+
+const mailboxes = [
+  { id: 'inbox', name: 'Inbox', role: 'inbox', parentId: null, myRights: { mayAddItems: true } },
+] as unknown as Mailbox[];
+const email = {
+  id: 'e1', blobId: 'b1', threadId: 't1', mailboxIds: { inbox: true }, keywords: { $seen: true },
+  from: [{ name: 'Alice', email: 'alice@example.com' }], to: [], subject: 'Hello', receivedAt: '2026-01-01T00:00:00Z',
+  preview: '', hasAttachment: false, size: 1, textBody: [], htmlBody: [], attachments: [], bodyValues: {},
+} as unknown as Email;
+
+function renderViewer() {
+  return render(<EmailViewer email={email} mailboxes={mailboxes} selectedMailbox="inbox" currentMailboxRole="inbox" />);
+}
+
+beforeEach(() => {
+  localStorage.clear();
+  observers.length = 0;
+});
+
+describe('plugin detail panel and narrow messages', () => {
+  it('starts collapsed when it would leave the message too narrow', () => {
+    reportWidth = 640;
+    renderViewer();
+
+    expect(screen.queryByTestId('slot-email-detail-sidebar')).not.toBeInTheDocument();
+    expect(screen.getByLabelText('plugin_panel_show')).toBeInTheDocument();
+  });
+
+  it('opens anyway when the user asks', () => {
+    reportWidth = 640;
+    renderViewer();
+
+    act(() => { fireEvent.click(screen.getByLabelText('plugin_panel_show')); });
+
+    expect(screen.getByTestId('slot-email-detail-sidebar')).toBeInTheDocument();
+  });
+
+  it('is open when there is room', () => {
+    reportWidth = 1100;
+    renderViewer();
+
+    expect(screen.getByTestId('slot-email-detail-sidebar')).toBeInTheDocument();
+  });
+});
diff --git a/components/email/__tests__/viewer-plugin-slot-remount.test.tsx b/components/email/__tests__/viewer-plugin-slot-remount.test.tsx
new file mode 100644
index 000000000..fbd5c96d9
--- /dev/null
+++ b/components/email/__tests__/viewer-plugin-slot-remount.test.tsx
@@ -0,0 +1,73 @@
+import { render, screen, fireEvent, act } from '@testing-library/react';
+import { describe, it, expect, vi } from 'vitest';
+import React, { useEffect } from 'react';
+import type { Email, Mailbox } from '@/lib/jmap/types';
+
+// The "more details" panel defined its plugin slot component inside render,
+// so every re-render of the viewer was a new component type: React unmounted
+// and remounted the plugin's iframe each time (and re-ran its shouldShow).
+
+vi.mock('@/hooks/use-media-query', () => ({
+  useDeviceDetection: () => ({ isMobile: false, isTablet: false, isDesktop: true }),
+  useMediaQuery: () => false,
+}));
+vi.mock('@/components/tour/tour-provider', () => ({
+  useTour: () => ({ activeTour: null, startTour: vi.fn(), endTour: vi.fn(), registerStep: vi.fn() }),
+}));
+
+const mounts: Record<string, number> = {};
+const propsSeen: Record<string, unknown[]> = {};
+vi.mock('@/components/plugins/plugin-slot', () => ({
+  PluginSlot: ({ name, extraProps }: { name: string; extraProps?: unknown }) => {
+    (propsSeen[name] ??= []).push(extraProps);
+    useEffect(() => {
+      mounts[name] = (mounts[name] ?? 0) + 1;
+      // Runs once per mount on purpose: that is what the test counts.
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+    return React.createElement('div', { 'data-slot': name });
+  },
+}));
+vi.mock('@/hooks/use-plugin-slot-offers', () => ({
+  usePluginSlotOffers: (slot: string) =>
+    slot === 'email-details-section' || slot === 'email-banner' ? [{ pluginId: 'p', order: 100 }] : [],
+}));
+
+class NoopResizeObserver {
+  observe() {}
+  unobserve() {}
+  disconnect() {}
+}
+vi.stubGlobal('ResizeObserver', NoopResizeObserver);
+
+const { EmailViewer } = await import('../email-viewer');
+
+const mailboxes = [
+  { id: 'inbox', name: 'Inbox', role: 'inbox', parentId: null, myRights: { mayAddItems: true } },
+] as unknown as Mailbox[];
+
+const email = {
+  id: 'e1', blobId: 'b1', threadId: 't1', mailboxIds: { inbox: true }, keywords: { $seen: true },
+  from: [{ name: 'Alice', email: 'alice@example.com' }], to: [{ name: 'Bob', email: 'bob@example.com' }],
+  subject: 'Hello', receivedAt: '2026-01-01T00:00:00Z', preview: 'Hello', hasAttachment: false, size: 100,
+  textBody: [], htmlBody: [], attachments: [], bodyValues: {},
+} as unknown as Email;
+
+describe('plugin slots in the message viewer', () => {
+  it('keep their iframes and props across re-renders', () => {
+    const view = (extra: Record<string, unknown>) => (
+      <EmailViewer email={email} mailboxes={mailboxes} selectedMailbox="inbox" currentMailboxRole="inbox" {...extra} />
+    );
+    const { rerender } = render(view({ isLoading: false }));
+    act(() => { fireEvent.click(screen.getAllByText('show_details')[0]); });
+    const detailMounts = mounts['email-details-section'];
+    const bannerProps = propsSeen['email-banner'].at(-1);
+    expect(detailMounts).toBeGreaterThan(0);
+
+    rerender(view({ isLoading: false, onReply: () => {} }));
+    rerender(view({ isLoading: false, onReply: () => {}, onForward: () => {} }));
+
+    expect(mounts['email-details-section']).toBe(detailMounts);
+    expect(propsSeen['email-banner'].at(-1)).toBe(bannerProps);
+  });
+});
diff --git a/components/email/__tests__/viewer-read-hooks.test.tsx b/components/email/__tests__/viewer-read-hooks.test.tsx
new file mode 100644
index 000000000..6437c4f4e
--- /dev/null
+++ b/components/email/__tests__/viewer-read-hooks.test.tsx
@@ -0,0 +1,94 @@
+import { render, screen, fireEvent, act, waitFor } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import type { Email, Mailbox } from '@/lib/jmap/types';
+import { emailHooks, clearAllHooks } from '@/lib/plugin-hooks';
+
+// mail-read hooks fired by the reading pane: onEmailContentRender once the
+// body is on screen and onThreadExpand for the conversation cards. (The link
+// hook runs inside the body iframe, which jsdom doesn't load; its decision is
+// covered in lib/__tests__/plugin-hook-result.test.ts.)
+
+vi.mock('@/hooks/use-media-query', () => ({
+  useDeviceDetection: () => ({ isMobile: false, isTablet: false, isDesktop: true }),
+  useMediaQuery: () => false,
+}));
+vi.mock('@/components/tour/tour-provider', () => ({
+  useTour: () => ({ activeTour: null, startTour: vi.fn(), endTour: vi.fn(), registerStep: vi.fn() }),
+}));
+vi.mock('@/components/plugins/plugin-slot', () => ({ PluginSlot: () => null }));
+vi.mock('@/hooks/use-plugin-slot-offers', () => ({ usePluginSlotOffers: () => [] }));
+
+class NoopResizeObserver {
+  observe() {}
+  unobserve() {}
+  disconnect() {}
+}
+vi.stubGlobal('ResizeObserver', NoopResizeObserver);
+
+const { EmailViewer } = await import('../email-viewer');
+const { ThreadConversationView } = await import('../thread-conversation-view');
+
+const mailboxes = [
+  { id: 'inbox', name: 'Inbox', role: 'inbox', parentId: null, myRights: { mayAddItems: true } },
+] as unknown as Mailbox[];
+
+const textEmail = (id = 'e1') => ({
+  id, blobId: 'b1', threadId: 't1', mailboxIds: { inbox: true }, keywords: { $seen: true },
+  from: [{ name: 'Alice', email: 'alice@example.com' }], to: [{ name: 'Bob', email: 'bob@example.com' }],
+  subject: 'Hello', receivedAt: '2026-01-01T00:00:00Z', preview: 'Hello', hasAttachment: false, size: 100,
+  textBody: [{ partId: '1', type: 'text/plain' }], htmlBody: [{ partId: '1', type: 'text/plain' }], attachments: [],
+  bodyValues: { '1': { value: 'Hello there' } },
+}) as unknown as Email;
+
+const viewer = (email: Email, extra: Record<string, unknown> = {}) => (
+  <EmailViewer email={email} mailboxes={mailboxes} selectedMailbox="inbox" currentMailboxRole="inbox" {...extra} />
+);
+
+beforeEach(() => clearAllHooks());
+
+describe('onEmailContentRender', () => {
+  it('fires once the body is on screen, once per message', async () => {
+    const handler = vi.fn();
+    emailHooks.onEmailContentRender.register('test', handler);
+
+    const { rerender } = render(viewer(textEmail(), { isLoading: true }));
+    await act(async () => {});
+    expect(handler).not.toHaveBeenCalled();
+
+    rerender(viewer(textEmail(), { isLoading: false }));
+    await waitFor(() => expect(handler).toHaveBeenCalledTimes(1));
+    expect(handler).toHaveBeenCalledWith({ emailId: 'e1', hasHtml: false, hasExternalContent: false });
+
+    rerender(viewer(textEmail(), { isLoading: false, onReply: () => {} }));
+    await act(async () => {});
+    expect(handler).toHaveBeenCalledTimes(1);
+
+    rerender(viewer(textEmail('e2'), { isLoading: false }));
+    await waitFor(() => expect(handler).toHaveBeenCalledTimes(2));
+    expect(handler).toHaveBeenLastCalledWith({ emailId: 'e2', hasHtml: false, hasExternalContent: false });
+  });
+});
+
+describe('onThreadExpand in the conversation view', () => {
+  it('reports a card being unfolded and folded', () => {
+    const handler = vi.fn();
+    emailHooks.onThreadExpand.register('test', handler);
+    const older = { ...textEmail('old'), keywords: { $seen: true }, receivedAt: '2025-12-01T00:00:00Z' } as Email;
+    const newer = textEmail('new');
+
+    render(
+      <ThreadConversationView
+        thread={{ threadId: 't1', emails: [newer, older], latestEmail: newer } as never}
+        emails={[newer, older]}
+        onBack={() => {}}
+      />,
+    );
+    // The newest card starts unfolded, the older read one folded.
+    const olderHeader = screen.getAllByText('Alice').at(-1)!;
+    fireEvent.click(olderHeader);
+    expect(handler).toHaveBeenLastCalledWith({ threadId: 't1', emailIds: ['old'], expanded: true });
+    fireEvent.click(screen.getAllByText('Alice').at(-1)!);
+    expect(handler).toHaveBeenLastCalledWith({ threadId: 't1', emailIds: ['old'], expanded: false });
+    expect(handler).toHaveBeenCalledTimes(2);
+  });
+});
diff --git a/components/email/composer-plugin-sidebars.tsx b/components/email/composer-plugin-sidebars.tsx
new file mode 100644
index 000000000..c2fa7860a
--- /dev/null
+++ b/components/email/composer-plugin-sidebars.tsx
@@ -0,0 +1,189 @@
+"use client";
+
+// The composer-sidebar and composer-sidebar-right plugin panels. Each gets a
+// fixed width and a toggle to fold it to a thin strip. When the composer is
+// too narrow for an open panel next to it, the panel folds by itself (right
+// first); opening it anyway lays it over the composer instead of squeezing
+// the message into a column nobody can write in.
+
+import { useEffect, useState } from "react";
+import { useTranslations } from "next-intl";
+import { PanelLeftClose, PanelLeftOpen, PanelRightClose, PanelRightOpen } from "@/components/icons";
+import { PluginSlot } from "@/components/plugins/plugin-slot";
+import { usePluginSlotOffers } from "@/hooks/use-plugin-slot-offers";
+import { cn } from "@/lib/utils";
+
+/** Width of an open panel. */
+export const COMPOSER_SIDEBAR_WIDTH = 260;
+/** Width of a folded panel (the strip with its toggle). */
+export const COMPOSER_SIDEBAR_STRIP = 37;
+/**
+ * Narrowest the composer itself may get next to open panels: below this its
+ * bottom bar (Attach, Templates, Options, Discard, Send) runs into itself.
+ */
+export const MIN_COMPOSER_WIDTH = 560;
+
+export type ComposerSidebarSide = "left" | "right";
+/** docked: open beside the composer; folded: a strip; overlay: open over the composer. */
+export type ComposerSidebarMode = "docked" | "folded" | "overlay";
+
+interface SideState {
+  present: boolean;
+  /** Folded by the user. */
+  collapsed: boolean;
+  /** Opened by the user while there was no room for it. */
+  overlayOpen?: boolean;
+}
+
+/**
+ * How each panel is shown in a composer `width` px wide (0 = not measured
+ * yet: everything the user left open is shown open). The left panel gets
+ * room first, since the right one is folded first.
+ */
+export function composerSidebarModes(
+  width: number,
+  left: SideState,
+  right: SideState,
+): Record<ComposerSidebarSide, ComposerSidebarMode | null> {
+  const present = (left.present ? 1 : 0) + (right.present ? 1 : 0);
+  let room = width > 0 ? width - MIN_COMPOSER_WIDTH - present * COMPOSER_SIDEBAR_STRIP : Infinity;
+  const place = (side: SideState): ComposerSidebarMode | null => {
+    if (!side.present) return null;
+    if (side.collapsed) return "folded";
+    const extra = COMPOSER_SIDEBAR_WIDTH - COMPOSER_SIDEBAR_STRIP;
+    if (extra <= room) {
+      room -= extra;
+      return "docked";
+    }
+    return side.overlayOpen ? "overlay" : "folded";
+  };
+  const l = place(left);
+  return { left: l, right: place(right) };
+}
+
+const storageKey = (side: ComposerSidebarSide) => `composerPluginSidebarCollapsed:${side}`;
+
+function readCollapsed(side: ComposerSidebarSide): boolean {
+  if (typeof window === "undefined") return false;
+  try { return localStorage.getItem(storageKey(side)) === "1"; } catch { return false; }
+}
+
+/** Layout state of both panels for a composer whose root element is `root`. */
+export function useComposerSidebars(root: HTMLElement | null) {
+  const hasLeft = usePluginSlotOffers("composer-sidebar").length > 0;
+  const hasRight = usePluginSlotOffers("composer-sidebar-right").length > 0;
+  const [width, setWidth] = useState(0);
+  const [collapsed, setCollapsed] = useState<Record<ComposerSidebarSide, boolean>>(() => ({
+    left: readCollapsed("left"),
+    right: readCollapsed("right"),
+  }));
+  const [overlayOpen, setOverlayOpen] = useState<Record<ComposerSidebarSide, boolean>>({ left: false, right: false });
+
+  useEffect(() => {
+    if (!root || (!hasLeft && !hasRight) || typeof ResizeObserver === "undefined") return;
+    const observer = new ResizeObserver((entries) => {
+      setWidth(Math.round(entries[0]?.contentRect.width ?? root.getBoundingClientRect().width));
+    });
+    observer.observe(root);
+    return () => observer.disconnect();
+  }, [root, hasLeft, hasRight]);
+
+  const modes = composerSidebarModes(
+    width,
+    { present: hasLeft, collapsed: collapsed.left, overlayOpen: overlayOpen.left },
+    { present: hasRight, collapsed: collapsed.right, overlayOpen: overlayOpen.right },
+  );
+
+  const setSideCollapsed = (side: ComposerSidebarSide, value: boolean) => {
+    setCollapsed((prev) => ({ ...prev, [side]: value }));
+    try { localStorage.setItem(storageKey(side), value ? "1" : "0"); } catch { /* storage blocked */ }
+  };
+
+  /** Open a folded panel: beside the composer when it fits, over it otherwise. */
+  const open = (side: ComposerSidebarSide) => {
+    const next = { ...collapsed, [side]: false };
+    const fits = composerSidebarModes(
+      width,
+      { present: hasLeft, collapsed: next.left },
+      { present: hasRight, collapsed: next.right },
+    )[side] === "docked";
+    setSideCollapsed(side, false);
+    setOverlayOpen((prev) => ({ ...prev, [side]: !fits }));
+  };
+  const close = (side: ComposerSidebarSide) => {
+    setSideCollapsed(side, true);
+    setOverlayOpen((prev) => ({ ...prev, [side]: false }));
+  };
+
+  return { modes, open, close };
+}
+
+/** One plugin panel of the composer, in the mode useComposerSidebars picked. */
+export function ComposerPluginSidebar({
+  side,
+  mode,
+  onOpen,
+  onClose,
+}: {
+  side: ComposerSidebarSide;
+  mode: ComposerSidebarMode | null;
+  onOpen: () => void;
+  onClose: () => void;
+}) {
+  const t = useTranslations("email_viewer");
+  if (!mode) return null;
+  const border = side === "left" ? "border-e" : "border-s";
+  const OpenIcon = side === "left" ? PanelLeftOpen : PanelRightOpen;
+  const CloseIcon = side === "left" ? PanelLeftClose : PanelRightClose;
+
+  if (mode === "folded") {
+    return (
+      <div
+        className={cn("hidden md:flex flex-col items-center shrink-0 h-full border-border bg-background", border)}
+        style={{ width: COMPOSER_SIDEBAR_STRIP }}
+        data-composer-sidebar={side}
+        data-composer-sidebar-mode="folded"
+      >
+        <button
+          type="button"
+          onClick={onOpen}
+          className="m-1 grid h-7 w-7 place-items-center rounded-md text-muted-foreground hover:bg-muted hover:text-foreground"
+          title={t("plugin_panel_show")}
+          aria-label={t("plugin_panel_show")}
+        >
+          <OpenIcon className="h-4 w-4" />
+        </button>
+      </div>
+    );
+  }
+
+  return (
+    <div
+      className={cn(
+        "hidden md:flex flex-col shrink-0 h-full border-border bg-background overflow-hidden",
+        border,
+        mode === "overlay" && cn("absolute inset-y-0 z-30 shadow-xl", side === "left" ? "start-0" : "end-0"),
+      )}
+      style={{ width: COMPOSER_SIDEBAR_WIDTH }}
+      data-composer-sidebar={side}
+      data-composer-sidebar-mode={mode}
+    >
+      <div className={cn("flex items-center px-1 py-1 border-b border-border shrink-0", side === "left" ? "justify-end" : "justify-start")}>
+        <button
+          type="button"
+          onClick={onClose}
+          className="grid h-7 w-7 place-items-center rounded-md text-muted-foreground hover:bg-muted hover:text-foreground"
+          title={t("plugin_panel_hide")}
+          aria-label={t("plugin_panel_hide")}
+        >
+          <CloseIcon className="h-4 w-4" />
+        </button>
+      </div>
+      <div className="flex-1 min-h-0 overflow-y-auto">
+        {side === "left"
+          ? <PluginSlot name="composer-sidebar" className="flex flex-col" />
+          : <PluginSlot name="composer-sidebar-right" className="flex flex-col" />}
+      </div>
+    </div>
+  );
+}
diff --git a/components/email/composer-toolbar-menu.tsx b/components/email/composer-toolbar-menu.tsx
index bba4b502c..eff707bc4 100644
--- a/components/email/composer-toolbar-menu.tsx
+++ b/components/email/composer-toolbar-menu.tsx
@@ -2,7 +2,9 @@
 
 import { useEffect, useId, useRef, useState } from "react";
 import { Button } from "@/components/ui/button";
-import { Check, ChevronDown, type AppIcon } from "@/components/icons";
+import { Check, ChevronDown, iconForName, Puzzle, type AppIcon } from "@/components/icons";
+import { usePluginActions } from "@/components/plugins/plugin-actions";
+import { runAction } from "@/lib/plugin-sandbox/actions";
 import { cn } from "@/lib/utils";
 
 interface ComposerToolbarMenuProps {
@@ -138,3 +140,111 @@ export function ComposerToolbarMenuCheckItem({ checked, onToggle, description, t
     </button>
   );
 }
+
+interface PluginItemsProps {
+  /** A surface of kind 'action' in lib/plugin-slot-catalog.ts. */
+  surface: string;
+  /** What the click is about; a function is read at click time. */
+  context: Record<string, unknown> | (() => Record<string, unknown>);
+  /** Called before the plugin gets the click, e.g. to close the menu. */
+  onSelect?: () => void;
+  /** Draw a separator before the entries (when the menu has its own above). */
+  separator?: boolean;
+  /** Only while the composer bar is narrower than 44rem (see ComposerPluginToolbarButtons). */
+  onlyWhenNarrow?: boolean;
+}
+
+/**
+ * Buttons plugins declared for the composer's bottom bar
+ * (composer-toolbar-actions), drawn like Attach and Templates. An action's
+ * shortcut is shown in its tooltip; the composer binds it.
+ *
+ * The bar is a container (`@container/composer-bar`). Below 44rem there is
+ * no room next to the app's own buttons, Discard and Send, so the buttons
+ * are hidden and the same actions are listed in the Options menu instead
+ * (ComposerPluginMenuItems with `onlyWhenNarrow`).
+ */
+export function ComposerPluginToolbarButtons({ surface, context }: { surface: "composer-toolbar-actions"; context: () => Record<string, unknown> }) {
+  const actions = usePluginActions(surface);
+  if (actions.length === 0) return null;
+  return (
+    <>
+      {actions.map((action) => {
+        const Icon = iconForName(action.icon) ?? Puzzle;
+        const tip = action.shortcut ? `${action.label} (${action.shortcut})` : action.label;
+        return (
+          <Button
+            key={`${action.pluginId}:${action.id}`}
+            type="button"
+            variant="ghost"
+            className={cn("hidden @[44rem]/composer-bar:inline-flex h-9 gap-1.5 px-2 sm:px-2.5", action.danger && "text-destructive")}
+            title={tip}
+            aria-label={action.label}
+            aria-keyshortcuts={action.shortcut}
+            data-plugin-action={`${action.pluginId}:${action.id}`}
+            onClick={() => { void runAction(action, surface, context()); }}
+          >
+            <Icon className="w-4 h-4" />
+            <span className="text-sm">{action.label}</span>
+          </Button>
+        );
+      })}
+    </>
+  );
+}
+
+/** Shows its children only while the composer bar is narrower than 44rem. */
+function NarrowOnly({ active, children }: { active: boolean; children: React.ReactNode }) {
+  if (!active) return <>{children}</>;
+  return <div className="@[44rem]/composer-bar:hidden" data-narrow-only="">{children}</div>;
+}
+
+/** Entries plugins declared for a composer menu, drawn like the menu's own. */
+export function ComposerPluginMenuItems({ surface, context, onSelect, separator, onlyWhenNarrow }: PluginItemsProps) {
+  const actions = usePluginActions(surface);
+  if (actions.length === 0) return null;
+  return (
+    <NarrowOnly active={!!onlyWhenNarrow}>
+      {separator && <div role="separator" className="my-1 h-px bg-border" />}
+      {actions.map((action) => {
+        const Icon = iconForName(action.icon) ?? Puzzle;
+        if (action.checked !== undefined) {
+          // An option like the menu's own (plain text, read receipt): stays
+          // open, so several can be set in one go.
+          return (
+            <ComposerToolbarMenuCheckItem
+              key={`${action.pluginId}:${action.id}`}
+              checked={action.checked}
+              description={action.description}
+              onToggle={() => { void runAction(action, surface, typeof context === "function" ? context() : context); }}
+            >
+              {action.label}
+            </ComposerToolbarMenuCheckItem>
+          );
+        }
+        return (
+          <button
+            key={`${action.pluginId}:${action.id}`}
+            type="button"
+            role="menuitem"
+            title={action.pluginName}
+            onClick={() => {
+              onSelect?.();
+              void runAction(action, surface, typeof context === "function" ? context() : context);
+            }}
+            className={cn(
+              "flex w-full items-center gap-2 rounded-sm px-3 py-2 text-start text-sm hover:bg-accent hover:text-accent-foreground",
+              action.danger && "text-destructive",
+            )}
+          >
+            <Icon className="w-4 h-4 shrink-0 text-muted-foreground" />
+            <span className="flex-1">
+              <span className="block">{action.label}</span>
+              {action.description && <span className="block text-xs text-muted-foreground">{action.description}</span>}
+            </span>
+          </button>
+        );
+      })}
+    </NarrowOnly>
+  );
+}
diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index fe3f3160d..5cff52511 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -34,7 +34,11 @@ import {
   Reply,
   Forward,
 } from "@/components/icons";
-import { ComposerToolbarMenu, ComposerToolbarMenuItem, ComposerToolbarMenuCheckItem } from "@/components/email/composer-toolbar-menu";
+import { ComposerPluginMenuItems, ComposerPluginToolbarButtons, ComposerToolbarMenu, ComposerToolbarMenuItem, ComposerToolbarMenuCheckItem } from "@/components/email/composer-toolbar-menu";
+import { registerComposer } from "@/lib/plugin-sandbox/composer-registry";
+import { plainOwnRange, readOwnContent, readSelection as readEditorSelection, replaceOwnContent, replaceSelection as replaceEditorSelection, replaceTextareaRange, textToEditorHtml, type OwnTextOptions } from "@/lib/plugin-sandbox/composer-edit";
+import { actionsFor, runAction } from "@/lib/plugin-sandbox/actions";
+import { matchesCombo } from "@/lib/plugin-sandbox/shortcuts";
 import { cn, formatFileSize, formatDateTime, generateUUID } from "@/lib/utils";
 import { schedulePresets } from "@/lib/schedule-presets";
 import { debug } from "@/lib/debug";
@@ -61,14 +65,19 @@ import { useIdentityStore } from "@/stores/identity-store";
 import { useProMultiAccountIdentities, stripCrossAccountIdentityPrefix } from "@/hooks/use-pro-multi-account-identities";
 import { useAccountStore } from "@/stores/account-store";
 import { useSettingsStore } from "@/stores/settings-store";
+import { ComposerPluginSidebar, useComposerSidebars } from "./composer-plugin-sidebars";
 import { PluginSlot } from "@/components/plugins/plugin-slot";
+import { usePluginSlotOffers } from "@/hooks/use-plugin-slot-offers";
+import { usePluginActions } from "@/components/plugins/plugin-actions";
 import { Avatar } from "@/components/ui/avatar";
 import { FilePreviewModal } from "@/components/files/file-preview-modal";
 import { FilePickerDialog } from "@/components/files/file-picker-dialog";
 import type { IJMAPClient } from "@/lib/jmap/client-interface";
 import type { FileNode } from "@/lib/jmap/types";
 import { useContactStore, getContactDisplayName, getContactPrimaryEmail } from "@/stores/contact-store";
-import { useTemplateStore } from "@/stores/template-store";
+import { useTemplateStore, renderTemplateWithPlugins, notifyTemplateApplied } from "@/stores/template-store";
+import { notifyIdentitySelected } from "@/stores/identity-store";
+import { usePluginSignature } from "@/hooks/use-plugin-signature";
 import { SubAddressHelper } from "@/components/identity/sub-address-helper";
 import { generateSubAddress } from "@/lib/sub-addressing";
 import { substitutePlaceholders, spliceTemplateAboveSignature, composeBodyHasUserContent } from "@/lib/template-utils";
@@ -98,7 +107,10 @@ import {
   type Recipient,
   enrichChipsWithColorsAndIcons,
   ICON_MAP,
+  plainTextToComposerBody,
 } from "@/lib/email-composer-utils";
+import type { ComposePrefill } from "@/lib/plugin-compose-gate";
+import { composerContextMode, composerMounted, composerUnmounted, draftSaved } from "@/lib/plugin-composer-hooks";
 import { isValidEmail } from "@/lib/validation";
 import { buildMentionCandidates } from "@/lib/recipient-mentions";
 import { RichTextEditor } from "@/components/email/rich-text-editor";
@@ -235,6 +247,20 @@ interface EmailComposerProps {
   className?: string;
   initialDraftText?: string;
   initialData?: ComposerDraftData | null;
+  /**
+   * Fields a plugin filled in through onBeforeCompose, over what the composer
+   * would start with. The host passes it for the first mount of a session
+   * only: a remount restores the user's own text from `initialData`.
+   */
+  prefill?: ComposePrefill | null;
+  /**
+   * Identifies the compose session across remounts (a pop-out, a layout
+   * switch), so plugins hear onComposerOpen / onComposerClose once per
+   * message rather than once per mount.
+   */
+  sessionKey?: string;
+  /** Id of the message being replied to or forwarded, for onComposerOpen. */
+  sourceEmailId?: string;
   mode?: 'compose' | 'reply' | 'replyAll' | 'forward';
   /**
    * Email of the mailbox/account the user is viewing when they start a new
@@ -323,6 +349,28 @@ function getDefaultScheduleValue(): string {
 // the body instead (#1114).
 const PINNED_FIELDS_MIN_BODY_HEIGHT = 200;
 
+/**
+ * An attachment a plugin uploaded itself, as the composer stores it, or null
+ * when the plugin sent something that isn't one.
+ */
+export function normalizePluginAttachment(raw: unknown): { name: string; type: string; size: number; blobId: string } | null {
+  if (!raw || typeof raw !== 'object') return null;
+  const r = raw as Record<string, unknown>;
+  if (typeof r.blobId !== 'string' || !/^[A-Za-z0-9_-]{1,255}$/.test(r.blobId)) return null;
+  if (typeof r.size !== 'number' || !Number.isFinite(r.size) || r.size < 0) return null;
+  // eslint-disable-next-line no-control-regex -- removing control characters is the point
+  const name = typeof r.name === 'string' ? r.name.replace(/[\u0000-\u001f\u007f]/g, '').trim().slice(0, 255) : '';
+  if (!name) return null;
+  const type = typeof r.type === 'string' && /^[\w.+-]+\/[\w.+-]+$/.test(r.type) ? r.type : 'application/octet-stream';
+  return { name, type, size: Math.floor(r.size), blobId: r.blobId };
+}
+
+/** How long a plugin may take over onBeforeDraftAutoSave before the save goes on without it. */
+const DRAFT_HOOK_TIMEOUT_MS = 5000;
+
+/** Longest text a plugin may insert into the message at once. */
+const MAX_PLUGIN_INSERT_LENGTH = 100_000;
+
 export function EmailComposer({
   onSend,
   onScheduledSendCreated,
@@ -331,8 +379,11 @@ export function EmailComposer({
   onDiscardDraft,
   onSaveState,
   className,
-  initialDraftText,
-  initialData,
+  initialDraftText: initialDraftTextProp,
+  initialData: initialDataProp,
+  prefill,
+  sessionKey,
+  sourceEmailId,
   mode = 'compose',
   composeFromAccountEmail,
   replyTo
@@ -340,14 +391,34 @@ export function EmailComposer({
   const t = useTranslations('email_composer');
   const tCommon = useTranslations('common');
   const tQuote = useTranslations('quote_header');
+  const tViewer = useTranslations('email_viewer');
   const timeFormat = useSettingsStore((state) => state.timeFormat);
   const plainTextModeDefault = useSettingsStore((state) => state.plainTextMode);
   // Per-message format (#1022). Seeded from the "plain text only" setting -
   // or the format a re-opened / stashed draft was written in - and switchable
   // from the toolbar for just this message.
   const [plainTextMode, setPlainTextMode] = useState<boolean>(
-    () => initialData?.plainTextMode ?? plainTextModeDefault
+    () => initialDataProp?.plainTextMode ?? plainTextModeDefault
   );
+  // A plugin's onBeforeCompose prefill (plain text body) folded into what the
+  // composer starts from: over `initialData` when the host hands one in (a
+  // mailto:, a re-opened draft), otherwise over the fields built below.
+  const [initialPlainTextMode] = useState(plainTextMode);
+  const initialData = useMemo<ComposerDraftData | null | undefined>(() => {
+    if (!initialDataProp || !prefill) return initialDataProp;
+    const next = { ...initialDataProp };
+    if (prefill.to) next.to = prefill.to.join(', ');
+    if (prefill.cc) {
+      next.cc = prefill.cc.join(', ');
+      if (prefill.cc.length > 0) next.showCc = true;
+    }
+    if (prefill.subject !== undefined) next.subject = prefill.subject;
+    if (prefill.body !== undefined) {
+      next.body = initialPlainTextMode ? prefill.body : plainTextToComposerBody(prefill.body);
+    }
+    return next;
+  }, [initialDataProp, prefill, initialPlainTextMode]);
+  const initialDraftText = !initialDataProp && prefill?.body !== undefined ? prefill.body : initialDraftTextProp;
   const subAddressDelimiter = useSettingsStore((state) => state.subAddressDelimiter);
   const autoSelectReplyIdentity = useSettingsStore((state) => state.autoSelectReplyIdentity);
   const replyIdentityMatch = useSettingsStore((state) => state.replyIdentityMatch);
@@ -626,17 +697,22 @@ export function EmailComposer({
   // is typing lives in a separate `*Input` string per field. This keeps a
   // display name containing a comma (e.g. "Doo, John") intact instead of
   // tearing it apart on a delimiter.
-  const [to, setTo] = useState<Recipient[]>(initialData ? parseRecipientList(initialData.to) : getInitialTo());
-  const [cc, setCc] = useState<Recipient[]>(initialData ? parseRecipientList(initialData.cc) : getInitialCc());
+  const [to, setTo] = useState<Recipient[]>(() => initialData
+    ? parseRecipientList(initialData.to)
+    : prefill?.to ? parseRecipientList(prefill.to.join(', ')) : getInitialTo());
+  const [cc, setCc] = useState<Recipient[]>(() => initialData
+    ? parseRecipientList(initialData.cc)
+    : prefill?.cc ? parseRecipientList(prefill.cc.join(', ')) : getInitialCc());
   const [bcc, setBcc] = useState<Recipient[]>(initialData ? parseRecipientList(initialData.bcc) : []);
   const [toInput, setToInput] = useState('');
   const [ccInput, setCcInput] = useState('');
   const [bccInput, setBccInput] = useState('');
-  const [subject, setSubject] = useState(initialData?.subject ?? getInitialSubject());
+  const [subject, setSubject] = useState(() => initialData?.subject ?? prefill?.subject ?? getInitialSubject());
   const [body, setBody] = useState(() =>
     initialData?.body != null ? withSignatureEmbedded(initialData.body) : getInitialBody()
   );
-  const [showCc, setShowCc] = useState(initialData?.showCc ?? getInitialCc().length > 0);
+  const [showCc, setShowCc] = useState(() => initialData?.showCc
+    ?? (prefill?.cc ? prefill.cc.length > 0 : getInitialCc().length > 0));
   const [showBcc, setShowBcc] = useState(initialData?.showBcc ?? false);
   // Committed recipients plus any not-yet-committed text the user has typed.
   // Send/validation/draft paths treat a typed-but-uncommitted address as a
@@ -869,9 +945,11 @@ export function EmailComposer({
   // Alias identities often lack a configured signature - fall back to the primary
   // identity's signature so replies (which auto-select a matching alias) still
   // populate the user's signature.
-  const signatureIdentity = (currentIdentity?.htmlSignature || currentIdentity?.textSignature)
+  const ownSignatureIdentity = (currentIdentity?.htmlSignature || currentIdentity?.textSignature)
     ? currentIdentity
     : primaryIdentity;
+  // Plugins may rewrite the signature (onSignatureRender).
+  const { identity: signatureIdentity, revision: pluginSignatureRevision } = usePluginSignature(ownSignatureIdentity);
 
   // Hold the TipTap editor instance so we can swap the embedded signature
   // when the user switches identity in "above quote" mode without rebuilding
@@ -882,15 +960,18 @@ export function EmailComposer({
   const replyFocusedRef = useRef(false);
   const prevSignatureIdentityIdRef = useRef<string | null | undefined>(signatureIdentity?.id);
   const prevSignatureSeparatorRef = useRef<boolean>(signatureSeparatorEnabled);
+  const prevPluginSignatureRevisionRef = useRef(pluginSignatureRevision);
 
   useEffect(() => {
     const editor = editorRef.current;
     const identityChanged = prevSignatureIdentityIdRef.current !== signatureIdentity?.id;
     const separatorChanged = prevSignatureSeparatorRef.current !== signatureSeparatorEnabled;
+    const pluginSignatureChanged = prevPluginSignatureRevisionRef.current !== pluginSignatureRevision;
     prevSignatureIdentityIdRef.current = signatureIdentity?.id;
     prevSignatureSeparatorRef.current = signatureSeparatorEnabled;
+    prevPluginSignatureRevisionRef.current = pluginSignatureRevision;
     if (!editor) return;
-    if (!identityChanged && !separatorChanged) return;
+    if (!identityChanged && !separatorChanged && !pluginSignatureChanged) return;
     if (plainTextMode) return;
     // Replies/forwards only embed when configured for "above quote". Compose
     // always embeds (see getInitialBody), so swap on identity change there too.
@@ -928,7 +1009,7 @@ export function EmailComposer({
     // would re-run on unrelated identity-field changes and re-splice the
     // signature into the live editor.
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [signatureIdentity?.id, signatureIdentity?.htmlSignature, signatureIdentity?.textSignature, signatureSeparatorEnabled, signaturePosition, mode, plainTextMode]);
+  }, [signatureIdentity?.id, signatureIdentity?.htmlSignature, signatureIdentity?.textSignature, signatureSeparatorEnabled, signaturePosition, mode, plainTextMode, pluginSignatureRevision]);
 
   useEffect(() => {
     const handleClickOutsideSendMenu = (event: MouseEvent) => {
@@ -1282,6 +1363,31 @@ export function EmailComposer({
   // open the next composer with the discarded reply's mode/replyTo.
   const explicitCloseRef = useRef(false);
 
+  // onComposerOpen / onComposerClose, once per session (see
+  // lib/plugin-composer-hooks.ts). Without a key from the host every mount is
+  // its own session.
+  const fallbackSessionKeyRef = useRef<string | null>(null);
+  if (!sessionKey && fallbackSessionKeyRef.current === null) {
+    fallbackSessionKeyRef.current = `composer-${Math.random().toString(36).slice(2)}`;
+  }
+  const effectiveSessionKey = sessionKey ?? fallbackSessionKeyRef.current ?? 'composer';
+  // Whether this session ended in a send, and the draft it ended with.
+  const sentRef = useRef(false);
+  const lastDraftIdRef = useRef<string | null>(initialData?.draftId ?? null);
+  useEffect(() => {
+    composerMounted(effectiveSessionKey, {
+      mode: composerContextMode(mode),
+      ...(sourceEmailId && mode !== 'compose' ? { inReplyToId: sourceEmailId } : {}),
+      ...(replyTo?.subject && mode !== 'compose' ? { originalSubject: replyTo.subject } : {}),
+    });
+    return () => composerUnmounted(effectiveSessionKey, () => ({
+      draftId: draftIdRef.current ?? lastDraftIdRef.current,
+      sent: sentRef.current,
+    }));
+  // The session is fixed for the life of this mount.
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [effectiveSessionKey]);
+
   // Auto-save state on unmount (when user navigates away without explicitly closing)
   useEffect(() => {
     return () => {
@@ -1563,8 +1669,8 @@ export function EmailComposer({
     }
   };
 
-  const handleTemplateSelect = useCallback((template: EmailTemplate, filledValues: Record<string, string>) => {
-    const filledSubject = Object.keys(filledValues).length > 0
+  const handleTemplateSelect = useCallback(async (template: EmailTemplate, filledValues: Record<string, string>) => {
+    let filledSubject = Object.keys(filledValues).length > 0
       ? substitutePlaceholders(template.subject, filledValues)
       : template.subject;
     const filledBody = Object.keys(filledValues).length > 0
@@ -1572,9 +1678,19 @@ export function EmailComposer({
       : template.body;
 
     // In plain text mode, use template body as-is; otherwise convert to HTML
-    const bodyContent = plainTextMode || template.isHTML
+    let bodyContent = plainTextMode || template.isHTML
       ? filledBody
       : `<p>${filledBody.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\n/g, '<br>')}</p>`;
+    // Plugins may rewrite the template before it goes in (onTemplateRender).
+    const rendered = await renderTemplateWithPlugins(template.id, {
+      subject: filledSubject,
+      html: plainTextMode && !template.isHTML ? `<p>${escapeHtml(filledBody).replace(/\n/g, '<br>')}</p>` : bodyContent,
+      text: template.isHTML ? htmlToPlainText(filledBody) : filledBody,
+    });
+    if (rendered) {
+      filledSubject = rendered.subject;
+      bodyContent = plainTextMode ? rendered.text : sanitizePluginBodyHtml(rendered.html);
+    }
 
     if (mode === 'compose') {
       // An empty template subject must not wipe one the user typed (#540).
@@ -1659,6 +1775,7 @@ export function EmailComposer({
     }
 
     setShowTemplatePicker(false);
+    notifyTemplateApplied(template);
   }, [mode, plainTextMode, signatureIdentity, signatureSeparatorEnabled]);
 
   useEffect(() => {
@@ -1935,17 +2052,42 @@ export function EmailComposer({
   // offers "attach from there". No `file` is set, matching the existing
   // draft-part hydration path above (a blobId-only attachment is already a
   // supported shape, just never previously reachable from a plugin).
-  const handlePluginAttachmentAdd = useCallback((upload: PluginAttachmentUpload) => {
-    setAttachments(prev => [
-      ...prev,
-      {
-        name: upload.name,
-        type: upload.type,
-        size: upload.size,
-        blobId: upload.blobId,
-      },
-    ]);
-  }, []);
+  const handlePluginAttachmentAdd = useCallback(async (raw: PluginAttachmentUpload): Promise<boolean> => {
+    // The values come from a plugin: check them, and run the same intercept
+    // and size limit every other way of attaching a file goes through.
+    const upload = normalizePluginAttachment(raw);
+    if (!upload) {
+      debug.warn('email', 'Refused a malformed attachment from a plugin', raw);
+      return false;
+    }
+    const ok = await emailHooks.onBeforeAttachmentUpload.intercept({
+      name: upload.name, type: upload.type, size: upload.size,
+    });
+    if (!ok) return false;
+    const maxTotal = composerClient?.getMaxSizeAttachmentsPerEmail?.() ?? 0;
+    const total = attachmentsRef.current.reduce((sum, att) => sum + (att.size || 0), 0);
+    if (maxTotal > 0 && total + upload.size > maxTotal) {
+      toast.error(t('attachments_total_too_large', { max: formatFileSize(maxTotal) }));
+      return false;
+    }
+    setAttachments(prev => [...prev, upload]);
+    return true;
+  }, [composerClient, t]);
+  // Stable props, so a re-render of the composer doesn't post them to the
+  // plugin's iframe again.
+  const pluginToolbarOffers = usePluginSlotOffers('composer-toolbar');
+  // The plugin side panels fold when the composer gets too narrow for them.
+  const [composerRootEl, setComposerRootEl] = useState<HTMLDivElement | null>(null);
+  const pluginSidebars = useComposerSidebars(composerRootEl);
+  const pluginAttachmentSourceOffers = usePluginSlotOffers('composer-attachment-source');
+  const hasAboveBodyOffers = usePluginSlotOffers('composer-above-body').length > 0;
+  const hasBelowBodyOffers = usePluginSlotOffers('composer-below-body').length > 0;
+  // Plugin entries make the Send and Attach buttons menus even where the app
+  // itself has nothing else to put there.
+  const hasSendMenuActions = usePluginActions('composer-send-menu').length > 0;
+  const hasAttachMenuActions = usePluginActions('composer-attach-menu').length > 0;
+  // Ticked plugin options count in the Options button's badge like the app's own.
+  const pluginOptionsOn = usePluginActions('composer-options-menu').filter((a) => a.checked).length;
 
   // Files from the Files app are already blobs on the server, so they are
   // attached by blobId with no download or upload (#1179). Stalwart resolves a
@@ -2030,7 +2172,10 @@ export function EmailComposer({
   }, [previewAttachment, composerClient]);
 
   // Auto-save draft functionality
-  const saveDraftOnce = async (): Promise<string | null> => {
+  // `auto`: the debounced save while typing. Only that one may be skipped
+  // by a plugin; saves on close and before send always run, or the text
+  // would be lost.
+  const saveDraftOnce = async (auto = false): Promise<string | null> => {
     if (!client || !composerClient) return null;
     const versionAtStart = changeVersionRef.current;
 
@@ -2133,7 +2278,19 @@ export function EmailComposer({
         fromName,
         htmlBody: draftHtmlBody
       }
-      savedDraft = await emailHooks.onBeforeDraftAutoSave.transform(savedDraft);
+      if (emailHooks.onBeforeDraftAutoSave.size > 0) {
+        const outcome = await emailHooks.onBeforeDraftAutoSave.interceptWithValue(
+          savedDraft,
+          (result) => (result && typeof result === 'object' ? result as typeof savedDraft : undefined),
+          { timeoutMs: DRAFT_HOOK_TIMEOUT_MS },
+        );
+        if (!outcome.allowed && auto) {
+          // Skipped: leave lastSavedDataRef alone so the next save retries.
+          setSaveStatus('idle');
+          return draftIdRef.current;
+        }
+        if (outcome.allowed) savedDraft = outcome.value;
+      }
 
       // Use the JMAP client and raw identity id for the *owning* account
       // - falls back to active client for single-account / same-account
@@ -2196,6 +2353,8 @@ export function EmailComposer({
 
       setSaveStatus('saved');
       saveFailedRef.current = false;
+      lastDraftIdRef.current = savedDraftId;
+      draftSaved(savedDraftId, savedDraft.subject);
 
       // Reset status after 2 seconds
       setTimeout(() => setSaveStatus('idle'), 2000);
@@ -2218,13 +2377,13 @@ export function EmailComposer({
   // racing two `Email/set { destroy, create }` requests against the same
   // draftId, which left orphan drafts and (when EmailSubmission failed)
   // looked like "send didn't happen" (#303).
-  const saveDraft = (): Promise<string | null> => {
+  const saveDraft = (opts: { auto?: boolean } = {}): Promise<string | null> => {
     const previous = inflightSaveRef.current;
     const promise = (async (): Promise<string | null> => {
       if (previous) {
         try { await previous; } catch { /* prior failure already reported */ }
       }
-      return saveDraftOnce();
+      return saveDraftOnce(!!opts.auto);
     })();
     inflightSaveRef.current = promise;
     promise.finally(() => {
@@ -2238,6 +2397,162 @@ export function EmailComposer({
   // Keep saveDraftRef pointing to latest saveDraft
   saveDraftRef.current = saveDraft;
 
+  // The draft as plugins see it: onDraftChange, the frames above and below
+  // the body, and clicks on plugin entries in the Send menu.
+  const draftSnapshot = () => ({
+    to: withInput(to, toInput).map(r => formatRecipient(r.name, r.email)),
+    cc: withInput(cc, ccInput).map(r => formatRecipient(r.name, r.email)),
+    bcc: withInput(bcc, bccInput).map(r => formatRecipient(r.name, r.email)),
+    subject,
+    htmlBody: plainTextMode ? '' : body,
+    textBody: plainTextMode ? body : htmlToPlainText(body),
+    identityId: selectedIdentityId || '',
+    attachments: attachments
+      .filter(a => a.blobId && !a.uploading && !a.error)
+      .map(a => ({ name: a.name, type: a.type || 'application/octet-stream', size: a.size })),
+  });
+  const draftSnapshotRef = useRef(draftSnapshot);
+  draftSnapshotRef.current = draftSnapshot;
+
+  // composer-above-body / composer-below-body get the draft when they appear
+  // and then 2 seconds after the last change, like onDraftChange: a new prop
+  // object on every keystroke would post the whole body into their iframes.
+  const wantsPluginDraft = hasAboveBodyOffers || hasBelowBodyOffers;
+  const [pluginDraft, setPluginDraft] = useState<ReturnType<typeof draftSnapshot> | null>(null);
+  const pluginDraftShownRef = useRef(false);
+  useEffect(() => {
+    if (!wantsPluginDraft) {
+      pluginDraftShownRef.current = false;
+      return;
+    }
+    if (!pluginDraftShownRef.current) {
+      pluginDraftShownRef.current = true;
+      setPluginDraft(draftSnapshotRef.current());
+      return;
+    }
+    const timer = setTimeout(() => setPluginDraft(draftSnapshotRef.current()), 2000);
+    return () => clearTimeout(timer);
+  }, [wantsPluginDraft, toStr, ccStr, bccStr, subject, body, plainTextMode, selectedIdentityId, attachments]);
+  // Plugins write into the message through these (slot props, gated by the
+  // catalogue): plain text at the caret, replacing the selection, so a
+  // rewrite of a selected paragraph is one call and Ctrl+Z takes it back in
+  // the rich editor. Stable, so the slot iframes don't get new props.
+  const plainTextModeRef = useRef(plainTextMode);
+  plainTextModeRef.current = plainTextMode;
+  const pluginInsertText = useCallback((value: unknown) => {
+    if (typeof value !== 'string' || value.length === 0 || value.length > MAX_PLUGIN_INSERT_LENGTH) return false;
+    if (plainTextModeRef.current) {
+      const textarea = bodyRef.current;
+      if (!textarea) return false;
+      const start = textarea.selectionStart ?? textarea.value.length;
+      const end = textarea.selectionEnd ?? start;
+      setBody((prev) => prev.slice(0, start) + value + prev.slice(end));
+      requestAnimationFrame(() => {
+        textarea.focus();
+        textarea.setSelectionRange(start + value.length, start + value.length);
+      });
+      return true;
+    }
+    const editor = editorRef.current;
+    if (!editor) return false;
+    const html = value.split(/\r?\n\r?\n/).map((para) => `<p>${escapeHtml(para).replace(/\r?\n/g, '<br>')}</p>`).join('');
+    editor.chain().focus().insertContent(html).run();
+    return true;
+  }, []);
+  const pluginSelectedText = useCallback(() => {
+    if (plainTextModeRef.current) {
+      const textarea = bodyRef.current;
+      if (!textarea) return '';
+      return textarea.value.slice(textarea.selectionStart ?? 0, textarea.selectionEnd ?? 0);
+    }
+    const editor = editorRef.current;
+    if (!editor) return '';
+    const { from, to } = editor.state.selection;
+    return editor.state.doc.textBetween(from, to, '\n\n');
+  }, []);
+  // Plugins read and change this message through api.composer, with the id
+  // this composer hands out in its action clicks and slot props (see
+  // composer-registry.ts). The rich editor is changed only through its own
+  // transactions, so one Ctrl+Z takes an edit back; the user's own text ends
+  // at the signature and the quote (composer-edit.ts).
+  const pluginEditOptsRef = useRef<OwnTextOptions & { signature: string }>({ signature: '' });
+  pluginEditOptsRef.current = {
+    replyLike: mode === 'reply' || mode === 'replyAll' || mode === 'forward',
+    forwardedSeparator: tQuote('forwarded_separator'),
+    signature: getPlainTextSignature(signatureIdentity),
+  };
+  const pluginAttachRef = useRef(handlePluginAttachmentAdd);
+  pluginAttachRef.current = handlePluginAttachmentAdd;
+  const [pluginComposerId, setPluginComposerId] = useState<string | null>(null);
+  useEffect(() => {
+    const plainRange = (value: string) => plainOwnRange(value, pluginEditOptsRef.current);
+    const { id, unregister } = registerComposer({
+      readBody: () => {
+        if (plainTextModeRef.current) {
+          const value = bodyRef.current?.value ?? '';
+          const { from, to } = plainRange(value);
+          const text = value.slice(from, to);
+          return { text, html: textToEditorHtml(text) };
+        }
+        const editor = editorRef.current;
+        return editor ? readOwnContent(editor, pluginEditOptsRef.current) : { html: '', text: '' };
+      },
+      readSelection: () => {
+        if (plainTextModeRef.current) {
+          const textarea = bodyRef.current;
+          const text = textarea ? textarea.value.slice(textarea.selectionStart ?? 0, textarea.selectionEnd ?? 0) : '';
+          return { text, html: textToEditorHtml(text), empty: text.length === 0 };
+        }
+        const editor = editorRef.current;
+        return editor ? readEditorSelection(editor) : { html: '', text: '', empty: true };
+      },
+      replaceBody: (html, text) => {
+        if (plainTextModeRef.current) {
+          const textarea = bodyRef.current;
+          if (!textarea) return false;
+          const { from, to } = plainRange(textarea.value);
+          return replaceTextareaRange(textarea, from, to, text);
+        }
+        const editor = editorRef.current;
+        return !!editor && replaceOwnContent(editor, html, pluginEditOptsRef.current);
+      },
+      replaceSelection: (html, text, { below }) => {
+        if (plainTextModeRef.current) {
+          const textarea = bodyRef.current;
+          if (!textarea) return false;
+          const start = textarea.selectionStart ?? textarea.value.length;
+          const end = textarea.selectionEnd ?? start;
+          return below
+            ? replaceTextareaRange(textarea, end, end, `\n\n${text}`)
+            : replaceTextareaRange(textarea, start, end, text);
+        }
+        const editor = editorRef.current;
+        return !!editor && replaceEditorSelection(editor, html, { below });
+      },
+      attach: (file) => pluginAttachRef.current(file as PluginAttachmentUpload),
+    });
+    setPluginComposerId(id);
+    return unregister;
+  }, []);
+
+  const pluginDraftProps = useMemo(
+    () => ({ draft: pluginDraft, insertText: pluginInsertText, getSelectedText: pluginSelectedText, composerId: pluginComposerId }),
+    [pluginDraft, pluginInsertText, pluginSelectedText, pluginComposerId],
+  );
+  const pluginToolbarProps = useMemo(
+    () => ({ insertText: pluginInsertText, getSelectedText: pluginSelectedText, composerId: pluginComposerId }),
+    [pluginInsertText, pluginSelectedText, pluginComposerId],
+  );
+  // A cloud picker attaches files, or puts share links in the text.
+  const pluginAttachmentSourceProps = useMemo(
+    () => ({ onAttach: handlePluginAttachmentAdd, insertText: pluginInsertText, composerId: pluginComposerId }),
+    [handlePluginAttachmentAdd, pluginInsertText, pluginComposerId],
+  );
+  const pluginComposerIdRef = useRef(pluginComposerId);
+  pluginComposerIdRef.current = pluginComposerId;
+  const sendMenuContext = useCallback(() => ({ draft: draftSnapshotRef.current(), composerId: pluginComposerIdRef.current }), []);
+  const composerActionContext = useCallback(() => ({ composerId: pluginComposerIdRef.current }), []);
+
   // Trigger auto-save when content changes (only if user modified something)
   useEffect(() => {
     // Clear existing timeout
@@ -2257,19 +2572,8 @@ export function EmailComposer({
       // tracked via inflightSaveRef.
       saveTimeoutRef.current = null;
       // Plugin observers (AI assist, grammar, …) get a debounced snapshot here.
-      emailHooks.onDraftChange.emit({
-        to: withInput(to, toInput).map(r => formatRecipient(r.name, r.email)),
-        cc: withInput(cc, ccInput).map(r => formatRecipient(r.name, r.email)),
-        bcc: withInput(bcc, bccInput).map(r => formatRecipient(r.name, r.email)),
-        subject,
-        htmlBody: plainTextMode ? '' : body,
-        textBody: plainTextMode ? body : htmlToPlainText(body),
-        identityId: selectedIdentityId || '',
-        attachments: attachments
-          .filter(a => a.blobId && !a.uploading && !a.error)
-          .map(a => ({ name: a.name, type: a.type || 'application/octet-stream', size: a.size })),
-      });
-      saveDraft();
+      emailHooks.onDraftChange.emit(draftSnapshot());
+      saveDraft({ auto: true });
     }, 2000);
 
     // Cleanup on unmount
@@ -2623,11 +2927,14 @@ export function EmailComposer({
           .map(a => ({ name: a.name, type: a.type || 'application/octet-stream', size: a.size })),
         inReplyTo: threadingHeaders?.inReplyTo?.[0],
       };
-      const sendAllowed = await emailHooks.onBeforeEmailSend.intercept(sendablePreview);
-      if (!sendAllowed) {
+      const sendCheck = await emailHooks.onBeforeEmailSend.interceptOutcome(sendablePreview);
+      if (sendCheck !== 'allowed') {
         // A plugin vetoed the send (it is expected to show its own UI).
         // Leave a trace so a silent no-op send is diagnosable (#592).
-        debug.log('email', 'Send aborted by an onBeforeEmailSend plugin handler');
+        debug.log('email', `Send stopped by an onBeforeEmailSend plugin handler (${sendCheck})`);
+        // A guard that crashed or never answered showed nothing; say why
+        // the message is still here.
+        if (sendCheck === 'failed') toast.error(t('send_guard_failed'));
         return;
       }
 
@@ -2670,6 +2977,7 @@ export function EmailComposer({
       }
       const sendHandledByPlugin = pluginOutcome === 'handled';
       if (sendHandledByPlugin) {
+        sentRef.current = true;
         if (finalDraftId) {
           // The draft was created through the identity's owning account
           // (see saveDraft), so clean it up there too - not on the active
@@ -2726,6 +3034,9 @@ export function EmailComposer({
         // draft ("Continue draft" flashed after every send). Reset below if
         // the send fails and the composer stays open.
         explicitCloseRef.current = true;
+        // Read when the close is reported: the host tears the composer down
+        // while onSend is still running. Reset below if the send fails.
+        sentRef.current = true;
         await onSend?.({
           to: outgoing.to,
           cc: outgoing.cc,
@@ -2784,6 +3095,7 @@ export function EmailComposer({
     } catch (err) {
       // Not sent, so the composer stays open and is an unsent draft again.
       explicitCloseRef.current = false;
+      sentRef.current = false;
       debug.error('Failed to send email:', err);
       if (err instanceof RecipientsRejectedError) {
         // Nothing went out; the message stays open here so the addresses
@@ -2947,7 +3259,16 @@ export function EmailComposer({
     const hasPrimaryModifier = e.ctrlKey || e.metaKey;
     const isSendShortcut = e.key === 'Enter' && hasPrimaryModifier && !e.altKey && !e.shiftKey;
     const isScheduleShortcut = e.key === 'Enter' && hasPrimaryModifier && !e.altKey && e.shiftKey;
-    if (!isPlainEscape && !isSendShortcut && !isScheduleShortcut) return;
+    if (!isPlainEscape && !isSendShortcut && !isScheduleShortcut) {
+      // A plugin's composer button with a shortcut (composer-toolbar-actions)
+      // works while the composer has focus, also while typing.
+      if (!e.altKey && !hasPrimaryModifier) return;
+      const action = actionsFor('composer-toolbar-actions').find((a) => a.shortcut && matchesCombo(a.shortcut, e.nativeEvent));
+      if (!action) return;
+      e.preventDefault();
+      void runAction(action, 'composer-toolbar-actions', composerActionContext());
+      return;
+    }
 
     if (
       showTemplatePicker ||
@@ -2988,14 +3309,12 @@ export function EmailComposer({
 
   return (
     <div
+      ref={setComposerRootEl}
       data-testid="email-composer"
-      className={cn("flex h-full bg-background", className)}
+      className={cn("flex h-full bg-background relative", className)}
       onKeyDownCapture={handleComposerKeyDown}
     >
-      <PluginSlot
-        name="composer-sidebar"
-        className="hidden md:flex shrink-0 h-full overflow-hidden border-e border-border"
-      />
+      <ComposerPluginSidebar side="left" mode={pluginSidebars.modes.left} onOpen={() => pluginSidebars.open('left')} onClose={() => pluginSidebars.close('left')} />
       {/* Right-side composer sidebar slot is rendered after the main content div below. */}
     <div
       className="flex flex-col h-full bg-background relative flex-1 min-w-0"
@@ -3122,7 +3441,7 @@ export function EmailComposer({
           </div>
         </div>
         {/* Mobile: keep scheduled send reachable without consuming footer space. */}
-        {composerClient?.hasDelayedSend() ? (
+        {composerClient?.hasDelayedSend() || hasSendMenuActions ? (
           <div ref={mobileSendMenuRef} className="relative inline-flex md:hidden">
             <Button
               onClick={() => handleSend()}
@@ -3139,7 +3458,8 @@ export function EmailComposer({
               type="button"
               onClick={() => setShowSendMenu((open) => !open)}
               disabled={!canSend || isSending}
-              title={t('schedule_send')}
+              title={composerClient?.hasDelayedSend() ? t('schedule_send') : tViewer('more_actions')}
+              aria-label={composerClient?.hasDelayedSend() ? t('schedule_send') : tViewer('more_actions')}
               size="sm"
               className="h-9 rounded-s-none px-2"
               aria-haspopup="menu"
@@ -3149,15 +3469,23 @@ export function EmailComposer({
             </Button>
             {showSendMenu && (
               <div role="menu" className="absolute end-0 top-full z-50 mt-2 min-w-44 rounded-md border border-border bg-popover p-1 text-popover-foreground shadow-lg">
-                <button
-                  type="button"
-                  role="menuitem"
-                  onClick={openScheduleDialog}
-                  className="flex w-full items-center gap-2 rounded-sm px-3 py-2 text-start text-sm hover:bg-accent hover:text-accent-foreground"
-                >
-                  <CalendarClock className="w-4 h-4" />
-                  {t('schedule_send')}
-                </button>
+                {composerClient?.hasDelayedSend() && (
+                  <button
+                    type="button"
+                    role="menuitem"
+                    onClick={openScheduleDialog}
+                    className="flex w-full items-center gap-2 rounded-sm px-3 py-2 text-start text-sm hover:bg-accent hover:text-accent-foreground"
+                  >
+                    <CalendarClock className="w-4 h-4" />
+                    {t('schedule_send')}
+                  </button>
+                )}
+                <ComposerPluginMenuItems
+                  surface="composer-send-menu"
+                  context={sendMenuContext}
+                  onSelect={() => setShowSendMenu(false)}
+                  separator={!!composerClient?.hasDelayedSend()}
+                />
               </div>
             )}
           </div>
@@ -3213,7 +3541,10 @@ export function EmailComposer({
                 <select
                   data-testid="composer-from"
                   value={selectedIdentityId || primaryIdentity?.id || ''}
-                  onChange={(e) => setSelectedIdentityId(e.target.value)}
+                  onChange={(e) => {
+                    setSelectedIdentityId(e.target.value);
+                    notifyIdentitySelected(identities, e.target.value);
+                  }}
                   className="flex-1 bg-transparent text-sm text-foreground outline-none cursor-pointer hover:text-muted-foreground transition-colors min-w-0 truncate"
                 >
                   {identityGroups.length > 0
@@ -3476,6 +3807,9 @@ export function EmailComposer({
       </div>
 
       <div className={cn("flex-1", pinFields && "min-h-0 overflow-auto")}>
+        {wantsPluginDraft && (
+          <PluginSlot name="composer-above-body" className="w-full" extraProps={pluginDraftProps} />
+        )}
         {/* Body */}
         {plainTextMode ? (
           <textarea
@@ -3534,6 +3868,9 @@ export function EmailComposer({
             dangerouslySetInnerHTML={{ __html: `${wantsSignatureSeparator(signatureSeparatorEnabled, signatureIdentity) ? '<div>-- </div>' : ''}${composerSignatureHtml}` }}
           />
         ) : null}
+        {wantsPluginDraft && (
+          <PluginSlot name="composer-below-body" className="w-full" extraProps={pluginDraftProps} />
+        )}
       </div>
       </div>
 
@@ -3634,18 +3971,36 @@ export function EmailComposer({
           </div>
         )}
 
+        {/* Plugin buttons get their own row: the composer is often too narrow
+            for them next to Attach, Templates, Options, Discard and Send, and
+            squeezing them in pushed Send out of the window. */}
+        {(pluginToolbarOffers.length > 0 || pluginAttachmentSourceOffers.length > 0) && (
+          <div className="flex flex-wrap items-center gap-1 border-t border-border px-4 py-1.5 bg-background shrink-0" data-composer-plugin-row="">
+            <PluginSlot name="composer-toolbar" extraProps={pluginToolbarProps} />
+            {/* Lets a plugin offer an alternative attachment source (an
+                external file browser, cloud storage picker, etc). The plugin
+                calls `onAttach` once it has uploaded the chosen file to JMAP
+                itself (api.jmap.uploadBlob) and just wants it added to this
+                draft. */}
+            <PluginSlot
+              name="composer-attachment-source"
+              extraProps={pluginAttachmentSourceProps}
+            />
+          </div>
+        )}
+
         {/* Bottom toolbar. In Mountain View's window both halves fold into
             one row (see [data-mv-compose-footer] in globals.css): Send first,
             the tools after it, and Discard as a bin at the far end. */}
         <div
           data-mv-compose-footer={mvWindow ? "" : undefined}
           className={cn(
-            "flex items-center justify-between px-4 py-2.5 bg-background shrink-0 pb-[calc(0.625rem+env(safe-area-inset-bottom)/2)]",
+            "@container/composer-bar flex items-center justify-between px-4 py-2.5 bg-background shrink-0 pb-[calc(0.625rem+env(safe-area-inset-bottom)/2)]",
             mvWindow ? "gap-1" : "border-t",
           )}
         >
           {/* Left side actions */}
-          <div className="flex items-center gap-1">
+          <div className="flex min-w-0 flex-1 items-center gap-1">
             <input
               ref={fileInputRef}
               type="file"
@@ -3654,7 +4009,7 @@ export function EmailComposer({
               className="hidden"
               accept="*/*"
             />
-            {filesEnabled && composerClient?.supportsFiles?.() ? (
+            {(filesEnabled && composerClient?.supportsFiles?.()) || hasAttachMenuActions ? (
               <ComposerToolbarMenu icon={Paperclip} label={t('attach')} testId="composer-attach-menu">
                 {(close) => <>
                   <ComposerToolbarMenuItem
@@ -3663,13 +4018,16 @@ export function EmailComposer({
                   >
                     {t('attach_from_device')}
                   </ComposerToolbarMenuItem>
-                  <ComposerToolbarMenuItem
-                    icon={FolderOpen}
-                    onSelect={() => { close(); setFilesPicker({ client: composerClient, accountId: composerAccountId }); }}
-                    testId="composer-attach-from-files"
-                  >
-                    {t('attach_from_files')}
-                  </ComposerToolbarMenuItem>
+                  {filesEnabled && composerClient?.supportsFiles?.() && (
+                    <ComposerToolbarMenuItem
+                      icon={FolderOpen}
+                      onSelect={() => { close(); setFilesPicker({ client: composerClient, accountId: composerAccountId }); }}
+                      testId="composer-attach-from-files"
+                    >
+                      {t('attach_from_files')}
+                    </ComposerToolbarMenuItem>
+                  )}
+                  <ComposerPluginMenuItems surface="composer-attach-menu" context={composerActionContext} onSelect={close} separator />
                 </>}
               </ComposerToolbarMenu>
             ) : (
@@ -3719,10 +4077,10 @@ export function EmailComposer({
             <ComposerToolbarMenu
               icon={SlidersHorizontal}
               label={t('options')}
-              activeCount={[plainTextMode, requestReadReceipt, requestDsn, requireTls].filter(Boolean).length}
+              activeCount={[plainTextMode, requestReadReceipt, requestDsn, requireTls].filter(Boolean).length + pluginOptionsOn}
               testId="composer-options-menu"
             >
-              {() => <>
+              {(close) => <>
                 <ComposerToolbarMenuCheckItem
                   checked={plainTextMode}
                   onToggle={togglePlainTextMode}
@@ -3759,22 +4117,15 @@ export function EmailComposer({
                     {t('option_require_tls')}
                   </ComposerToolbarMenuCheckItem>
                 )}
+                <ComposerPluginMenuItems surface="composer-options-menu" context={composerActionContext} onSelect={close} separator />
+                <ComposerPluginMenuItems surface="composer-toolbar-actions" context={composerActionContext} onSelect={close} separator onlyWhenNarrow />
               </>}
             </ComposerToolbarMenu>
-            <PluginSlot name="composer-toolbar" />
-            {/* Lets a plugin offer an alternative attachment source (an
-                external file browser, cloud storage picker, etc). The plugin
-                calls `onAttach` once it has uploaded the chosen file to JMAP
-                itself (api.jmap.uploadBlob) and just wants it added to this
-                draft. */}
-            <PluginSlot
-              name="composer-attachment-source"
-              extraProps={{ onAttach: handlePluginAttachmentAdd }}
-            />
+            <ComposerPluginToolbarButtons surface="composer-toolbar-actions" context={composerActionContext} />
           </div>
 
           {/* Right side - Discard + Send (desktop) */}
-          <div className="flex items-center gap-2">
+          <div className="flex shrink-0 items-center gap-2">
             <button
               type="button"
               onClick={handleDiscardClick}
@@ -3788,7 +4139,7 @@ export function EmailComposer({
             >
               {mvWindow ? <Trash2 className="w-5 h-5" /> : t('discard')}
             </button>
-            {composerClient?.hasDelayedSend() ? (
+            {composerClient?.hasDelayedSend() || hasSendMenuActions ? (
               <div ref={sendMenuRef} data-mv-send={mvWindow ? "" : undefined} className="relative hidden md:inline-flex">
                 <Button
                   onClick={() => handleSend()}
@@ -3804,7 +4155,8 @@ export function EmailComposer({
                   type="button"
                   onClick={() => setShowSendMenu((open) => !open)}
                   disabled={!canSend || isSending}
-                  title={t('schedule_send')}
+                  title={composerClient?.hasDelayedSend() ? t('schedule_send') : tViewer('more_actions')}
+                  aria-label={composerClient?.hasDelayedSend() ? t('schedule_send') : tViewer('more_actions')}
                   className="rounded-s-none px-2"
                   aria-haspopup="menu"
                   aria-expanded={showSendMenu}
@@ -3816,15 +4168,23 @@ export function EmailComposer({
                     role="menu"
                     className="absolute end-0 bottom-full z-50 mb-2 min-w-44 rounded-md border border-border bg-popover p-1 text-popover-foreground shadow-lg"
                   >
-                    <button
-                      type="button"
-                      role="menuitem"
-                      onClick={openScheduleDialog}
-                      className="flex w-full items-center gap-2 rounded-sm px-3 py-2 text-start text-sm hover:bg-accent hover:text-accent-foreground"
-                    >
-                      <CalendarClock className="w-4 h-4" />
-                      {t('schedule_send')}
-                    </button>
+                    {composerClient?.hasDelayedSend() && (
+                      <button
+                        type="button"
+                        role="menuitem"
+                        onClick={openScheduleDialog}
+                        className="flex w-full items-center gap-2 rounded-sm px-3 py-2 text-start text-sm hover:bg-accent hover:text-accent-foreground"
+                      >
+                        <CalendarClock className="w-4 h-4" />
+                        {t('schedule_send')}
+                      </button>
+                    )}
+                    <ComposerPluginMenuItems
+                      surface="composer-send-menu"
+                      context={sendMenuContext}
+                      onSelect={() => setShowSendMenu(false)}
+                      separator={!!composerClient?.hasDelayedSend()}
+                    />
                   </div>
                 )}
               </div>
@@ -4063,10 +4423,7 @@ export function EmailComposer({
         />
       )}
     </div>
-      <PluginSlot
-        name="composer-sidebar-right"
-        className="hidden md:flex shrink-0 h-full overflow-hidden border-s border-border"
-      />
+      <ComposerPluginSidebar side="right" mode={pluginSidebars.modes.right} onOpen={() => pluginSidebars.open('right')} onClose={() => pluginSidebars.close('right')} />
     </div>
   );
 }
diff --git a/components/email/email-context-menu.tsx b/components/email/email-context-menu.tsx
index 3c732be1a..26ee9d45a 100644
--- a/components/email/email-context-menu.tsx
+++ b/components/email/email-context-menu.tsx
@@ -12,6 +12,7 @@ import {
   ContextMenuHeader,
 } from "@/components/ui/context-menu";
 import { PluginSlot } from "@/components/plugins/plugin-slot";
+import { PluginActions, usePluginActions } from "@/components/plugins/plugin-actions";
 import {
   Reply,
   ReplyAll,
@@ -266,6 +267,23 @@ export function EmailContextMenu({
   // Stable, so the Rules entry does not re-resolve its account every render.
   const ruleSenderEmails = useMemo(() => ruleEmails ?? [email], [ruleEmails, email]);
 
+  // The row's plugin buttons (message-row-actions). On phones the long press
+  // opens this menu, so it is where those buttons live there.
+  const hasRowPluginActions = usePluginActions("message-row-actions", { mailboxRole: currentMailboxRole ?? null }).length > 0;
+  const rowPluginContext = useMemo(() => ({ emailId: email.id }), [email.id]);
+  const rowPluginBlock = !showBatchActions && hasRowPluginActions ? (
+    <>
+      <ContextMenuSeparator />
+      <PluginActions
+        surface="message-row-actions"
+        variant="menu"
+        context={rowPluginContext}
+        mailboxRole={currentMailboxRole ?? null}
+        onRan={onClose}
+      />
+    </>
+  ) : null;
+
   // The menu's entries, composed below in the default layout's order or,
   // under Mountain View, in Gmail's.
   const replyBlock = (
@@ -564,6 +582,7 @@ export function EmailContextMenu({
           {findBlock}
           <ContextMenuSeparator />
           {permalinkBlock}
+          {rowPluginBlock}
         </>
       ) : (
         <>
@@ -581,6 +600,7 @@ export function EmailContextMenu({
           {spamBlock}
           <ContextMenuSeparator />
           {readItem}
+          {rowPluginBlock}
         </>
       )}
         </>
diff --git a/components/email/email-hover-actions.tsx b/components/email/email-hover-actions.tsx
index 6b1e835fe..82fd8c29c 100644
--- a/components/email/email-hover-actions.tsx
+++ b/components/email/email-hover-actions.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { createPortal } from "react-dom";
 import { Email } from "@/lib/jmap/types";
 import { useSettingsStore } from "@/stores/settings-store";
@@ -11,6 +11,7 @@ import { useTranslations } from "next-intl";
 import { useIsMobile } from "@/hooks/use-media-query";
 import { TagPicker } from "@/components/email/tag-picker";
 import { getEmailTagIds } from "@/lib/thread-utils";
+import { PluginActions, usePluginActions } from "@/components/plugins/plugin-actions";
 
 interface EmailHoverActionsProps {
   email: Email;
@@ -27,6 +28,8 @@ interface EmailHoverActionsProps {
   onUndoSpam?: () => void;
   // Hidden where marking spam is meaningless for self-authored mail (Drafts, Sent).
   spamApplicable?: boolean;
+  /** Role of the folder the row is listed in; plugin buttons can be limited to some. */
+  mailboxRole?: string | null;
 }
 
 const ACTION_CONFIG: Record<HoverAction, {
@@ -105,6 +108,7 @@ export function EmailHoverActions({
   isInJunk = false,
   onUndoSpam,
   spamApplicable = true,
+  mailboxRole = null,
 }: EmailHoverActionsProps) {
   const configuredHoverActions = useSettingsStore((state) => state.hoverActions);
   const mountainView = useSettingsStore((state) => state.interfaceLayout === 'mountain-view');
@@ -113,6 +117,9 @@ export function EmailHoverActions({
   const hoverActionsCorner = useSettingsStore((state) => state.hoverActionsCorner);
   const t = useTranslations("settings.email_behavior.hover_actions");
   const isMobile = useIsMobile();
+  // Buttons plugins add to the row (message-row-actions), after the app's own.
+  const pluginActionCount = usePluginActions("message-row-actions", { mailboxRole }).length;
+  const pluginContext = useMemo(() => ({ emailId: email.id }), [email.id]);
 
   // The tag quick-action opens the same picker the context menu and the reading
   // pane use. It is portalled to the body because every row sits inside a
@@ -159,7 +166,7 @@ export function EmailHoverActions({
   const hoverBackgroundClassName = backgroundClassName;
 
   if (isMobile) return null;
-  if (hoverActions.length === 0) return null;
+  if (hoverActions.length === 0 && pluginActionCount === 0) return null;
 
   const handleAction = (e: React.MouseEvent, action: HoverAction) => {
     e.stopPropagation();
@@ -251,6 +258,18 @@ export function EmailHoverActions({
       </button>
     );
   });
+  if (pluginActionCount > 0) {
+    actionButtons.push(
+      <PluginActions
+        key="plugin-actions"
+        surface="message-row-actions"
+        context={pluginContext}
+        mailboxRole={mailboxRole}
+        compact
+        className="flex-nowrap gap-0.5"
+      />,
+    );
+  }
 
   const tagPicker =
     tagPickerPos && onSetTag
diff --git a/components/email/email-list.tsx b/components/email/email-list.tsx
index 5e33fd79b..a52fe0b68 100644
--- a/components/email/email-list.tsx
+++ b/components/email/email-list.tsx
@@ -9,7 +9,7 @@ import { listVerificationCode } from "@/lib/verification-code";
 import { EmailContextMenu, type CopyTargetAccount } from "./email-context-menu";
 import { BatchTagButton } from "./batch-tag-button";
 import { cn, cleanPreview } from "@/lib/utils";
-import { Trash2, Mail, MailX, MailOpen, Loader2, SearchX, AlertTriangle, CalendarClock, ShieldCheck } from "@/components/icons";
+import { Trash2, Mail, MailX, MailOpen, Loader2, SearchX, AlertTriangle, CalendarClock, ShieldCheck, X } from "@/components/icons";
 import { useState, useEffect, useLayoutEffect, useRef, useCallback, useMemo } from "react";
 import { Button } from "@/components/ui/button";
 import { ConfirmDialog } from "@/components/ui/confirm-dialog";
@@ -31,7 +31,10 @@ import { TagDisplayContext, useMeasuredTagDisplay } from "@/hooks/use-tag-displa
 import { SearchChips } from "@/components/search/search-chips";
 import { isFilterEmpty, DEFAULT_SEARCH_FILTERS } from "@/lib/jmap/search-utils";
 import { getOwnAddresses } from "@/lib/filters/quick-rule-target";
+import { emitThreadExpand } from "@/lib/plugin-thread-expand";
 import { normalizeAddress } from "@/lib/filters/quick-rules";
+import { PluginSlot } from "@/components/plugins/plugin-slot";
+import { PluginActions } from "@/components/plugins/plugin-actions";
 
 interface EmailListProps {
   emails: Email[];
@@ -72,6 +75,9 @@ interface EmailListProps {
   hideBatchToolbar?: boolean;
 }
 
+/** Below this width the batch toolbar drops its labels (see batchNarrow). */
+const BATCH_TOOLBAR_WIDE = 480;
+
 export function EmailList({
   emails,
   selectedEmailId,
@@ -264,6 +270,20 @@ export function EmailList({
     observer.observe(toolbar);
     return () => observer.disconnect();
   }, []);
+  // A narrow list (folder sidebar open, phones) has no room for the batch
+  // toolbar's labels: plugin buttons go behind one "more" button and "Clear
+  // selection" becomes an icon, instead of wrapping into each other.
+  const [batchNarrow, setBatchNarrow] = useState(false);
+  useEffect(() => {
+    const toolbar = batchToolbarRef.current;
+    if (!toolbar || typeof ResizeObserver === 'undefined') return;
+    const observer = new ResizeObserver((entries) => {
+      const width = entries[0]?.contentRect.width ?? toolbar.getBoundingClientRect().width;
+      if (width > 0) setBatchNarrow(width < BATCH_TOOLBAR_WIDE);
+    });
+    observer.observe(toolbar);
+    return () => observer.disconnect();
+  }, []);
   // One tag treatment for the whole list, measured from the scroll container.
   const tagDisplay = useMeasuredTagDisplay(parentRef);
   const density = useSettingsStore((state) => state.density);
@@ -380,6 +400,19 @@ export function EmailList({
   );
 
   const hasSelection = selectedEmailKeys.size > 0;
+  // What plugin buttons in the selection toolbar act on: the JMAP ids of the
+  // selected messages, thread members included.
+  const selectedEmailIds = useMemo(
+    () => resolveSelectedEmails({ emails, threadEmailsCache, selectedEmailKeys }).map((email) => email.id),
+    [emails, threadEmailsCache, selectedEmailKeys],
+  );
+  const bulkActionContext = useMemo(() => ({ emailIds: selectedEmailIds }), [selectedEmailIds]);
+  const listSlotProps = useMemo(
+    () => ({ mailboxId: selectedMailbox || null, mailboxRole: effectiveMailboxRole ?? null }),
+    [selectedMailbox, effectiveMailboxRole],
+  );
+  const isSearching = !!searchQuery || !isFilterEmpty(searchFilters);
+  const emptySlotProps = useMemo(() => ({ ...listSlotProps, searching: isSearching }), [listSlotProps, isSearching]);
 
   const handleBatchMarkAsRead = async (read: boolean) => {
     if (!client || isProcessing) return;
@@ -497,18 +530,34 @@ export function EmailList({
     }
   }, [client, hasMoreEmails, isLoadingMore, isLoading, isScheduledView, loadMoreEmails, onLoadMoreScheduled]);
 
+  // The messages of a thread as the list knows them, for onThreadExpand.
+  const threadMembers = useCallback((threadKey: string): Email[] => (
+    useEmailStore.getState().threadEmailsCache.get(threadKey)
+      ?? threadGroups.find((g) => g.threadKey === threadKey)?.emails
+      ?? []
+  ), [threadGroups]);
+
   const handleToggleThreadExpansion = useCallback(async (threadKey: string) => {
     const isExpanded = expandedThreadIds.has(threadKey);
 
     if (!isExpanded && client) {
       toggleThreadExpansion(threadKey);
       await fetchThreadEmails(client, threadKey);
+      emitThreadExpand(threadKey, threadMembers(threadKey), true);
       // Mark all unread emails in this thread as read
       void markThreadAsRead(client, threadKey);
     } else {
       toggleThreadExpansion(threadKey);
+      emitThreadExpand(threadKey, threadMembers(threadKey), !isExpanded);
     }
-  }, [client, expandedThreadIds, toggleThreadExpansion, fetchThreadEmails, markThreadAsRead]);
+  }, [client, expandedThreadIds, toggleThreadExpansion, fetchThreadEmails, markThreadAsRead, threadMembers]);
+
+  const collapseAllThreadsAndNotify = useCallback(() => {
+    const wereExpanded = [...useEmailStore.getState().expandedThreadIds];
+    const members = wereExpanded.map((key) => [key, threadMembers(key)] as const);
+    collapseAllThreads();
+    for (const [key, emails] of members) emitThreadExpand(key, emails, false);
+  }, [collapseAllThreads, threadMembers]);
 
   // Range-based load more: trigger when last visible item is near the end.
   // Debounce to prevent rapid cascade when thread grouping reduces item
@@ -562,13 +611,13 @@ export function EmailList({
           hasSelection && !isScheduledView && !hideBatchToolbar ? "max-h-16 opacity-100" : "max-h-0 opacity-0"
         )}
       >
-        <div className="px-4 py-2 border-b bg-accent/30 border-border flex items-center justify-between">
-          <div className="flex items-center gap-2 animate-in fade-in slide-in-from-left-3 duration-300">
-            <span className="text-sm font-medium text-foreground">
+        <div className={cn("py-2 border-b bg-accent/30 border-border flex items-center justify-between gap-2", batchNarrow ? "px-2" : "px-4")} data-batch-narrow={batchNarrow ? "" : undefined}>
+          <div className="flex items-center gap-2 min-w-0 animate-in fade-in slide-in-from-left-3 duration-300">
+            <span className="text-sm font-medium text-foreground whitespace-nowrap truncate">
               {t('batch_actions.selected_messages', { count: selectedEmailKeys.size })}
             </span>
           </div>
-          <div className="flex items-center gap-1 animate-in fade-in slide-in-from-right-3 duration-300">
+          <div className={cn("flex items-center flex-shrink-0 animate-in fade-in slide-in-from-right-3 duration-300", batchNarrow ? "gap-0.5 [&_button]:px-2" : "gap-1")}>
             <Button
               variant="ghost"
               size="sm"
@@ -636,16 +685,27 @@ export function EmailList({
                 <Trash2 className="w-4 h-4" />
               )}
             </Button>
-            <div className="w-px h-6 bg-border mx-1" />
+            {hasSelection && (
+              <PluginActions
+                surface="message-bulk-actions"
+                context={bulkActionContext}
+                mailboxRole={effectiveMailboxRole ?? null}
+                compact
+                overflow={batchNarrow}
+                className="flex-nowrap"
+              />
+            )}
+            <div className={cn("w-px h-6 bg-border", batchNarrow ? "mx-0.5" : "mx-1")} />
             <Button
               variant="ghost"
               size="sm"
               onClick={clearSelection}
               title={t('batch_actions.clear_selection')}
+              aria-label={t('batch_actions.clear_selection')}
               disabled={isProcessing}
-              className="text-muted-foreground hover:text-foreground transition-colors disabled:opacity-50"
+              className="text-muted-foreground hover:text-foreground transition-colors disabled:opacity-50 whitespace-nowrap"
             >
-              {t('batch_actions.clear_selection')}
+              {batchNarrow ? <X className="w-4 h-4" /> : t('batch_actions.clear_selection')}
             </Button>
           </div>
         </div>
@@ -691,6 +751,8 @@ export function EmailList({
         </div>
       )}
 
+      <PluginSlot name="message-list-header" className="w-full" extraProps={listSlotProps} />
+
       {/* Email List */}
       <div ref={parentRef} className="flex-1 overflow-y-auto bg-background relative" data-tour="email-list">
         {/* Loading overlay */}
@@ -722,6 +784,7 @@ export function EmailList({
             <p className="text-sm mt-1 text-muted-foreground">
               {isScheduledView ? t('no_scheduled_emails_description') : searchQuery || !isFilterEmpty(searchFilters) ? t('no_search_results_description') : t('no_emails_description')}
             </p>
+            <PluginSlot name="message-list-empty" className="mt-4 w-full max-w-md px-4" extraProps={emptySlotProps} />
           </div>
         ) : (
           <>
@@ -756,14 +819,14 @@ export function EmailList({
                       isLoading={isLoadingThread === thread.threadKey}
                       expandedEmails={threadEmailsCache.get(thread.threadKey)}
                       onToggleExpand={() => handleToggleThreadExpansion(thread.threadKey)}
-                      onCollapseAllThreads={collapseAllThreads}
+                      onCollapseAllThreads={collapseAllThreadsAndNotify}
                       onEmailSelect={(email) => {
                         // Collapse expanded threads when selecting an email outside the expanded thread
                         const currentExpanded = useEmailStore.getState().expandedThreadIds;
                         if (currentExpanded.size > 0) {
                           // Check if the selected email belongs to any expanded thread via its threadId
                           if (!email.threadId || !currentExpanded.has(threadKeyFor(email))) {
-                            collapseAllThreads();
+                            collapseAllThreadsAndNotify();
                           }
                         }
                         onEmailSelect?.(email);
diff --git a/components/email/email-viewer.tsx b/components/email/email-viewer.tsx
index 07463f525..df59d15dd 100644
--- a/components/email/email-viewer.tsx
+++ b/components/email/email-viewer.tsx
@@ -4,7 +4,7 @@ import { Fragment, useState, useEffect, useLayoutEffect, useMemo, useRef, useCal
 import { Email, ContactCard, Mailbox } from "@/lib/jmap/types";
 import { emailExportFilename, attachmentDownloadFilename, attachmentsBundleFilename, DEFAULT_EMAIL_TEMPLATE, DEFAULT_ATTACHMENT_TEMPLATE } from "@/lib/download-filename";
 import { EML_IMPORT_ACCEPT, expandImportableEmails } from "@/lib/eml-import";
-import { applyNewTabToAnchor, emailIframeCsp, escapeHtml, isOpenableLinkHref, plainTextToSafeHtml, sanitizeEmailBodyForIframe, sanitizeEmailHtml, sanitizePlainTextRenderedHtml } from "@/lib/email-sanitization";
+import { applyNewTabToAnchor, emailIframeCsp, escapeHtml, isExternalResourceUrl, isOpenableLinkHref, plainTextToSafeHtml, sanitizeEmailBodyForIframe, sanitizeEmailHtml, sanitizePlainTextRenderedHtml } from "@/lib/email-sanitization";
 import { getRenderableHtmlBody } from "@/lib/email-body-selection";
 import { collectReferencedCids, isEmbeddedInBody } from "@/lib/attachment-visibility";
 import { collapsePlainTextQuotes, setupQuoteCollapse } from "@/lib/quote-collapse";
@@ -26,6 +26,7 @@ import { useKeywordFormat } from "@/hooks/use-keyword-format";
 import { getEmailTagIds } from "@/lib/thread-utils";
 import { getSecurityStatus, extractListHeaders, getSenderVerification } from "@/lib/email-headers";
 import { emailToReadView } from "@/lib/plugin-projection";
+import type { EmailReadView, ExternalLinkContext } from "@/lib/plugin-types";
 import { generateEmailSource } from "@/lib/email-source";
 import {
   Reply,
@@ -111,6 +112,7 @@ import { useMenuNavigation } from "@/hooks/use-menu-navigation";
 import { findCalendarAttachment, isCalendarMimeType } from "@/lib/calendar-invitation";
 import { RecipientPopover } from "./recipient-popover";
 import { MailtoLink } from "@/components/ui/mailto-link";
+import { requestInternalMailto } from "@/lib/protocol-handlers/mailto";
 import { imageBlobUrl, inertBlobType, isFilePreviewable, isMimeTypeSafeForInlinePreview, toInertBlob } from "@/lib/file-preview";
 import { useWopiStatus, canWopiOpen } from "@/hooks/use-wopi-status";
 import { parseTnef, isTnefAttachment } from "@/lib/tnef";
@@ -120,10 +122,14 @@ import { VerificationCodeChip } from "./verification-code-chip";
 import { ConversationEmailBody, useConversationExternalContent, useMarkReadWhenShown } from "./thread-conversation-view";
 import type { TnefAttachment } from "@/lib/tnef";
 import { PluginSlot } from "@/components/plugins/plugin-slot";
+import { PluginActions } from "@/components/plugins/plugin-actions";
+import { AttachmentPluginFrames, AttachmentPluginMenu, PluginPanelEntries, ReaderAboveQuoteSlot } from "./reader-plugin-surfaces";
 import { RulesPanel, useRulesAvailability } from "./rules-menu";
 import { usePluginSlotOffers } from "@/hooks/use-plugin-slot-offers";
 import { ResizeHandle } from "@/components/layout/resize-handle";
-import { emailHooks, uiHooks, renderHooks } from "@/lib/plugin-hooks";
+import { emailHooks, renderHooks } from "@/lib/plugin-hooks";
+import { emitThreadExpand } from "@/lib/plugin-thread-expand";
+import { resolveExternalLink } from "@/lib/plugin-hook-result";
 import type { AttachmentInfo, AttachmentPreview } from "@/lib/plugin-types";
 import { useAttachmentDrag, isDragOutSupported, type AttachmentDragSource } from "@/hooks/use-attachment-drag";
 import type { IJMAPClient } from "@/lib/jmap/client-interface";
@@ -951,6 +957,18 @@ function MvPager({
   );
 }
 
+/**
+ * The plugin slot under one "more details" category. Props are memoised so
+ * re-renders of the viewer don't post them to the plugin again.
+ */
+function DetailsCategorySlot({ email, category }: { email: EmailReadView | null; category: string | null }) {
+  const props = useMemo(() => ({ email, category }), [email, category]);
+  return <PluginSlot name="email-details-section" className="mt-2 empty:mt-0" extraProps={props} />;
+}
+
+/** Narrowest the message may get next to a plugin panel before the panel collapses. */
+const MIN_READER_WIDTH = 480;
+
 function SidebarSection({ icon: Icon, title, children }: { icon: React.ComponentType<{ className?: string }>; title: string; children: React.ReactNode }) {
   return (
     <div>
@@ -1106,10 +1124,17 @@ export function EmailViewer({
   const mvOpenIndex = (mvViewer || mvMobileViewer) && mvConversation && email ? mvConversation.findIndex((e) => e.id === email.id) : -1;
   const mvBefore = mvOpenIndex > 0 ? mvConversation!.slice(0, mvOpenIndex) : [];
   const mvAfter = mvOpenIndex >= 0 ? mvConversation!.slice(mvOpenIndex + 1) : [];
+  const mvConversationIds = mvOpenIndex >= 0 ? mvConversation!.map((e) => e.id).join(',') : '';
+  const threadSummaryProps = useMemo(
+    () => ({ threadId: email?.threadId ?? null, emailIds: mvConversationIds ? mvConversationIds.split(',') : [] }),
+    [email?.threadId, mvConversationIds],
+  );
   // Mountain View: which other messages of the conversation are unfolded. A
   // conversation opens with its unread messages unfolded, as Gmail does, so
   // reading the thread reads all of them.
   const [mvExpandedIds, setMvExpandedIds] = useState<ReadonlySet<string>>(() => new Set());
+  const mvExpandedIdsRef = useRef(mvExpandedIds);
+  mvExpandedIdsRef.current = mvExpandedIds;
   const mvExpandedThreadRef = useRef<string | null>(null);
   useEffect(() => {
     if (!mvConversation || mvConversation.length === 0 || !email) {
@@ -1122,6 +1147,7 @@ export function EmailViewer({
     setMvExpandedIds(new Set(mvConversation.filter((e) => e.id !== email.id && !e.keywords?.$seen).map((e) => e.id)));
   }, [mvConversation, email]);
   const toggleMvExpanded = useCallback((target: Email) => {
+    emitThreadExpand(target.threadId, [target], !mvExpandedIdsRef.current.has(target.id));
     setMvExpandedIds((prev) => {
       const next = new Set(prev);
       if (next.has(target.id)) next.delete(target.id);
@@ -1133,6 +1159,12 @@ export function EmailViewer({
   const [mvOpenCollapsed, setMvOpenCollapsed] = useState(false);
   useEffect(() => setMvOpenCollapsed(false), [email?.id]);
   const mvOpenFolded = mvOpenIndex >= 0 && mvOpenCollapsed;
+  // Folding or unfolding the open message of a conversation, told to plugins
+  // like any other conversation message (onThreadExpand).
+  const setMvOpenFolded = (folded: boolean) => {
+    if (email) emitThreadExpand(email.threadId, [email], !folded);
+    setMvOpenCollapsed(folded);
+  };
   // The conversation is not here yet (the one on hand is another thread's, or
   // none). Hold the message back instead of drawing it alone and then pushing
   // it down under the earlier messages.
@@ -1390,6 +1422,22 @@ export function EmailViewer({
   // Whether any plugin offers a "more details" section, so we only render the
   // bottom plugin category wrapper when something will fill it.
   const hasDetailsSlotOffers = usePluginSlotOffers('email-details-section').length > 0;
+  const hasBannerOffers = usePluginSlotOffers('email-banner').length > 0;
+  const hasHeaderOffers = usePluginSlotOffers('reader-header').length > 0;
+  const hasBelowSubjectOffers = usePluginSlotOffers('reader-below-subject').length > 0;
+  const hasAboveQuoteOffers = usePluginSlotOffers('reader-above-quote').length > 0;
+  // One projected view per message for all plugin slots on it, built only
+  // when a plugin is there to see it. A fresh object on every render made
+  // each slot post its props to the plugin again and re-run shouldShow.
+  const wantsPluginEmailView = hasDetailSidebar || hasDetailsSlotOffers || hasBannerOffers
+    || hasHeaderOffers || hasBelowSubjectOffers || hasAboveQuoteOffers;
+  const pluginEmailView = useMemo(
+    () => (email && wantsPluginEmailView ? emailToReadView(email) : null),
+    [email, wantsPluginEmailView],
+  );
+  const pluginEmailProps = useMemo(() => ({ email: pluginEmailView }), [pluginEmailView]);
+  const readerActionContext = useMemo(() => ({ emailId: email?.id }), [email?.id]);
+  const pluginFooterProps = useMemo(() => ({ emailId: email?.id }), [email?.id]);
   const [detailSidebarCollapsed, setDetailSidebarCollapsed] = useState<boolean>(() => {
     if (typeof window === 'undefined') return false;
     try { return localStorage.getItem('emailDetailSidebarCollapsed') === '1'; } catch { return false; }
@@ -1402,6 +1450,29 @@ export function EmailViewer({
     } catch { return 280; }
   });
   const detailSidebarWidthRef = useRef(detailSidebarWidth);
+  // The panel takes its width from the message. When that would leave the
+  // message too narrow to read (three panes on a laptop), the panel starts
+  // collapsed; opening it anyway is still the user's call.
+  // A callback ref: the root only exists once a message is open (the empty
+  // and loading states render other markup), so the observer has to attach
+  // when the element appears, not when the plugin offer does.
+  const [viewerRootEl, setViewerRootEl] = useState<HTMLDivElement | null>(null);
+  const [viewerWidth, setViewerWidth] = useState(0);
+  const [detailSidebarForcedOpen, setDetailSidebarForcedOpen] = useState(false);
+  useEffect(() => {
+    if (!hasDetailSidebar || !viewerRootEl || typeof ResizeObserver === 'undefined') return;
+    const ro = new ResizeObserver((entries) => {
+      const width = Math.round(entries[0]?.contentRect.width ?? 0);
+      setViewerWidth(width);
+    });
+    ro.observe(viewerRootEl);
+    return () => ro.disconnect();
+  }, [hasDetailSidebar, viewerRootEl]);
+  const readerTooNarrow = viewerWidth > 0 && viewerWidth - detailSidebarWidth < MIN_READER_WIDTH;
+  const sidebarCollapsed = detailSidebarCollapsed || (readerTooNarrow && !detailSidebarForcedOpen);
+  // Opened by hand while the message is too narrow for it: the panel lies over
+  // the message instead of squeezing it.
+  const sidebarOverlay = !sidebarCollapsed && readerTooNarrow;
 
   useEffect(() => {
     try { localStorage.setItem('emailDetailSidebarCollapsed', detailSidebarCollapsed ? '1' : '0'); } catch { /* ignore */ }
@@ -2725,6 +2796,15 @@ export function EmailViewer({
   // Gates the quick reply on the iframe having loaded the current srcDoc, so
   // it doesn't flash in below a still-resizing iframe.
   const [iframeReady, setIframeReady] = useState(false);
+  // The plain-text body, where reader-above-quote mounts between text and quote.
+  const [plainBodyEl, setPlainBodyEl] = useState<HTMLDivElement | null>(null);
+  // One object per body: React writes innerHTML again whenever this object
+  // changes, which would drop what was mounted in the body and fold the quote
+  // back up on every render.
+  const plainBodyHtml = useMemo(
+    () => ({ __html: sanitizePlainTextRenderedHtml(effectiveEmailContent.html) }),
+    [effectiveEmailContent.html],
+  );
   // Tracks which parsed document we've already wired up, so setup runs exactly
   // once per srcDoc even though both the readiness poll below and the iframe
   // 'load' event can trigger it.
@@ -2747,6 +2827,30 @@ export function EmailViewer({
     staleDocRef.current = iframeRef.current?.contentDocument ?? null;
   }, [emailIframeSrcDoc]);
 
+  // onEmailContentRender: once per opened message, after its body is on
+  // screen (the iframe has loaded an HTML body; a text body renders at once).
+  const contentRenderedForRef = useRef<string | null>(null);
+  useEffect(() => {
+    if (!email || isBodyLoading) return;
+    if (effectiveEmailContent.isHtml && !iframeReady) return;
+    if (contentRenderedForRef.current === email.id) return;
+    contentRenderedForRef.current = email.id;
+    if (emailHooks.onEmailContentRender.size === 0) return;
+    let hasExternalContent = hasBlockedContent;
+    if (!hasExternalContent && effectiveEmailContent.isHtml) {
+      // Loaded rather than blocked (allowed by the user or the policy): look
+      // at what the rendered body actually references.
+      const doc = iframeRef.current?.contentDocument;
+      hasExternalContent = !!doc && Array.from(doc.querySelectorAll('[src], [srcset], [background], [poster]')).some((el) =>
+        ['src', 'srcset', 'background', 'poster'].some((attr) => isExternalResourceUrl(el.getAttribute(attr))));
+    }
+    void emailHooks.onEmailContentRender.emit({
+      emailId: email.id,
+      hasHtml: effectiveEmailContent.isHtml,
+      hasExternalContent,
+    });
+  }, [email, isBodyLoading, effectiveEmailContent.isHtml, iframeReady, hasBlockedContent]);
+
   // Open a blob: link the rendered body points at a cid: part. Mirrors the
   // attachment-chip gate: inert previewable types open in a tab, everything
   // else (and any blob: URL we did not mint) is downloaded under its part name.
@@ -2872,7 +2976,17 @@ export function EmailViewer({
           const targetEl = (ev.target as Element | null)?.closest?.('a[href], area[href]') as HTMLAnchorElement | HTMLAreaElement | null;
           if (!targetEl) return;
           const href = targetEl.getAttribute('href') || '';
-          if (!href || href.startsWith('#') || href.startsWith('mailto:')) return;
+          if (!href || href.startsWith('#')) return;
+          if (/^mailto:/i.test(href)) {
+            // Write it here, like any other address in the app; the mail page
+            // asks onMailtoIntercept first. Not taken (no recipient, nobody
+            // listening): the browser's own handling stays.
+            if (requestInternalMailto(href)) {
+              ev.preventDefault();
+              ev.stopPropagation();
+            }
+            return;
+          }
           ev.preventDefault();
           ev.stopPropagation();
           // A link at a cid: part now carries the blob: URL we minted for it.
@@ -2887,14 +3001,16 @@ export function EmailViewer({
           // data:, unresolved cid: and relative paths would land inside our
           // own origin.
           if (!isOpenableLinkHref(href)) return;
-          const ctx = {
+          const ctx: ExternalLinkContext = {
             href,
             target: targetEl.getAttribute('target') ?? undefined,
             emailId: email?.id,
           };
-          const ok = await uiHooks.onBeforeExternalLink.intercept(ctx);
-          if (!ok || !isOpenableLinkHref(ctx.href)) return;
-          window.open(ctx.href, '_blank', 'noopener,noreferrer');
+          // A plugin returns false to stop the link or { href } to send it
+          // somewhere else (a web address only).
+          const target = await resolveExternalLink(ctx);
+          if (!target) return;
+          window.open(target, '_blank', 'noopener,noreferrer');
         };
         doc.addEventListener('click', onLinkClick, true);
 
@@ -3430,6 +3546,15 @@ export function EmailViewer({
         </Button>
         </>)}
         <PluginSlot name="toolbar-actions" />
+        {/* Phones get these in the More panel. */}
+        {!isMobile && email && (
+          <PluginActions
+            surface="reader-actions"
+            context={readerActionContext}
+            mailboxRole={currentMailboxRole ?? null}
+            compact={!showToolbarLabels}
+          />
+        )}
       </div>
 
       {/* Right: Organize actions - order: archive, delete, move, tag, spam, read state, print, view source */}
@@ -3973,6 +4098,7 @@ export function EmailViewer({
 
   return (
     <div
+      ref={setViewerRootEl}
       data-tour="email-viewer"
       className={cn("flex-1 flex flex-row h-full bg-background overflow-hidden relative", className)}
     >
@@ -4174,6 +4300,14 @@ export function EmailViewer({
                   {t('keyboard_shortcuts')}
                 </button>
               )}
+              {email && (
+                <PluginPanelEntries
+                  surface="reader-actions"
+                  context={readerActionContext}
+                  mailboxRole={currentMailboxRole ?? null}
+                  onRan={() => setMoreMenuOpen(false)}
+                />
+              )}
             </>
           )}
           {moreMenuSub === 'move' && moveTree.length > 0 && onMoveToMailbox && (() => {
@@ -4246,6 +4380,8 @@ export function EmailViewer({
         </div>
       )}
 
+      <PluginSlot name="reader-header" className="w-full bg-background" extraProps={pluginEmailProps} />
+
       {/* === SUBJECT BLOCK === */}
       <div className={cn(
         "bg-background",
@@ -4377,6 +4513,11 @@ export function EmailViewer({
       <div className={cn("flex-1 overflow-auto overscroll-contain", mvViewer || mvMobileViewer ? "bg-background" : "bg-muted/30", isMobile && !mvMobileViewer && "pb-[calc(3.25rem+env(safe-area-inset-bottom)/2)] sm:pb-0")}>
       <div className="min-h-full flex flex-col">
 
+      {/* Above the messages of the open conversation. */}
+      {mvOpenIndex >= 0 && (
+        <PluginSlot name="thread-summary" className="w-full" extraProps={threadSummaryProps} />
+      )}
+
       {/* Mountain View: the conversation's earlier messages, folded. */}
       {mvBefore.length > 0 && (
         <div data-mv-conversation-before="">
@@ -4387,7 +4528,7 @@ export function EmailViewer({
       {/* Mountain View: the open message folded like the rest of the conversation. */}
       {mvOpenFolded && email ? (
         <div data-mv-open-folded="">
-          <MvConversationCard email={email} onOpen={() => setMvOpenCollapsed(false)} timeFormat={timeFormat} compact={mvMobileViewer} />
+          <MvConversationCard email={email} onOpen={() => setMvOpenFolded(false)} timeFormat={timeFormat} compact={mvMobileViewer} />
         </div>
       ) : mvAwaitingConversation ? (
         <div className={cn("flex items-start py-3 animate-pulse", mvMobileViewer ? "gap-3 px-4" : "gap-4 px-6")} data-mv-conversation-pending="">
@@ -4409,7 +4550,7 @@ export function EmailViewer({
           // message, as Gmail does; its buttons and links keep their own job.
           if (isInteractiveClick(e.target, e.currentTarget)) return;
           if (window.getSelection()?.toString()) return;
-          setMvOpenCollapsed(true);
+          setMvOpenFolded(true);
         } : undefined}
       >
           <div className="flex items-start" style={{ gap: mvViewer ? '16px' : 'var(--density-item-gap)' }}>
@@ -4561,7 +4702,7 @@ export function EmailViewer({
                     const thumbUrl = imageThumbUrls[attachment.id];
                     return (
                       <DraggableAttachmentChip key={attachment.id} attachment={attachment} client={blobClient} accountId={blobAccountId} enabled={dragOutActive} downloadName={resolveAttachmentName(attachment)}>
-                        {(dragProps) => (
+                        {(dragProps) => (<>
                       <div
                         className={cn(
                           "bg-muted/60 hover:bg-muted rounded-md border border-border/50 group relative cursor-pointer overflow-hidden",
@@ -4599,7 +4740,7 @@ export function EmailViewer({
                           </span>
                         </div>
                         <div className={cn(
-                          "absolute bg-background/95 opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-center gap-1 px-1.5 rounded-md",
+                          "absolute bg-background/95 opacity-0 pointer-events-none group-hover:opacity-100 group-hover:pointer-events-auto group-focus-within:opacity-100 group-focus-within:pointer-events-auto transition-opacity flex items-center justify-center gap-1 px-1.5 rounded-md",
                           thumbUrl ? "top-1 end-1" : "inset-y-0 end-0 rounded-s-none rounded-e-md",
                         )}>
                           <button
@@ -4618,22 +4759,11 @@ export function EmailViewer({
                               <Eye className="w-3.5 h-3.5 text-foreground" />
                             </button>
                           )}
-                          <PluginSlot
-                            name="attachment-actions"
-                            className="contents"
-                            extraProps={{
-                              attachment: {
-                                name: attachment.name || '',
-                                type: attachment.type,
-                                size: attachment.size,
-                                blobId: attachment.blobId,
-                                emailId: email?.id,
-                              } satisfies AttachmentInfo,
-                            }}
-                          />
+                          <AttachmentPluginMenu emailId={email?.id} attachment={attachment} iconClassName="w-3.5 h-3.5" />
                         </div>
                       </div>
-                        )}
+                        <AttachmentPluginFrames emailId={email?.id} attachment={attachment} />
+                        </>)}
                       </DraggableAttachmentChip>
                     );
                   })}
@@ -4657,7 +4787,7 @@ export function EmailViewer({
                           const opensPreview = isPreviewable && mailAttachmentAction === 'preview';
                           return (
                             <DraggableAttachmentChip key={attachment.id} attachment={attachment} client={blobClient} accountId={blobAccountId} enabled={dragOutActive} downloadName={resolveAttachmentName(attachment)}>
-                              {(dragProps) => (
+                              {(dragProps) => (<>
                             <div
                               className="flex items-center gap-1.5 px-2 py-1 rounded-md hover:bg-muted/60 group relative cursor-pointer w-full"
                               title={`${opensPreview ? tFiles('preview') : t('download')} ${getAttachmentDisplayName(attachment.name, attachment.type)}`}
@@ -4674,7 +4804,7 @@ export function EmailViewer({
                               <span className="text-[10px] text-muted-foreground ms-auto flex-shrink-0">
                                 {formatFileSize(attachment.size)}
                               </span>
-                              <div className="absolute inset-y-0 end-0 rounded-e-md bg-background/95 opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-center gap-1 px-1.5">
+                              <div className="absolute inset-y-0 end-0 rounded-e-md bg-background/95 opacity-0 pointer-events-none group-hover:opacity-100 group-hover:pointer-events-auto group-focus-within:opacity-100 group-focus-within:pointer-events-auto transition-opacity flex items-center justify-center gap-1 px-1.5">
                                 <button
                                   className="p-1 hover:bg-accent rounded transition-colors"
                                   title={t('download')}
@@ -4691,22 +4821,11 @@ export function EmailViewer({
                                     <Eye className="w-3.5 h-3.5 text-foreground" />
                                   </button>
                                 )}
-                                <PluginSlot
-                                  name="attachment-actions"
-                                  className="contents"
-                                  extraProps={{
-                                    attachment: {
-                                      name: attachment.name || '',
-                                      type: attachment.type,
-                                      size: attachment.size,
-                                      blobId: attachment.blobId,
-                                      emailId: email?.id,
-                                    } satisfies AttachmentInfo,
-                                  }}
-                                />
+                                <AttachmentPluginMenu emailId={email?.id} attachment={attachment} iconClassName="w-3.5 h-3.5" />
                               </div>
                             </div>
-                              )}
+                              <AttachmentPluginFrames emailId={email?.id} attachment={attachment} />
+                              </>)}
                             </DraggableAttachmentChip>
                           );
                         })}
@@ -4727,7 +4846,7 @@ export function EmailViewer({
           onClick={mvOpenIndex >= 0 ? (e) => {
             if (isInteractiveClick(e.target, e.currentTarget)) return;
             if (window.getSelection()?.toString()) return;
-            setMvOpenCollapsed(true);
+            setMvOpenFolded(true);
           } : undefined}
         >
           <div className="flex items-start" style={{ gap: 'var(--density-item-gap)' }}>
@@ -4827,6 +4946,8 @@ export function EmailViewer({
           </div>
         </div>
 
+        <PluginSlot name="reader-below-subject" className="w-full bg-background" extraProps={pluginEmailProps} />
+
         {/* Expandable Details (shared across mobile/tablet/desktop) */}
         {showFullHeaders && (() => {
           const translateAuthResult = (result?: string) => {
@@ -4917,20 +5038,13 @@ export function EmailViewer({
           const hasListInfo = !!(listHeaders?.listId || listHeaders?.listUnsubscribe || listHeaders?.listHelp || listHeaders?.listPost);
           const hasAuthSection = !!(auth?.spf || auth?.dkim || auth?.dmarc || auth?.iprev || email.spamScore !== undefined || email.spamLLM);
 
-          // Projected, read-only view handed to plugins that render in the
-          // "more details" panel. Includes the parsed `headers` map and full
-          // `source` so plugins can inspect raw headers / message source.
-          // Built lazily here - only when the details panel is expanded.
-          const detailsView = emailToReadView(email);
           // Lets a plugin add rows under an existing category. The plugin's
           // own `shouldShow({ email, category })` decides which category it
           // appears under (or `category === null` for the new bottom section).
-          const CategorySlot = ({ category }: { category: string }) => (
-            <PluginSlot
-              name="email-details-section"
-              className="mt-2 empty:mt-0"
-              extraProps={{ email: detailsView, category }}
-            />
+          // A component defined here would be a new type on every render and
+          // remount the plugin's iframe each time, so it lives outside.
+          const categorySlot = (category: string) => (
+            <DetailsCategorySlot email={pluginEmailView} category={category} />
           );
 
           return (
@@ -5004,7 +5118,7 @@ export function EmailViewer({
                       )}
                     </Row>
                   </dl>
-                  <CategorySlot category="recipients_routing" />
+                  {categorySlot("recipients_routing")}
                 </section>
 
                 {hasAuthSection && (
@@ -5090,7 +5204,7 @@ export function EmailViewer({
                         </div>
                       </div>
                     )}
-                    <CategorySlot category="authentication_security" />
+                    {categorySlot("authentication_security")}
                   </section>
                 )}
 
@@ -5125,7 +5239,7 @@ export function EmailViewer({
                         <Row label={t('details.thread_id')} mono>{email.threadId}</Row>
                       )}
                     </dl>
-                    <CategorySlot category="identifiers_threading" />
+                    {categorySlot("identifiers_threading")}
                   </section>
                 )}
 
@@ -5153,7 +5267,7 @@ export function EmailViewer({
                       <Row label={t('details.account')}>{email.accountLabel}</Row>
                     )}
                   </dl>
-                  <CategorySlot category="message_properties" />
+                  {categorySlot("message_properties")}
                 </section>
 
                 {hasListInfo && (
@@ -5179,7 +5293,7 @@ export function EmailViewer({
                         <Row label={t('details.list_post')}><span className="break-all">{listHeaders.listPost}</span></Row>
                       )}
                     </dl>
-                    <CategorySlot category="mailing_list" />
+                    {categorySlot("mailing_list")}
                   </section>
                 )}
 
@@ -5187,10 +5301,7 @@ export function EmailViewer({
                     `category === null` render their own titled section here. */}
                 {hasDetailsSlotOffers && (
                   <section className="lg:col-span-2 min-w-0">
-                    <PluginSlot
-                      name="email-details-section"
-                      extraProps={{ email: detailsView, category: null }}
-                    />
+                    <DetailsCategorySlot email={pluginEmailView} category={null} />
                   </section>
                 )}
               </div>
@@ -5373,7 +5484,7 @@ export function EmailViewer({
           </div>
         )}
 
-        <PluginSlot name="email-banner" extraProps={{ email: emailToReadView(email) }} />
+        <PluginSlot name="email-banner" extraProps={pluginEmailProps} />
 
       {/* === ATTACHMENTS below header (below-header mode, desktop only) === */}
       {attachmentPosition === 'below-header' && effectiveAttachments.length > 0 && (
@@ -5425,7 +5536,7 @@ export function EmailViewer({
               const thumbUrl = imageThumbUrls[attachment.id];
               return (
                 <DraggableAttachmentChip key={attachment.id} attachment={attachment} client={blobClient} accountId={blobAccountId} enabled={dragOutActive} downloadName={resolveAttachmentName(attachment)}>
-                  {(dragProps) => (
+                  {(dragProps) => (<>
                 <div
                   className={cn(
                     "bg-muted/60 hover:bg-muted rounded-md border border-border/50 group relative cursor-pointer flex-shrink-0 overflow-hidden",
@@ -5468,7 +5579,7 @@ export function EmailViewer({
                     </span>
                   </div>
                   <div className={cn(
-                    "absolute rounded-md bg-background/95 opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-center gap-1 px-1.5",
+                    "absolute rounded-md bg-background/95 opacity-0 pointer-events-none group-hover:opacity-100 group-hover:pointer-events-auto group-focus-within:opacity-100 group-focus-within:pointer-events-auto transition-opacity flex items-center justify-center gap-1 px-1.5",
                     thumbUrl ? "top-1 end-1" : "inset-y-0 end-0 rounded-e-md rounded-s-none",
                   )}>
                     <button
@@ -5487,22 +5598,11 @@ export function EmailViewer({
                         <Eye className="w-4 h-4 text-foreground" />
                       </button>
                     )}
-                    <PluginSlot
-                      name="attachment-actions"
-                      className="contents"
-                      extraProps={{
-                        attachment: {
-                          name: attachment.name || '',
-                          type: attachment.type,
-                          size: attachment.size,
-                          blobId: attachment.blobId,
-                          emailId: email?.id,
-                        } satisfies AttachmentInfo,
-                      }}
-                    />
+                    <AttachmentPluginMenu emailId={email?.id} attachment={attachment} />
                   </div>
                 </div>
-                  )}
+                  <AttachmentPluginFrames emailId={email?.id} attachment={attachment} />
+                  </>)}
                 </DraggableAttachmentChip>
               );
             })}
@@ -5526,7 +5626,7 @@ export function EmailViewer({
                     const opensPreview = isPreviewable && mailAttachmentAction === 'preview';
                     return (
                       <DraggableAttachmentChip key={attachment.id} attachment={attachment} client={blobClient} accountId={blobAccountId} enabled={dragOutActive} downloadName={resolveAttachmentName(attachment)}>
-                        {(dragProps) => (
+                        {(dragProps) => (<>
                       <div
                         className="flex items-center gap-1.5 px-2 py-1 rounded-md hover:bg-muted/60 group relative cursor-pointer w-full"
                         title={`${opensPreview ? tFiles('preview') : t('download')} ${getAttachmentDisplayName(attachment.name, attachment.type)}`}
@@ -5543,7 +5643,7 @@ export function EmailViewer({
                         <span className="text-xs text-muted-foreground ms-auto flex-shrink-0">
                           {formatFileSize(attachment.size)}
                         </span>
-                        <div className="absolute inset-y-0 end-0 rounded-e-md bg-background/95 opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-center gap-1 px-1.5">
+                        <div className="absolute inset-y-0 end-0 rounded-e-md bg-background/95 opacity-0 pointer-events-none group-hover:opacity-100 group-hover:pointer-events-auto group-focus-within:opacity-100 group-focus-within:pointer-events-auto transition-opacity flex items-center justify-center gap-1 px-1.5">
                           <button
                             className="p-1 hover:bg-accent rounded transition-colors"
                             title={t('download')}
@@ -5560,22 +5660,11 @@ export function EmailViewer({
                               <Eye className="w-4 h-4 text-foreground" />
                             </button>
                           )}
-                          <PluginSlot
-                            name="attachment-actions"
-                            className="contents"
-                            extraProps={{
-                              attachment: {
-                                name: attachment.name || '',
-                                type: attachment.type,
-                                size: attachment.size,
-                                blobId: attachment.blobId,
-                                emailId: email?.id,
-                              } satisfies AttachmentInfo,
-                            }}
-                          />
+                          <AttachmentPluginMenu emailId={email?.id} attachment={attachment} />
                         </div>
                       </div>
-                        )}
+                        <AttachmentPluginFrames emailId={email?.id} attachment={attachment} />
+                        </>)}
                       </DraggableAttachmentChip>
                     );
                   })}
@@ -5597,7 +5686,7 @@ export function EmailViewer({
                 const thumbUrl = imageThumbUrls[attachment.id];
                 return (
                   <DraggableAttachmentChip key={attachment.id} attachment={attachment} client={blobClient} accountId={blobAccountId} enabled={dragOutActive} downloadName={resolveAttachmentName(attachment)}>
-                    {(dragProps) => (
+                    {(dragProps) => (<>
                   <div
                     className={cn(
                       "bg-muted/60 hover:bg-muted rounded-md border border-border/50 group relative cursor-pointer overflow-hidden",
@@ -5633,9 +5722,11 @@ export function EmailViewer({
                       <span className="text-xs text-muted-foreground flex-shrink-0">
                         {formatFileSize(attachment.size)}
                       </span>
+                      {/* Phones have no hover: the plugin menu stays visible. */}
+                      <AttachmentPluginMenu emailId={email?.id} attachment={attachment} className="-me-1 flex-shrink-0" iconClassName="w-3.5 h-3.5" />
                     </div>
                     <div className={cn(
-                      "absolute bg-background/95 opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-center gap-1 px-1.5 rounded-md",
+                      "absolute bg-background/95 opacity-0 pointer-events-none group-hover:opacity-100 group-hover:pointer-events-auto group-focus-within:opacity-100 group-focus-within:pointer-events-auto transition-opacity flex items-center justify-center gap-1 px-1.5 rounded-md",
                       thumbUrl ? "top-1 end-1" : "inset-y-0 end-0 rounded-s-none rounded-e-md",
                     )}>
                       <button
@@ -5654,22 +5745,10 @@ export function EmailViewer({
                           <Eye className="w-4 h-4 text-foreground" />
                         </button>
                       )}
-                      <PluginSlot
-                        name="attachment-actions"
-                        className="contents"
-                        extraProps={{
-                          attachment: {
-                            name: attachment.name || '',
-                            type: attachment.type,
-                            size: attachment.size,
-                            blobId: attachment.blobId,
-                            emailId: email?.id,
-                          } satisfies AttachmentInfo,
-                        }}
-                      />
                     </div>
                   </div>
-                    )}
+                    <AttachmentPluginFrames emailId={email?.id} attachment={attachment} />
+                    </>)}
                   </DraggableAttachmentChip>
                 );
               })}
@@ -5692,7 +5771,7 @@ export function EmailViewer({
                       const opensPreview = isPreviewable && mailAttachmentAction === 'preview';
                       return (
                         <DraggableAttachmentChip key={attachment.id} attachment={attachment} client={blobClient} accountId={blobAccountId} enabled={dragOutActive} downloadName={resolveAttachmentName(attachment)}>
-                          {(dragProps) => (
+                          {(dragProps) => (<>
                         <div
                           className="flex items-center gap-1.5 px-2 py-1 rounded-md hover:bg-muted/60 group relative cursor-pointer w-full"
                           title={`${opensPreview ? tFiles('preview') : t('download')} ${getAttachmentDisplayName(attachment.name, attachment.type)}`}
@@ -5709,7 +5788,8 @@ export function EmailViewer({
                           <span className="text-[10px] text-muted-foreground ms-auto flex-shrink-0">
                             {formatFileSize(attachment.size)}
                           </span>
-                          <div className="absolute inset-y-0 end-0 rounded-e-md bg-background/95 opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-center gap-1 px-1.5">
+                          <AttachmentPluginMenu emailId={email?.id} attachment={attachment} className="flex-shrink-0" iconClassName="w-3.5 h-3.5" />
+                          <div className="absolute inset-y-0 end-0 rounded-e-md bg-background/95 opacity-0 pointer-events-none group-hover:opacity-100 group-hover:pointer-events-auto group-focus-within:opacity-100 group-focus-within:pointer-events-auto transition-opacity flex items-center justify-center gap-1 px-1.5">
                             <button
                               className="p-1 hover:bg-accent rounded transition-colors"
                               title={t('download')}
@@ -5726,22 +5806,10 @@ export function EmailViewer({
                                 <Eye className="w-3.5 h-3.5 text-foreground" />
                               </button>
                             )}
-                            <PluginSlot
-                              name="attachment-actions"
-                              className="contents"
-                              extraProps={{
-                                attachment: {
-                                  name: attachment.name || '',
-                                  type: attachment.type,
-                                  size: attachment.size,
-                                  blobId: attachment.blobId,
-                                  emailId: email?.id,
-                                } satisfies AttachmentInfo,
-                              }}
-                            />
                           </div>
                         </div>
-                          )}
+                          <AttachmentPluginFrames emailId={email?.id} attachment={attachment} />
+                          </>)}
                         </DraggableAttachmentChip>
                       );
                     })}
@@ -5758,7 +5826,7 @@ export function EmailViewer({
 
           {/* Email Body */}
           <div className={cn(
-            "email-content-wrapper overflow-x-auto",
+            "email-content-wrapper overflow-x-auto relative",
             // Folded, the body stays mounted so unfolding does not reload it.
             (mvOpenFolded || mvAwaitingConversation) && "hidden",
             // Mountain View indents the body under the sender's name, as Gmail does.
@@ -5790,9 +5858,10 @@ export function EmailViewer({
               />
             ) : (
               <div
+                ref={setPlainBodyEl}
                 className="email-content-text text-foreground"
                 dir="auto"
-                dangerouslySetInnerHTML={{ __html: sanitizePlainTextRenderedHtml(effectiveEmailContent.html) }}
+                dangerouslySetInnerHTML={plainBodyHtml}
                 style={{
                   ...(plainTextFont === 'mono' && { fontFamily: 'ui-monospace, "SF Mono", Consolas, monospace' }),
                   fontSize: '14px',
@@ -5802,9 +5871,17 @@ export function EmailViewer({
                 }}
               />
             )}
+            {!isBodyLoading && (
+              <ReaderAboveQuoteSlot
+                root={effectiveEmailContent.isHtml ? (iframeReady ? iframeRef.current?.contentDocument?.body ?? null : null) : plainBodyEl}
+                frame={effectiveEmailContent.isHtml ? iframeRef.current : null}
+                extraProps={pluginEmailProps}
+                version={effectiveEmailContent.html}
+              />
+            )}
           </div>
 
-          <PluginSlot name="email-footer" />
+          <PluginSlot name="email-footer" extraProps={pluginFooterProps} />
 
           {/* Mountain View: the conversation's later messages, folded. */}
           {mvAfter.length > 0 && (
@@ -6063,47 +6140,61 @@ export function EmailViewer({
     {hasDetailSidebar && !isMobile && (
       <>
         {/* Collapse toggle when sidebar is collapsed */}
-        {detailSidebarCollapsed && (
+        {sidebarCollapsed && (
           <div className="flex flex-col items-center border-s border-border bg-background">
             <Button
               variant="ghost"
               size="icon"
-              onClick={() => setDetailSidebarCollapsed(false)}
+              onClick={() => {
+                setDetailSidebarCollapsed(false);
+                if (readerTooNarrow) setDetailSidebarForcedOpen(true);
+              }}
               className="h-8 w-8 m-1"
-              aria-label="Expand panel"
+              aria-label={t('plugin_panel_show')}
             >
               <PanelRightOpen className="w-4 h-4" />
             </Button>
           </div>
         )}
-        {!detailSidebarCollapsed && (
+        {!sidebarCollapsed && (
           <>
-            <ResizeHandle
-              onResizeStart={() => { detailSidebarWidthRef.current = detailSidebarWidth; }}
-              onResize={(delta) => {
-                const newWidth = Math.max(200, Math.min(500, detailSidebarWidthRef.current - delta));
-                setDetailSidebarWidth(newWidth);
-              }}
-              onResizeEnd={() => { detailSidebarWidthRef.current = detailSidebarWidth; }}
-              onDoubleClick={() => setDetailSidebarWidth(280)}
-            />
+            {!sidebarOverlay && (
+              <ResizeHandle
+                onResizeStart={() => { detailSidebarWidthRef.current = detailSidebarWidth; }}
+                onResize={(delta) => {
+                  const newWidth = Math.max(200, Math.min(500, detailSidebarWidthRef.current - delta));
+                  setDetailSidebarWidth(newWidth);
+                }}
+                onResizeEnd={() => { detailSidebarWidthRef.current = detailSidebarWidth; }}
+                onDoubleClick={() => setDetailSidebarWidth(280)}
+              />
+            )}
             <div
-              className="flex flex-col h-full border-s border-border bg-background overflow-hidden"
-              style={{ width: detailSidebarWidth, minWidth: detailSidebarWidth }}
+              data-plugin-detail-panel={sidebarOverlay ? 'overlay' : 'docked'}
+              className={cn(
+                "flex flex-col h-full border-s border-border bg-background overflow-hidden",
+                sidebarOverlay && "absolute inset-y-0 end-0 z-30 shadow-xl",
+              )}
+              style={sidebarOverlay
+                ? { width: Math.min(detailSidebarWidth, Math.max(200, viewerWidth - 48)) }
+                : { width: detailSidebarWidth, minWidth: detailSidebarWidth }}
             >
               <div className="flex items-center justify-end px-1 py-1 border-b border-border shrink-0">
                 <Button
                   variant="ghost"
                   size="icon"
-                  onClick={() => setDetailSidebarCollapsed(true)}
+                  onClick={() => {
+                    setDetailSidebarCollapsed(true);
+                    setDetailSidebarForcedOpen(false);
+                  }}
                   className="h-7 w-7"
-                  aria-label="Collapse panel"
+                  aria-label={t('plugin_panel_hide')}
                 >
                   <PanelRightClose className="w-4 h-4" />
                 </Button>
               </div>
               <div className="flex-1 overflow-y-auto">
-                <PluginSlot name="email-detail-sidebar" extraProps={{ email }} />
+                <PluginSlot name="email-detail-sidebar" extraProps={pluginEmailProps} />
               </div>
             </div>
           </>
@@ -6139,10 +6230,10 @@ export function EmailViewer({
             }} : {}),
           };
           if (client && supportsSync) {
-            createContact(client, contactData).then(() => toast.success('Contact added'));
+            createContact(client, contactData).then((created) => { if (created) toast.success('Contact added'); });
           } else {
-            addLocalContact({ id: `local-${generateUUID()}`, addressBookIds: {}, ...contactData } as ContactCard);
-            toast.success('Contact added');
+            void addLocalContact({ id: `local-${generateUUID()}`, addressBookIds: {}, ...contactData } as ContactCard)
+              .then((created) => { if (created) toast.success('Contact added'); });
           }
         }}
       />
diff --git a/components/email/mv-list-toolbar.tsx b/components/email/mv-list-toolbar.tsx
index 98aad7e34..5fbce7d6a 100644
--- a/components/email/mv-list-toolbar.tsx
+++ b/components/email/mv-list-toolbar.tsx
@@ -31,6 +31,7 @@ import { localizeMailboxName } from "@/lib/mailbox-label";
 import { buildMoveTargets, resolveMoveOwnerAccountId } from "@/lib/move-targets";
 import { getEmailTagIds } from "@/lib/thread-utils";
 import { cn, type MailboxNode } from "@/lib/utils";
+import { PluginActions } from "@/components/plugins/plugin-actions";
 
 interface MvListToolbarProps {
   /** Loaded conversation count, for the right-hand range readout. */
@@ -606,6 +607,13 @@ export function MvListToolbar({
               </div>
             )}
           </div>
+          <PluginActions
+            surface="message-bulk-actions"
+            context={{ emailIds: selectedEmails.map((email) => email.id) }}
+            mailboxRole={currentRole ?? null}
+            compact
+            className="shrink-0"
+          />
           <span className="ms-2 text-sm text-muted-foreground truncate">
             {tBatch("selected_messages", { count: selectionCount })}
           </span>
diff --git a/components/email/plugin-row-badges.tsx b/components/email/plugin-row-badges.tsx
new file mode 100644
index 000000000..de6b0e787
--- /dev/null
+++ b/components/email/plugin-row-badges.tsx
@@ -0,0 +1,164 @@
+"use client";
+
+import { useEffect, useState, useSyncExternalStore } from "react";
+import type { Email } from "@/lib/jmap/types";
+import type { EmailListBadge } from "@/lib/plugin-types";
+import { renderHooks } from "@/lib/plugin-hooks";
+import { emailSummary } from "@/lib/plugin-projection";
+import { rowBadgeGeneration, subscribeRowBadges } from "@/lib/plugin-sandbox/row-badges";
+import { cn } from "@/lib/utils";
+import { TAG_GROUP_CLASS, TAG_LOZENGE_CLASS } from "./tag-badge";
+
+// Badges plugins add to a message-list row through onEmailListItemRender.
+//
+// The hook is async and would otherwise run for every row on every render, so
+// the answer is kept per message and keyword state: scrolling a row back into
+// view, or re-rendering the list, reuses it. A keyword change (read, flagged,
+// a tag) asks again, since that is what most badges are about.
+
+/** At most this many plugin badges per row; the row has little room. */
+export const MAX_ROW_BADGES = 3;
+const MAX_LABEL_LENGTH = 32;
+const MAX_TITLE_LENGTH = 200;
+const CACHE_LIMIT = 2000;
+
+const cache = new Map<string, EmailListBadge[]>();
+const inflight = new Map<string, Promise<EmailListBadge[]>>();
+
+function cacheKey(email: Email, listeners: number, generation: number): string {
+  const keywords = Object.keys(email.keywords ?? {})
+    .filter((k) => email.keywords?.[k])
+    .sort()
+    .join(",");
+  // The listener count is part of the key so a plugin being switched on or
+  // off doesn't leave the old answer behind.
+  // The generation moves on when a plugin asks for a refresh.
+  return `${generation}|${listeners}|${email.id}|${keywords}`;
+}
+
+// A colour the badge may use: hex, rgb()/hsl() with plain numbers, a CSS
+// variable or a colour name. Anything else (url(), expressions, several
+// declarations) is dropped and the badge keeps the theme colours.
+const SAFE_COLOR = /^(#[0-9a-f]{3,8}|(rgb|rgba|hsl|hsla)\([\d\s.,%/+-]+\)|var\(--[a-z0-9-]+\)|[a-z]{3,30})$/i;
+
+// eslint-disable-next-line no-control-regex -- removing control characters is the point
+const CONTROL_CHARS = /[\u0000-\u001f\u007f]/g;
+
+function cleanText(value: unknown, max: number): string {
+  return typeof value === "string" ? value.replace(CONTROL_CHARS, "").trim().slice(0, max) : "";
+}
+
+/** Keep only well-formed badges, as plain text, capped at MAX_ROW_BADGES. */
+export function normalizeBadges(raw: unknown): EmailListBadge[] {
+  if (!Array.isArray(raw)) return [];
+  const out: EmailListBadge[] = [];
+  const seen = new Set<string>();
+  for (const item of raw) {
+    if (out.length >= MAX_ROW_BADGES) break;
+    if (!item || typeof item !== "object") continue;
+    const candidate = item as Record<string, unknown>;
+    const label = cleanText(candidate.label, MAX_LABEL_LENGTH);
+    if (!label) continue;
+    const key = cleanText(candidate.key, 100) || label;
+    if (seen.has(key)) continue;
+    seen.add(key);
+    const badge: EmailListBadge = { key, label };
+    const color = cleanText(candidate.color, 60);
+    if (color && SAFE_COLOR.test(color)) badge.color = color;
+    const title = cleanText(candidate.title, MAX_TITLE_LENGTH);
+    if (title) badge.title = title;
+    out.push(badge);
+  }
+  return out;
+}
+
+function remember(key: string, badges: EmailListBadge[]): void {
+  if (cache.size >= CACHE_LIMIT) {
+    const oldest = cache.keys().next().value;
+    if (oldest !== undefined) cache.delete(oldest);
+  }
+  cache.set(key, badges);
+}
+
+function resolveBadges(email: Email, key: string): Promise<EmailListBadge[]> {
+  const pending = inflight.get(key);
+  if (pending) return pending;
+  const promise = renderHooks.onEmailListItemRender.transform<EmailListBadge[]>([], { email: emailSummary(email) })
+    .then(normalizeBadges, () => [])
+    .then((badges) => {
+      remember(key, badges);
+      return badges;
+    })
+    .finally(() => inflight.delete(key));
+  inflight.set(key, promise);
+  return promise;
+}
+
+/** Forget every cached answer (tests). */
+export function clearRowBadgeCache(): void {
+  cache.clear();
+  inflight.clear();
+}
+
+/**
+ * The plugin badges for a row: none at first, then whatever the plugins
+ * returned. Without any onEmailListItemRender handler this does nothing.
+ */
+export function usePluginRowBadges(email: Email): EmailListBadge[] {
+  const listeners = renderHooks.onEmailListItemRender.size;
+  const generation = useSyncExternalStore(subscribeRowBadges, rowBadgeGeneration, rowBadgeGeneration);
+  const key = listeners > 0 ? cacheKey(email, listeners, generation) : null;
+  const [state, setState] = useState<{ key: string | null; badges: EmailListBadge[] }>(() => ({
+    key,
+    badges: key ? cache.get(key) ?? [] : [],
+  }));
+
+  useEffect(() => {
+    if (!key) return;
+    const cached = cache.get(key);
+    if (cached) {
+      setState((prev) => (prev.key === key && prev.badges === cached ? prev : { key, badges: cached }));
+      return;
+    }
+    let cancelled = false;
+    void resolveBadges(email, key).then((badges) => {
+      if (!cancelled) setState({ key, badges });
+    });
+    return () => { cancelled = true; };
+    // `key` covers the parts of the email the answer depends on.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [key]);
+
+  if (!key) return [];
+  // While a new answer is on its way, show the cached one for this key, if
+  // any, rather than the previous key's badges.
+  return state.key === key ? state.badges : cache.get(key) ?? [];
+}
+
+/** Plugin badges next to a row's subject. Renders nothing when there are none. */
+export function PluginRowBadges({ email, className }: { email: Email; className?: string }) {
+  const badges = usePluginRowBadges(email);
+  if (badges.length === 0) return null;
+  return (
+    <span className={cn(TAG_GROUP_CLASS, className)} data-testid="plugin-row-badges">
+      {badges.map((badge) => (
+        <span
+          key={badge.key}
+          title={badge.title}
+          className={cn(
+            TAG_LOZENGE_CLASS,
+            "max-w-[8rem] truncate border",
+            !badge.color && "border-border bg-muted text-muted-foreground",
+          )}
+          style={badge.color ? {
+            color: badge.color,
+            borderColor: badge.color,
+            backgroundColor: `color-mix(in srgb, ${badge.color} 12%, transparent)`,
+          } : undefined}
+        >
+          {badge.label}
+        </span>
+      ))}
+    </span>
+  );
+}
diff --git a/components/email/reader-plugin-surfaces.tsx b/components/email/reader-plugin-surfaces.tsx
new file mode 100644
index 000000000..f6f3cde0f
--- /dev/null
+++ b/components/email/reader-plugin-surfaces.tsx
@@ -0,0 +1,290 @@
+"use client";
+
+// Plugin surfaces of the open message that need more than a one-line mount:
+// the attachment menu, plugin entries in the phone "More" panel, and the
+// frame between a reply's own text and the quote under it.
+
+import { useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
+import { createPortal } from "react-dom";
+import { useTranslations } from "next-intl";
+import { iconForName, MoreHorizontal, Puzzle } from "@/components/icons";
+import { ContextMenu } from "@/components/ui/context-menu";
+import { PluginActions, usePluginActions } from "@/components/plugins/plugin-actions";
+import { PluginSlot } from "@/components/plugins/plugin-slot";
+import { usePluginSlotOffers } from "@/hooks/use-plugin-slot-offers";
+import { useContextMenu } from "@/hooks/use-context-menu";
+import { runAction } from "@/lib/plugin-sandbox/actions";
+import { QUOTE_TOGGLE_ATTR } from "@/lib/quote-collapse";
+import { cn } from "@/lib/utils";
+import type { AttachmentInfo } from "@/lib/plugin-types";
+
+// ─── attachment-menu ─────────────────────────────────────────
+
+export interface AttachmentMenuTarget {
+  /** Parts without a blob (decrypted, unpacked from TNEF) get no menu: a plugin couldn't fetch them. */
+  blobId?: string;
+  name?: string | null;
+  type: string;
+  size: number;
+}
+
+/**
+ * A "more" button on an attachment that opens the entries plugins declared
+ * for `attachment-menu`, filtered by the attachment's MIME type. Nothing is
+ * drawn when no plugin has an entry for this type, or the part has no blob.
+ */
+export function AttachmentPluginMenu({
+  emailId,
+  attachment,
+  className,
+  iconClassName = "w-4 h-4",
+}: {
+  emailId: string | undefined;
+  attachment: AttachmentMenuTarget;
+  className?: string;
+  iconClassName?: string;
+}) {
+  const t = useTranslations("email_viewer");
+  const actions = usePluginActions("attachment-menu", { mimeType: attachment.type });
+  const { contextMenu, openContextMenu, closeContextMenu, menuRef } = useContextMenu<true>();
+  const context = useMemo(() => ({
+    emailId,
+    blobId: attachment.blobId,
+    name: attachment.name || "",
+    type: attachment.type,
+    size: attachment.size,
+  }), [emailId, attachment.blobId, attachment.name, attachment.type, attachment.size]);
+
+  if (actions.length === 0 || !emailId || !attachment.blobId) return null;
+  return (
+    <>
+      <button
+        type="button"
+        className={cn("p-1 hover:bg-accent rounded transition-colors", className)}
+        title={t("more_actions")}
+        aria-label={t("more_actions")}
+        aria-haspopup="menu"
+        aria-expanded={contextMenu.isOpen}
+        data-attachment-plugin-menu=""
+        onClick={(e) => openContextMenu(e, true)}
+      >
+        <MoreHorizontal className={cn(iconClassName, "text-foreground")} />
+      </button>
+      <ContextMenu ref={menuRef} isOpen={contextMenu.isOpen} position={contextMenu.position} onClose={closeContextMenu}>
+        <PluginActions
+          surface="attachment-menu"
+          variant="menu"
+          context={context}
+          mimeType={attachment.type}
+          onRan={closeContextMenu}
+        />
+      </ContextMenu>
+    </>
+  );
+}
+
+// ─── attachment-actions ──────────────────────────────────────
+
+/**
+ * The `attachment-actions` frames of one attachment, drawn next to its chip.
+ * They used to sit in the chip's hover overlay, where a wide frame was cut
+ * off and covered the name, and on phones (no hover) lay invisible over the
+ * chip and swallowed taps meant for its menu button.
+ */
+export function AttachmentPluginFrames({
+  emailId,
+  attachment,
+  className,
+}: {
+  emailId: string | undefined;
+  attachment: AttachmentMenuTarget;
+  className?: string;
+}) {
+  const extraProps = useMemo(() => ({
+    attachment: {
+      name: attachment.name || "",
+      type: attachment.type,
+      size: attachment.size,
+      blobId: attachment.blobId,
+      emailId,
+    } satisfies AttachmentInfo,
+  }), [emailId, attachment.name, attachment.type, attachment.size, attachment.blobId]);
+  return (
+    <PluginSlot
+      name="attachment-actions"
+      className={cn("max-w-full flex-shrink-0", className)}
+      extraProps={extraProps}
+    />
+  );
+}
+
+// ─── Entries in a phone slide-in panel ───────────────────────
+
+/**
+ * Plugin actions as rows of a full-height phone menu panel (the reader's
+ * "More" panel), drawn like the panel's own rows. A separator leads them.
+ */
+export function PluginPanelEntries({
+  surface,
+  context,
+  mailboxRole,
+  onRan,
+}: {
+  surface: string;
+  context: Record<string, unknown>;
+  mailboxRole?: string | null;
+  onRan?: () => void;
+}) {
+  const actions = usePluginActions(surface, { mailboxRole });
+  if (actions.length === 0) return null;
+  return (
+    <>
+      <div className="h-px bg-border my-1" />
+      {actions.map((action) => {
+        const Icon = iconForName(action.icon) ?? Puzzle;
+        return (
+          <button
+            key={`${action.pluginId}:${action.id}`}
+            role="menuitem"
+            title={action.pluginName}
+            onClick={() => { onRan?.(); void runAction(action, surface, context); }}
+            className={cn(
+              "w-full px-4 py-3 min-h-[44px] text-sm text-start hover:bg-muted flex items-center gap-3",
+              action.danger ? "text-destructive" : "text-foreground",
+            )}
+          >
+            <Icon className="w-5 h-5" />
+            {action.label}
+          </button>
+        );
+      })}
+    </>
+  );
+}
+
+// ─── reader-above-quote ──────────────────────────────────────
+
+export const QUOTE_ANCHOR_ATTR = "data-plugin-quote-anchor";
+
+/**
+ * Puts an empty block right before the collapsed quote of a rendered body
+ * and returns it: before the "•••" toggle setupQuoteCollapse added (HTML
+ * body in its iframe), or before the <details> collapsePlainTextQuotes
+ * wrapped the quote in (plain-text body). Null when the body has no quote
+ * the viewer recognised.
+ */
+export function insertQuoteAnchor(root: HTMLElement): HTMLElement | null {
+  const existing = root.querySelector<HTMLElement>(`[${QUOTE_ANCHOR_ATTR}]`);
+  if (existing) return existing;
+  const toggle = root.querySelector(`[${QUOTE_TOGGLE_ATTR}]`)
+    ?? root.querySelector(":scope > details");
+  if (!toggle?.parentNode) return null;
+  const anchor = root.ownerDocument.createElement("div");
+  anchor.setAttribute(QUOTE_ANCHOR_ATTR, "");
+  // No fixed height: in a plain-text body the frame renders inside the anchor
+  // and must push the quote toggle down, not lie over it. QuoteOverlay sets
+  // the height itself for an HTML body.
+  anchor.style.cssText = "display:block;margin:0;padding:0;border:0;white-space:normal;";
+  toggle.parentNode.insertBefore(anchor, toggle);
+  return anchor;
+}
+
+/**
+ * The `reader-above-quote` frame. In a plain-text body (same document) it
+ * renders into the anchor. In an HTML body the anchor lives in the mail's
+ * sandboxed iframe, which can't host a plugin frame, so the frame is laid
+ * over the iframe at the anchor's place and the anchor is grown to the
+ * frame's height to make room for it.
+ *
+ * `root` is the body element the quote was collapsed in (null while the body
+ * isn't ready); `version` changes whenever that body is rendered anew.
+ */
+export function ReaderAboveQuoteSlot({
+  root,
+  frame,
+  extraProps,
+  version,
+}: {
+  root: HTMLElement | null;
+  /** The iframe holding `root`, for an HTML body. */
+  frame?: HTMLIFrameElement | null;
+  extraProps: Record<string, unknown>;
+  version?: unknown;
+}) {
+  const offered = usePluginSlotOffers("reader-above-quote").length > 0;
+  const [anchor, setAnchor] = useState<HTMLElement | null>(null);
+
+  useLayoutEffect(() => {
+    if (!offered || !root) {
+      setAnchor(null);
+      return;
+    }
+    const next = insertQuoteAnchor(root);
+    setAnchor(next);
+    return () => {
+      next?.remove();
+    };
+  }, [offered, root, version]);
+
+  if (!anchor) return null;
+  const slot = <PluginSlot name="reader-above-quote" className="w-full" extraProps={extraProps} />;
+  if (!frame || anchor.ownerDocument === document) {
+    return createPortal(slot, anchor);
+  }
+  return <QuoteOverlay anchor={anchor} frame={frame}>{slot}</QuoteOverlay>;
+}
+
+function QuoteOverlay({ anchor, frame, children }: { anchor: HTMLElement; frame: HTMLIFrameElement; children: React.ReactNode }) {
+  const overlayRef = useRef<HTMLDivElement>(null);
+  const [box, setBox] = useState<{ top: number; left: number; width: number } | null>(null);
+
+  useEffect(() => {
+    const overlay = overlayRef.current;
+    const host = overlay?.offsetParent as HTMLElement | null;
+    if (!overlay) return;
+    const place = () => {
+      // The anchor's box is in the iframe's viewport; the iframe doesn't
+      // scroll (it is as tall as the mail), so frame top + anchor top is
+      // where the anchor sits on the page.
+      const frameRect = frame.getBoundingClientRect();
+      const hostRect = host?.getBoundingClientRect() ?? { top: 0, left: 0 };
+      const anchorRect = anchor.getBoundingClientRect();
+      const next = {
+        top: frameRect.top - hostRect.top + frame.clientTop + anchorRect.top,
+        left: frameRect.left - hostRect.left + frame.clientLeft,
+        width: frame.clientWidth,
+      };
+      setBox((prev) => (prev && prev.top === next.top && prev.left === next.left && prev.width === next.width ? prev : next));
+    };
+    const fit = () => {
+      // Make room in the mail for the frame. A mail scaled down to fit a
+      // phone is drawn smaller than its layout, so undo that scale.
+      const scale = anchor.offsetWidth > 0 ? anchor.getBoundingClientRect().width / anchor.offsetWidth : 1;
+      const height = overlay.offsetHeight / (scale || 1);
+      anchor.style.height = `${Math.ceil(height)}px`;
+      place();
+    };
+    fit();
+    if (typeof ResizeObserver === "undefined") return;
+    const observer = new ResizeObserver(fit);
+    observer.observe(overlay);
+    observer.observe(frame);
+    window.addEventListener("resize", place);
+    return () => {
+      observer.disconnect();
+      window.removeEventListener("resize", place);
+      anchor.style.height = "0px";
+    };
+  }, [anchor, frame]);
+
+  return (
+    <div
+      ref={overlayRef}
+      data-plugin-quote-overlay=""
+      className="absolute z-[1]"
+      style={box ? { top: box.top, left: box.left, width: box.width } : { top: 0, left: 0, right: 0, visibility: "hidden" }}
+    >
+      {children}
+    </div>
+  );
+}
diff --git a/components/email/thread-conversation-view.tsx b/components/email/thread-conversation-view.tsx
index 4a4f70d43..3acf3b128 100644
--- a/components/email/thread-conversation-view.tsx
+++ b/components/email/thread-conversation-view.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useState, useEffect, useMemo, useRef, useCallback } from "react";
+import React, { useState, useEffect, useLayoutEffect, useMemo, useRef, useCallback } from "react";
 import DOMPurify from "dompurify";
 import { Email, ThreadGroup } from "@/lib/jmap/types";
 import { EMAIL_SANITIZE_CONFIG, blockExternalResourcesOnNode, collapseBlockedImageContainers, emailIframeCsp, plainTextToSafeHtml, restrictDataUriResourcesOnNode, sanitizePlainTextRenderedHtml } from "@/lib/email-sanitization";
@@ -41,6 +41,12 @@ import { useAuthStore } from "@/stores/auth-store";
 import { isFilePreviewable, toInertBlob } from "@/lib/file-preview";
 import { useWopiStatus, canWopiOpen } from "@/hooks/use-wopi-status";
 import { useOwnDomainAddress } from "@/hooks/use-own-domain-address";
+import { emitThreadExpand } from "@/lib/plugin-thread-expand";
+import { PluginSlot } from "@/components/plugins/plugin-slot";
+import { PluginActions } from "@/components/plugins/plugin-actions";
+import { usePluginSlotOffers } from "@/hooks/use-plugin-slot-offers";
+import { emailToReadView } from "@/lib/plugin-projection";
+import { AttachmentPluginMenu, ReaderAboveQuoteSlot } from "./reader-plugin-surfaces";
 
 interface ThreadConversationViewProps {
   thread: ThreadGroup;
@@ -52,6 +58,8 @@ interface ThreadConversationViewProps {
   onForward?: (email: Email) => void;
   onDownloadAttachment?: (blobId: string, name: string, type?: string) => void;
   onMarkAsRead?: (emailId: string, read: boolean) => void;
+  /** Role of the folder the conversation was opened from, for plugin actions limited to some folders. */
+  mailboxRole?: string | null;
 }
 
 // Helper function to get file icon based on mime type or extension
@@ -166,9 +174,15 @@ export function ThreadConversationView({
   onForward,
   onDownloadAttachment,
   onMarkAsRead,
+  mailboxRole,
 }: ThreadConversationViewProps) {
   const t = useTranslations();
   const externalContent = useConversationExternalContent();
+  const emailIdList = emails.map((email) => email.id).join(',');
+  const threadSummaryProps = useMemo(
+    () => ({ threadId: thread.latestEmail.threadId ?? null, emailIds: emailIdList ? emailIdList.split(',') : [] }),
+    [thread.latestEmail.threadId, emailIdList],
+  );
 
   // Track which emails are expanded (most recent by default)
   const [expandedIds, setExpandedIds] = useState<Set<string>>(new Set());
@@ -193,6 +207,8 @@ export function ThreadConversationView({
   }, [emails]);
 
   const toggleExpanded = (emailId: string) => {
+    const target = emails.find((e) => e.id === emailId);
+    if (target) emitThreadExpand(target.threadId, [target], !expandedIds.has(emailId));
     setExpandedIds(prev => {
       const next = new Set(prev);
       if (next.has(emailId)) {
@@ -239,6 +255,7 @@ export function ThreadConversationView({
 
       {/* Email Cards */}
       <div className="flex-1 overflow-y-auto">
+        <PluginSlot name="thread-summary" className="w-full" extraProps={threadSummaryProps} />
         <div className="space-y-3" style={{ padding: 'var(--density-card-p)' }}>
           {emails.map((email, index) => (
             <EmailCard
@@ -255,6 +272,7 @@ export function ThreadConversationView({
               onForward={onForward ? () => onForward(email) : undefined}
               onDownloadAttachment={onDownloadAttachment}
               onMarkAsRead={onMarkAsRead}
+              mailboxRole={mailboxRole}
             />
           ))}
         </div>
@@ -277,6 +295,24 @@ interface EmailCardProps {
   onForward?: () => void;
   onDownloadAttachment?: (blobId: string, name: string, type?: string) => void;
   onMarkAsRead?: (emailId: string, read: boolean) => void;
+  mailboxRole?: string | null;
+}
+
+/**
+ * The single reader's plugin surfaces for one message of the phone
+ * conversation, mounted only while the message is unfolded: reader-header
+ * on top, reader-below-subject and email-banner under the sender,
+ * email-footer under the body. The props are the same as in the single
+ * reader and stay stable across re-renders.
+ */
+function useConversationPluginProps(email: Email) {
+  const headerOffers = usePluginSlotOffers('reader-header').length;
+  const belowSubjectOffers = usePluginSlotOffers('reader-below-subject').length;
+  const bannerOffers = usePluginSlotOffers('email-banner').length;
+  const wantsView = headerOffers + belowSubjectOffers + bannerOffers > 0;
+  const emailProps = useMemo(() => ({ email: wantsView ? emailToReadView(email) : null }), [email, wantsView]);
+  const idProps = useMemo(() => ({ emailId: email.id }), [email.id]);
+  return { emailProps, idProps };
 }
 
 function EmailCard({
@@ -292,9 +328,11 @@ function EmailCard({
   onForward,
   onDownloadAttachment,
   onMarkAsRead,
+  mailboxRole,
 }: EmailCardProps) {
   const t = useTranslations();
   const density = useSettingsStore((state) => state.density);
+  const plugin = useConversationPluginProps(email);
   const sender = email.from?.[0];
   const formatAddress = useOwnDomainAddress();
   const isUnread = !email.keywords?.$seen;
@@ -309,6 +347,7 @@ function EmailCard({
       isExpanded ? "bg-background shadow-sm" : "bg-muted/30",
       isUnread && !isExpanded && "border-s-2 border-l-primary"
     )}>
+      {isExpanded && <PluginSlot name="reader-header" className="w-full" extraProps={plugin.emailProps} />}
       {/* Card Header - Always visible */}
       <button
         onClick={onToggleExpanded}
@@ -362,6 +401,8 @@ function EmailCard({
       {/* Expanded Content */}
       {isExpanded && (
         <div className="border-t border-border animate-in slide-in-from-top-2 duration-200">
+          <PluginSlot name="reader-below-subject" className="w-full" extraProps={plugin.emailProps} />
+          <PluginSlot name="email-banner" className="w-full" extraProps={plugin.emailProps} />
           <ConversationEmailBody
             email={email}
             allowExternal={allowExternal}
@@ -369,8 +410,10 @@ function EmailCard({
             onTrustSender={onTrustSender}
             onDownloadAttachment={onDownloadAttachment}
           />
+          <PluginSlot name="email-footer" className="w-full" extraProps={plugin.idProps} />
 
-          {/* Action Buttons */}
+          {/* Action Buttons; plugin reader actions behind a "more" button, as
+              in the single reader's More panel on phones. */}
           <div className="px-4 pb-4 flex gap-2">
             {onReply && (
               <Button
@@ -414,6 +457,13 @@ function EmailCard({
                 <span className="truncate">{t("email_viewer.forward")}</span>
               </Button>
             )}
+            <PluginActions
+              surface="reader-actions"
+              context={plugin.idProps}
+              mailboxRole={mailboxRole ?? null}
+              overflow
+              className="flex-shrink-0 rounded-md border border-border"
+            />
           </div>
         </div>
       )}
@@ -464,6 +514,14 @@ export function ConversationEmailBody({
   const [hasBlockedContent, setHasBlockedContent] = useState(false);
   const [cidBlobUrls, setCidBlobUrls] = useState<Record<string, string>>({});
   const { client } = useAuthStore();
+  // reader-above-quote: the body the quote was collapsed in, once it is on screen.
+  const [htmlBodyEl, setHtmlBodyEl] = useState<HTMLElement | null>(null);
+  const [plainBodyEl, setPlainBodyEl] = useState<HTMLDivElement | null>(null);
+  const wantsQuoteSlot = usePluginSlotOffers('reader-above-quote').length > 0;
+  const quoteSlotProps = useMemo(
+    () => ({ email: wantsQuoteSlot ? emailToReadView(email) : null }),
+    [email, wantsQuoteSlot],
+  );
 
   // Fetch inline CID images with authentication to prevent browser auth dialogs
   useEffect(() => {
@@ -648,6 +706,13 @@ export function ConversationEmailBody({
   ${isDark ? emailDarkModeCss() : ''}
 </style></head><body dir="auto">${emailContent.html}</body></html>`;
   }, [emailContent.isHtml, emailContent.html, allowExternal, isDark]);
+  useLayoutEffect(() => { setHtmlBodyEl(null); }, [emailIframeSrcDoc]);
+  // One object per body: React writes innerHTML again whenever this object
+  // changes, dropping whatever was mounted in the body.
+  const plainBodyHtml = useMemo(
+    () => ({ __html: sanitizePlainTextRenderedHtml(emailContent.html) }),
+    [emailContent.html],
+  );
 
   const handleIframeLoad = useCallback(() => {
     const iframe = iframeRef.current;
@@ -676,6 +741,7 @@ export function ConversationEmailBody({
         a.setAttribute('target', '_blank');
         a.setAttribute('rel', 'noopener noreferrer');
       });
+      setHtmlBodyEl(doc.body);
     } catch {
       // contentDocument may be inaccessible under stricter sandboxes; ignore.
     }
@@ -723,7 +789,7 @@ export function ConversationEmailBody({
       )}
 
       {/* Email Body */}
-      <div style={bodyStyle ?? { padding: 'var(--density-card-p)' }}>
+      <div className="relative" style={bodyStyle ?? { padding: 'var(--density-card-p)' }}>
         {emailContent.isHtml ? (
           <iframe
             ref={iframeRef}
@@ -737,6 +803,7 @@ export function ConversationEmailBody({
           />
         ) : (
           <div
+            ref={setPlainBodyEl}
             className={cn(
               "prose prose-sm max-w-none",
               !emailAlwaysLightMode && "dark:prose-invert",
@@ -746,9 +813,15 @@ export function ConversationEmailBody({
               "[&_img]:max-w-full [&_img]:h-auto"
             )}
             style={{ whiteSpace: 'pre-wrap', ...(plainTextFont === 'mono' && { fontFamily: 'ui-monospace, "SF Mono", Consolas, monospace' }), fontSize: '13px' }}
-            dangerouslySetInnerHTML={{ __html: sanitizePlainTextRenderedHtml(emailContent.html) }}
+            dangerouslySetInnerHTML={plainBodyHtml}
           />
         )}
+        <ReaderAboveQuoteSlot
+          root={emailContent.isHtml ? htmlBodyEl : plainBodyEl}
+          frame={emailContent.isHtml ? iframeRef.current : null}
+          extraProps={quoteSlotProps}
+          version={emailContent.html}
+        />
       </div>
 
       {/* Attachments */}
@@ -761,8 +834,8 @@ export function ConversationEmailBody({
                 || (!!attachment.blobId && canWopiOpen(wopiStatus, attachment.name));
               const opensPreview = isPreviewable && mailAttachmentAction === 'preview';
               return (
+                <React.Fragment key={idx}>
                 <button
-                  key={idx}
                   onClick={(e) => {
                     e.stopPropagation();
                     onDownloadAttachment?.(attachment.blobId, attachment.name || 'attachment', attachment.type);
@@ -781,6 +854,8 @@ export function ConversationEmailBody({
                     <Download className="w-4 h-4 text-muted-foreground" />
                   )}
                 </button>
+                <AttachmentPluginMenu emailId={email.id} attachment={attachment} className="-ms-1.5 self-center p-2 rounded-lg" />
+                </React.Fragment>
               );
             })}
           </div>
diff --git a/components/email/thread-list-item.tsx b/components/email/thread-list-item.tsx
index f40a91e07..5ed9264fb 100644
--- a/components/email/thread-list-item.tsx
+++ b/components/email/thread-list-item.tsx
@@ -29,6 +29,7 @@ import type { SwipeAction } from "@/stores/settings-store";
 import { ThreadEmailItem } from "./thread-email-item";
 import { EmailHoverActions } from "./email-hover-actions";
 import { SearchSnippetText } from "./search-snippet-text";
+import { PluginRowBadges } from "./plugin-row-badges";
 import { useOwnDomainAddress } from "@/hooks/use-own-domain-address";
 import { useTranslations } from "next-intl";
 
@@ -596,6 +597,7 @@ const SingleEmailItem = React.forwardRef<HTMLDivElement, SingleEmailItemProps>(
                     )}>
                       {subjectSnippet ? <SearchSnippetText snippet={subjectSnippet} /> : (email.subject || '(no subject)')}
                     </span>
+                    <PluginRowBadges email={email} className={mvRow ? "ms-2" : undefined} />
                     {(previewSnippet || inlinePreview) && (
                       <span className="min-w-0 shrink-[9999] truncate text-muted-foreground">
                         {/* Gmail runs the snippet on from the subject after a dash. */}
@@ -738,6 +740,7 @@ const SingleEmailItem = React.forwardRef<HTMLDivElement, SingleEmailItemProps>(
                   )}>
                     {subjectSnippet ? <SearchSnippetText snippet={subjectSnippet} /> : (email.subject || "(no subject)")}
                   </span>
+                  <PluginRowBadges email={email} />
                 </div>
 
                 {showPreview && density !== 'extra-compact' && density !== 'compact' && (
@@ -780,6 +783,7 @@ const SingleEmailItem = React.forwardRef<HTMLDivElement, SingleEmailItemProps>(
             onUndoSpam={onUndoSpam}
             isInJunk={currentMailboxRole === 'junk'}
             spamApplicable={!['sent', 'drafts', 'scheduled'].includes(currentMailboxRole || '')}
+            mailboxRole={currentMailboxRole ?? null}
           />
         )}
       </div>
@@ -1182,6 +1186,7 @@ export const ThreadListItem = React.forwardRef<HTMLDivElement, ThreadListItemPro
                       )}>
                         {subjectSnippet ? <SearchSnippetText snippet={subjectSnippet} /> : (latestEmail.subject || '(no subject)')}
                       </span>
+                      <PluginRowBadges email={latestEmail} className={mvRow ? "ms-2" : undefined} />
                       {(previewSnippet || inlinePreview) && (
                         <span className="min-w-0 shrink-[9999] truncate text-muted-foreground">
                           {mvRow && '\u00a0-\u00a0'}
@@ -1330,6 +1335,7 @@ export const ThreadListItem = React.forwardRef<HTMLDivElement, ThreadListItemPro
                     )}>
                       {subjectSnippet ? <SearchSnippetText snippet={subjectSnippet} /> : (latestEmail.subject || "(no subject)")}
                     </span>
+                    <PluginRowBadges email={latestEmail} />
                   </div>
 
                   {showPreview && density !== 'extra-compact' && density !== 'compact' && (
@@ -1376,6 +1382,7 @@ export const ThreadListItem = React.forwardRef<HTMLDivElement, ThreadListItemPro
               onUndoSpam={onUndoSpam ? () => onUndoSpam(latestEmail) : undefined}
               isInJunk={currentMailboxRole === 'junk'}
               spamApplicable={!['sent', 'drafts', 'scheduled'].includes(currentMailboxRole || '')}
+              mailboxRole={currentMailboxRole ?? null}
             />
           )}
         </div>
diff --git a/components/files/__tests__/files-plugin-surfaces.test.tsx b/components/files/__tests__/files-plugin-surfaces.test.tsx
new file mode 100644
index 000000000..93359c09d
--- /dev/null
+++ b/components/files/__tests__/files-plugin-surfaces.test.tsx
@@ -0,0 +1,273 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { act, cleanup, fireEvent, render, screen, within } from '@testing-library/react';
+import { FileBrowser } from '../file-browser';
+import { FileDetailsPanel } from '../file-details-panel';
+import { FilePreviewModal } from '../file-preview-modal';
+import { ImagePreviewModal } from '../image-preview-modal';
+import { useFileStore, type FileResource } from '@/stores/file-store';
+import { resetActions, setActionDispatcher, setPluginActions } from '@/lib/plugin-sandbox/actions';
+import { clearSlotOffers, framePropsOf, offerSlots } from '@/components/plugins/__tests__/fake-slot-offer';
+import type { IJMAPClient } from '@/lib/jmap/client-interface';
+import type { FileResourceView } from '@/lib/plugin-types';
+
+// Plugin surfaces in Files: entries in an item's menu and buttons in the
+// selection toolbar (file-actions), and a section in the previews and the
+// details panel (file-preview-section).
+
+vi.mock('@/lib/debug', () => ({ debug: { log: () => {}, warn: () => {}, error: () => {} } }));
+vi.mock('@/components/settings/share-collection-dialog', () => ({ ShareCollectionDialog: () => null }));
+vi.mock('@/components/plugins/plugin-iframe-slot', () => import('@/components/plugins/__tests__/fake-slot-offer'));
+const device = vi.hoisted(() => ({ isMobile: false }));
+vi.mock('@/hooks/use-media-query', async (importOriginal) => ({
+  ...(await importOriginal<typeof import('@/hooks/use-media-query')>()),
+  useIsMobile: () => device.isMobile,
+}));
+
+const folder = {
+  id: 'f-docs', name: 'Documents', serverName: 'Documents', isDirectory: true, contentType: '', contentLength: 0,
+  lastModified: '2026-10-01T00:00:00Z', blobId: null, parentId: null,
+} as FileResource;
+const notes = {
+  id: 'f-notes', name: 'notes.txt', serverName: 'notes.txt', isDirectory: false, contentType: 'text/plain', contentLength: 10,
+  lastModified: '2026-10-01T00:00:00Z', blobId: 'b-notes', parentId: null,
+} as FileResource;
+const photo = {
+  id: 'f-photo', name: 'photo.png', serverName: 'photo.png', isDirectory: false, contentType: 'image/png', contentLength: 99,
+  lastModified: '2026-10-02T00:00:00Z', blobId: 'b-photo', parentId: null,
+} as FileResource;
+
+const notesView: FileResourceView = {
+  id: 'f-notes', name: 'notes.txt', type: 'file', size: 10, mimeType: 'text/plain', path: '/', modified: '2026-10-01T00:00:00Z',
+};
+
+function renderBrowser(selected: string[] = []) {
+  const client = { listAllFileNodesAcrossAccounts: vi.fn(async () => []) } as unknown as IJMAPClient;
+  act(() => {
+    useFileStore.setState({
+      client, sharedRoots: [], allFolders: [folder], currentParentId: null, pathStack: [{ id: null, name: '' }], hasListed: true,
+    });
+  });
+  const noop = vi.fn(async () => {});
+  render(
+    <FileBrowser
+      currentPath="/"
+      resources={[folder, notes, photo]}
+      isLoading={false}
+      error={null}
+      selectedResources={new Set(selected)}
+      uploadProgress={null}
+      clipboard={null}
+      onNavigate={vi.fn()}
+      onSetSelection={vi.fn()}
+      onToggleSelect={vi.fn()}
+      onPreviewFile={vi.fn()}
+      onDownload={noop}
+      onCreateFolder={noop}
+      onUploadFiles={noop}
+      onUploadFolder={noop}
+      onCancelUpload={vi.fn()}
+      onDelete={noop}
+      onBatchDelete={noop}
+      onRename={noop}
+      onBatchDownload={noop}
+      onRefresh={noop}
+      onClearSelection={vi.fn()}
+      onCut={vi.fn()}
+      onCopy={vi.fn()}
+      onPaste={noop}
+      onMoveTo={noop}
+      onPreviewImage={vi.fn()}
+      onCreateTextFile={noop}
+      onDuplicate={noop}
+      getImageUrl={async () => ''}
+      favorites={[]}
+      recentFiles={[]}
+      onToggleFavorite={vi.fn()}
+      onOpenRecent={vi.fn()}
+      onRenameNode={noop}
+      onDeleteNode={noop}
+      onDownloadNode={noop}
+      onRevealNode={noop}
+      onRemoveRecent={vi.fn()}
+      client={client}
+      ownAccountId="a"
+    />,
+  );
+}
+
+function rowOf(name: string): HTMLElement {
+  return within(screen.getByRole('grid', { name: 'file_list' })).getByText(name).closest('[role=row]') as HTMLElement;
+}
+
+const dispatch = vi.fn().mockResolvedValue(undefined);
+
+beforeEach(() => {
+  device.isMobile = false;
+  localStorage.clear();
+  dispatch.mockClear();
+  setActionDispatcher(dispatch);
+});
+
+afterEach(() => {
+  cleanup();
+  clearSlotOffers();
+  resetActions();
+  setActionDispatcher(null);
+  act(() => { useFileStore.setState({ client: null, sharedRoots: [], allFolders: [] }); });
+});
+
+describe('file-actions', () => {
+  it('adds entries to an item menu, filtered by its type, and sends the item', async () => {
+    act(() => setPluginActions('ocr', 'OCR', 'file-actions', [
+      { id: 'read-text', label: 'Read text', mimeTypes: ['text/'] },
+      { id: 'edit-image', label: 'Edit image', mimeTypes: ['image/'] },
+      { id: 'archive', label: 'Archive' },
+    ]));
+    renderBrowser();
+
+    fireEvent.contextMenu(rowOf('notes.txt'));
+    expect(await screen.findByRole('menuitem', { name: 'Read text' })).toBeInTheDocument();
+    expect(screen.queryByRole('menuitem', { name: 'Edit image' })).toBeNull();
+    // After the app's own entries.
+    const items = screen.getAllByRole('menuitem').map((el) => el.textContent);
+    expect(items.indexOf('Archive')).toBeGreaterThan(items.findIndex((text) => text?.includes('delete')));
+
+    await act(async () => { fireEvent.click(screen.getByRole('menuitem', { name: 'Read text' })); });
+    expect(dispatch).toHaveBeenCalledWith('ocr', 'file-actions', 'read-text', { files: [notesView] });
+  });
+
+  it('keeps type-specific entries off folders', async () => {
+    act(() => setPluginActions('ocr', 'OCR', 'file-actions', [
+      { id: 'read-text', label: 'Read text', mimeTypes: ['text/'] },
+      { id: 'archive', label: 'Archive' },
+    ]));
+    renderBrowser();
+
+    fireEvent.contextMenu(rowOf('Documents'));
+    expect(await screen.findByRole('menuitem', { name: 'Archive' })).toBeInTheDocument();
+    expect(screen.queryByRole('menuitem', { name: 'Read text' })).toBeNull();
+  });
+
+  it('adds buttons to the selection toolbar with the selected items', async () => {
+    act(() => setPluginActions('ocr', 'OCR', 'file-actions', [
+      { id: 'archive', label: 'Archive' },
+      { id: 'read-text', label: 'Read text', mimeTypes: ['text/'] },
+    ]));
+    renderBrowser(['notes.txt', 'photo.png']);
+
+    const toolbar = screen.getByRole('toolbar', { name: 'selection_actions' });
+    const button = within(toolbar).getByRole('button', { name: 'Archive' });
+    // Several items: no type filter applies, so every entry shows.
+    expect(within(toolbar).getByRole('button', { name: 'Read text' })).toBeInTheDocument();
+
+    await act(async () => { fireEvent.click(button); });
+    const context = dispatch.mock.calls[0][3] as { files: FileResourceView[] };
+    expect(context.files.map((f) => f.id)).toEqual(['f-notes', 'f-photo']);
+  });
+
+  it('puts them behind one more button in the phone selection toolbar', async () => {
+    device.isMobile = true;
+    act(() => setPluginActions('ocr', 'OCR', 'file-actions', [
+      { id: 'archive', label: 'Archive' },
+      { id: 'read-text', label: 'Read text', mimeTypes: ['text/'] },
+    ]));
+    renderBrowser(['notes.txt']);
+
+    const toolbar = screen.getByRole('toolbar', { name: 'selection_actions' });
+    expect(within(toolbar).queryByRole('button', { name: 'Archive' })).toBeNull();
+    const more = within(toolbar).getByRole('button', { name: 'more_actions' });
+    // Not in the row that scrolls sideways, where it could end up out of sight.
+    expect(more.closest('.overflow-x-auto')).toBeNull();
+    fireEvent.click(more);
+    expect(await screen.findByRole('menuitem', { name: 'Read text' })).toBeInTheDocument();
+    await act(async () => { fireEvent.click(screen.getByRole('menuitem', { name: 'Archive' })); });
+    const context = dispatch.mock.calls[0][3] as { files: FileResourceView[] };
+    expect(context.files.map((f) => f.id)).toEqual(['f-notes']);
+  });
+
+  it('filters the toolbar by the type of a single selected file', () => {
+    act(() => setPluginActions('ocr', 'OCR', 'file-actions', [{ id: 'read-text', label: 'Read text', mimeTypes: ['text/'] }]));
+    renderBrowser(['photo.png']);
+
+    const toolbar = screen.getByRole('toolbar', { name: 'selection_actions' });
+    expect(within(toolbar).queryByRole('button', { name: 'Read text' })).toBeNull();
+  });
+
+  it('adds nothing without a plugin', async () => {
+    renderBrowser(['notes.txt']);
+    expect(document.querySelector('[data-plugin-actions]')).toBeNull();
+    fireEvent.contextMenu(rowOf('notes.txt'));
+    await screen.findAllByRole('menuitem');
+    expect(screen.queryByRole('menuitem', { name: 'Archive' })).toBeNull();
+  });
+});
+
+describe('file-preview-section', () => {
+  const panelProps = {
+    resource: notes,
+    selection: [notes],
+    folderName: 'Files',
+    folderItems: [notes],
+    path: '/notes.txt',
+    isStarred: false,
+    canShare: false,
+    canPreview: true,
+    canEdit: false,
+    iconOptions: { showIcons: true, coloredIcons: true, showThumbnails: false },
+    getImageUrl: async () => '',
+    onClose: vi.fn(),
+    onOpen: vi.fn(),
+    onEdit: vi.fn(),
+    onDownload: vi.fn(),
+    onShare: vi.fn(),
+    onToggleStar: vi.fn(),
+  } as unknown as React.ComponentProps<typeof FileDetailsPanel>;
+
+  it('shows the selected file in the details panel', () => {
+    offerSlots('p1', ['file-preview-section']);
+    render(<FileDetailsPanel {...panelProps} pluginFile={notesView} />);
+    expect(framePropsOf(screen.getByTestId('plugin-frame-file-preview-section')).file).toEqual(notesView);
+  });
+
+  it('passes the selection from the browser to the details panel', () => {
+    offerSlots('p1', ['file-preview-section']);
+    localStorage.setItem('files-show-details', '1');
+    renderBrowser(['notes.txt']);
+    expect(framePropsOf(screen.getByTestId('plugin-frame-file-preview-section')).file).toEqual(notesView);
+  });
+
+  it('shows the previewed file under the text preview', async () => {
+    offerSlots('p1', ['file-preview-section']);
+    render(
+      <FilePreviewModal
+        name="notes.txt"
+        file={notesView}
+        onClose={vi.fn()}
+        onDownload={vi.fn()}
+        getFileContent={async () => ({ blob: new Blob(['hi'], { type: 'text/plain' }), contentType: 'text/plain' })}
+      />,
+    );
+    expect(framePropsOf(await screen.findByTestId('plugin-frame-file-preview-section')).file).toEqual(notesView);
+  });
+
+  it('keeps clicks on the section from closing the image preview', () => {
+    offerSlots('p1', ['file-preview-section']);
+    const onClose = vi.fn();
+    render(<ImagePreviewModal name="photo.png" file={{ ...notesView, id: 'f-photo' }} onClose={onClose} onDownload={async () => {}} getImageUrl={async () => ''} />);
+
+    const frame = screen.getByTestId('plugin-frame-file-preview-section');
+    expect(framePropsOf(frame).file).toMatchObject({ id: 'f-photo' });
+    fireEvent.click(frame);
+    expect(onClose).not.toHaveBeenCalled();
+  });
+
+  it('renders nothing without a plugin or a file', () => {
+    render(<FileDetailsPanel {...panelProps} pluginFile={notesView} />);
+    expect(document.querySelector('[data-plugin-slot]')).toBeNull();
+    cleanup();
+
+    offerSlots('p1', ['file-preview-section']);
+    render(<ImagePreviewModal name="photo.png" onClose={vi.fn()} onDownload={async () => {}} getImageUrl={async () => ''} />);
+    expect(document.querySelector('[data-plugin-slot]')).toBeNull();
+  });
+});
diff --git a/components/files/file-browser.tsx b/components/files/file-browser.tsx
index f245ed5e2..c616e391e 100644
--- a/components/files/file-browser.tsx
+++ b/components/files/file-browser.tsx
@@ -26,11 +26,13 @@ import { FileDetailsPanel } from "@/components/files/file-details-panel";
 import { INTERNAL_DRAG_TYPE, anchorEvent, isInternalDrag, readDraggedNames } from "@/components/files/file-item-parts";
 import { ResizeHandle } from "@/components/layout/resize-handle";
 import { getDroppedFilesAndFolders } from "@/lib/webdav/drop-utils";
-import { useFileStore, type FileResource } from "@/stores/file-store";
+import { resourceToView, useFileStore, type FileResource } from "@/stores/file-store";
+import { PluginActions, usePluginActions } from "@/components/plugins/plugin-actions";
 import { toast } from "@/stores/toast-store";
 import { ShareCollectionDialog } from "@/components/settings/share-collection-dialog";
 import type { IJMAPClient } from "@/lib/jmap/client-interface";
 import type { FileNodeRights } from "@/lib/jmap/types";
+import type { FileResourceView } from "@/lib/plugin-types";
 
 interface ClipboardState {
   mode: "cut" | "copy";
@@ -371,6 +373,8 @@ export function FileBrowser({
   const cutNames = useMemo(() => new Set(clipboard?.mode === "cut" ? clipboard.names : []), [clipboard]);
   const selectedList = useMemo(() => displayResources.filter((r) => selectedResources.has(r.name)), [displayResources, selectedResources]);
   const singleSelected = selectedList.length === 1 ? selectedList[0] : null;
+  // What plugins see of the selection (file-actions, file-preview-section).
+  const selectedViews = useMemo(() => selectedList.map((r) => resourceToView(r, currentPath)), [selectedList, currentPath]);
 
   // ---- Breadcrumbs -----------------------------------------------------------
   const crumbs: Crumb[] = useMemo(() => {
@@ -759,6 +763,7 @@ export function FileBrowser({
           <ContextMenuItem icon={Copy} label={t("copy")} shortcut="Ctrl+C" onClick={() => { closeMenu(); onCopy(names); }} />
           <ContextMenuSeparator />
           <ContextMenuItem icon={Trash2} label={t("delete_count", { count: names.length })} destructive onClick={() => { closeMenu(); deleteNames(names); }} />
+          <FilePluginMenuEntries files={menuSelection.map((r) => resourceToView(r, currentPath))} onRan={closeMenu} />
         </>
       );
     }
@@ -800,6 +805,11 @@ export function FileBrowser({
         <ContextMenuItem icon={Info} label={t("details")} onClick={() => { closeMenu(); toggleDetails(true); }} />
         <ContextMenuSeparator />
         <ContextMenuItem icon={Trash2} label={t("delete")} shortcut="Del" destructive onClick={() => { closeMenu(); deleteNames([resource.name]); }} />
+        <FilePluginMenuEntries
+          files={[resourceToView(resource, currentPath)]}
+          mimeType={resource.isDirectory ? "" : resource.contentType}
+          onRan={closeMenu}
+        />
       </>
     );
   };
@@ -962,6 +972,7 @@ export function FileBrowser({
       canShare={canShare(singleSelected)}
       canPreview={!!singleSelected && isPreviewable(singleSelected.name)}
       canEdit={!!singleSelected && !!onEditFile && !!isOfficeEditable?.(singleSelected.name)}
+      pluginFile={singleSelected ? selectedViews[0] : null}
       iconOptions={iconOptions}
       getImageUrl={getImageUrl}
       onClose={() => toggleDetails(false)}
@@ -991,6 +1002,8 @@ export function FileBrowser({
     onCopy: () => onCopy(selectedList.map((r) => r.name)),
     onDelete: () => deleteNames(selectedList.map((r) => r.name)),
     onClear: onClearSelection,
+    pluginFiles: selectedViews,
+    pluginMimeType: singleSelected ? (singleSelected.isDirectory ? "" : singleSelected.contentType) : undefined,
   } : null;
 
   return (
@@ -1272,3 +1285,15 @@ function ListSkeleton() {
     </div>
   );
 }
+
+/** Plugin entries at the end of a file's menu, after a separator when there are any. */
+function FilePluginMenuEntries({ files, mimeType, onRan }: { files: FileResourceView[]; mimeType?: string; onRan: () => void }) {
+  const hasActions = usePluginActions("file-actions", { mimeType }).length > 0;
+  if (!hasActions) return null;
+  return (
+    <>
+      <ContextMenuSeparator />
+      <PluginActions surface="file-actions" variant="menu" context={{ files }} mimeType={mimeType} onRan={onRan} />
+    </>
+  );
+}
diff --git a/components/files/file-details-panel.tsx b/components/files/file-details-panel.tsx
index 70c35f0b0..5e741b53d 100644
--- a/components/files/file-details-panel.tsx
+++ b/components/files/file-details-panel.tsx
@@ -1,10 +1,13 @@
 "use client";
 
+import { useMemo } from "react";
 import { useTranslations } from "next-intl";
 import { X, Download, Share2, Star, StarOff, FolderOpen, Eye, SquarePen, Files } from "@/components/icons";
 import { Button } from "@/components/ui/button";
 import { cn, formatFileSize } from "@/lib/utils";
 import type { FileResource } from "@/stores/file-store";
+import type { FileResourceView } from "@/lib/plugin-types";
+import { PluginSlot } from "@/components/plugins/plugin-slot";
 import {
   ResourceIcon, Thumbnail, canShowThumbnail, formatFullDate, type IconOptions,
 } from "@/components/files/file-item-parts";
@@ -31,6 +34,8 @@ interface FileDetailsPanelProps {
   onShare: () => void;
   onToggleStar: () => void;
   className?: string;
+  /** The one selected item as plugins see it (file-preview-section). */
+  pluginFile?: FileResourceView | null;
 }
 
 function kindOf(resource: FileResource, t: (key: string, values?: Record<string, string>) => string): string {
@@ -46,9 +51,10 @@ function totalSize(items: FileResource[]): number {
 
 export function FileDetailsPanel({
   resource, selection, folderName, folderItems, path, isStarred, canShare, canPreview, canEdit,
-  iconOptions, getImageUrl, onClose, onOpen, onEdit, onDownload, onShare, onToggleStar, className,
+  iconOptions, getImageUrl, onClose, onOpen, onEdit, onDownload, onShare, onToggleStar, className, pluginFile,
 }: FileDetailsPanelProps) {
   const t = useTranslations("files");
+  const pluginProps = useMemo(() => (pluginFile ? { file: pluginFile } : null), [pluginFile]);
 
   const header = (
     <div className="flex items-center justify-between px-4 h-11 border-b border-border flex-shrink-0">
@@ -155,6 +161,7 @@ export function FileDetailsPanel({
         <Row label={t("sharing")} value={sharing} />
         <Row label={t("path")} value={path} mono />
       </dl>
+      {pluginProps && <PluginSlot name="file-preview-section" className="w-full" extraProps={pluginProps} />}
     </div>,
   );
 }
diff --git a/components/files/file-preview-modal.tsx b/components/files/file-preview-modal.tsx
index 212d63a10..c83e2a471 100644
--- a/components/files/file-preview-modal.tsx
+++ b/components/files/file-preview-modal.tsx
@@ -8,6 +8,8 @@ import { ZoomableImage } from "@/components/files/zoomable-image";
 import { getFilePreviewKind, imageBlobUrl, isMimeTypeSafeForInlinePreview, previewBlobType } from "@/lib/file-preview";
 import dynamic from "next/dynamic";
 import { EmlPreview, type ParsedEml } from "@/components/files/eml-preview";
+import { FilePreviewPluginSection } from "@/components/files/file-preview-plugin-section";
+import type { FileResourceView } from "@/lib/plugin-types";
 
 // pdf.js-based inline viewer for mobile (no native inline PDF viewer). Loaded
 // only on the mobile PDF path so pdfjs-dist + its worker never reach the
@@ -22,6 +24,8 @@ interface FilePreviewModalProps {
   onClose: () => void;
   onDownload: () => Promise<void> | void;
   getFileContent: () => Promise<{ blob: Blob; contentType: string }>;
+  /** The previewed file as plugins see it (file-preview-section). */
+  file?: FileResourceView | null;
 }
 
 function SimpleMarkdown({ content }: { content: string }) {
@@ -115,7 +119,7 @@ function processInline(text: string): React.ReactNode {
   return parts.length === 1 ? parts[0] : <>{parts}</>;
 }
 
-export function FilePreviewModal({ name, onClose, onDownload, getFileContent }: FilePreviewModalProps) {
+export function FilePreviewModal({ name, onClose, onDownload, getFileContent, file }: FilePreviewModalProps) {
   const t = useTranslations("files");
   const [content, setContent] = useState<string | null>(null);
   const [objectUrl, setObjectUrl] = useState<string | null>(null);
@@ -381,6 +385,7 @@ export function FilePreviewModal({ name, onClose, onDownload, getFileContent }:
           />
         )}
       </div>
+      <FilePreviewPluginSection file={file} />
     </div>
   );
 }
diff --git a/components/files/file-preview-plugin-section.tsx b/components/files/file-preview-plugin-section.tsx
new file mode 100644
index 000000000..ff65b66c3
--- /dev/null
+++ b/components/files/file-preview-plugin-section.tsx
@@ -0,0 +1,25 @@
+"use client";
+
+import { useMemo } from "react";
+import { PluginSlot } from "@/components/plugins/plugin-slot";
+import { usePluginSlotOffers } from "@/hooks/use-plugin-slot-offers";
+import type { FileResourceView } from "@/lib/plugin-types";
+
+/**
+ * file-preview-section in the full-screen previews: a panel under the
+ * preview. Nothing at all when no plugin offers it or the file is unknown.
+ */
+export function FilePreviewPluginSection({ file }: { file?: FileResourceView | null }) {
+  const offered = usePluginSlotOffers("file-preview-section").length > 0;
+  const extraProps = useMemo(() => (file ? { file } : null), [file]);
+  if (!offered || !extraProps) return null;
+  return (
+    // The overlay closes on a click; the panel is not part of the backdrop.
+    <div
+      className="max-h-[40vh] w-full flex-shrink-0 overflow-y-auto border-t border-border bg-background pb-[env(safe-area-inset-bottom)]"
+      onClick={(e) => e.stopPropagation()}
+    >
+      <PluginSlot name="file-preview-section" className="w-full" extraProps={extraProps} />
+    </div>
+  );
+}
diff --git a/components/files/files-app.tsx b/components/files/files-app.tsx
index f1d7ca70f..424d0dc72 100644
--- a/components/files/files-app.tsx
+++ b/components/files/files-app.tsx
@@ -1,13 +1,13 @@
 "use client";
 
-import { useState, useEffect, useRef, useCallback } from "react";
+import { useState, useEffect, useRef, useCallback, useMemo } from "react";
 import { useTranslations } from "next-intl";
 import { ConfirmDialog } from "@/components/ui/confirm-dialog";
 import { useConfirmDialog } from "@/hooks/use-confirm-dialog";
 import { useAuthStore, redirectToLogin, saveRedirectAfterLogin } from '@/stores/auth-store';
 import { useAccountStore } from "@/stores/account-store";
 import { useEmailStore } from "@/stores/email-store";
-import { useFileStore, resourceServerRef, type UploadResult } from "@/stores/file-store";
+import { useFileStore, resourceServerRef, resourceToView, type UploadResult } from "@/stores/file-store";
 import { toast } from "@/stores/toast-store";
 import { cn, formatFileSize } from "@/lib/utils";
 import { NavigationRail } from "@/components/layout/navigation-rail";
@@ -357,7 +357,7 @@ export function FilesApp({ linkSegments: routeSegments }: FilesAppProps = {}) {
     if (!confirmed) return;
 
     try {
-      await deleteResource(name);
+      if (!await deleteResource(name)) return;
       toast.success(t("delete_success"));
     } catch (err) {
       console.error("Failed to delete:", err);
@@ -375,7 +375,7 @@ export function FilesApp({ linkSegments: routeSegments }: FilesAppProps = {}) {
     if (!confirmed) return;
 
     try {
-      await deleteResources(names);
+      if (!await deleteResources(names)) return;
       toast.success(t("batch_delete_success", { count: names.length }));
     } catch (err) {
       console.error("Failed to batch delete:", err);
@@ -395,7 +395,7 @@ export function FilesApp({ linkSegments: routeSegments }: FilesAppProps = {}) {
 
   const handleRename = useCallback(async (oldName: string, newName: string) => {
     try {
-      await renameResource(oldName, newName);
+      if (!await renameResource(oldName, newName)) return;
       toast.success(t("rename_success"), {
         action: { label: t("undo"), onClick: handleUndo },
       });
@@ -451,7 +451,7 @@ export function FilesApp({ linkSegments: routeSegments }: FilesAppProps = {}) {
 
   const handleMoveTo = useCallback(async (names: string[], targetId: string | null) => {
     try {
-      await moveToFolderId(names, targetId);
+      if (!await moveToFolderId(names, targetId)) return;
       toast.success(t("move_success", { count: names.length }), {
         action: { label: t("undo"), onClick: handleUndo },
       });
@@ -463,7 +463,7 @@ export function FilesApp({ linkSegments: routeSegments }: FilesAppProps = {}) {
 
   const handlePaste = useCallback(async () => {
     try {
-      await pasteResources();
+      if (!await pasteResources()) return;
       toast.success(t("paste_success"), {
         action: lastAction ? { label: t("undo"), onClick: handleUndo } : undefined,
       });
@@ -485,7 +485,7 @@ export function FilesApp({ linkSegments: routeSegments }: FilesAppProps = {}) {
 
   const handleRenameNode = useCallback(async (id: string, newName: string) => {
     try {
-      await renameNode(id, newName);
+      if (!await renameNode(id, newName)) return;
       toast.success(t("rename_success"), {
         action: { label: t("undo"), onClick: handleUndo },
       });
@@ -504,7 +504,7 @@ export function FilesApp({ linkSegments: routeSegments }: FilesAppProps = {}) {
     });
     if (!confirmed) return;
     try {
-      await deleteNode(id);
+      if (!await deleteNode(id)) return;
       toast.success(t("delete_success"));
     } catch (err) {
       console.error("Failed to delete:", err);
@@ -544,6 +544,13 @@ export function FilesApp({ linkSegments: routeSegments }: FilesAppProps = {}) {
   const proInterfaceActive = useProInterfaceActive();
   const isFocusedProTab = useIsFocusedProTab();
   const filesLinkPath = appPath(buildFilesPath(currentPath, previewFile));
+
+  // The previewed file as plugins see it (file-preview-section).
+  const previewedName = previewFile ?? previewImage;
+  const previewedView = useMemo(() => {
+    const resource = previewedName ? resources.find((r) => r.name === previewedName) : undefined;
+    return resource ? resourceToView(resource, currentPath) : null;
+  }, [previewedName, resources, currentPath]);
   useDeepLinkUrl(
     isEmbedded
       ? (isFocusedProTab ? filesLinkPath : null)
@@ -715,6 +722,7 @@ export function FilesApp({ linkSegments: routeSegments }: FilesAppProps = {}) {
           onClose={() => setPreviewImage(null)}
           onDownload={handleDownload}
           getImageUrl={getImageUrl}
+          file={previewedView}
         />
       )}
 
@@ -725,6 +733,7 @@ export function FilesApp({ linkSegments: routeSegments }: FilesAppProps = {}) {
           onClose={() => setPreviewFile(null)}
           onDownload={() => handleDownload(previewFile)}
           getFileContent={() => getFileContent(previewFile)}
+          file={previewedView}
         />
       )}
 
diff --git a/components/files/files-header.tsx b/components/files/files-header.tsx
index c9989adc3..9fdb298cc 100644
--- a/components/files/files-header.tsx
+++ b/components/files/files-header.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useState } from "react";
+import { useMemo, useState } from "react";
 import { useTranslations } from "next-intl";
 import {
   Menu, ChevronRight, Search, X, ArrowUpDown, Check, LayoutGrid, LayoutList,
@@ -12,6 +12,8 @@ import { ContextMenu, ContextMenuItem, ContextMenuSeparator } from "@/components
 import { useContextMenu } from "@/hooks/use-context-menu";
 import { cn } from "@/lib/utils";
 import { anchorEvent, isInternalDrag, readDraggedNames } from "@/components/files/file-item-parts";
+import { PluginActions } from "@/components/plugins/plugin-actions";
+import type { FileResourceView } from "@/lib/plugin-types";
 
 export type SortKey = "name" | "size" | "modified";
 export type SortDir = "asc" | "desc";
@@ -39,6 +41,10 @@ interface SelectionActions {
   onCopy: () => void;
   onDelete: () => void;
   onClear: () => void;
+  /** The selection as plugins see it (file-actions). */
+  pluginFiles: FileResourceView[];
+  /** The one selected item's type, so plugins can offer type-specific actions; undefined for several. */
+  pluginMimeType?: string;
 }
 
 interface FilesHeaderProps {
@@ -132,7 +138,10 @@ export function FilesHeader({
           <ToolButton icon={Scissors} label={t("cut")} onClick={selection.onCut} compact />
           <ToolButton icon={Copy} label={t("copy")} onClick={selection.onCopy} compact />
           <ToolButton icon={Trash2} label={t("delete")} onClick={selection.onDelete} compact destructive />
+          {!compact && <SelectionPluginActions files={selection.pluginFiles} mimeType={selection.pluginMimeType} />}
         </div>
+        {/* Outside the scrolling row, so the "more" button never scrolls out of sight. */}
+        {compact && <SelectionPluginActions files={selection.pluginFiles} mimeType={selection.pluginMimeType} overflow />}
         <div className="flex-1" />
         <DetailsToggle showDetails={showDetails} onToggle={onToggleDetails} label={t("details")} />
       </div>
@@ -426,3 +435,12 @@ function SortItem({ label, checked, onClick, icon: Icon }: {
     </button>
   );
 }
+
+/**
+ * Plugin buttons in the selection toolbar, icon-only like the app's own. On
+ * phones the toolbar has no room for them: they go behind one "more" button.
+ */
+function SelectionPluginActions({ files, mimeType, overflow }: { files: FileResourceView[]; mimeType?: string; overflow?: boolean }) {
+  const context = useMemo(() => ({ files }), [files]);
+  return <PluginActions surface="file-actions" context={context} mimeType={mimeType} compact overflow={overflow} className="flex-nowrap gap-0.5 flex-shrink-0" />;
+}
diff --git a/components/files/image-preview-modal.tsx b/components/files/image-preview-modal.tsx
index fff8793af..129998a60 100644
--- a/components/files/image-preview-modal.tsx
+++ b/components/files/image-preview-modal.tsx
@@ -5,15 +5,19 @@ import { X, Download } from "@/components/icons";
 import { Button } from "@/components/ui/button";
 import { useTranslations } from "next-intl";
 import { ZoomableImage } from "@/components/files/zoomable-image";
+import { FilePreviewPluginSection } from "@/components/files/file-preview-plugin-section";
+import type { FileResourceView } from "@/lib/plugin-types";
 
 interface ImagePreviewModalProps {
   name: string;
   onClose: () => void;
   onDownload: (name: string) => Promise<void>;
   getImageUrl: (name: string) => Promise<string>;
+  /** The previewed file as plugins see it (file-preview-section). */
+  file?: FileResourceView | null;
 }
 
-export function ImagePreviewModal({ name, onClose, onDownload, getImageUrl }: ImagePreviewModalProps) {
+export function ImagePreviewModal({ name, onClose, onDownload, getImageUrl, file }: ImagePreviewModalProps) {
   const t = useTranslations("files");
   const [imageUrl, setImageUrl] = useState<string | null>(null);
   const [loading, setLoading] = useState(true);
@@ -111,6 +115,7 @@ export function ImagePreviewModal({ name, onClose, onDownload, getImageUrl }: Im
           <ZoomableImage src={imageUrl} alt={name} onBackgroundClick={onClose} />
         )}
       </div>
+      <FilePreviewPluginSection file={file} />
     </div>
   );
 }
diff --git a/components/icons/index.ts b/components/icons/index.ts
index 8c3b910ef..d71b4b106 100644
--- a/components/icons/index.ts
+++ b/components/icons/index.ts
@@ -164,6 +164,7 @@ export {
   IconBeach as Palmtree,
   IconBeach as PalmtreeIcon,
   IconLayoutSidebarLeftCollapse as PanelLeftClose,
+  IconLayoutSidebarLeftExpand as PanelLeftOpen,
   IconLayoutSidebarRight as PanelRight,
   IconLayoutSidebarRightCollapse as PanelRightClose,
   IconLayoutSidebarRightExpand as PanelRightOpen,
diff --git a/components/identity/identity-manager-modal.tsx b/components/identity/identity-manager-modal.tsx
index da778912c..8f4dd8102 100644
--- a/components/identity/identity-manager-modal.tsx
+++ b/components/identity/identity-manager-modal.tsx
@@ -7,7 +7,9 @@ import { cn } from '@/lib/utils';
 import { Button } from '@/components/ui/button';
 import { ConfirmDialog } from '@/components/ui/confirm-dialog';
 import { IdentityForm } from './identity-form';
-import { useIdentityStore } from '@/stores/identity-store';
+import {
+  useIdentityStore, createIdentityWithHooks, updateIdentityWithHooks, deleteIdentityWithHooks,
+} from '@/stores/identity-store';
 import { useAuthStore } from '@/stores/auth-store';
 import { useAccountStore } from '@/stores/account-store';
 import { useSettingsStore } from '@/stores/settings-store';
@@ -137,14 +139,7 @@ export function IdentityManagerModal({ isOpen, onClose }: IdentityManagerModalPr
     if (!client) return;
 
     try {
-      await client.createIdentity(
-        data.name,
-        data.email,
-        data.replyTo,
-        data.bcc,
-        data.textSignature,
-        data.htmlSignature
-      );
+      if (!(await createIdentityWithHooks(client, data))) return;
 
       await refreshIdentities();
       setIsCreating(false);
@@ -160,13 +155,14 @@ export function IdentityManagerModal({ isOpen, onClose }: IdentityManagerModalPr
     if (!client) return;
 
     try {
-      await client.updateIdentity(identity.id, {
+      const saved = await updateIdentityWithHooks(client, identity, {
         name: data.name,
         replyTo: data.replyTo,
         bcc: data.bcc,
         textSignature: data.textSignature,
         htmlSignature: data.htmlSignature,
       });
+      if (!saved) return;
 
       await refreshIdentities();
       setEditingId(null);
@@ -196,7 +192,7 @@ export function IdentityManagerModal({ isOpen, onClose }: IdentityManagerModalPr
     setDeletingId(identity.id);
 
     try {
-      await client.deleteIdentity(identity.id);
+      if (!(await deleteIdentityWithHooks(client, identity))) return;
       await refreshIdentities();
       toast.success(tNotif('identity_deleted'));
     } catch (error) {
diff --git a/components/keyboard-shortcuts-modal.tsx b/components/keyboard-shortcuts-modal.tsx
index bddd6041a..95bf049c5 100644
--- a/components/keyboard-shortcuts-modal.tsx
+++ b/components/keyboard-shortcuts-modal.tsx
@@ -7,6 +7,8 @@ import { useSettingsStore } from "@/stores/settings-store";
 import { cn } from "@/lib/utils";
 import { useFocusTrap } from "@/hooks/use-focus-trap";
 import { useTour } from "@/components/tour/tour-provider";
+import { useProInterfaceActive } from "@/components/pro/pro-interface-redirect";
+import { usePluginActions } from "@/components/plugins/plugin-actions";
 
 interface KeyboardShortcutsModalProps {
   isOpen: boolean;
@@ -17,9 +19,12 @@ export function KeyboardShortcutsModal({ isOpen, onClose }: KeyboardShortcutsMod
   const t = useTranslations();
   const { startTour } = useTour();
   const interfaceLayout = useSettingsStore((state) => state.interfaceLayout);
-  // Rows that belong to one interface layout are listed only under it.
+  const shell = useProInterfaceActive() ? "pro" : "standard";
+  // Plugin buttons in the composer that have a shortcut (composer-toolbar-actions).
+  const pluginComposerShortcuts = usePluginActions("composer-toolbar-actions").filter((a) => a.shortcut);
+  // Rows that belong to one interface layout (or one shell) are listed only under it.
   const shown = (entries: readonly ShortcutEntry[]) =>
-    entries.filter((entry) => !entry.layout || entry.layout === interfaceLayout);
+    entries.filter((entry) => (!entry.layout || entry.layout === interfaceLayout) && (!entry.shell || entry.shell === shell));
 
   const modalRef = useFocusTrap({
     isActive: isOpen,
@@ -142,6 +147,13 @@ export function KeyboardShortcutsModal({ isOpen, onClose }: KeyboardShortcutsMod
                     description={t(shortcut.description)}
                   />
                 ))}
+                {pluginComposerShortcuts.map((action) => (
+                  <ShortcutRow
+                    key={`${action.pluginId}:${action.id}`}
+                    shortcutKey={action.shortcut!}
+                    description={`${action.label} (${action.pluginName})`}
+                  />
+                ))}
               </div>
             </section>
           </div>
diff --git a/components/layout/__tests__/navigation-plugin-pages.test.tsx b/components/layout/__tests__/navigation-plugin-pages.test.tsx
new file mode 100644
index 000000000..e0e84e679
--- /dev/null
+++ b/components/layout/__tests__/navigation-plugin-pages.test.tsx
@@ -0,0 +1,67 @@
+import React from 'react';
+import { act, fireEvent, render, screen } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+// Every plugin page gets an entry in the navigation, after the built-in apps:
+// the rail (desktop), the bottom bar (phones) and Mountain View's app grid.
+
+vi.mock('../account-switcher', () => ({ AccountSwitcher: () => null }));
+vi.mock('@/components/plugins/plugin-slot', () => ({ PluginSlot: () => null }));
+vi.mock('@/components/keyboard-shortcuts-modal', () => ({ KeyboardShortcutsModal: () => null }));
+vi.mock('@/components/search/search-box', () => ({ SearchBox: () => null }));
+vi.mock('@/hooks/use-config', () => ({ useConfig: () => ({ appName: 'Mail' }) }));
+vi.mock('@/hooks/use-stalwart-admin', () => ({ useStalwartAdmin: () => false }));
+vi.mock('@/i18n/navigation', () => ({
+  useRouter: () => ({ push: vi.fn(), back: vi.fn(), replace: vi.fn() }),
+  usePathname: () => '/apps/kanban/board',
+  Link: ({ children, href, ...rest }: { children: React.ReactNode; href: string }) => <a href={href} {...rest}>{children}</a>,
+}));
+
+const { NavigationRail } = await import('../navigation-rail');
+const { MvTopBar } = await import('../mv-top-bar');
+const pages = await import('@/lib/plugin-sandbox/pages');
+const { useUpdateStore } = await import('@/stores/update-store');
+
+beforeEach(() => {
+  useUpdateStore.setState({ startPolling: vi.fn() } as never);
+});
+afterEach(() => pages.resetPages());
+
+const register = () => act(() => pages.setPluginPages('kanban', 'Kanban', [
+  { id: 'board', title: 'Board', icon: 'LayoutGrid' },
+  { id: 'stats', title: 'Stats' },
+]));
+
+describe.each(['vertical', 'horizontal'] as const)('navigation rail (%s)', (orientation) => {
+  it('lists no plugin pages when none are registered', () => {
+    const { container } = render(<NavigationRail orientation={orientation} />);
+    expect(container.querySelector('[data-plugin-page-link]')).toBeNull();
+  });
+
+  it('links each page after the built-in apps and marks the open one', () => {
+    register();
+    const { container } = render(<NavigationRail orientation={orientation} />);
+
+    const links = [...container.querySelectorAll('[data-plugin-page-link]')];
+    expect(links.map((a) => a.getAttribute('href'))).toEqual(['/apps/kanban/board', '/apps/kanban/stats']);
+    const mail = container.querySelector('a[href="/"]')!;
+    expect(mail.compareDocumentPosition(links[0]) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
+    expect(links[0]).toHaveAttribute('aria-current', 'page');
+    expect(links[1]).not.toHaveAttribute('aria-current');
+    // Title in the entry (as label on the collapsed rail).
+    expect(screen.getAllByText('Board').length + screen.queryAllByLabelText('Board').length).toBeGreaterThan(0);
+  });
+});
+
+describe('Mountain View app grid', () => {
+  it('offers plugin pages next to the built-in apps', () => {
+    register();
+    const { container } = render(<MvTopBar />);
+    fireEvent.click(screen.getByRole('button', { name: 'add_app' }));
+
+    const links = [...container.querySelectorAll('[data-plugin-page-link]')];
+    expect(links.map((a) => a.getAttribute('href'))).toEqual(['/apps/kanban/board', '/apps/kanban/stats']);
+    expect(links[0]).toHaveAttribute('role', 'menuitem');
+    expect(screen.getByText('Stats')).toBeInTheDocument();
+  });
+});
diff --git a/components/layout/__tests__/sidebar-plugin-section.test.tsx b/components/layout/__tests__/sidebar-plugin-section.test.tsx
new file mode 100644
index 000000000..d17904faf
--- /dev/null
+++ b/components/layout/__tests__/sidebar-plugin-section.test.tsx
@@ -0,0 +1,119 @@
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import type { Mailbox } from '@/lib/jmap/types';
+import type { InstalledPlugin } from '@/lib/plugin-types';
+
+const createSlotInstance = vi.fn((..._args: unknown[]) => ({ destroy: vi.fn(), updateProps: vi.fn(), setTheme: vi.fn() }));
+vi.mock('@/lib/plugin-sandbox/host-bridge', () => ({
+  createSlotInstance: (...args: unknown[]) => createSlotInstance(...args),
+}));
+vi.mock('@/lib/plugin-sandbox/host-theme', () => ({ snapshotHostTheme: () => ({}) }));
+vi.mock('@/components/tour/tour-provider', () => ({
+  useTour: () => ({ startTour: vi.fn(), resetTourCompletion: vi.fn(), activeTour: null, endTour: vi.fn(), registerStep: vi.fn() }),
+}));
+vi.mock('@/contexts/drag-drop-context', () => ({
+  useDragDropContext: () => ({ isDragging: false }),
+}));
+vi.mock('@/hooks/use-mailbox-drop', () => ({
+  useMailboxDrop: () => ({ dropHandlers: {}, isValidDropTarget: false, isInvalidDropTarget: false }),
+}));
+vi.mock('@/hooks/use-tag-drop', () => ({
+  useTagDrop: () => ({ dropHandlers: {}, isValidDropTarget: false }),
+}));
+vi.mock('../account-switcher', () => ({ AccountSwitcher: () => null }));
+
+const { Sidebar } = await import('../sidebar');
+const registry = await import('@/lib/plugin-sandbox/registry');
+const { dispatchApiCall } = await import('@/lib/plugin-sandbox/host-api');
+const { clearSectionTitle } = await import('@/lib/plugin-sandbox/section-titles');
+
+const mailboxes: Mailbox[] = [
+  { id: 'inbox', name: 'Inbox', role: 'inbox', parentId: null, totalEmails: 0, unreadEmails: 0, myRights: { mayAddItems: true } },
+] as unknown as Mailbox[];
+
+function offer(id: string, name: string, slot: string) {
+  const plugin: InstalledPlugin = {
+    id, name, version: '1.0.0', author: '', description: '', type: 'ui-extension',
+    permissions: ['ui:sidebar-widget'], grantedPermissions: ['ui:sidebar-widget'], entrypoint: 'index.js',
+    enabled: true, status: 'running', settings: {},
+  };
+  registry.register({
+    plugin,
+    code: '',
+    tier: 'untrusted',
+    background: { evaluateShouldShow: vi.fn(async () => true) } as never,
+    slotOffers: [{ name: slot as never, order: 100, hasShouldShow: false }],
+    hookDisposables: [],
+  });
+}
+
+beforeEach(() => {
+  createSlotInstance.mockClear();
+  localStorage.clear();
+});
+
+afterEach(() => {
+  for (const p of registry.all()) registry.deregister(p.plugin.id);
+  clearSectionTitle('cal');
+});
+
+describe('Sidebar plugin sections', () => {
+  it('draws nothing when no plugin offers a section', () => {
+    offer('w', 'Widget only', 'sidebar-widget');
+    const { container } = render(<Sidebar mailboxes={mailboxes} selectedMailbox="inbox" />);
+
+    expect(container.querySelector('[data-plugin-slot="sidebar-section"]')).toBeNull();
+    expect(screen.queryByText('Widget only')).toBeNull();
+  });
+
+  it('gives each plugin a section headed by its name, below the folders, with the open folder', async () => {
+    offer('cal', 'Agenda', 'sidebar-section');
+    const { container } = render(<Sidebar mailboxes={mailboxes} selectedMailbox="inbox" />);
+
+    const header = screen.getByRole('button', { name: 'Agenda' });
+    expect(header).toHaveAttribute('aria-expanded', 'true');
+    const section = container.querySelector('[data-plugin-slot="sidebar-section"]')!;
+    // Below the folder list.
+    const inbox = container.querySelector('[data-mailbox-id="inbox"]')!;
+    expect(inbox.compareDocumentPosition(section) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
+
+    await waitFor(() => expect(createSlotInstance).toHaveBeenCalled());
+    const opts = createSlotInstance.mock.calls[0][0] as { slot: string; extraProps: Record<string, unknown>; plugin: { id: string } };
+    expect(opts.slot).toBe('sidebar-section');
+    expect(opts.plugin.id).toBe('cal');
+    expect(opts.extraProps).toEqual({ mailboxId: 'inbox' });
+  });
+
+  it('folds a section and remembers it per plugin', async () => {
+    offer('cal', 'Agenda', 'sidebar-section');
+    const first = render(<Sidebar mailboxes={mailboxes} selectedMailbox="inbox" />);
+    await waitFor(() => expect(createSlotInstance).toHaveBeenCalledTimes(1));
+
+    act(() => { fireEvent.click(screen.getByRole('button', { name: 'Agenda' })); });
+    expect(screen.getByRole('button', { name: 'Agenda' })).toHaveAttribute('aria-expanded', 'false');
+    first.unmount();
+
+    createSlotInstance.mockClear();
+    render(<Sidebar mailboxes={mailboxes} selectedMailbox="inbox" />);
+    expect(screen.getByRole('button', { name: 'Agenda' })).toHaveAttribute('aria-expanded', 'false');
+    await new Promise((r) => setTimeout(r, 20));
+    expect(createSlotInstance).not.toHaveBeenCalled();
+  });
+
+  it('heads a section with the title the plugin set, and with its name again after null', async () => {
+    offer('cal', 'Agenda', 'sidebar-section');
+    render(<Sidebar mailboxes={mailboxes} selectedMailbox="inbox" />);
+    const plugin = registry.get('cal')!.plugin;
+
+    await act(async () => { await dispatchApiCall(plugin, 'ui.setSectionTitle', ['Upcoming birthdays']); });
+    expect(screen.getByRole('button', { name: 'Upcoming birthdays' })).toBeInTheDocument();
+    expect(screen.queryByRole('button', { name: 'Agenda' })).toBeNull();
+
+    await expect(dispatchApiCall(plugin, 'ui.setSectionTitle', ['x'.repeat(41)])).rejects.toThrow(/at most 40/);
+    await act(async () => { await dispatchApiCall(plugin, 'ui.setSectionTitle', [null]); });
+    expect(screen.getByRole('button', { name: 'Agenda' })).toBeInTheDocument();
+
+    const noPerm = { ...plugin, id: 'other', permissions: [], grantedPermissions: [] };
+    await expect(dispatchApiCall(noPerm, 'ui.setSectionTitle', ['Mine'])).rejects.toThrow(/lacks permission "ui:sidebar-widget"/);
+  });
+});
diff --git a/components/layout/__tests__/top-bar-plugin-actions.test.tsx b/components/layout/__tests__/top-bar-plugin-actions.test.tsx
new file mode 100644
index 000000000..d4e4c48ae
--- /dev/null
+++ b/components/layout/__tests__/top-bar-plugin-actions.test.tsx
@@ -0,0 +1,82 @@
+import { act, fireEvent, render, screen } from '@testing-library/react';
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { resetActions, setActionDispatcher, setPluginActions } from '@/lib/plugin-sandbox/actions';
+
+// The top bar's plugin buttons (top-bar-actions): next to the search field in
+// Mountain View's bar, and in the phone header's overflow menu.
+
+vi.mock('../account-switcher', () => ({ AccountSwitcher: () => null }));
+vi.mock('@/components/search/search-box', () => ({ SearchBox: () => <input data-testid="search" /> }));
+vi.mock('@/hooks/use-config', () => ({ useConfig: () => ({ appName: 'Mail' }) }));
+vi.mock('@/hooks/use-stalwart-admin', () => ({ useStalwartAdmin: () => false }));
+
+const { MvTopBar } = await import('../mv-top-bar');
+const { MobileHeader } = await import('../mobile-header');
+
+const dispatch = vi.fn().mockResolvedValue(undefined);
+
+const search = {
+  query: '', onQueryChange: vi.fn(), onSubmit: vi.fn(), onClear: vi.fn(), onSelectContact: vi.fn(),
+  onToggleFilters: vi.fn(), filtersOpen: false, activeFilterCount: 0,
+};
+
+beforeEach(() => {
+  resetActions();
+  dispatch.mockClear();
+  setActionDispatcher(dispatch);
+});
+
+describe('Mountain View top bar', () => {
+  it('has no plugin buttons when no plugin declared any', () => {
+    const { container } = render(<MvTopBar search={search} />);
+    expect(container.querySelector('[data-plugin-actions="top-bar-actions"]')).toBeNull();
+  });
+
+  it('puts plugin buttons right after the search field and sends the click', async () => {
+    act(() => setPluginActions('tr', 'Translator', 'top-bar-actions', [{ id: 'go', label: 'Translate', icon: 'Languages' }]));
+    const { container } = render(<MvTopBar search={search} />);
+
+    const group = container.querySelector('[data-plugin-actions="top-bar-actions"]')!;
+    expect(group).not.toBeNull();
+    const searchField = screen.getByTestId('search');
+    expect(searchField.compareDocumentPosition(group) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
+
+    const button = screen.getByRole('button', { name: 'Translate' });
+    // Compact: icon only, the label as tooltip.
+    expect(button).toHaveAttribute('title', 'Translate (Translator)');
+    await act(async () => { fireEvent.click(button); });
+    expect(dispatch).toHaveBeenCalledWith('tr', 'top-bar-actions', 'go', {});
+  });
+});
+
+describe('phone header', () => {
+  it('offers only the command palette in its menu when no plugin declared buttons', () => {
+    const opened = vi.fn();
+    window.addEventListener('bulwark:command-palette', opened);
+    render(<MobileHeader title="Inbox" />);
+    fireEvent.click(screen.getByRole('button', { name: 'more' }));
+
+    // Notifications and the command palette (both labelled "title" here, as
+    // the translations are keys in tests); no plugin entries.
+    const items = screen.getAllByRole('menuitem');
+    expect(items.map((m) => m.textContent)).toEqual(['title', 'title']);
+    fireEvent.click(items[1]);
+    expect(opened).toHaveBeenCalled();
+    window.removeEventListener('bulwark:command-palette', opened);
+  });
+
+  it('lists plugin buttons in its overflow menu', async () => {
+    act(() => setPluginActions('tr', 'Translator', 'top-bar-actions', [{ id: 'go', label: 'Translate' }]));
+    render(<MobileHeader title="Inbox" />);
+
+    const more = screen.getByRole('button', { name: 'more' });
+    expect(screen.queryByRole('menuitem', { name: 'Translate' })).toBeNull();
+    fireEvent.click(more);
+    expect(more).toHaveAttribute('aria-expanded', 'true');
+
+    await act(async () => { fireEvent.click(screen.getByRole('menuitem', { name: 'Translate' })); });
+    expect(dispatch).toHaveBeenCalledWith('tr', 'top-bar-actions', 'go', {});
+    // The menu closes on the click.
+    expect(screen.queryByRole('menu')).toBeNull();
+  });
+});
diff --git a/components/layout/mobile-header.tsx b/components/layout/mobile-header.tsx
index 7e929ddae..3dc6db4cd 100644
--- a/components/layout/mobile-header.tsx
+++ b/components/layout/mobile-header.tsx
@@ -1,6 +1,7 @@
 "use client";
 
-import { Menu, ArrowLeft, Plus, Search, X } from "@/components/icons";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { Menu, ArrowLeft, Plus, Search, X, MoreVertical, Terminal, Bell } from "@/components/icons";
 import { Button } from "@/components/ui/button";
 import { useUIStore } from "@/stores/ui-store";
 import { useSettingsStore } from "@/stores/settings-store";
@@ -8,6 +9,84 @@ import { useIsDesktop } from "@/hooks/use-media-query";
 import { cn } from "@/lib/utils";
 import { useTranslations } from "next-intl";
 import { AccountSwitcher } from "@/components/layout/account-switcher";
+import { PluginActions } from "@/components/plugins/plugin-actions";
+import { useMenuNavigation } from "@/hooks/use-menu-navigation";
+import { ContextMenuItem } from "@/components/ui/context-menu";
+import { openCommandPalette } from "@/lib/app-commands";
+import { NotificationSheet, formatBadgeCount, useUnreadNotificationCount } from "@/components/notifications/notification-center";
+
+/** Plugin buttons in the top bar are not about any one item. */
+const TOP_BAR_CONTEXT: Record<string, unknown> = {};
+
+/**
+ * The phone header's overflow menu: the notifications (the desktop bell), the
+ * command palette (no Ctrl+K on a phone) and what the desktop top bar shows
+ * as buttons (plugin top-bar-actions) and has no room for here.
+ */
+function MobileHeaderMenu() {
+  const t = useTranslations('top_bar');
+  const tPalette = useTranslations('command_palette');
+  const tNotifications = useTranslations('notification_center');
+  const unread = useUnreadNotificationCount();
+  const [showNotifications, setShowNotifications] = useState(false);
+  const [open, setOpen] = useState(false);
+  const triggerRef = useRef<HTMLButtonElement>(null);
+  const close = useCallback(() => setOpen(false), []);
+  const { menuRef, onKeyDown } = useMenuNavigation<HTMLDivElement>({ open, onClose: close, triggerRef });
+
+  useEffect(() => {
+    if (!open) return;
+    const onPointerDown = (e: MouseEvent) => {
+      if (triggerRef.current?.contains(e.target as Node) || menuRef.current?.contains(e.target as Node)) return;
+      setOpen(false);
+    };
+    document.addEventListener('mousedown', onPointerDown);
+    return () => document.removeEventListener('mousedown', onPointerDown);
+  }, [open, menuRef]);
+
+  return (
+    <div className="relative">
+      <Button
+        ref={triggerRef}
+        variant="ghost"
+        size="icon"
+        onClick={() => setOpen((v) => !v)}
+        className={cn("relative h-11 w-11", open && "bg-accent")}
+        aria-label={unread > 0 ? `${t('more')} (${tNotifications('unread_count', { count: unread })})` : t('more')}
+        aria-haspopup="menu"
+        aria-expanded={open}
+      >
+        <MoreVertical className="h-5 w-5" />
+        {unread > 0 && (
+          <span className="absolute top-2 end-2 w-2 h-2 rounded-full bg-red-500 ring-2 ring-background" aria-hidden="true" />
+        )}
+      </Button>
+      {open && (
+        <div
+          ref={menuRef}
+          onKeyDown={onKeyDown}
+          role="menu"
+          aria-label={t('more')}
+          className="absolute end-0 top-full mt-1 z-50 min-w-[200px] max-w-[calc(100vw-2rem)] rounded-md border border-border bg-background py-1 shadow-lg"
+        >
+          <ContextMenuItem
+            icon={Bell}
+            label={tNotifications('title')}
+            shortcut={unread > 0 ? formatBadgeCount(unread) : undefined}
+            onClick={() => { close(); setShowNotifications(true); }}
+          />
+          <ContextMenuItem
+            icon={Terminal}
+            label={tPalette('title')}
+            onClick={() => { close(); openCommandPalette(); }}
+          />
+          <PluginActions surface="top-bar-actions" context={TOP_BAR_CONTEXT} variant="menu" onRan={close} />
+        </div>
+      )}
+      {showNotifications && <NotificationSheet onClose={() => setShowNotifications(false)} />}
+    </div>
+  );
+}
 
 interface MobileHeaderProps {
   title: string;
@@ -166,6 +245,8 @@ export function MobileHeader({
           </Button>
         )}
 
+        <MobileHeaderMenu />
+
         {/* Which account you are reading is otherwise only visible after
             opening the drawer. Last in this group so it sits on the far
             edge — opposite the menu button, and mirrored under RTL because
diff --git a/components/layout/mv-top-bar.tsx b/components/layout/mv-top-bar.tsx
index d1a0b484d..399ec8f2c 100644
--- a/components/layout/mv-top-bar.tsx
+++ b/components/layout/mv-top-bar.tsx
@@ -9,6 +9,7 @@ import {
   HelpCircle,
   Mail,
   Menu,
+  Puzzle,
   Settings,
   Shield,
   SlidersHorizontal,
@@ -31,8 +32,14 @@ import { useUpdateStore, selectHasUpdate } from "@/stores/update-store";
 import { cn } from "@/lib/utils";
 import { AccountSwitcher } from "@/components/layout/account-switcher";
 import { SearchBox, type ContactSearchField } from "@/components/search/search-box";
+import { PluginActions } from "@/components/plugins/plugin-actions";
+import { usePluginPages, pluginPageHref, isPluginPageActive } from "@/hooks/use-plugin-pages";
+import { NotificationBell } from "@/components/notifications/notification-center";
 import type { ContactSuggestion } from "@/lib/search-suggestions";
 
+/** The top bar is not about any one item: plugin clicks carry no context. */
+const TOP_BAR_CONTEXT: Record<string, unknown> = {};
+
 /** Mail search, which only the mail surface puts into the bar. */
 interface MvTopBarSearch {
   query: string;
@@ -107,6 +114,7 @@ export function MvTopBar({
   // The same gate the navigation rail puts on its "add app" button.
   const sidebarAppsEnabled = usePolicyStore((s) => s.isFeatureEnabled("sidebarAppsEnabled"));
   const sidebarApps = useResolvedSidebarApps();
+  const pluginPages = usePluginPages();
   const isStalwartAdmin = useStalwartAdmin();
   const hasUpdate = useUpdateStore(selectHasUpdate);
   // The navigation rail starts the update check, and this bar replaces it on
@@ -229,10 +237,14 @@ export function MvTopBar({
         </div>
       )}
 
+      {/* Plugin buttons (top-bar-actions), next to the search field */}
+      <PluginActions surface="top-bar-actions" context={TOP_BAR_CONTEXT} compact className="shrink-0 flex-nowrap" />
+
       {/* Spacer keeps the right cluster pinned while search stays left */}
       <div className="flex-1 min-w-0" />
 
       <div className="flex items-center gap-1 shrink-0">
+        <NotificationBell placement="below" className="w-12 h-12 rounded-full" />
         {onShowShortcuts && (
           <button
             type="button"
@@ -323,6 +335,29 @@ export function MvTopBar({
                     </Link>
                   );
                 })}
+                {pluginPages.map((page) => {
+                  const PageIcon = iconForName(page.icon) ?? Puzzle;
+                  return (
+                    <Link
+                      key={`plugin-page:${page.pluginId}:${page.id}`}
+                      href={pluginPageHref(page)}
+                      role="menuitem"
+                      title={page.pluginName}
+                      data-plugin-page-link={`${page.pluginId}/${page.id}`}
+                      onClick={() => {
+                        if (activeAppId) onCloseInlineApp?.();
+                        setAppsOpen(false);
+                      }}
+                      className={cn(
+                        "flex flex-col items-center gap-1.5 rounded-lg py-3 px-1 text-center transition-colors hover:bg-muted",
+                        !activeAppId && isPluginPageActive(pathname, page) && "bg-muted"
+                      )}
+                    >
+                      <PageIcon className="w-6 h-6 text-muted-foreground" />
+                      <span className="text-xs truncate max-w-full">{page.title}</span>
+                    </Link>
+                  );
+                })}
                 {sidebarApps.map((app) => {
                   const AppIcon = iconForName(app.icon);
                   return (
diff --git a/components/layout/navigation-rail.tsx b/components/layout/navigation-rail.tsx
index 2021e30ed..8152d454d 100644
--- a/components/layout/navigation-rail.tsx
+++ b/components/layout/navigation-rail.tsx
@@ -2,7 +2,7 @@
 
 import { useState, useRef, useEffect, useLayoutEffect, useCallback } from "react";
 import { createPortal } from "react-dom";
-import { Mail, Calendar, BookUser, HardDrive, Settings, Keyboard, Plus, Shield, LogOut, Check, Search } from "@/components/icons";
+import { Mail, Calendar, BookUser, HardDrive, Settings, Keyboard, Plus, Shield, LogOut, Check, Search, Puzzle } from "@/components/icons";
 import { AccountSwitcher } from "./account-switcher";
 import { iconForName } from "@/components/icons";
 import { useConfig } from "@/hooks/use-config";
@@ -27,6 +27,8 @@ import { KeyboardShortcutsModal } from "@/components/keyboard-shortcuts-modal";
 import { getPathPrefix, withBasePath } from "@/lib/browser-navigation";
 import { Avatar } from "@/components/ui/avatar";
 import { toUnicodeEmail } from "@/lib/idn";
+import { usePluginPages, pluginPageHref, isPluginPageActive } from "@/hooks/use-plugin-pages";
+import { NotificationBell } from "@/components/notifications/notification-center";
 
 interface NavItem {
   id: string;
@@ -220,6 +222,8 @@ export function NavigationRail({
   // Operator-provided apps (#931) plus the user's own; the gate above only
   // removes the user's, so a pinned set still shows when custom apps are off.
   const visibleSidebarApps = useResolvedSidebarApps();
+  // Pages plugins added (api.ui.setPages); listed after the built-in apps.
+  const pluginPages = usePluginPages();
   const inboxUnread = mailboxes.find(m => m.role === "inbox")?.unreadEmails || 0;
   const isStalwartAdmin = useStalwartAdmin();
   const hasUpdate = useUpdateStore(selectHasUpdate);
@@ -382,6 +386,40 @@ export function NavigationRail({
           );
         })}
 
+        {/* Plugin pages, after the built-in apps */}
+        {pluginPages.map((page) => {
+          const isActive = !activeAppId && isPluginPageActive(pathname, page);
+          const PageIcon = iconForName(page.icon) ?? Puzzle;
+          return (
+            <Link
+              key={`plugin-page:${page.pluginId}:${page.id}`}
+              href={pluginPageHref(page)}
+              onClick={() => { if (activeAppId) onCloseInlineApp?.(); }}
+              data-plugin-page-link={`${page.pluginId}/${page.id}`}
+              title={page.pluginName}
+              className={cn(
+                "flex flex-col items-center justify-center gap-1 py-2 px-1 min-h-[44px] grow shrink-0 basis-[64px]",
+                "transition-colors duration-150",
+                isActive
+                  ? "text-primary"
+                  : "text-muted-foreground hover:text-foreground"
+              )}
+              aria-current={isActive ? "page" : undefined}
+            >
+              <div className={cn(
+                "relative",
+                mountainView && isActive && "min-w-14 rounded-full bg-primary/15 px-4 py-[3px]"
+              )}>
+                <PageIcon className="w-5 h-5" />
+                {isActive && !mountainView && (
+                  <span className="absolute -bottom-1 left-1/2 -translate-x-1/2 w-4 h-0.5 rounded-full bg-primary" />
+                )}
+              </div>
+              <span className="text-[10px] font-medium leading-tight truncate max-w-full">{page.title}</span>
+            </Link>
+          );
+        })}
+
         {/* Custom sidebar apps (per-app mobile visibility) */}
         {visibleSidebarApps.filter((app) => app.showOnMobile).map((app) => {
           const AppIcon = iconForName(app.icon);
@@ -554,6 +592,37 @@ export function NavigationRail({
           );
         })}
 
+        {/* Plugin pages, after the built-in apps */}
+        {pluginPages.map((page) => {
+          const isActive = !activeAppId && isPluginPageActive(pathname, page);
+          const PageIcon = iconForName(page.icon) ?? Puzzle;
+          return (
+            <Link
+              key={`plugin-page:${page.pluginId}:${page.id}`}
+              href={pluginPageHref(page)}
+              onClick={() => { if (activeAppId) onCloseInlineApp?.(); }}
+              data-plugin-page-link={`${page.pluginId}/${page.id}`}
+              className={cn(
+                "relative flex items-center gap-2.5 rounded-md transition-colors duration-150",
+                collapsed
+                  ? "justify-center w-10 h-10"
+                  : "px-2.5 text-sm",
+                "max-lg:min-h-[44px]",
+                isActive
+                  ? "bg-primary/10 text-primary font-medium"
+                  : "text-muted-foreground hover:bg-muted hover:text-foreground"
+              )}
+              aria-current={isActive ? "page" : undefined}
+              aria-label={collapsed ? page.title : undefined}
+              title={collapsed ? `${page.title} (${page.pluginName})` : page.pluginName}
+              style={collapsed ? undefined : { paddingBlock: 'var(--density-sidebar-py)' }}
+            >
+              <PageIcon className={cn("w-[18px] h-[18px] flex-shrink-0", isActive && "text-primary")} />
+              {!collapsed && <span className="truncate">{page.title}</span>}
+            </Link>
+          );
+        })}
+
         {/* Custom sidebar apps */}
         {visibleSidebarApps.length > 0 && (
           <div
@@ -642,6 +711,8 @@ export function NavigationRail({
           </a>
         )}
 
+        <NotificationBell placement="side" className="w-10 h-10 rounded-md" />
+
         <Link
           href="/settings"
           onClick={handleNavClick('settings')}
diff --git a/components/layout/sidebar.tsx b/components/layout/sidebar.tsx
index a5cfd249c..e5969acfb 100644
--- a/components/layout/sidebar.tsx
+++ b/components/layout/sidebar.tsx
@@ -4,6 +4,7 @@ import { useState, useEffect, useMemo, Fragment, ReactNode } from "react";
 import { useTranslations } from "next-intl";
 import { useRouter } from "@/i18n/navigation";
 import { PluginSlot } from "@/components/plugins/plugin-slot";
+import { PluginSidebarSections } from "@/components/plugins/plugin-sidebar-sections";
 import { Button } from "@/components/ui/button";
 import {
   Inbox,
@@ -1709,6 +1710,7 @@ export function Sidebar({
           </div>
         )}
 
+        {!isCollapsed && <PluginSidebarSections mailboxId={selectedKeyword ? null : selectedMailbox || null} />}
         {!isCollapsed && <PluginSlot name="sidebar-widget" className="border-t border-border" />}
       </div>
 
diff --git a/components/mail/__tests__/after-send-hook.test.tsx b/components/mail/__tests__/after-send-hook.test.tsx
new file mode 100644
index 000000000..d91336608
--- /dev/null
+++ b/components/mail/__tests__/after-send-hook.test.tsx
@@ -0,0 +1,196 @@
+import React, { Suspense, lazy } from 'react';
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { Mailbox } from '@/lib/jmap/types';
+import { useAuthStore } from '@/stores/auth-store';
+import { useEmailStore } from '@/stores/email-store';
+import { useSettingsStore } from '@/stores/settings-store';
+import { usePluginStore } from '@/stores/plugin-store';
+import { useThemeStore } from '@/stores/theme-store';
+import { useToastStore } from '@/stores/toast-store';
+import { DEFAULT_SEARCH_FILTERS } from '@/lib/jmap/search-utils';
+import { emailHooks, clearAllHooks } from '@/lib/plugin-hooks';
+import { resetAnnouncedSends } from '@/lib/plugin-after-send';
+
+// onAfterEmailSend: once the server accepted the message, never for a failed
+// send or one taken back with Undo.
+
+vi.mock('next/dynamic', () => ({ default: (load: () => Promise<React.ComponentType<Record<string, unknown>>>) => {
+  const Component = lazy(async () => ({ default: await load() }));
+  return function Dynamic(props: Record<string, unknown>) {
+    return <Suspense fallback={null}><Component {...props} /></Suspense>;
+  };
+} }));
+const sendData = vi.hoisted(() => ({ delayedUntil: undefined as string | undefined, error: null as unknown }));
+vi.mock('@/components/email/email-composer', () => ({
+  EmailComposer: ({ onSend }: { onSend?: (data: unknown) => Promise<void> }) => (
+    <button onClick={() => {
+      onSend?.({ to: ['bob@example.com'], cc: ['carol@example.com'], bcc: [], subject: 'Hi', body: 'Hello', delayedUntil: sendData.delayedUntil })
+        .catch((e) => { sendData.error = e; });
+    }}>
+      stub send
+    </button>
+  ),
+}));
+vi.mock('@/components/layout/sidebar', () => ({ Sidebar: () => null }));
+vi.mock('@/components/layout/navigation-rail', () => ({ NavigationRail: () => null }));
+vi.mock('@/components/layout/calendar-event-notification-toaster', () => ({ CalendarEventNotificationToaster: () => null }));
+vi.mock('@/components/layout/share-notification-toaster', () => ({ ShareNotificationToaster: () => null }));
+vi.mock('@/components/layout/mobile-header', () => ({ MobileHeader: () => null }));
+vi.mock('@/components/email/message-list-tabs', () => ({ MessageListTabs: () => null }));
+vi.mock('@/components/search/search-box', () => ({ SearchBox: () => null }));
+vi.mock('@/components/tour/tour-provider', () => ({ useTour: () => ({ activeTour: null, registerStep: vi.fn() }) }));
+vi.mock('@/components/plugins/plugin-slot', () => ({ PluginSlot: () => null }));
+vi.mock('@/hooks/use-plugin-slot-offers', () => ({ usePluginSlotOffers: () => [] }));
+vi.mock('@/hooks/use-config', () => ({ useConfig: () => ({ appName: 'Mail' }) }));
+vi.mock('@/hooks/use-identity-sync', () => ({ useIdentitySync: () => {} }));
+vi.mock('@/hooks/use-pro-multi-account-identities', () => ({ useProMultiAccountIdentities: () => [] }));
+vi.mock('@/hooks/use-pro-multi-account-mailboxes', () => ({ useProMultiAccountMailboxes: () => {} }));
+vi.mock('@/hooks/use-wopi-status', () => ({ useWopiStatus: () => null, canWopiOpen: () => false }));
+vi.mock('@/hooks/use-browser-navigation', () => ({ useBrowserNavigation: () => {} }));
+vi.mock('@/hooks/use-media-query', () => ({
+  useDeviceDetection: () => ({ isMobile: false, isTablet: false, isDesktop: true }),
+  useMediaQuery: () => false,
+  useIsDesktop: () => true,
+}));
+vi.mock('@/lib/push-bindings', () => ({ reconcilePushBindings: () => {}, releasePushBindings: () => {} }));
+vi.mock('@/components/email/email-list', () => ({ EmailList: () => <div>message list</div> }));
+
+const { MailApp } = await import('../mail-app');
+
+const inbox = { id: 'inbox', name: 'Inbox', role: 'inbox' } as Mailbox;
+const cancelUndoSend = vi.fn();
+const sendEmail = vi.fn();
+const refreshScheduledMetadata = vi.fn();
+
+beforeEach(() => {
+  vi.stubGlobal('fetch', vi.fn().mockRejectedValue(new Error('Unexpected network request')));
+  vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} });
+  usePluginStore.setState({ initializePlugins: vi.fn().mockResolvedValue(undefined) });
+  useThemeStore.setState({ syncServerThemes: vi.fn().mockResolvedValue(undefined) });
+  useToastStore.setState({ toasts: [] });
+  const client = {
+    getAccountId: () => 'acc', getUsername: () => 'me@example.com',
+    getSieveAccountId: () => null, hasDelayedSend: () => true, getSession: () => null,
+  };
+  useAuthStore.setState({
+    isAuthenticated: true, isLoading: false, client: client as never, activeAccountId: 'login', identities: [],
+    getClientForAccount: () => client as never,
+    getAllConnectedClients: () => new Map([['login', client]]) as never,
+  });
+  useSettingsStore.setState({ enableUnifiedMailbox: false, mailLayout: 'split', sendDelaySeconds: 30 } as never);
+  cancelUndoSend.mockReset();
+  sendEmail.mockReset();
+  clearAllHooks();
+  resetAnnouncedSends();
+  sendData.delayedUntil = undefined;
+  sendData.error = null;
+  refreshScheduledMetadata.mockReset().mockResolvedValue(undefined);
+  useEmailStore.setState({
+    emails: [], selectedEmail: null, selectedMailbox: inbox.id, mailboxes: [inbox],
+    viewingAccountId: null, accountMailboxes: {}, isUnifiedView: false, unifiedRole: null,
+    isScheduledView: false, isLoadingEmail: false, isLoading: false, searchQuery: '',
+    searchFilters: { ...DEFAULT_SEARCH_FILTERS }, searchMailboxId: '', selectedKeyword: null,
+    selectedEmailKeys: new Set(),
+    fetchMailboxes: vi.fn().mockResolvedValue(undefined), fetchEmails: vi.fn().mockResolvedValue(undefined),
+    fetchQuota: vi.fn().mockResolvedValue(undefined), fetchTagCounts: vi.fn().mockResolvedValue(undefined),
+    refreshScheduledMetadata,
+    cancelUndoSend,
+    sendEmail,
+    clearPendingUndoSend: () => useEmailStore.setState({ pendingUndoSend: null }),
+    pendingUndoSend: null,
+  } as never);
+});
+afterEach(() => {
+  vi.restoreAllMocks();
+  vi.unstubAllGlobals();
+});
+
+
+async function sendFromComposer() {
+  render(<MailApp />);
+  fireEvent.click(screen.getByRole('button', { name: 'sidebar.compose' }));
+  fireEvent.click(await screen.findByText('stub send', {}, { timeout: 5000 }));
+  await waitFor(() => expect(sendEmail).toHaveBeenCalled());
+}
+
+const undoToast = () => useToastStore.getState().toasts.find((t) => t.action?.label === 'email_viewer.undo_send');
+
+describe('onAfterEmailSend', () => {
+  it('reports a send the server accepted', async () => {
+    useSettingsStore.setState({ sendDelaySeconds: 0 } as never);
+    const sent = vi.fn();
+    emailHooks.onAfterEmailSend.register('test', sent);
+    sendEmail.mockResolvedValue({ scheduled: false, emailId: 'e1', emailSubmissionId: 's1' });
+
+    await sendFromComposer();
+
+    await waitFor(() => expect(sent).toHaveBeenCalledTimes(1));
+    expect(sent).toHaveBeenCalledWith({
+      emailId: 'e1', submissionId: 's1', to: ['bob@example.com'], cc: ['carol@example.com'], bcc: [],
+      subject: 'Hi', scheduledFor: null,
+    });
+  });
+
+  it('says nothing when the send fails', async () => {
+    const sent = vi.fn();
+    emailHooks.onAfterEmailSend.register('test', sent);
+    sendEmail.mockRejectedValue(new Error('refused'));
+    vi.spyOn(console, 'error').mockImplementation(() => {});
+
+    await sendFromComposer();
+    await waitFor(() => expect(sendData.error).not.toBeNull());
+
+    expect(sent).not.toHaveBeenCalled();
+  });
+
+  it('reports a scheduled send at once, with its time', async () => {
+    const sent = vi.fn();
+    emailHooks.onAfterEmailSend.register('test', sent);
+    sendData.delayedUntil = '2030-01-01T08:00:00.000Z';
+    sendEmail.mockResolvedValue({ scheduled: true, emailId: 'e2', emailSubmissionId: 's2', sendAt: '2030-01-01T08:00:00Z' });
+
+    await sendFromComposer();
+
+    await waitFor(() => expect(sent).toHaveBeenCalledTimes(1));
+    expect(sent).toHaveBeenCalledWith(expect.objectContaining({ emailId: 'e2', scheduledFor: '2030-01-01T08:00:00Z' }));
+  });
+
+  it('waits out the undo window, and says nothing when the send is undone', async () => {
+    const sent = vi.fn();
+    emailHooks.onAfterEmailSend.register('test', sent);
+    let sendAt = '';
+    sendEmail.mockImplementation(async () => {
+      sendAt = new Date(Date.now() + 1500).toISOString();
+      useEmailStore.setState({
+        pendingUndoSend: { submissionId: 's3', emailId: 'e3', identityId: 'id-1', sendAt, isSmime: false },
+      } as never);
+      return { scheduled: true, emailId: 'e3', emailSubmissionId: 's3', sendAt };
+    });
+    cancelUndoSend.mockResolvedValue(null);
+
+    await sendFromComposer();
+    expect(sent).not.toHaveBeenCalled();
+
+    await waitFor(() => expect(undoToast()).toBeDefined());
+    act(() => { undoToast()!.action!.onClick(); });
+    await waitFor(() => expect(cancelUndoSend).toHaveBeenCalled());
+
+    await act(() => new Promise((r) => setTimeout(r, 1800)));
+    expect(sent).not.toHaveBeenCalled();
+  }, 15_000);
+
+  it('reports a held send once the undo window is over', async () => {
+    const sent = vi.fn();
+    emailHooks.onAfterEmailSend.register('test', sent);
+    sendEmail.mockImplementation(async () => (
+      { scheduled: true, emailId: 'e4', emailSubmissionId: 's4', sendAt: new Date(Date.now() + 1000).toISOString() }
+    ));
+
+    await sendFromComposer();
+    expect(sent).not.toHaveBeenCalled();
+
+    await waitFor(() => expect(sent).toHaveBeenCalledTimes(1), { timeout: 3000 });
+    expect(sent).toHaveBeenCalledWith(expect.objectContaining({ emailId: 'e4', submissionId: 's4', scheduledFor: null }));
+  }, 15_000);
+});
diff --git a/components/mail/__tests__/compose-plugin-hooks.test.tsx b/components/mail/__tests__/compose-plugin-hooks.test.tsx
new file mode 100644
index 000000000..e384396ca
--- /dev/null
+++ b/components/mail/__tests__/compose-plugin-hooks.test.tsx
@@ -0,0 +1,166 @@
+import React, { Suspense, lazy } from 'react';
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { Mailbox } from '@/lib/jmap/types';
+import { useAuthStore } from '@/stores/auth-store';
+import { useEmailStore } from '@/stores/email-store';
+import { useSettingsStore } from '@/stores/settings-store';
+import { usePluginStore } from '@/stores/plugin-store';
+import { useThemeStore } from '@/stores/theme-store';
+import { DEFAULT_SEARCH_FILTERS } from '@/lib/jmap/search-utils';
+import { emailHooks, clearAllHooks } from '@/lib/plugin-hooks';
+import { requestInternalMailto } from '@/lib/protocol-handlers/mailto';
+
+// onBeforeCompose and onMailtoIntercept in the mail page: a plugin can stop
+// the composer from opening or prefill it, and stop a mailto: link.
+
+vi.mock('next/dynamic', () => ({ default: (load: () => Promise<React.ComponentType<Record<string, unknown>>>) => {
+  const Component = lazy(async () => ({ default: await load() }));
+  return function Dynamic(props: Record<string, unknown>) {
+    return <Suspense fallback={null}><Component {...props} /></Suspense>;
+  };
+} }));
+const composerProps = vi.hoisted(() => ({ last: null as Record<string, unknown> | null }));
+vi.mock('@/components/email/email-composer', () => ({
+  EmailComposer: (props: Record<string, unknown>) => {
+    composerProps.last = props;
+    return <div>stub composer</div>;
+  },
+}));
+vi.mock('@/components/layout/sidebar', () => ({ Sidebar: () => null }));
+vi.mock('@/components/layout/navigation-rail', () => ({ NavigationRail: () => null }));
+vi.mock('@/components/layout/calendar-event-notification-toaster', () => ({ CalendarEventNotificationToaster: () => null }));
+vi.mock('@/components/layout/share-notification-toaster', () => ({ ShareNotificationToaster: () => null }));
+vi.mock('@/components/layout/mobile-header', () => ({ MobileHeader: () => null }));
+vi.mock('@/components/email/message-list-tabs', () => ({ MessageListTabs: () => null }));
+vi.mock('@/components/search/search-box', () => ({ SearchBox: () => null }));
+vi.mock('@/components/tour/tour-provider', () => ({ useTour: () => ({ activeTour: null, registerStep: vi.fn() }) }));
+vi.mock('@/components/plugins/plugin-slot', () => ({ PluginSlot: () => null }));
+vi.mock('@/hooks/use-plugin-slot-offers', () => ({ usePluginSlotOffers: () => [] }));
+vi.mock('@/hooks/use-config', () => ({ useConfig: () => ({ appName: 'Mail' }) }));
+vi.mock('@/hooks/use-identity-sync', () => ({ useIdentitySync: () => {} }));
+vi.mock('@/hooks/use-pro-multi-account-identities', () => ({ useProMultiAccountIdentities: () => [] }));
+vi.mock('@/hooks/use-pro-multi-account-mailboxes', () => ({ useProMultiAccountMailboxes: () => {} }));
+vi.mock('@/hooks/use-wopi-status', () => ({ useWopiStatus: () => null, canWopiOpen: () => false }));
+vi.mock('@/hooks/use-browser-navigation', () => ({ useBrowserNavigation: () => {} }));
+vi.mock('@/hooks/use-media-query', () => ({
+  useDeviceDetection: () => ({ isMobile: true, isTablet: false, isDesktop: false }),
+  useMediaQuery: () => false,
+  useIsDesktop: () => false,
+}));
+vi.mock('@/lib/push-bindings', () => ({ reconcilePushBindings: () => {}, releasePushBindings: () => {} }));
+vi.mock('@/components/email/email-list', () => ({ EmailList: () => <div>message list</div> }));
+
+const { MailApp } = await import('../mail-app');
+
+const inbox = { id: 'inbox', name: 'Inbox', role: 'inbox' } as Mailbox;
+const sendEmail = vi.fn();
+
+beforeEach(() => {
+  vi.stubGlobal('fetch', vi.fn().mockRejectedValue(new Error('Unexpected network request')));
+  vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} });
+  usePluginStore.setState({ initializePlugins: vi.fn().mockResolvedValue(undefined) });
+  useThemeStore.setState({ syncServerThemes: vi.fn().mockResolvedValue(undefined) });
+  const client = {
+    getAccountId: () => 'acc', getUsername: () => 'me@example.com',
+    getSieveAccountId: () => null, hasDelayedSend: () => false, getSession: () => null,
+  };
+  useAuthStore.setState({
+    isAuthenticated: true, isLoading: false, client: client as never, activeAccountId: 'login', identities: [],
+    getClientForAccount: () => client as never,
+    getAllConnectedClients: () => new Map([['login', client]]) as never,
+  });
+  useSettingsStore.setState({ enableUnifiedMailbox: false, mailLayout: 'split', sendDelaySeconds: 0 } as never);
+  sendEmail.mockReset().mockResolvedValue({});
+  useEmailStore.setState({
+    emails: [], selectedEmail: null, selectedMailbox: inbox.id, mailboxes: [inbox],
+    viewingAccountId: null, accountMailboxes: {}, isUnifiedView: false, unifiedRole: null,
+    isScheduledView: false, isLoadingEmail: false, isLoading: false, searchQuery: '',
+    searchFilters: { ...DEFAULT_SEARCH_FILTERS }, searchMailboxId: '', selectedKeyword: null,
+    selectedEmailKeys: new Set(),
+    fetchMailboxes: vi.fn().mockResolvedValue(undefined), fetchEmails: vi.fn().mockResolvedValue(undefined),
+    fetchQuota: vi.fn().mockResolvedValue(undefined), fetchTagCounts: vi.fn().mockResolvedValue(undefined),
+    refreshScheduledMetadata: vi.fn().mockResolvedValue(undefined),
+    sendEmail,
+  } as never);
+});
+afterEach(() => {
+  vi.restoreAllMocks();
+  vi.unstubAllGlobals();
+});
+
+
+const openCompose = () => fireEvent.click(screen.getByRole('button', { name: 'sidebar.compose' }));
+
+describe('onBeforeCompose', () => {
+  beforeEach(() => {
+    clearAllHooks();
+    composerProps.last = null;
+  });
+
+  it('opens the composer as before when no plugin listens', async () => {
+    render(<MailApp />);
+    openCompose();
+    await screen.findByText('stub composer', {}, { timeout: 5000 });
+    expect(composerProps.last?.prefill).toBeNull();
+  });
+
+  it('keeps the composer closed when a plugin returns false', async () => {
+    const handler = vi.fn(() => false);
+    emailHooks.onBeforeCompose.register('test', handler);
+    render(<MailApp />);
+    openCompose();
+    await waitFor(() => expect(handler).toHaveBeenCalledTimes(1));
+    await act(() => new Promise((r) => setTimeout(r, 50)));
+    expect(screen.queryByText('stub composer')).not.toBeInTheDocument();
+    expect(handler).toHaveBeenCalledWith({ mode: 'new', to: [], cc: [], subject: '', body: '' });
+  });
+
+  it('hands the fields a plugin returns to the composer', async () => {
+    emailHooks.onBeforeCompose.register('test', (opts: Record<string, unknown>) => ({
+      ...opts, to: ['carol@example.com'], subject: 'Weekly report',
+    }));
+    render(<MailApp />);
+    openCompose();
+    await screen.findByText('stub composer', {}, { timeout: 5000 });
+    expect(composerProps.last?.prefill).toEqual({ to: ['carol@example.com'], subject: 'Weekly report' });
+  });
+});
+
+describe('onMailtoIntercept', () => {
+  beforeEach(() => {
+    clearAllHooks();
+    composerProps.last = null;
+  });
+
+  it('asks plugins with the link and opens the composer when they agree', async () => {
+    const intercept = vi.fn(() => true);
+    const before = vi.fn(() => undefined);
+    emailHooks.onMailtoIntercept.register('test', intercept);
+    emailHooks.onBeforeCompose.register('test', before);
+    render(<MailApp />);
+
+    let taken = false;
+    act(() => { taken = requestInternalMailto('mailto:bob@example.com?subject=Hi'); });
+    expect(taken).toBe(true);
+
+    await screen.findByText('stub composer', {}, { timeout: 5000 });
+    expect(intercept).toHaveBeenCalledWith({ href: 'mailto:bob@example.com?subject=Hi', to: ['bob@example.com'], subject: 'Hi' });
+    expect(before).toHaveBeenCalledWith(expect.objectContaining({ mode: 'new', to: ['bob@example.com'], subject: 'Hi' }));
+    expect(composerProps.last?.initialData).toEqual(expect.objectContaining({ to: 'bob@example.com', subject: 'Hi' }));
+  });
+
+  it('keeps the composer closed when a plugin returns false', async () => {
+    const intercept = vi.fn(() => false);
+    emailHooks.onMailtoIntercept.register('test', intercept);
+    render(<MailApp />);
+
+    let taken = false;
+    act(() => { taken = requestInternalMailto('mailto:bob@example.com'); });
+    // Still taken: the click must not fall through to the OS handler.
+    expect(taken).toBe(true);
+    await waitFor(() => expect(intercept).toHaveBeenCalledTimes(1));
+    await act(() => new Promise((r) => setTimeout(r, 50)));
+    expect(screen.queryByText('stub composer')).not.toBeInTheDocument();
+  });
+});
diff --git a/components/mail/__tests__/mail-app-top-bar-actions.test.tsx b/components/mail/__tests__/mail-app-top-bar-actions.test.tsx
new file mode 100644
index 000000000..1cebde9a0
--- /dev/null
+++ b/components/mail/__tests__/mail-app-top-bar-actions.test.tsx
@@ -0,0 +1,122 @@
+import React from 'react';
+import { act, render, screen } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { Mailbox } from '@/lib/jmap/types';
+import { useAuthStore } from '@/stores/auth-store';
+import { useEmailStore } from '@/stores/email-store';
+import { useSettingsStore } from '@/stores/settings-store';
+import { usePluginStore } from '@/stores/plugin-store';
+import { useThemeStore } from '@/stores/theme-store';
+import { DEFAULT_SEARCH_FILTERS } from '@/lib/jmap/search-utils';
+import { resetActions, setPluginActions } from '@/lib/plugin-sandbox/actions';
+
+// The standard layout has no global top bar: its search row sits on top of
+// the message list. Plugin top-bar buttons go there, after refresh.
+
+const device = vi.hoisted(() => ({ isMobile: false }));
+
+vi.mock('@/components/layout/sidebar', () => ({ Sidebar: () => null }));
+vi.mock('@/components/layout/navigation-rail', () => ({ NavigationRail: () => null }));
+vi.mock('@/components/layout/calendar-event-notification-toaster', () => ({ CalendarEventNotificationToaster: () => null }));
+vi.mock('@/components/layout/share-notification-toaster', () => ({ ShareNotificationToaster: () => null }));
+vi.mock('@/components/layout/mobile-header', () => ({ MobileHeader: () => null }));
+vi.mock('@/components/email/message-list-tabs', () => ({ MessageListTabs: () => null }));
+vi.mock('@/components/search/search-box', () => ({ SearchBox: () => <input data-testid="search" /> }));
+vi.mock('@/components/tour/tour-provider', () => ({ useTour: () => ({ activeTour: null, registerStep: vi.fn() }) }));
+vi.mock('@/components/plugins/plugin-slot', () => ({ PluginSlot: () => null }));
+vi.mock('@/hooks/use-plugin-slot-offers', () => ({ usePluginSlotOffers: () => [] }));
+vi.mock('@/hooks/use-config', () => ({ useConfig: () => ({ appName: 'Mail' }) }));
+vi.mock('@/hooks/use-identity-sync', () => ({ useIdentitySync: () => {} }));
+vi.mock('@/hooks/use-pro-multi-account-identities', () => ({ useProMultiAccountIdentities: () => [] }));
+vi.mock('@/hooks/use-pro-multi-account-mailboxes', () => ({ useProMultiAccountMailboxes: () => {} }));
+vi.mock('@/hooks/use-wopi-status', () => ({ useWopiStatus: () => null, canWopiOpen: () => false }));
+vi.mock('@/hooks/use-browser-navigation', () => ({ useBrowserNavigation: () => {} }));
+vi.mock('@/hooks/use-media-query', () => ({
+  useDeviceDetection: () => ({ isMobile: device.isMobile, isTablet: false, isDesktop: !device.isMobile }),
+  useMediaQuery: () => false,
+  useIsDesktop: () => !device.isMobile,
+  useIsMobile: () => device.isMobile,
+}));
+vi.mock('@/lib/push-bindings', () => ({ reconcilePushBindings: () => {}, releasePushBindings: () => {} }));
+vi.mock('@/components/email/email-list', () => ({ EmailList: () => <div>message list</div> }));
+
+const { MailApp } = await import('../mail-app');
+
+const inbox = { id: 'inbox', name: 'Inbox', role: 'inbox' } as Mailbox;
+
+beforeEach(() => {
+  resetActions();
+  vi.stubGlobal('fetch', vi.fn().mockRejectedValue(new Error('Unexpected network request')));
+  vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} });
+  usePluginStore.setState({ initializePlugins: vi.fn().mockResolvedValue(undefined) });
+  useThemeStore.setState({ syncServerThemes: vi.fn().mockResolvedValue(undefined) });
+  const client = {
+    getAccountId: () => 'acc', getUsername: () => 'me@example.com',
+    getSieveAccountId: () => null, hasDelayedSend: () => false, getSession: () => null,
+  };
+  useAuthStore.setState({
+    isAuthenticated: true, isLoading: false, client: client as never, activeAccountId: 'login', identities: [],
+    getClientForAccount: () => client as never,
+    getAllConnectedClients: () => new Map([['login', client]]) as never,
+  });
+  useSettingsStore.setState({ enableUnifiedMailbox: false, mailLayout: 'split', interfaceLayout: 'default' } as never);
+  useEmailStore.setState({
+    emails: [], selectedEmail: null, selectedMailbox: inbox.id, mailboxes: [inbox],
+    viewingAccountId: null, accountMailboxes: {}, isUnifiedView: false, unifiedRole: null,
+    isScheduledView: false, isLoadingEmail: false, isLoading: false, searchQuery: '',
+    searchFilters: { ...DEFAULT_SEARCH_FILTERS }, searchMailboxId: '', selectedKeyword: null,
+    selectedEmailKeys: new Set(),
+    fetchMailboxes: vi.fn().mockResolvedValue(undefined), fetchEmails: vi.fn().mockResolvedValue(undefined),
+    fetchQuota: vi.fn().mockResolvedValue(undefined), fetchTagCounts: vi.fn().mockResolvedValue(undefined),
+    refreshScheduledMetadata: vi.fn().mockResolvedValue(undefined),
+  } as never);
+});
+afterEach(() => {
+  device.isMobile = false;
+  vi.restoreAllMocks();
+  vi.unstubAllGlobals();
+});
+
+describe('top-bar-actions in the standard layout', () => {
+  it('draws nothing in the search row without plugins', () => {
+    const { container } = render(<MailApp />);
+    expect(screen.getByTestId('search')).toBeInTheDocument();
+    expect(container.querySelector('[data-plugin-actions="top-bar-actions"]')).toBeNull();
+  });
+
+  it('puts plugin buttons in the search row after refresh', () => {
+    act(() => setPluginActions('tr', 'Translator', 'top-bar-actions', [{ id: 'go', label: 'Translate' }]));
+    const { container } = render(<MailApp />);
+
+    const group = container.querySelector('[data-plugin-actions="top-bar-actions"]')!;
+    expect(group).not.toBeNull();
+    const refresh = screen.getByRole('button', { name: 'refresh' });
+    expect(group.parentElement).toBe(refresh.parentElement);
+    expect(refresh.compareDocumentPosition(group) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
+    expect(screen.getByRole('button', { name: 'Translate' })).toBeInTheDocument();
+  });
+
+  it('leaves them to the header menu on phones', () => {
+    device.isMobile = true;
+    act(() => setPluginActions('tr', 'Translator', 'top-bar-actions', [{ id: 'go', label: 'Translate' }]));
+    const { container } = render(<MailApp />);
+    expect(container.querySelector('[data-plugin-actions="top-bar-actions"]')).toBeNull();
+  });
+});
+
+describe('command palette commands on the mail page', () => {
+  it('takes compose from the palette and opens the composer', async () => {
+    const { requestAppCommand } = await import('@/lib/app-commands');
+    render(<MailApp />);
+    let taken = false;
+    act(() => { taken = requestAppCommand('compose'); });
+    expect(taken).toBe(true);
+  });
+
+  it('runs a search parked before the page was ready', async () => {
+    const { parkAppCommand, peekParkedAppCommand } = await import('@/lib/app-commands');
+    parkAppCommand('search');
+    render(<MailApp />);
+    expect(peekParkedAppCommand()).toBeNull();
+  });
+});
diff --git a/components/mail/__tests__/mailto-draft.test.ts b/components/mail/__tests__/mailto-draft.test.ts
new file mode 100644
index 000000000..33756ba47
--- /dev/null
+++ b/components/mail/__tests__/mailto-draft.test.ts
@@ -0,0 +1,27 @@
+import { describe, expect, it } from "vitest";
+import { mailtoComposerDraft } from "../mailto-draft";
+
+const base = { to: ["bob@example.com"], cc: [], bcc: ["x@example.com"], subject: "Hi", body: "Line 1\nLine 2" };
+
+describe("mailtoComposerDraft", () => {
+  it("keeps a mailto: request as before: plain body, format from the setting", () => {
+    const plain = mailtoComposerDraft(base, true);
+    expect(plain).toEqual(expect.objectContaining({
+      to: "bob@example.com", bcc: "x@example.com", showBcc: true, subject: "Hi", body: "Line 1\nLine 2", mode: "compose",
+    }));
+    expect(plain).not.toHaveProperty("plainTextMode");
+    expect(plain).not.toHaveProperty("attachments");
+    expect(mailtoComposerDraft(base, false).body).not.toBe(base.body);
+  });
+
+  it("opens a plugin's HTML body in HTML mode, even with plain text on", () => {
+    const draft = mailtoComposerDraft({ ...base, htmlBody: "<p>Hello <b>you</b></p>" }, true);
+    expect(draft.body).toBe("<p>Hello <b>you</b></p>");
+    expect(draft.plainTextMode).toBe(false);
+  });
+
+  it("carries a plugin's uploaded attachments", () => {
+    const attachments = [{ blobId: "b1", name: "a.pdf", type: "application/pdf", size: 10 }];
+    expect(mailtoComposerDraft({ ...base, attachments }, false).attachments).toEqual(attachments);
+  });
+});
diff --git a/components/mail/mail-app.tsx b/components/mail/mail-app.tsx
index 385bbbdaa..e7d7d8c51 100644
--- a/components/mail/mail-app.tsx
+++ b/components/mail/mail-app.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import { useEffect, useLayoutEffect, useState, useRef, useMemo, useCallback, useId } from "react";
-import { usePathname } from "next/navigation";
 import { useTranslations } from "next-intl";
 import { Sidebar } from "@/components/layout/sidebar";
 import { EmailList } from "@/components/email/email-list";
@@ -83,6 +82,8 @@ import { useSearchHistoryStore } from "@/stores/search-history-store";
 import { WelcomeBanner } from "@/components/ui/welcome-banner";
 import { NavigationRail } from "@/components/layout/navigation-rail";
 import { MvTopBar } from "@/components/layout/mv-top-bar";
+import { PluginActions } from "@/components/plugins/plugin-actions";
+import { useAppCommands } from "@/lib/app-commands";
 import { MvSearchForm } from "@/components/search/mv-search-form";
 import { MvSidePanel } from "@/components/layout/mv-side-panel";
 import { MvListToolbar } from "@/components/email/mv-list-toolbar";
@@ -115,9 +116,15 @@ import { AppTopBannerSlot } from "@/components/plugins/app-top-banner-slot";
 import { useThemeStore } from "@/stores/theme-store";
 import { consumePendingMailto, subscribeToPendingMailto } from "@/lib/protocol-handlers/session";
 import { INTERNAL_MAILTO_EVENT, type ParsedMailto } from "@/lib/protocol-handlers/mailto";
-import { plainTextToComposerBody, getQuoteBodies } from "@/lib/email-composer-utils";
-import { appLifecycleHooks, uiHooks, routerHooks, toastHooks, emailHooks } from "@/lib/plugin-hooks";
+import { PLUGIN_REPLY_EVENT, type PluginReplyRequest } from "@/lib/plugin-sandbox/host-api-compose";
+import { mailtoComposerDraft } from "./mailto-draft";
+import { getQuoteBodies } from "@/lib/email-composer-utils";
+import { emailHooks } from "@/lib/plugin-hooks";
 import { emailToReadView } from "@/lib/plugin-projection";
+import { emitThreadExpand } from "@/lib/plugin-thread-expand";
+import { announceSent, cancelAnnouncedSend, releaseAnnouncedSend } from "@/lib/plugin-after-send";
+import { composeOptionsFor, runBeforeCompose, type ComposePrefill, type ComposerOpenMode } from "@/lib/plugin-compose-gate";
+import { formatMailto } from "@/lib/protocol-handlers/mailto";
 import { buildQuoteHeader } from "@/lib/quote-header";
 import { buildComposeTabTitle, buildReplySubject } from "@/lib/subject-prefix";
 import { buildForwardAsAttachmentPayload } from "@/lib/forward-as-attachment";
@@ -175,6 +182,9 @@ function freshMailboxes(previous: Mailbox[], timeoutMs = 10_000): Promise<Mailbo
  */
 const MV_CONVERSATION_WAIT_MS = 800;
 
+/** Plugin buttons in the top bar are not about any one item. */
+const TOP_BAR_CONTEXT: Record<string, unknown> = {};
+
 export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
   // Static Lite build: the route params are empty, read the link from the URL.
   const linkSegments = useLiteLinkSegments('mail', routeSegments);
@@ -191,6 +201,10 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
   const [composerDraftText, setComposerDraftText] = useState("");
   const [pendingDraft, setPendingDraft] = useState<ComposerDraftData | null>(null);
   const [composerSessionId, setComposerSessionId] = useState(0);
+  // Fields a plugin filled in through onBeforeCompose for the composer about
+  // to open. Dropped once the composer hands its own state back, so a
+  // remount restores what the user wrote instead.
+  const [composerPrefill, setComposerPrefill] = useState<ComposePrefill | null>(null);
   // Plugin-resolved quote header for the next reply/forward composer open.
   // Cleared on close so a subsequent "compose new" doesn't reuse stale state.
   const [composerQuoteHeader, setComposerQuoteHeader] = useState<QuoteHeader | null>(null);
@@ -293,87 +307,8 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
     return () => clearInterval(timer);
   }, [isRateLimited, rateLimitUntil]);
 
-  // Plugin hooks: window-level lifecycle + selection + service-worker messages.
-  // One effect because the listeners share a registration / cleanup window.
-  useEffect(() => {
-    if (typeof window === 'undefined') return;
-    const onFocus = () => { appLifecycleHooks.onWindowFocus.emit(); };
-    const onBlur = () => { appLifecycleHooks.onWindowBlur.emit(); };
-    const onOnline = () => { appLifecycleHooks.onOnline.emit(); };
-    const onOffline = () => { appLifecycleHooks.onOffline.emit(); };
-
-    let selectionTimer: ReturnType<typeof setTimeout> | null = null;
-    const onSelectionChange = () => {
-      if (selectionTimer) clearTimeout(selectionTimer);
-      selectionTimer = setTimeout(() => {
-        const sel = document.getSelection();
-        const text = sel?.toString() ?? '';
-        if (!text) return;
-        const anchorNode = sel?.anchorNode as Node | null;
-        const anchorEl = (anchorNode?.nodeType === Node.ELEMENT_NODE
-          ? anchorNode as Element
-          : anchorNode?.parentElement) ?? null;
-        let source: 'email-body' | 'composer' | 'task-detail' | 'event-detail' | 'other' = 'other';
-        let emailId: string | undefined;
-        if (anchorEl) {
-          if (anchorEl.closest('[data-plugin-source="email-body"], iframe.email-body, .email-viewer-body')) {
-            source = 'email-body';
-            const idEl = anchorEl.closest('[data-email-id]') as HTMLElement | null;
-            emailId = idEl?.dataset.emailId;
-          } else if (anchorEl.closest('[data-plugin-source="composer"], .email-composer')) {
-            source = 'composer';
-          } else if (anchorEl.closest('[data-plugin-source="task-detail"]')) {
-            source = 'task-detail';
-          } else if (anchorEl.closest('[data-plugin-source="event-detail"]')) {
-            source = 'event-detail';
-          }
-        }
-        uiHooks.onTextSelectionChange.emit({ text, source, emailId });
-      }, 150);
-    };
-
-    const onSwMessage = (e: MessageEvent) => {
-      const msg = e.data as { kind?: string; tag?: string; data?: unknown } | null;
-      if (msg && msg.kind === 'notificationclick' && typeof msg.tag === 'string') {
-        toastHooks.onNotificationClick.emit({ tag: msg.tag, data: msg.data });
-      }
-    };
-
-    window.addEventListener('focus', onFocus);
-    window.addEventListener('blur', onBlur);
-    window.addEventListener('online', onOnline);
-    window.addEventListener('offline', onOffline);
-    document.addEventListener('selectionchange', onSelectionChange);
-    if (typeof navigator !== 'undefined' && navigator.serviceWorker) {
-      navigator.serviceWorker.addEventListener('message', onSwMessage);
-    }
-    return () => {
-      window.removeEventListener('focus', onFocus);
-      window.removeEventListener('blur', onBlur);
-      window.removeEventListener('online', onOnline);
-      window.removeEventListener('offline', onOffline);
-      document.removeEventListener('selectionchange', onSelectionChange);
-      if (selectionTimer) clearTimeout(selectionTimer);
-      if (typeof navigator !== 'undefined' && navigator.serviceWorker) {
-        navigator.serviceWorker.removeEventListener('message', onSwMessage);
-      }
-    };
-  }, []);
-
-  // Plugin hooks: route navigation. Tracks Next.js pathname transitions.
-  const pathname = usePathname();
-  const prevPathnameRef = useRef<string | null>(null);
-  useEffect(() => {
-    if (!pathname) return;
-    const from = prevPathnameRef.current;
-    if (from === pathname) return;
-    if (from !== null) {
-      routerHooks.onRouteLeave.emit({ path: from });
-      routerHooks.onNavigate.emit({ path: pathname, from });
-    }
-    routerHooks.onRouteEnter.emit({ path: pathname });
-    prevPathnameRef.current = pathname;
-  }, [pathname]);
+  // Window, selection and navigation events for plugins are fired app-wide
+  // by components/providers/plugin-app-events.tsx.
 
   // Mobile/tablet responsive hooks
   const { isMobile, isTablet } = useDeviceDetection();
@@ -897,10 +832,12 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
       }
     },
     onCompose: () => {
-      startFreshComposerSession();
-      setComposerMode('compose');
-      setShowComposer(true);
-      if (isMobile) setActiveView('viewer');
+      void withComposeGate('compose', {}, () => {
+        startFreshComposerSession();
+        setComposerMode('compose');
+        setShowComposer(true);
+        if (isMobile) setActiveView('viewer');
+      });
     },
     onFocusSearch: () => {
       if (isScheduledView) return;
@@ -971,10 +908,15 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
       const store = useEmailStore.getState();
       const wasExpanded = store.expandedThreadIds.has(threadKey);
       store.toggleThreadExpansion(threadKey);
+      const members = () => useEmailStore.getState().threadEmailsCache.get(threadKey)
+        ?? activeEmails.filter((e) => e.threadId && threadKeyFor(e) === threadKey);
       if (!wasExpanded) {
         void store.fetchThreadEmails(client, threadKey).then(() => {
+          emitThreadExpand(threadKey, members(), true);
           void useEmailStore.getState().markThreadAsRead(client, threadKey);
         });
+      } else {
+        emitThreadExpand(threadKey, members(), false);
       }
     },
   // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -994,6 +936,15 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
     handlers: keyboardHandlers,
   });
 
+  // Compose and search from the command palette (components/command-palette).
+  useAppCommands({
+    compose: keyboardHandlers.onCompose,
+    search: () => {
+      if (isMobile) setMobileSearchOpen(true);
+      else keyboardHandlers.onFocusSearch?.();
+    },
+  }, isAuthenticated && !!client);
+
   // Shared mail refresh: re-fetch mailboxes (unread counts) + the active list
   // via JMAP. Used by both the browser refresh gestures and the toolbar button.
   const [isManualRefreshing, setIsManualRefreshing] = useState(false);
@@ -1123,6 +1074,7 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
       replyTo,
       initialDraftText: composerDraftText,
       initialData: pendingDraft,
+      prefill: composerPrefill,
       sourceEmailId: selectedEmail?.id ?? null,
       title,
     });
@@ -1131,6 +1083,7 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
     setShowComposer(false);
     setComposerDraftText("");
     setPendingDraft(null);
+    setComposerPrefill(null);
     setComposerQuoteHeader(null);
     // We only react to the rising edge of `showComposer` here; the other
     // variables read above are captured-but-stale-safe because the next
@@ -1181,34 +1134,45 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
     }
   }, [initialCheckDone, isAuthenticated, authLoading]);
 
-  const applyMailtoDraft = useCallback((pending: ParsedMailto, suppressOutgoingStash: boolean) => {
-    const body = useSettingsStore.getState().plainTextMode
-      ? pending.body
-      : plainTextToComposerBody(pending.body);
+  // onBeforeCompose, in front of every way the composer opens. `open` runs
+  // once plugins agreed (straight away when none listens); a plugin's
+  // prefill goes to the composer through `composerPrefill`.
+  const withComposeGate = useCallback(async (
+    mode: ComposerOpenMode,
+    fields: Omit<NonNullable<Parameters<typeof composeOptionsFor>[1]>, 'ownEmails' | 'replyPrefix' | 'forwardPrefix'>,
+    open: () => void,
+  ): Promise<boolean> => {
+    if (emailHooks.onBeforeCompose.size === 0) {
+      setComposerPrefill(null);
+      open();
+      return true;
+    }
+    const prefill = await runBeforeCompose(composeOptionsFor(mode, {
+      ...fields,
+      ownEmails: identities.map((i) => i.email).filter((e): e is string => Boolean(e)),
+      replyPrefix: t('email_composer.prefix.reply'),
+      forwardPrefix: t('email_composer.prefix.forward'),
+    }));
+    if (!prefill) return false;
+    setComposerPrefill(Object.keys(prefill).length > 0 ? prefill : null);
+    open();
+    return true;
+  }, [identities, t]);
 
+  const applyMailtoDraft = useCallback((pending: ParsedMailto, suppressOutgoingStash: boolean) => {
     if (suppressOutgoingStash) {
       suppressComposerStateSaveSessionRef.current = composerSessionId;
     }
     setComposerSessionId((id) => id + 1);
-    setPendingDraft({
-      to: pending.to.join(", "),
-      cc: pending.cc.join(", "),
-      bcc: pending.bcc.join(", "),
-      subject: pending.subject,
-      body,
-      showCc: pending.cc.length > 0,
-      showBcc: pending.bcc.length > 0,
-      selectedIdentityId: null,
-      subAddressTag: "",
-      mode: "compose",
-      draftId: null,
-    });
+    setPendingDraft(mailtoComposerDraft(pending, useSettingsStore.getState().plainTextMode));
     setComposerMode("compose");
     setShowComposer(true);
     if (isMobile) setActiveView("viewer");
   }, [composerSessionId, isMobile, setActiveView]);
 
-  const openMailtoDraft = useCallback((pending: ParsedMailto) => {
+  const openMailtoDraft = useCallback((pending: ParsedMailto) => withComposeGate('compose', {
+    to: pending.to, cc: pending.cc, subject: pending.subject, body: pending.body,
+  }, () => {
     // A live composer owns text the user has not sent. Replacing it outright
     // used to drop that text on the floor - the stash suppression below is an
     // ordering fix, not a decision anyone made. Route the request through the
@@ -1223,7 +1187,7 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
       return;
     }
     applyMailtoDraft(pending, showComposer);
-  }, [applyMailtoDraft, showComposer]);
+  }), [applyMailtoDraft, showComposer, withComposeGate]);
 
   const openMailtoForAccount = useCallback(async (pending: ParsedMailto, accountId: string) => {
     setIsProtocolAccountSwitching(true);
@@ -1238,7 +1202,19 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
     }
   }, [openMailtoDraft, switchAccount]);
 
-  const handleMailtoProtocolRequest = useCallback((pending: ParsedMailto) => {
+  // onMailtoIntercept: a plugin may stop a mailto: from opening the composer.
+  const mailtoAllowed = useCallback(async (pending: ParsedMailto & { href?: string }): Promise<boolean> => {
+    if (emailHooks.onMailtoIntercept.size === 0) return true;
+    return emailHooks.onMailtoIntercept.intercept({
+      href: pending.href ?? formatMailto(pending),
+      to: [...pending.to],
+      ...(pending.subject ? { subject: pending.subject } : {}),
+      ...(pending.body ? { body: pending.body } : {}),
+    });
+  }, []);
+
+  const handleMailtoProtocolRequest = useCallback(async (pending: ParsedMailto) => {
+    if (!(await mailtoAllowed(pending))) return;
     const protocolAccounts = getMailtoProtocolAccounts();
     if (protocolAccounts.length > 1) {
       setPendingMailtoAccountChoice(pending);
@@ -1252,14 +1228,14 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
     }
 
     openMailtoDraft(pending);
-  }, [activeAccountId, getMailtoProtocolAccounts, openMailtoDraft, openMailtoForAccount]);
+  }, [activeAccountId, getMailtoProtocolAccounts, mailtoAllowed, openMailtoDraft, openMailtoForAccount]);
 
   useEffect(() => {
     if (!isAuthenticated || !client) return;
 
     const openPendingMailto = () => {
       const pending = consumePendingMailto();
-      if (pending) handleMailtoProtocolRequest(pending);
+      if (pending) void handleMailtoProtocolRequest(pending);
     };
 
     openPendingMailto();
@@ -1275,15 +1251,19 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
     if (!isAuthenticated || !client) return;
 
     const onInternalMailto = (event: Event) => {
-      const pending = (event as CustomEvent<ParsedMailto>).detail;
+      const pending = (event as CustomEvent<ParsedMailto & { href?: string }>).detail;
       if (!pending) return;
+      // Taken, whatever plugins say: the click must not fall through to the
+      // OS mail handler.
       event.preventDefault();
-      openMailtoDraft(pending);
+      void mailtoAllowed(pending).then((allowed) => {
+        if (allowed) void openMailtoDraft(pending);
+      });
     };
 
     window.addEventListener(INTERNAL_MAILTO_EVENT, onInternalMailto);
     return () => window.removeEventListener(INTERNAL_MAILTO_EVENT, onInternalMailto);
-  }, [isAuthenticated, client, openMailtoDraft]);
+  }, [isAuthenticated, client, mailtoAllowed, openMailtoDraft]);
 
   // Fallback fetch for paths that didn't go through login()'s prefetch
   // (notably checkAuth on page refresh). Settings pages can also prefill
@@ -1406,6 +1386,7 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
     const bindings = pushBindingsRef.current;
     if (!isAuthenticated || !client) {
       releasePushBindings(bindings);
+      setPushConnected(false);
       return;
     }
     reconcilePushBindings({
@@ -1439,6 +1420,8 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
     if (bindings.size > 0) {
       setPushConnected(true);
       debug.log('push', `[Push] Push notifications enabled for ${bindings.size} account(s)`);
+    } else {
+      setPushConnected(false);
     }
   }, [isAuthenticated, client, activeAccountId, connectedAccountsSignature, connectedAccountsRevision, setPushConnected]);
 
@@ -1912,6 +1895,7 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
 
       const result = await sendEmail(sendClient, data.to, data.subject, data.body, data.cc, data.bcc, data.identityId, data.fromEmail, data.draftId, data.fromName, data.htmlBody, data.attachments, data.inReplyTo, data.references, data.delayedUntil, data.envelopeMailFrom, { requestReadReceipt: data.requestReadReceipt, requestDsn: data.requestDsn, requireTls: data.requireTls, localAccountId: data.localAccountId });
       submitted = true;
+      announceSent(result, data);
       setShowComposer(false);
       // Sending an edited draft destroys it server-side - and every autosave
       // before that already replaced it under a fresh id (createDraft is a
@@ -2094,11 +2078,13 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
     } else {
       setComposerQuoteHeader(null);
     }
-    startFreshComposerSession();
-    setComposerDraftText(draftText || "");
-    setComposerMode('reply');
-    setShowComposer(true);
-    if (isMobile) setActiveView('viewer');
+    await withComposeGate('reply', { source: selectedEmail, body: draftText || '' }, () => {
+      startFreshComposerSession();
+      setComposerDraftText(draftText || "");
+      setComposerMode('reply');
+      setShowComposer(true);
+      if (isMobile) setActiveView('viewer');
+    });
   };
 
   const handleEditDraft = async (email?: Email) => {
@@ -2143,6 +2129,14 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
       : identities;
     const matchedIdentityId = findDraftIdentityId(composerIdentities, draft.from?.[0]);
 
+    const draftRecipients = (list: typeof draft.to) => (list ?? []).map(a => a.email).filter(Boolean);
+    if (!(await withComposeGate('compose', {
+      to: draftRecipients(draft.to),
+      cc: draftRecipients(draft.cc),
+      subject: draft.subject && draft.subject !== t('email_composer.no_subject') ? draft.subject : '',
+      body: bodyText,
+    }, () => {}))) return;
+
     // Increment session ID to force the composer to remount with fresh state,
     // even if it was already open (e.g. right-clicking a draft while composing).
     setComposerSessionId(id => id + 1);
@@ -2228,6 +2222,7 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
                     pending.submissionAccountId,
                   );
                   clearPendingUndoSend();
+                  releaseAnnouncedSend(pending.submissionId);
                   if (isScheduledView) await fetchScheduledEmails(client);
                 } catch (error) {
                   console.error('Failed to send now:', error);
@@ -2242,6 +2237,8 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
           void (async () => {
             try {
               const restored = await cancelUndoSend(undoClient, pending);
+              // Never left the server: plugins don't hear about it.
+              cancelAnnouncedSend(pending.submissionId);
               if (restored && !pending.isSmime) {
                 await handleEditDraft(restored);
               }
@@ -2272,7 +2269,7 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [cancelUndoSend, clearPendingUndoSend, client, fetchScheduledEmails, isScheduledView, pendingUndoSend?.submissionId, sendDelaySeconds, t]);
 
-  const handleReplyAll = async () => {
+  const handleReplyAll = async (draftText?: string) => {
     if (selectedEmail) {
       const formerSelected = { ...selectedEmail };
       const enrichedEmail = await emailHooks.onBeforeComposeOpenToReplyAll.transform(selectedEmail);
@@ -2290,12 +2287,31 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
     } else {
       setComposerQuoteHeader(null);
     }
-    startFreshComposerSession();
-    setComposerMode('replyAll');
-    setShowComposer(true);
-    if (isMobile) setActiveView('viewer');
+    const text = typeof draftText === 'string' ? draftText : '';
+    await withComposeGate('replyAll', { source: selectedEmail, ...(text ? { body: text } : {}) }, () => {
+      startFreshComposerSession();
+      setComposerDraftText(text);
+      setComposerMode('replyAll');
+      setShowComposer(true);
+      if (isMobile) setActiveView('viewer');
+    });
   };
 
+  // A plugin's "reply with this" (api.compose.reply), for the open message only.
+  const pluginReplyRef = useRef({ handleReply, handleReplyAll, openId: selectedEmail?.id ?? null });
+  pluginReplyRef.current = { handleReply, handleReplyAll, openId: selectedEmail?.id ?? null };
+  useEffect(() => {
+    const onPluginReply = (event: Event) => {
+      const req = (event as CustomEvent<PluginReplyRequest>).detail;
+      const { openId, handleReply: reply, handleReplyAll: replyAll } = pluginReplyRef.current;
+      if (!req || !openId || req.emailId !== openId) return;
+      event.preventDefault();
+      void (req.all ? replyAll(req.text) : reply(req.text));
+    };
+    window.addEventListener(PLUGIN_REPLY_EVENT, onPluginReply);
+    return () => window.removeEventListener(PLUGIN_REPLY_EVENT, onPluginReply);
+  }, []);
+
   const handleForward = async () => {
     if (selectedEmail) {
       const formerSelected = { ...selectedEmail };
@@ -2314,10 +2330,12 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
     } else {
       setComposerQuoteHeader(null);
     }
-    startFreshComposerSession();
-    setComposerMode('forward');
-    setShowComposer(true);
-    if (isMobile) setActiveView('viewer');
+    await withComposeGate('forward', { source: selectedEmail }, () => {
+      startFreshComposerSession();
+      setComposerMode('forward');
+      setShowComposer(true);
+      if (isMobile) setActiveView('viewer');
+    });
   };
 
   // Forward the original message as a message/rfc822 attachment instead of
@@ -2369,6 +2387,7 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
     });
     if (!ok) return;
 
+    if (!(await withComposeGate('forward', { subject: payload.subject }, () => {}))) return;
     startFreshComposerSession();
     setPendingDraft({
       to: "",
@@ -3667,8 +3686,14 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
       if (useEmailStore.getState().emails.some((e) => e.id === target.id)) {
         await markAsRead(client, target.id, true);
       } else {
+        // Not in the store's list, so the store action can't ask plugins.
+        if (emailHooks.onBeforeEmailReadStateChange.size > 0
+          && !(await emailHooks.onBeforeEmailReadStateChange.intercept({ emailIds: [target.id], read: true }))) {
+          return;
+        }
         const { threadClient, accountId } = mvConversationRoute(target, client);
         await threadClient.markAsRead(target.id, true, accountId);
+        void emailHooks.onEmailReadStateChange.emit({ emailIds: [target.id], read: true });
       }
       patchMvConversation(target.id, (e) => ({ ...e, keywords: { ...e.keywords, $seen: true } }));
     } catch (error) {
@@ -3881,30 +3906,36 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
     email = await emailHooks.onBeforeComposeOpenToReply.transform(email);
     selectEmail(email);
     await prepareComposerQuoteHeader(email, 'reply');
-    startFreshComposerSession();
-    setComposerMode('reply');
-    setShowComposer(true);
-    if (isMobile) setActiveView('viewer');
+    await withComposeGate('reply', { source: email }, () => {
+      startFreshComposerSession();
+      setComposerMode('reply');
+      setShowComposer(true);
+      if (isMobile) setActiveView('viewer');
+    });
   };
 
   const handleConversationReplyAll = async (email: Email) => {
     email = await emailHooks.onBeforeComposeOpenToReplyAll.transform(email);
     selectEmail(email);
     await prepareComposerQuoteHeader(email, 'replyAll');
-    startFreshComposerSession();
-    setComposerMode('replyAll');
-    setShowComposer(true);
-    if (isMobile) setActiveView('viewer');
+    await withComposeGate('replyAll', { source: email }, () => {
+      startFreshComposerSession();
+      setComposerMode('replyAll');
+      setShowComposer(true);
+      if (isMobile) setActiveView('viewer');
+    });
   };
 
   const handleConversationForward = async (email: Email) => {
     email = await emailHooks.onBeforeComposeOpenToForward.transform(email);
     selectEmail(email);
     await prepareComposerQuoteHeader(email, 'forward');
-    startFreshComposerSession();
-    setComposerMode('forward');
-    setShowComposer(true);
-    if (isMobile) setActiveView('viewer');
+    await withComposeGate('forward', { source: email }, () => {
+      startFreshComposerSession();
+      setComposerMode('forward');
+      setShowComposer(true);
+      if (isMobile) setActiveView('viewer');
+    });
   };
 
   const ToggleChip = ({ icon, label, value, onClick }: { icon: React.ReactNode; label: string; value: boolean | null; onClick: () => void }) => (
@@ -3999,7 +4030,11 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
         } : undefined)}
         initialDraftText={composerDraftText}
         initialData={pendingDraft}
+        prefill={composerPrefill}
+        sessionKey={`inline-${composerSessionId}`}
+        sourceEmailId={composerSourceEmail?.id}
         onSaveState={(data) => {
+          setComposerPrefill(null);
           if (suppressComposerStateSaveSessionRef.current === composerSessionId) {
             suppressComposerStateSaveSessionRef.current = null;
             return;
@@ -4009,6 +4044,7 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
         onSend={async (data) => {
           await handleEmailSend(data);
           setPendingDraft(null);
+          setComposerPrefill(null);
         }}
         onScheduledSendCreated={async () => {
           if (client) {
@@ -4024,6 +4060,7 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
           setComposerMode('compose');
           setComposerDraftText("");
           setPendingDraft(null);
+          setComposerPrefill(null);
           setComposerQuoteHeader(null);
           if (isMobile) {
             setActiveView('list');
@@ -4198,13 +4235,15 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
               onImportEmail={handleImportEmailFromContextMenu}
               onRefreshMailboxes={handleRefreshMailboxes}
               onCompose={() => {
-                startFreshComposerSession();
-                setComposerMode('compose');
-                setShowComposer(true);
-                if (isMobile) {
-                  setSidebarOpen(false);
-                  setActiveView('viewer');
-                }
+                void withComposeGate('compose', {}, () => {
+                  startFreshComposerSession();
+                  setComposerMode('compose');
+                  setShowComposer(true);
+                  if (isMobile) {
+                    setSidebarOpen(false);
+                    setActiveView('viewer');
+                  }
+                });
               }}
               onSidebarClose={() => setSidebarOpen(false)}
               mvShell={mvShell}
@@ -4402,6 +4441,11 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
                   >
                     <RotateCcw className={cn("w-4 h-4", isManualRefreshing && "animate-spin")} />
                   </button>
+                  {/* Plugin buttons (top-bar-actions). On phones they sit in
+                      the header's overflow menu instead (MobileHeader). */}
+                  {!isMobile && (
+                    <PluginActions surface="top-bar-actions" context={TOP_BAR_CONTEXT} compact className="flex-shrink-0 flex-nowrap" />
+                  )}
                 </div>
               </div>
               )}
@@ -4715,10 +4759,12 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
                 at the top of the navigation rail instead. */}
             {!mvShell && <Button
               onClick={() => {
-                startFreshComposerSession();
-                setComposerMode('compose');
-                setShowComposer(true);
-                if (isMobile) setActiveView('viewer');
+                void withComposeGate('compose', {}, () => {
+                  startFreshComposerSession();
+                  setComposerMode('compose');
+                  setShowComposer(true);
+                  if (isMobile) setActiveView('viewer');
+                });
               }}
               className={cn(
                 "absolute z-40 shadow-lg",
@@ -4829,6 +4875,7 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
                     await markAsRead(client, emailId, read);
                   }
                 }}
+                mailboxRole={mailboxes.find(m => m.id === selectedMailbox)?.role ?? (isUnifiedView ? (unifiedRole ?? undefined) : undefined)}
               />
             ) : (
               <>
@@ -4908,9 +4955,11 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
                       }
                     }}
                     onCompose={() => {
-                      startFreshComposerSession();
-                      setComposerMode('compose');
-                      setShowComposer(true);
+                      void withComposeGate('compose', {}, () => {
+                        startFreshComposerSession();
+                        setComposerMode('compose');
+                        setShowComposer(true);
+                      });
                     }}
                     currentUserEmail={client?.getUsername()}
                     currentUserName={client?.getUsername()?.split("@")[0]}
diff --git a/components/mail/mailto-draft.ts b/components/mail/mailto-draft.ts
new file mode 100644
index 000000000..2adeb5c52
--- /dev/null
+++ b/components/mail/mailto-draft.ts
@@ -0,0 +1,34 @@
+import type { ComposerDraftData } from "@/components/email/email-composer";
+import type { ParsedMailto } from "@/lib/protocol-handlers/mailto";
+import { plainTextToComposerBody } from "@/lib/email-composer-utils";
+
+/**
+ * The composer draft for an in-app mailto: request or a plugin's
+ * api.compose.open. A plain body follows the "plain text only" setting; an
+ * HTML body (only a plugin sends one, sanitised by the host) opens in HTML
+ * mode whatever that setting says. Attachments a plugin uploaded come along
+ * as blob references, like those of a re-opened draft.
+ */
+export function mailtoComposerDraft(pending: ParsedMailto, plainTextMode: boolean): ComposerDraftData {
+  const isHtml = typeof pending.htmlBody === "string";
+  const body = isHtml
+    ? pending.htmlBody!
+    : plainTextMode
+      ? pending.body
+      : plainTextToComposerBody(pending.body);
+  return {
+    to: pending.to.join(", "),
+    cc: pending.cc.join(", "),
+    bcc: pending.bcc.join(", "),
+    subject: pending.subject,
+    body,
+    showCc: pending.cc.length > 0,
+    showBcc: pending.bcc.length > 0,
+    selectedIdentityId: null,
+    subAddressTag: "",
+    mode: "compose",
+    draftId: null,
+    ...(isHtml ? { plainTextMode: false } : {}),
+    ...(pending.attachments?.length ? { attachments: pending.attachments } : {}),
+  };
+}
diff --git a/components/notifications/__tests__/notification-center.test.tsx b/components/notifications/__tests__/notification-center.test.tsx
new file mode 100644
index 000000000..8bbe2ba38
--- /dev/null
+++ b/components/notifications/__tests__/notification-center.test.tsx
@@ -0,0 +1,140 @@
+import React from 'react';
+import { act, fireEvent, render, screen, within } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+// The bell and its panel, where they sit (rail, Mountain View's bar, the
+// phone header's menu) and what a click on an entry does.
+
+vi.mock('next-intl', () => ({
+  useTranslations: () => (key: string, params?: Record<string, unknown>) =>
+    params ? `${key}(${Object.values(params).join(',')})` : key,
+  useFormatter: () => ({ relativeTime: () => 'just now' }),
+  useLocale: () => 'en',
+}));
+vi.mock('@/hooks/use-config', () => ({ useConfig: () => ({ appName: 'Bulwark' }) }));
+vi.mock('@/hooks/use-stalwart-admin', () => ({ useStalwartAdmin: () => false }));
+vi.mock('@/components/layout/account-switcher', () => ({ AccountSwitcher: () => null }));
+vi.mock('@/components/plugins/plugin-slot', () => ({ PluginSlot: () => null }));
+vi.mock('@/components/keyboard-shortcuts-modal', () => ({ KeyboardShortcutsModal: () => null }));
+vi.mock('@/components/search/search-box', () => ({ SearchBox: () => null }));
+
+const { NavigationRail } = await import('@/components/layout/navigation-rail');
+const { MvTopBar } = await import('@/components/layout/mv-top-bar');
+const { MobileHeader } = await import('@/components/layout/mobile-header');
+const { useNotificationCenterStore } = await import('@/stores/notification-center-store');
+const { useUpdateStore } = await import('@/stores/update-store');
+const { toastHooks } = await import('@/lib/plugin-hooks');
+
+const add = useNotificationCenterStore.getState().add;
+const clicked = vi.fn();
+
+beforeEach(() => {
+  useUpdateStore.setState({ startPolling: vi.fn() } as never);
+  act(() => useNotificationCenterStore.getState().clear());
+  clicked.mockClear();
+  toastHooks.onNotificationClick.register('rss', clicked);
+});
+afterEach(() => toastHooks.onNotificationClick.removePlugin('rss'));
+
+const bell = () => screen.getByRole('button', { name: /^title/ });
+
+describe('notification bell', () => {
+  it('sits in the navigation rail without a count when nothing is unread', () => {
+    render(<NavigationRail collapsed />);
+    expect(bell()).toHaveAccessibleName('title');
+    expect(bell()).toHaveTextContent('');
+  });
+
+  it('shows the unread count and lists entries with their source, newest first', () => {
+    act(() => {
+      add({ level: 'error', title: 'Could not send', body: 'Server said no' });
+      add({ level: 'info', title: '3 new posts', body: 'Hacker News', pluginId: 'rss', pluginName: 'RSS Reader', tag: 'feed:hn' });
+    });
+    render(<NavigationRail collapsed />);
+
+    expect(bell()).toHaveAccessibleName('title (unread_count(2))');
+    expect(bell()).toHaveTextContent('2');
+    fireEvent.click(bell());
+
+    const panel = screen.getByRole('dialog', { name: 'title' });
+    const items = within(panel).getAllByRole('listitem');
+    expect(items.map((li) => li.getAttribute('data-entry-source'))).toEqual(['rss', 'app']);
+    expect(items[0]).toHaveTextContent('3 new posts');
+    expect(items[0]).toHaveTextContent('RSS Reader');
+    expect(items[1]).toHaveTextContent('Could not send');
+    expect(items[1]).toHaveTextContent('Bulwark');
+    expect(items[1]).toHaveTextContent('level_error');
+  });
+
+  it('tells the plugin when its entry is clicked, with the tag, and marks it read', async () => {
+    act(() => add({ level: 'info', title: '3 new posts', body: '', pluginId: 'rss', pluginName: 'RSS Reader', tag: 'feed:hn' }));
+    render(<NavigationRail collapsed />);
+    fireEvent.click(bell());
+
+    await act(async () => { fireEvent.click(screen.getByRole('button', { name: /3 new posts/ })); });
+    expect(clicked).toHaveBeenCalledWith({ tag: 'feed:hn' });
+    expect(useNotificationCenterStore.getState().entries[0].read).toBe(true);
+    expect(screen.queryByRole('dialog')).toBeNull();
+  });
+
+  it("shows a plugin's link under its entry, opening in a new tab without the opener", () => {
+    act(() => {
+      add({ level: 'info', title: 'Filed', body: '', pluginId: 'rss', pluginName: 'Paperless-ngx', action: { label: 'Open in Paperless', url: 'https://paperless.example.com/documents/12/details' } });
+      add({ level: 'info', title: 'Odd', body: '', pluginId: 'rss', pluginName: 'X', action: { label: 'Run', url: 'javascript:alert(1)' } });
+    });
+    render(<NavigationRail collapsed />);
+    fireEvent.click(bell());
+
+    const panel = screen.getByRole('dialog', { name: 'title' });
+    const links = within(panel).getAllByRole('link');
+    expect(links).toHaveLength(1);
+    expect(links[0]).toHaveTextContent('Open in Paperless');
+    expect(links[0]).toHaveAttribute('href', 'https://paperless.example.com/documents/12/details');
+    expect(links[0]).toHaveAttribute('target', '_blank');
+    expect(links[0].getAttribute('rel')).toContain('noopener');
+    // Not inside the entry's button.
+    expect(links[0].closest('button')).toBeNull();
+  });
+
+  it('marks all read and clears', () => {
+    act(() => {
+      add({ level: 'warning', title: 'a', body: '' });
+      add({ level: 'error', title: 'b', body: '' });
+    });
+    render(<NavigationRail collapsed />);
+    fireEvent.click(bell());
+
+    act(() => { fireEvent.click(screen.getByRole('button', { name: 'mark_all_read' })); });
+    expect(bell()).toHaveAccessibleName('title');
+    expect(screen.getAllByRole('listitem')).toHaveLength(2);
+
+    act(() => { fireEvent.click(screen.getByRole('button', { name: 'clear' })); });
+    expect(screen.queryAllByRole('listitem')).toHaveLength(0);
+    expect(screen.getByText('empty')).toBeInTheDocument();
+  });
+
+  it('sits in Mountain View\'s top bar', () => {
+    act(() => add({ level: 'error', title: 'a', body: '' }));
+    render(<MvTopBar />);
+    expect(bell()).toHaveAccessibleName('title (unread_count(1))');
+  });
+
+  it('is an entry in the phone header menu that opens the list full screen', () => {
+    act(() => add({ level: 'error', title: 'Could not send', body: '' }));
+    render(<MobileHeader title="Inbox" />);
+
+    const more = screen.getByRole('button', { name: /^more/ });
+    expect(more).toHaveAccessibleName('more (unread_count(1))');
+    fireEvent.click(more);
+    // First entry: notifications (with the count), then the command palette.
+    const [notifications] = screen.getAllByRole('menuitem');
+    expect(notifications).toHaveTextContent('1');
+    fireEvent.click(notifications);
+
+    const sheet = screen.getByRole('dialog', { name: 'title' });
+    expect(sheet).toHaveAttribute('aria-modal', 'true');
+    expect(within(sheet).getByText('Could not send')).toBeInTheDocument();
+    fireEvent.click(within(sheet).getByRole('button', { name: 'close' }));
+    expect(screen.queryByRole('dialog')).toBeNull();
+  });
+});
diff --git a/components/notifications/notification-center.tsx b/components/notifications/notification-center.tsx
new file mode 100644
index 000000000..ee6a09964
--- /dev/null
+++ b/components/notifications/notification-center.tsx
@@ -0,0 +1,276 @@
+"use client";
+
+import { useCallback, useEffect, useLayoutEffect, useRef, useState } from "react";
+import { createPortal } from "react-dom";
+import { useFormatter, useTranslations } from "next-intl";
+import { AlertCircle, AlertTriangle, Bell, CheckCheck, ExternalLink, Puzzle, Trash2, X } from "@/components/icons";
+import { useConfig } from "@/hooks/use-config";
+import { useFocusTrap } from "@/hooks/use-focus-trap";
+import { isDocumentRTL } from "@/i18n/direction";
+import { toastHooks } from "@/lib/plugin-hooks";
+import { cn } from "@/lib/utils";
+import {
+  selectUnreadCount,
+  useNotificationCenterStore,
+  type CenterEntry,
+} from "@/stores/notification-center-store";
+
+/** "99+" past two digits, like the other badges. */
+export function formatBadgeCount(count: number): string {
+  return count > 99 ? "99+" : String(count);
+}
+
+export function useUnreadNotificationCount(): number {
+  return useNotificationCenterStore(selectUnreadCount);
+}
+
+function EntryIcon({ entry }: { entry: CenterEntry }) {
+  if (entry.level === "error") return <AlertCircle className="w-4 h-4 text-destructive" />;
+  if (entry.level === "warning") return <AlertTriangle className="w-4 h-4 text-warning" />;
+  if (entry.pluginId) return <Puzzle className="w-4 h-4 text-muted-foreground" />;
+  return <Bell className="w-4 h-4 text-muted-foreground" />;
+}
+
+/**
+ * The list behind the bell: recent notifications from plugins and the app's
+ * error and warning toasts, newest first. Clicking a plugin's entry tells
+ * that plugin (onNotificationClick), as a click on the system notification
+ * does.
+ */
+export function NotificationPanel({ onClose, className, sheet = false }: { onClose: () => void; className?: string; sheet?: boolean }) {
+  const t = useTranslations("notification_center");
+  const format = useFormatter();
+  const { appName } = useConfig();
+  const entries = useNotificationCenterStore((s) => s.entries);
+  const unread = useNotificationCenterStore(selectUnreadCount);
+  const markRead = useNotificationCenterStore((s) => s.markRead);
+  const markAllRead = useNotificationCenterStore((s) => s.markAllRead);
+  const clear = useNotificationCenterStore((s) => s.clear);
+  const [now] = useState(() => Date.now());
+
+  const openEntry = (entry: CenterEntry) => {
+    markRead(entry.id);
+    if (!entry.pluginId) return;
+    onClose();
+    void toastHooks.onNotificationClick.emitTo(entry.pluginId, { tag: entry.tag ?? "" });
+  };
+
+  return (
+    <div className={cn("flex flex-col bg-background text-foreground", className)} data-notification-panel="">
+      <div className="flex items-center gap-1 px-3 h-12 border-b border-border shrink-0">
+        <h2 className="flex-1 min-w-0 truncate text-sm font-semibold">{t("title")}</h2>
+        <button
+          type="button"
+          onClick={markAllRead}
+          disabled={unread === 0}
+          className="inline-flex items-center gap-1 h-8 px-2 rounded-md text-xs text-muted-foreground hover:bg-muted hover:text-foreground disabled:opacity-50 disabled:pointer-events-none transition-colors"
+        >
+          <CheckCheck className="w-4 h-4" />
+          <span>{t("mark_all_read")}</span>
+        </button>
+        <button
+          type="button"
+          onClick={clear}
+          disabled={entries.length === 0}
+          className="inline-flex items-center gap-1 h-8 px-2 rounded-md text-xs text-muted-foreground hover:bg-muted hover:text-foreground disabled:opacity-50 disabled:pointer-events-none transition-colors"
+        >
+          <Trash2 className="w-4 h-4" />
+          <span>{t("clear")}</span>
+        </button>
+        {sheet && (
+          <button
+            type="button"
+            onClick={onClose}
+            className="grid place-items-center h-10 w-10 rounded-md text-muted-foreground hover:bg-muted hover:text-foreground transition-colors"
+            aria-label={t("close")}
+          >
+            <X className="w-5 h-5" />
+          </button>
+        )}
+      </div>
+      {entries.length === 0 ? (
+        <p className="px-4 py-8 text-center text-sm text-muted-foreground">{t("empty")}</p>
+      ) : (
+        <ul className="flex-1 min-h-0 overflow-y-auto py-1" aria-label={t("title")}>
+          {entries.map((entry) => {
+            const source = entry.pluginName ?? appName;
+            const content = (
+              <>
+                <span className="mt-0.5 flex-shrink-0" aria-hidden="true"><EntryIcon entry={entry} /></span>
+                <span className="flex-1 min-w-0">
+                  <span className="flex items-baseline gap-2">
+                    <span className={cn("flex-1 min-w-0 truncate text-sm", !entry.read && "font-semibold")}>{entry.title}</span>
+                    <time dateTime={new Date(entry.time).toISOString()} className="flex-shrink-0 text-[11px] text-muted-foreground tabular-nums">
+                      {format.relativeTime(new Date(entry.time), now)}
+                    </time>
+                  </span>
+                  {entry.body && <span className="block text-xs text-muted-foreground line-clamp-2 break-words">{entry.body}</span>}
+                  <span className="block text-[11px] text-muted-foreground truncate">
+                    {entry.level !== "info" && <span className="sr-only">{t(entry.level === "error" ? "level_error" : "level_warning")}: </span>}
+                    {source}
+                  </span>
+                </span>
+                {!entry.read && (
+                  <span className="mt-1.5 w-2 h-2 rounded-full bg-primary flex-shrink-0" aria-label={t("unread")} />
+                )}
+              </>
+            );
+            return (
+              <li key={entry.id} data-entry-source={entry.pluginId ?? "app"}>
+                {entry.pluginId ? (
+                  <button
+                    type="button"
+                    onClick={() => openEntry(entry)}
+                    className="w-full flex items-start gap-2.5 px-3 py-2 text-start hover:bg-muted focus-visible:bg-muted focus-visible:outline-none transition-colors"
+                  >
+                    {content}
+                  </button>
+                ) : (
+                  <div className="flex items-start gap-2.5 px-3 py-2">
+                    {content}
+                  </div>
+                )}
+                {entry.action && (
+                  // Lined up with the text above (padding + icon + gap). A link of
+                  // its own, outside the entry's button: one control can't hold another.
+                  <a
+                    href={entry.action.url}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    onClick={() => markRead(entry.id)}
+                    className="-mt-1 mb-1 ms-[38px] inline-flex items-center gap-1 rounded text-xs font-medium text-primary hover:underline focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+                  >
+                    {entry.action.label}
+                    <ExternalLink className="w-3 h-3" aria-hidden="true" />
+                  </a>
+                )}
+              </li>
+            );
+          })}
+        </ul>
+      )}
+    </div>
+  );
+}
+
+/** The phone version: the panel over the whole screen. */
+export function NotificationSheet({ onClose }: { onClose: () => void }) {
+  const t = useTranslations("notification_center");
+  const ref = useFocusTrap({ isActive: true, onEscape: onClose, restoreFocus: true });
+  return createPortal(
+    <div
+      ref={ref}
+      role="dialog"
+      aria-modal="true"
+      aria-label={t("title")}
+      className="fixed inset-0 z-50 flex flex-col bg-background pt-[env(safe-area-inset-top)]"
+    >
+      <NotificationPanel onClose={onClose} sheet className="flex-1 min-h-0" />
+    </div>,
+    document.body,
+  );
+}
+
+/**
+ * The bell with the unread count. `side` opens the panel beside the button
+ * (navigation rail), `below` drops it under the button (Mountain View's top
+ * bar).
+ */
+export function NotificationBell({ placement, className }: { placement: "side" | "below"; className?: string }) {
+  const t = useTranslations("notification_center");
+  const unread = useUnreadNotificationCount();
+  const [open, setOpen] = useState(false);
+  const buttonRef = useRef<HTMLButtonElement>(null);
+  const panelRef = useRef<HTMLDivElement>(null);
+  const [style, setStyle] = useState<React.CSSProperties>({});
+  const close = useCallback(() => setOpen(false), []);
+
+  const position = useCallback(() => {
+    const rect = buttonRef.current?.getBoundingClientRect();
+    if (!rect) return;
+    if (placement === "side") {
+      const bottom = Math.max(8, window.innerHeight - rect.bottom);
+      setStyle(isDocumentRTL()
+        ? { position: "fixed", right: window.innerWidth - rect.left + 8, bottom }
+        : { position: "fixed", left: rect.right + 8, bottom });
+    } else {
+      const top = rect.bottom + 4;
+      setStyle(isDocumentRTL()
+        ? { position: "fixed", left: Math.max(8, rect.left), top }
+        : { position: "fixed", right: Math.max(8, window.innerWidth - rect.right), top });
+    }
+  }, [placement]);
+
+  useLayoutEffect(() => {
+    if (open) position();
+  }, [open, position]);
+
+  useEffect(() => {
+    if (!open) return;
+    const onPointerDown = (e: MouseEvent) => {
+      if (buttonRef.current?.contains(e.target as Node) || panelRef.current?.contains(e.target as Node)) return;
+      setOpen(false);
+    };
+    const onKeyDown = (e: KeyboardEvent) => {
+      if (e.key === "Escape") {
+        setOpen(false);
+        buttonRef.current?.focus();
+      }
+    };
+    document.addEventListener("mousedown", onPointerDown);
+    document.addEventListener("keydown", onKeyDown);
+    window.addEventListener("resize", position);
+    return () => {
+      document.removeEventListener("mousedown", onPointerDown);
+      document.removeEventListener("keydown", onKeyDown);
+      window.removeEventListener("resize", position);
+    };
+  }, [open, position]);
+
+  const label = unread > 0 ? `${t("title")} (${t("unread_count", { count: unread })})` : t("title");
+
+  return (
+    <>
+      <button
+        ref={buttonRef}
+        type="button"
+        onClick={() => setOpen((v) => !v)}
+        className={cn(
+          "relative grid place-items-center transition-colors",
+          open ? "bg-muted text-foreground" : "text-muted-foreground hover:bg-muted hover:text-foreground",
+          className,
+        )}
+        title={t("title")}
+        aria-label={label}
+        aria-haspopup="dialog"
+        aria-expanded={open}
+        data-notification-bell=""
+      >
+        <Bell className={placement === "side" ? "w-[18px] h-[18px]" : "w-5 h-5"} />
+        {unread > 0 && (
+          <span
+            className={cn(
+              "absolute flex items-center justify-center min-w-[16px] h-4 px-1 rounded-full bg-red-500 text-white text-[10px] font-bold",
+              placement === "side" ? "-top-0.5 -end-0.5" : "top-1.5 end-1.5",
+            )}
+            aria-hidden="true"
+          >
+            {formatBadgeCount(unread)}
+          </span>
+        )}
+      </button>
+      {open && createPortal(
+        <div
+          ref={panelRef}
+          role="dialog"
+          aria-label={t("title")}
+          style={style}
+          className="z-50 w-[22rem] max-w-[calc(100vw-1rem)] max-h-[min(32rem,80vh)] flex flex-col overflow-hidden rounded-lg border border-border bg-background shadow-lg"
+        >
+          <NotificationPanel onClose={close} className="flex-1 min-h-0" />
+        </div>,
+        document.body,
+      )}
+    </>
+  );
+}
diff --git a/components/plugins/__tests__/fake-plugin-offer.ts b/components/plugins/__tests__/fake-plugin-offer.ts
new file mode 100644
index 000000000..d4d952644
--- /dev/null
+++ b/components/plugins/__tests__/fake-plugin-offer.ts
@@ -0,0 +1,50 @@
+// Test helpers: pretend a running plugin offers a frame slot, without booting
+// a sandbox. Pair with a vi.mock of '@/components/plugins/plugin-iframe-slot'
+// (FakeIframeSlot below) so the "iframe" shows the props it would receive.
+
+import React from 'react';
+import { register, deregister } from '@/lib/plugin-sandbox/registry';
+import type { ActivePlugin } from '@/lib/plugin-sandbox/registry';
+import type { SlotName } from '@/lib/plugin-types';
+
+const offered = new Set<string>();
+const lastProps = new Map<string, Record<string, unknown>>();
+
+/** The props (functions included) the fake iframe of a slot last received. */
+export function lastSlotProps(slot: string): Record<string, unknown> {
+  return lastProps.get(slot) ?? {};
+}
+
+/** Registers a fake plugin that offers the given slots. */
+export function offerSlots(pluginId: string, slots: string[]): void {
+  register({
+    plugin: { id: pluginId, name: pluginId },
+    code: '',
+    tier: 'untrusted',
+    background: {},
+    slotOffers: slots.map((name) => ({ name: name as SlotName, order: 100, hasShouldShow: false })),
+    hookDisposables: [],
+  } as unknown as ActivePlugin);
+  offered.add(pluginId);
+}
+
+/** Removes every fake plugin registered with offerSlots. */
+export function clearOffers(): void {
+  for (const id of offered) deregister(id);
+  offered.clear();
+}
+
+/** Stand-in for PluginIframeSlot: a div carrying the slot name and its props as JSON. */
+export function FakeIframeSlot({ pluginId, slot, extraProps }: { pluginId: string; slot: string; extraProps?: Record<string, unknown> }) {
+  lastProps.set(slot, extraProps ?? {});
+  return React.createElement('div', {
+    'data-testid': `slot-${slot}`,
+    'data-plugin': pluginId,
+    'data-props': JSON.stringify(extraProps ?? {}),
+  });
+}
+
+/** The props the fake iframe of a slot received. */
+export function slotProps(el: HTMLElement): Record<string, unknown> {
+  return JSON.parse(el.getAttribute('data-props') ?? '{}');
+}
diff --git a/components/plugins/__tests__/fake-slot-offer.tsx b/components/plugins/__tests__/fake-slot-offer.tsx
new file mode 100644
index 000000000..2f4c68e33
--- /dev/null
+++ b/components/plugins/__tests__/fake-slot-offer.tsx
@@ -0,0 +1,37 @@
+// Test helpers for mount-site tests: a plugin that offers a slot, and a
+// stand-in for the sandboxed iframe that shows which props it was handed.
+//
+// Use with:
+//   vi.mock('@/components/plugins/plugin-iframe-slot', () => import('@/components/plugins/__tests__/fake-slot-offer'));
+import { deregister, register, type ActivePlugin } from '@/lib/plugin-sandbox/registry';
+import type { SlotName } from '@/lib/plugin-types';
+
+const registered = new Set<string>();
+
+/** Registers an active plugin that offers these slots. */
+export function offerSlots(pluginId: string, slots: SlotName[]): void {
+  register({
+    plugin: { id: pluginId, name: pluginId },
+    code: '',
+    tier: 'untrusted',
+    background: {},
+    slotOffers: slots.map((name) => ({ name, order: 100, hasShouldShow: false })),
+    hookDisposables: [],
+  } as unknown as ActivePlugin);
+  registered.add(pluginId);
+}
+
+export function clearSlotOffers(): void {
+  for (const id of registered) deregister(id);
+  registered.clear();
+}
+
+/** Drop-in for PluginIframeSlot: no iframe, the props as JSON. */
+export function PluginIframeSlot({ pluginId, slot, extraProps }: { pluginId: string; slot: string; extraProps?: Record<string, unknown> }) {
+  return <div data-testid={`plugin-frame-${slot}`} data-plugin-id={pluginId} data-props={JSON.stringify(extraProps ?? {})} />;
+}
+
+/** The props the fake iframe for this slot received. */
+export function framePropsOf(el: HTMLElement): Record<string, unknown> {
+  return JSON.parse(el.getAttribute('data-props') || '{}') as Record<string, unknown>;
+}
diff --git a/components/plugins/__tests__/plugin-actions.test.tsx b/components/plugins/__tests__/plugin-actions.test.tsx
new file mode 100644
index 000000000..cfd1ce469
--- /dev/null
+++ b/components/plugins/__tests__/plugin-actions.test.tsx
@@ -0,0 +1,41 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { act, fireEvent, render, screen } from '@testing-library/react';
+import { PluginActions } from '../plugin-actions';
+import { resetActions, setActionDispatcher, setPluginActions } from '@/lib/plugin-sandbox/actions';
+
+const dispatch = vi.fn().mockResolvedValue(undefined);
+
+beforeEach(() => {
+  resetActions();
+  dispatch.mockClear();
+  setActionDispatcher(dispatch);
+});
+
+describe('PluginActions', () => {
+  it('renders nothing when no plugin declared actions', () => {
+    const { container } = render(<PluginActions surface="message-bulk-actions" context={{ emailIds: ['e1'] }} />);
+
+    expect(container).toBeEmptyDOMElement();
+  });
+
+  it('draws declared buttons and sends the click with the context', async () => {
+    render(<PluginActions surface="message-bulk-actions" context={{ emailIds: ['e1', 'e2'] }} />);
+    act(() => setPluginActions('tasks', 'Email to task', 'message-bulk-actions', [{ id: 'make', label: 'Make tasks' }]));
+
+    await act(async () => { fireEvent.click(screen.getByRole('button', { name: 'Make tasks' })); });
+
+    expect(dispatch).toHaveBeenCalledWith('tasks', 'message-bulk-actions', 'make', { emailIds: ['e1', 'e2'] });
+  });
+
+  it('shows only actions meant for the folder or file type', () => {
+    act(() => setPluginActions('p', 'P', 'attachment-menu', [
+      { id: 'pdf', label: 'Send PDF', mimeTypes: ['application/pdf'] },
+      { id: 'img', label: 'Edit image', mimeTypes: ['image/'] },
+    ]));
+
+    render(<PluginActions surface="attachment-menu" context={{}} variant="menu" mimeType="image/png" />);
+
+    expect(screen.queryByRole('menuitem', { name: 'Send PDF' })).toBeNull();
+    expect(screen.getByRole('menuitem', { name: 'Edit image' })).toBeInTheDocument();
+  });
+});
diff --git a/components/plugins/__tests__/plugin-connect-dialog.test.tsx b/components/plugins/__tests__/plugin-connect-dialog.test.tsx
new file mode 100644
index 000000000..86fa4894e
--- /dev/null
+++ b/components/plugins/__tests__/plugin-connect-dialog.test.tsx
@@ -0,0 +1,86 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
+
+const apiFetch = vi.fn();
+vi.mock('next-intl', () => {
+  const t = (key: string, values?: Record<string, unknown>) => (values ? `${key} ${JSON.stringify(values)}` : key);
+  return { useTranslations: () => t, useLocale: () => 'en' };
+});
+vi.mock('@/lib/browser-navigation', async (importOriginal) => ({
+  ...(await importOriginal<typeof import('@/lib/browser-navigation')>()),
+  apiFetch: (...args: unknown[]) => apiFetch(...args),
+}));
+
+import { PluginConnectDialog } from '../plugin-connect-dialog';
+import { originFromInput, requestConnect, type ConnectResult } from '@/lib/plugin-sandbox/connect-dialog';
+
+beforeEach(() => {
+  apiFetch.mockReset();
+  apiFetch.mockResolvedValue(new Response(JSON.stringify({ ok: true }), { status: 200 }));
+});
+
+function open(mode: 'password' | 'signin' = 'password') {
+  let result: Promise<ConnectResult>;
+  act(() => {
+    result = requestConnect({
+      pluginId: 'nextcloud', pluginName: 'Nextcloud', credentialId: 'cloud', mode,
+      spec: { label: 'Nextcloud', scope: 'user', inject: { type: 'basic' } },
+    });
+  });
+  return result!;
+}
+
+describe('connect dialog', () => {
+  it('sends the password to the server and tells the plugin only that it worked', async () => {
+    render(<PluginConnectDialog />);
+    const result = open();
+
+    fireEvent.change(screen.getByText('server').parentElement!.querySelector('input')!, { target: { value: 'cloud.example.org/index.php' } });
+    fireEvent.change(screen.getByText('username').parentElement!.querySelector('input')!, { target: { value: 'alice' } });
+    fireEvent.change(screen.getByText('secret').parentElement!.querySelector('input')!, { target: { value: 'app-pw' } });
+    expect(screen.getByText(/intro_password /)).toHaveTextContent('cloud.example.org');
+    fireEvent.click(screen.getByRole('button', { name: 'connect' }));
+
+    await expect(result).resolves.toEqual({ connected: true, origin: 'https://cloud.example.org' });
+    const [url, init] = apiFetch.mock.calls[0];
+    expect(url).toBe('/api/plugin-secrets');
+    expect(JSON.parse(init.body)).toMatchObject({
+      pluginId: 'nextcloud', credentialId: 'cloud', origin: 'https://cloud.example.org', username: 'alice', secret: 'app-pw',
+    });
+    expect(JSON.stringify(await result)).not.toContain('app-pw');
+  });
+
+  it('only approves the server for a sign-in flow', async () => {
+    render(<PluginConnectDialog />);
+    const result = open('signin');
+
+    expect(screen.queryByText('secret')).toBeNull();
+    fireEvent.change(screen.getByText('server').parentElement!.querySelector('input')!, { target: { value: 'https://cloud.example.org' } });
+    fireEvent.click(screen.getByRole('button', { name: 'continue' }));
+
+    await expect(result).resolves.toEqual({ connected: false, origin: 'https://cloud.example.org' });
+    expect(JSON.parse(apiFetch.mock.calls[0][1].body)).not.toHaveProperty('secret');
+  });
+
+  it('shows the server error and stays open', async () => {
+    apiFetch.mockResolvedValueOnce(new Response(JSON.stringify({ error: 'The server address must start with https://' }), { status: 400 }));
+    render(<PluginConnectDialog />);
+    const result = open();
+    fireEvent.change(screen.getByText('server').parentElement!.querySelector('input')!, { target: { value: 'cloud.example.org' } });
+    fireEvent.change(screen.getByText('username').parentElement!.querySelector('input')!, { target: { value: 'alice' } });
+    fireEvent.change(screen.getByText('secret').parentElement!.querySelector('input')!, { target: { value: 'pw' } });
+    fireEvent.click(screen.getByRole('button', { name: 'connect' }));
+
+    await waitFor(() => expect(screen.getByRole('alert')).toHaveTextContent('must start with https'));
+    fireEvent.click(screen.getByRole('button', { name: 'cancel' }));
+    await expect(result).resolves.toEqual({ connected: false });
+  });
+});
+
+describe('originFromInput', () => {
+  it('adds https and keeps only the origin', () => {
+    expect(originFromInput('cloud.example.org/nextcloud')).toBe('https://cloud.example.org');
+    expect(originFromInput('https://u:p@cloud.example.org')).toBeNull();
+    expect(originFromInput('javascript:alert(1)')).toBeNull();
+  });
+});
diff --git a/components/plugins/__tests__/plugin-dialog-overlay.test.tsx b/components/plugins/__tests__/plugin-dialog-overlay.test.tsx
new file mode 100644
index 000000000..8d805e842
--- /dev/null
+++ b/components/plugins/__tests__/plugin-dialog-overlay.test.tsx
@@ -0,0 +1,33 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { act, fireEvent, render, screen } from '@testing-library/react';
+
+vi.mock('next-intl', () => ({ useTranslations: () => (key: string) => key }));
+vi.mock('../plugin-iframe-slot', () => ({ PluginIframeSlot: () => <div data-testid="custom-frame" /> }));
+
+import { PluginDialogHost } from '../plugin-dialog-host';
+import { awaitCustomDialog, awaitDialog, head, resetDialogLimits, resolveHead } from '@/lib/plugin-sandbox/host-dialog';
+
+beforeEach(() => {
+  while (head()) resolveHead(null);
+  resetDialogLimits();
+});
+
+describe('a question on top of a plugin dialog', () => {
+  it('shows both, answers the question, and keeps the plugin dialog open', async () => {
+    render(<PluginDialogHost />);
+    let custom: Promise<unknown>;
+    let question: Promise<boolean>;
+    act(() => { custom = awaitCustomDialog({ pluginId: 'ai', title: 'Assistant', message: '', slot: 'plugin-dialog' }); });
+    act(() => { question = awaitDialog({ pluginId: 'ai', kind: 'confirm', title: 'Discard the text?', message: '' }); });
+
+    expect(screen.getByTestId('custom-frame')).toBeInTheDocument();
+    expect(screen.getByText('Discard the text?')).toBeInTheDocument();
+    await act(async () => { fireEvent.click(screen.getByRole('button', { name: 'confirm' })); });
+
+    await expect(question!).resolves.toBe(true);
+    expect(screen.queryByText('Discard the text?')).toBeNull();
+    expect(screen.getByTestId('custom-frame')).toBeInTheDocument();
+    act(() => resolveHead(null));
+    await expect(custom!).resolves.toBeNull();
+  });
+});
diff --git a/components/plugins/__tests__/plugin-iframe-slot-props.test.tsx b/components/plugins/__tests__/plugin-iframe-slot-props.test.tsx
new file mode 100644
index 000000000..46e7ede21
--- /dev/null
+++ b/components/plugins/__tests__/plugin-iframe-slot-props.test.tsx
@@ -0,0 +1,69 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { render, waitFor } from '@testing-library/react';
+import type { InstalledPlugin } from '@/lib/plugin-types';
+
+const evaluateShouldShow = vi.fn(async () => true);
+let activePlugin: InstalledPlugin;
+let hasShouldShow = false;
+
+vi.mock('@/lib/plugin-sandbox/registry', () => ({
+  get: () => ({
+    plugin: activePlugin,
+    code: '',
+    tier: 'untrusted',
+    background: { evaluateShouldShow },
+    slotOffers: [{ name: 'email-banner', hasShouldShow, order: 100 }],
+  }),
+}));
+
+const createSlotInstance = vi.fn(() => ({ destroy: vi.fn(), updateProps: vi.fn(), setTheme: vi.fn() }));
+vi.mock('@/lib/plugin-sandbox/host-bridge', () => ({
+  createSlotInstance: (...args: unknown[]) => createSlotInstance(...(args as [])),
+}));
+vi.mock('@/lib/plugin-sandbox/host-theme', () => ({ snapshotHostTheme: () => ({}) }));
+
+import { PluginIframeSlot } from '../plugin-iframe-slot';
+
+function plugin(perms: string[]): InstalledPlugin {
+  return {
+    id: 'p1', name: 'P', version: '1.0.0', author: '', description: '', type: 'ui-extension',
+    permissions: perms, grantedPermissions: perms, entrypoint: 'index.js',
+    enabled: true, status: 'running', settings: {},
+  };
+}
+
+const EMAIL = { id: 'm1', text: 'confidential body' };
+
+beforeEach(() => {
+  vi.clearAllMocks();
+  hasShouldShow = false;
+});
+
+describe('PluginIframeSlot', () => {
+  it('mounts a banner-only plugin without the opened message', async () => {
+    activePlugin = plugin(['ui:email-banner']);
+    render(<PluginIframeSlot pluginId="p1" slot="email-banner" extraProps={{ email: EMAIL }} />);
+
+    await waitFor(() => expect(createSlotInstance).toHaveBeenCalled());
+    const opts = (createSlotInstance.mock.calls[0] as unknown[])[0] as { extraProps: Record<string, unknown> };
+    expect(opts.extraProps.email).toBeUndefined();
+  });
+
+  it('does not show the message to shouldShow either', async () => {
+    activePlugin = plugin(['ui:email-banner']);
+    hasShouldShow = true;
+    render(<PluginIframeSlot pluginId="p1" slot="email-banner" extraProps={{ email: EMAIL }} />);
+
+    await waitFor(() => expect(evaluateShouldShow).toHaveBeenCalled());
+    expect((evaluateShouldShow.mock.calls[0] as unknown[])[1]).toEqual({});
+  });
+
+  it('hands the message to a plugin that may read mail', async () => {
+    activePlugin = plugin(['ui:email-banner', 'email:read']);
+    render(<PluginIframeSlot pluginId="p1" slot="email-banner" extraProps={{ email: EMAIL }} />);
+
+    await waitFor(() => expect(createSlotInstance).toHaveBeenCalled());
+    const opts = (createSlotInstance.mock.calls[0] as unknown[])[0] as { extraProps: Record<string, unknown> };
+    expect(opts.extraProps.email).toEqual(EMAIL);
+  });
+});
diff --git a/components/plugins/__tests__/plugin-page-app.test.tsx b/components/plugins/__tests__/plugin-page-app.test.tsx
new file mode 100644
index 000000000..f3e394919
--- /dev/null
+++ b/components/plugins/__tests__/plugin-page-app.test.tsx
@@ -0,0 +1,104 @@
+import React from 'react';
+import { act, render, screen, waitFor } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { InstalledPlugin } from '@/lib/plugin-types';
+
+// The app-page slot: a plugin's page at /apps/<pluginId>/<pageId>, inside the
+// app's own frame.
+
+const createSlotInstance = vi.fn((..._args: unknown[]) => ({ destroy: vi.fn(), updateProps: vi.fn(), setTheme: vi.fn() }));
+vi.mock('@/lib/plugin-sandbox/host-bridge', () => ({
+  createSlotInstance: (...args: unknown[]) => createSlotInstance(...args),
+}));
+vi.mock('@/lib/plugin-sandbox/host-theme', () => ({ snapshotHostTheme: () => ({}) }));
+vi.mock('@/components/layout/navigation-rail', () => ({
+  NavigationRail: ({ orientation }: { orientation?: string }) => <nav data-testid={`rail-${orientation ?? 'vertical'}`} />,
+}));
+vi.mock('@/components/plugins/app-top-banner-slot', () => ({ AppTopBannerSlot: () => null }));
+vi.mock('@/components/layout/sidebar-apps-modal', () => ({ SidebarAppsModal: () => null }));
+vi.mock('@/hooks/use-config', () => ({ useConfig: () => ({ appName: 'Mail' }) }));
+vi.mock('@/i18n/navigation', () => ({
+  useRouter: () => ({ push: vi.fn(), back: vi.fn(), replace: vi.fn() }),
+  usePathname: () => '/apps/kanban/board',
+  Link: ({ children, href, ...rest }: { children: React.ReactNode; href: string }) => <a href={href} {...rest}>{children}</a>,
+}));
+
+const { PluginPageApp } = await import('../plugin-page-app');
+const registry = await import('@/lib/plugin-sandbox/registry');
+const pages = await import('@/lib/plugin-sandbox/pages');
+const { useAuthStore } = await import('@/stores/auth-store');
+const { usePluginStore } = await import('@/stores/plugin-store');
+
+function activate(id: string, slots: string[]) {
+  const plugin: InstalledPlugin = {
+    id, name: 'Kanban', version: '1.0.0', author: '', description: '', type: 'ui-extension',
+    permissions: ['ui:app-page'], grantedPermissions: ['ui:app-page'], entrypoint: 'index.js',
+    enabled: true, status: 'running', settings: {},
+  };
+  registry.register({
+    plugin, code: '', tier: 'untrusted',
+    background: { evaluateShouldShow: vi.fn(async () => true) } as never,
+    slotOffers: slots.map((name) => ({ name: name as never, order: 100, hasShouldShow: false })),
+    hookDisposables: [],
+  });
+}
+
+beforeEach(() => {
+  createSlotInstance.mockClear();
+  useAuthStore.setState({ isAuthenticated: true, isLoading: false, client: {} as never });
+  usePluginStore.setState({ initialized: true, initializePlugins: vi.fn().mockResolvedValue(undefined) });
+});
+afterEach(() => {
+  for (const p of registry.all()) registry.deregister(p.plugin.id);
+  pages.resetPages();
+});
+
+describe('plugin pages', () => {
+  it('fills the content area with the plugin page and hands it the rest of the path', async () => {
+    activate('kanban', ['app-page']);
+    act(() => pages.setPluginPages('kanban', 'Kanban', [{ id: 'board', title: 'Board' }]));
+
+    const { container } = render(<PluginPageApp linkSegments={['kanban', 'board', 'cards', '42']} />);
+
+    expect(screen.getByTestId('rail-vertical')).toBeInTheDocument();
+    expect(container.querySelector('[data-plugin-page="kanban/board"]')).not.toBeNull();
+    await waitFor(() => expect(createSlotInstance).toHaveBeenCalled());
+    const opts = createSlotInstance.mock.calls[0][0] as { slot: string; extraProps: Record<string, unknown>; plugin: { id: string } };
+    expect(opts.slot).toBe('app-page');
+    expect(opts.plugin.id).toBe('kanban');
+    expect(opts.extraProps).toEqual({ pageId: 'board', path: 'cards/42' });
+  });
+
+  it('passes an empty path for the page itself', async () => {
+    activate('kanban', ['app-page']);
+    act(() => pages.setPluginPages('kanban', 'Kanban', [{ id: 'board', title: 'Board' }]));
+    render(<PluginPageApp linkSegments={['kanban', 'board']} />);
+
+    await waitFor(() => expect(createSlotInstance).toHaveBeenCalled());
+    expect((createSlotInstance.mock.calls[0][0] as { extraProps: unknown }).extraProps).toEqual({ pageId: 'board', path: '' });
+  });
+
+  it('says the page is not available, with a way back to Mail, once the plugin is gone', () => {
+    render(<PluginPageApp linkSegments={['kanban', 'board']} />);
+
+    expect(screen.getByText('not_available_title')).toBeInTheDocument();
+    expect(screen.getByRole('link', { name: 'back_to_mail' })).toHaveAttribute('href', '/');
+    expect(createSlotInstance).not.toHaveBeenCalled();
+  });
+
+  it('waits for the plugins to start before saying so', () => {
+    usePluginStore.setState({ initialized: false });
+    render(<PluginPageApp linkSegments={['kanban', 'board']} />);
+
+    expect(screen.queryByText('not_available_title')).toBeNull();
+    expect(screen.getByLabelText('loading')).toBeInTheDocument();
+  });
+
+  it('does not mount another plugin page under a wrong page id', () => {
+    activate('kanban', ['app-page']);
+    act(() => pages.setPluginPages('kanban', 'Kanban', [{ id: 'board', title: 'Board' }]));
+    render(<PluginPageApp linkSegments={['kanban', 'other']} />);
+
+    expect(screen.getByText('not_available_title')).toBeInTheDocument();
+  });
+});
diff --git a/components/plugins/plugin-actions.tsx b/components/plugins/plugin-actions.tsx
new file mode 100644
index 000000000..3c6359d5f
--- /dev/null
+++ b/components/plugins/plugin-actions.tsx
@@ -0,0 +1,144 @@
+'use client';
+
+import { useSyncExternalStore, useState } from 'react';
+import { useTranslations } from 'next-intl';
+import { iconForName, MoreHorizontal, Puzzle } from '@/components/icons';
+import { ContextMenu, ContextMenuItem } from '@/components/ui/context-menu';
+import { useContextMenu } from '@/hooks/use-context-menu';
+import { cn } from '@/lib/utils';
+import {
+  actionApplies,
+  actionsFor,
+  runAction,
+  subscribeActions,
+  type RegisteredAction,
+} from '@/lib/plugin-sandbox/actions';
+
+const EMPTY: RegisteredAction[] = [];
+
+/** The actions plugins declared for a surface, filtered by folder role or MIME type. */
+export function usePluginActions(surface: string, filter: { mailboxRole?: string | null; mimeType?: string | null } = {}) {
+  const all = useSyncExternalStore(subscribeActions, () => actionsFor(surface), () => EMPTY);
+  return all.filter((a) => actionApplies(a, filter));
+}
+
+interface PluginActionsProps {
+  /** A surface of kind 'action' in lib/plugin-slot-catalog.ts. */
+  surface: string;
+  /** What the click is about (ids of the message, files, ...). Filtered per plugin before it is sent. */
+  context: Record<string, unknown>;
+  /** Buttons in a toolbar row, or entries in a menu. */
+  variant?: 'buttons' | 'menu';
+  mailboxRole?: string | null;
+  mimeType?: string | null;
+  className?: string;
+  /** Icon-only buttons with the label as tooltip (narrow toolbars). */
+  compact?: boolean;
+  /** No room for buttons: one "more" button that opens the actions as a menu. */
+  overflow?: boolean;
+  /** Called after a click, e.g. to close the menu the entry sits in. */
+  onRan?: () => void;
+}
+
+/**
+ * Buttons or menu entries plugins declared with api.ui.setActions. The host
+ * draws them so they match the app; the plugin gets the click.
+ */
+export function PluginActions({ surface, context, variant = 'buttons', mailboxRole, mimeType, className, compact, overflow, onRan }: PluginActionsProps) {
+  const actions = usePluginActions(surface, { mailboxRole, mimeType });
+  const [busy, setBusy] = useState<string | null>(null);
+  if (actions.length === 0) return null;
+  if (overflow && variant === 'buttons') {
+    return <PluginActionsOverflow surface={surface} context={context} mailboxRole={mailboxRole} mimeType={mimeType} className={className} />;
+  }
+
+  const run = async (action: RegisteredAction) => {
+    const key = `${action.pluginId}:${action.id}`;
+    setBusy(key);
+    try {
+      onRan?.();
+      await runAction(action, surface, context);
+    } finally {
+      setBusy((current) => (current === key ? null : current));
+    }
+  };
+
+  if (variant === 'menu') {
+    return (
+      <>
+        {actions.map((action) => (
+          <ContextMenuItem
+            key={`${action.pluginId}:${action.id}`}
+            icon={iconForName(action.icon) ?? Puzzle}
+            label={action.label}
+            title={action.pluginName}
+            destructive={action.danger}
+            onClick={() => { void run(action); }}
+          />
+        ))}
+      </>
+    );
+  }
+
+  return (
+    <div className={cn('inline-flex flex-wrap items-center gap-1', className)} data-plugin-actions={surface}>
+      {actions.map((action) => {
+        const Icon = iconForName(action.icon) ?? Puzzle;
+        const key = `${action.pluginId}:${action.id}`;
+        return (
+          <button
+            key={key}
+            type="button"
+            disabled={busy === key}
+            title={compact ? `${action.label} (${action.pluginName})` : action.pluginName}
+            aria-label={action.label}
+            onClick={(e) => { e.stopPropagation(); void run(action); }}
+            className={cn(
+              'inline-flex h-8 items-center gap-1.5 rounded-md px-2 text-sm text-muted-foreground transition-colors',
+              'hover:bg-muted hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring',
+              'disabled:opacity-50',
+              action.danger && 'text-destructive hover:bg-destructive/10 hover:text-destructive',
+            )}
+          >
+            <Icon className="h-4 w-4 flex-shrink-0" />
+            {!compact && <span className="whitespace-nowrap">{action.label}</span>}
+          </button>
+        );
+      })}
+    </div>
+  );
+}
+
+/** The actions of a surface behind one "more" button, for toolbars without room for them. */
+function PluginActionsOverflow({ surface, context, mailboxRole, mimeType, className }: Pick<PluginActionsProps, 'surface' | 'context' | 'mailboxRole' | 'mimeType' | 'className'>) {
+  const t = useTranslations('email_viewer');
+  const { contextMenu, openContextMenu, closeContextMenu, menuRef } = useContextMenu<true>();
+  return (
+    <div className={cn('inline-flex items-center', className)} data-plugin-actions={surface} data-plugin-actions-overflow="">
+      <button
+        type="button"
+        title={t('more_actions')}
+        aria-label={t('more_actions')}
+        aria-haspopup="menu"
+        aria-expanded={contextMenu.isOpen}
+        onClick={(e) => { e.stopPropagation(); openContextMenu(e, true); }}
+        className={cn(
+          'inline-flex h-8 items-center rounded-md px-2 text-muted-foreground transition-colors',
+          'hover:bg-muted hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring',
+        )}
+      >
+        <MoreHorizontal className="h-4 w-4" />
+      </button>
+      <ContextMenu ref={menuRef} isOpen={contextMenu.isOpen} position={contextMenu.position} onClose={closeContextMenu}>
+        <PluginActions
+          surface={surface}
+          variant="menu"
+          context={context}
+          mailboxRole={mailboxRole}
+          mimeType={mimeType}
+          onRan={closeContextMenu}
+        />
+      </ContextMenu>
+    </div>
+  );
+}
diff --git a/components/plugins/plugin-connect-dialog.tsx b/components/plugins/plugin-connect-dialog.tsx
new file mode 100644
index 000000000..962e70c54
--- /dev/null
+++ b/components/plugins/plugin-connect-dialog.tsx
@@ -0,0 +1,160 @@
+'use client';
+
+import { useEffect, useId, useState, useSyncExternalStore } from 'react';
+import { useTranslations } from 'next-intl';
+import { KeyRound } from '@/components/icons';
+import { Button } from '@/components/ui/button';
+import {
+  currentConnect,
+  originFromInput,
+  saveCredential,
+  subscribeConnect,
+} from '@/lib/plugin-sandbox/connect-dialog';
+
+/**
+ * The host's own "Connect account" dialog (see lib/plugin-sandbox/connect-dialog.ts).
+ * Everything here is rendered by the host: the plugin can't change the text,
+ * and what the user types goes to the server, never to the plugin.
+ */
+export function PluginConnectDialog() {
+  const request = useSyncExternalStore(subscribeConnect, currentConnect, () => null);
+  const t = useTranslations('plugins.connect');
+  const titleId = useId();
+  const [server, setServer] = useState('');
+  const [username, setUsername] = useState('');
+  const [secret, setSecret] = useState('');
+  const [error, setError] = useState<string | null>(null);
+  const [saving, setSaving] = useState(false);
+
+  useEffect(() => {
+    setServer(request?.suggestedOrigin ?? '');
+    setUsername(request?.suggestedUsername ?? '');
+    setSecret('');
+    setError(null);
+    setSaving(false);
+  }, [request?.id, request?.suggestedOrigin, request?.suggestedUsername]);
+
+  useEffect(() => {
+    if (!request) return;
+    const onKey = (e: KeyboardEvent) => {
+      if (e.key === 'Escape') request.resolve({ connected: false });
+    };
+    window.addEventListener('keydown', onKey);
+    return () => window.removeEventListener('keydown', onKey);
+  }, [request]);
+
+  if (!request) return null;
+
+  const { spec, mode, pluginName } = request;
+  const fixedOrigin = spec.origin;
+  const needsUsername = mode === 'password' && spec.inject.type === 'basic';
+  const needsSecret = mode === 'password' && spec.inject.type !== 'none';
+  const origin = fixedOrigin ?? originFromInput(server);
+  const canSubmit = !!origin && (!needsSecret || !!secret) && (!needsUsername || !!username.trim()) && !saving;
+
+  const submit = async () => {
+    if (!origin) {
+      setError(t('error_server'));
+      return;
+    }
+    setSaving(true);
+    setError(null);
+    const failure = await saveCredential({
+      pluginId: request.pluginId,
+      credentialId: request.credentialId,
+      label: spec.label,
+      origin,
+      inject: spec.inject,
+      ...(needsUsername ? { username: username.trim() } : {}),
+      ...(needsSecret ? { secret } : {}),
+    });
+    setSaving(false);
+    if (failure) {
+      setError(t('error_save', { error: failure }));
+      return;
+    }
+    request.resolve({ connected: mode === 'password', origin });
+  };
+
+  const host = origin ? new URL(origin).host : null;
+  const intro = mode === 'signin'
+    ? t('intro_signin', { name: pluginName, label: spec.label })
+    : host
+      ? t('intro_password', { name: pluginName, label: spec.label, host })
+      : t('intro_password_any', { name: pluginName, label: spec.label });
+
+  return (
+    <div
+      role="dialog"
+      aria-modal="true"
+      aria-labelledby={titleId}
+      className="fixed inset-0 z-[100001] flex items-center justify-center bg-black/50 p-4"
+      onMouseDown={(e) => {
+        if (e.target === e.currentTarget) request.resolve({ connected: false });
+      }}
+    >
+      <div className="flex w-full max-w-[440px] flex-col rounded-lg border border-border bg-popover text-popover-foreground shadow-xl">
+        <form className="p-5" onSubmit={(e) => { e.preventDefault(); void submit(); }}>
+          <div className="mb-3 flex items-center gap-2">
+            <KeyRound className="h-5 w-5 flex-shrink-0 text-muted-foreground" />
+            <h2 id={titleId} className="text-base font-semibold">{t('title', { label: spec.label })}</h2>
+          </div>
+          <p className="mb-4 text-sm text-muted-foreground [overflow-wrap:anywhere]">{intro}</p>
+          <div className="mb-4 flex flex-col gap-3">
+            {!fixedOrigin && (
+              <label className="flex flex-col gap-1">
+                <span className="text-xs font-medium">{t('server')}</span>
+                {/* Not type="url": the browser would refuse "cloud.example.com"
+                    without https://, which originFromInput adds. */}
+                <input
+                  type="text"
+                  inputMode="url"
+                  autoCapitalize="off"
+                  spellCheck={false}
+                  value={server}
+                  placeholder={t('server_hint')}
+                  autoFocus
+                  onChange={(e) => setServer(e.target.value)}
+                  className="w-full rounded-md border border-input bg-background px-2.5 py-2 text-sm text-foreground outline-none focus:ring-2 focus:ring-ring"
+                />
+              </label>
+            )}
+            {needsUsername && (
+              <label className="flex flex-col gap-1">
+                <span className="text-xs font-medium">{t('username')}</span>
+                <input
+                  type="text"
+                  value={username}
+                  autoComplete="username"
+                  autoFocus={!!fixedOrigin}
+                  onChange={(e) => setUsername(e.target.value)}
+                  className="w-full rounded-md border border-input bg-background px-2.5 py-2 text-sm text-foreground outline-none focus:ring-2 focus:ring-ring"
+                />
+              </label>
+            )}
+            {needsSecret && (
+              <label className="flex flex-col gap-1">
+                <span className="text-xs font-medium">{t('secret')}</span>
+                <input
+                  type="password"
+                  value={secret}
+                  autoComplete="off"
+                  autoFocus={!!fixedOrigin && !needsUsername}
+                  onChange={(e) => setSecret(e.target.value)}
+                  className="w-full rounded-md border border-input bg-background px-2.5 py-2 text-sm text-foreground outline-none focus:ring-2 focus:ring-ring"
+                />
+              </label>
+            )}
+            {error && <p role="alert" className="text-xs text-destructive">{error}</p>}
+          </div>
+          <div className="flex justify-end gap-2">
+            <Button type="button" variant="outline" onClick={() => request.resolve({ connected: false })}>{t('cancel')}</Button>
+            <Button type="submit" disabled={!canSubmit}>
+              {saving ? t('saving') : mode === 'signin' ? t('continue') : t('connect')}
+            </Button>
+          </div>
+        </form>
+      </div>
+    </div>
+  );
+}
diff --git a/components/plugins/plugin-consent-dialog.tsx b/components/plugins/plugin-consent-dialog.tsx
index 4194245fc..8699f05f4 100644
--- a/components/plugins/plugin-consent-dialog.tsx
+++ b/components/plugins/plugin-consent-dialog.tsx
@@ -4,109 +4,61 @@
 // the plugin's manifest declares. Accepting persists the grant on the
 // plugin record so future enables skip the prompt.
 
-import React, { useEffect, useSyncExternalStore } from 'react';
-import { head, resolveHead, subscribe, describePermission } from '@/lib/plugin-sandbox/consent';
+import React, { useId, useSyncExternalStore } from 'react';
+import { useTranslations } from 'next-intl';
+import { head, resolveHead, subscribe } from '@/lib/plugin-sandbox/consent';
+import { HIGH_RISK_PERMISSIONS } from '@/lib/plugin-sandbox/permission-text';
+import { useFocusTrap } from '@/hooks/use-focus-trap';
+import { Button } from '@/components/ui/button';
+import { PluginPermissionList } from './plugin-permission-list';
 
 export function PluginConsentDialog(): React.JSX.Element | null {
   const current = useSyncExternalStore(subscribe, head, () => null);
-
-  useEffect(() => {
-    if (!current) return;
-    function onKey(e: KeyboardEvent) {
-      if (e.key === 'Escape') {
-        e.preventDefault();
-        resolveHead(false);
-      }
-    }
-    document.addEventListener('keydown', onKey, true);
-    return () => document.removeEventListener('keydown', onKey, true);
-  }, [current]);
+  const t = useTranslations('plugins.consent');
+  const id = useId();
+  const dialogRef = useFocusTrap({
+    isActive: !!current,
+    onEscape: () => resolveHead(false),
+    restoreFocus: true,
+  });
 
   if (!current) return null;
+  const risky = current.permissions.some((p) => HIGH_RISK_PERMISSIONS.has(p));
 
   return (
     <div
-      role="dialog"
-      aria-modal="true"
-      aria-labelledby="plugin-consent-title"
-      style={{
-        position: 'fixed', inset: 0,
-        background: 'rgba(0,0,0,0.55)',
-        display: 'flex', alignItems: 'center', justifyContent: 'center',
-        zIndex: 100001,
-      }}
+      className="fixed inset-0 z-[100001] flex items-center justify-center bg-black/50 p-4"
       onMouseDown={(e) => { if (e.target === e.currentTarget) resolveHead(false); }}
     >
-      <div style={{
-        background: 'var(--background, #fff)',
-        color: 'var(--foreground, #0f172a)',
-        border: '1px solid var(--border, #e2e8f0)',
-        borderRadius: 12,
-        padding: 20,
-        maxWidth: 560,
-        width: '92%',
-        boxShadow: '0 16px 48px rgba(0,0,0,0.35)',
-      }}>
-        <h2 id="plugin-consent-title" style={{ fontSize: 16, fontWeight: 600, margin: '0 0 6px 0' }}>
-          Allow “{current.pluginName}” to access your data?
-        </h2>
-        <p style={{ fontSize: 12, color: 'var(--muted-foreground, #64748b)', margin: '0 0 14px 0' }}>
-          This plugin is requesting the permissions below. You can revoke them by uninstalling the plugin.
-        </p>
-
-        <ul style={{ listStyle: 'none', padding: 0, margin: '0 0 16px 0', maxHeight: 320, overflowY: 'auto' }}>
-          {current.permissions.map((perm) => {
-            const desc = describePermission(perm);
-            return (
-              <li
-                key={perm}
-                style={{
-                  padding: '10px 12px',
-                  marginBottom: 6,
-                  borderRadius: 8,
-                  background: 'var(--accent, #f1f5f9)',
-                  border: '1px solid var(--border, #e2e8f0)',
-                }}
-              >
-                <div style={{ fontSize: 13, fontWeight: 600, marginBottom: 2 }}>{desc.title}</div>
-                <div style={{ fontSize: 12, color: 'var(--muted-foreground, #64748b)' }}>{desc.body}</div>
-                <code style={{ fontSize: 10, color: 'var(--muted-foreground, #94a3b8)', display: 'block', marginTop: 4 }}>{perm}</code>
-              </li>
-            );
-          })}
-        </ul>
-
-        <div style={{ display: 'flex', gap: 8, justifyContent: 'flex-end' }}>
-          <button
-            type="button"
-            onClick={() => resolveHead(false)}
-            style={{
-              padding: '8px 16px', borderRadius: 8, fontSize: 13, fontWeight: 500,
-              cursor: 'pointer',
-              border: '1px solid var(--border, #e2e8f0)',
-              background: 'transparent',
-              color: 'inherit',
-            }}
-          >
-            Deny
-          </button>
-          <button
-            type="button"
-            autoFocus
-            onClick={() => resolveHead(true)}
-            style={{
-              padding: '8px 16px', borderRadius: 8, fontSize: 13, fontWeight: 500,
-              cursor: 'pointer',
-              border: '1px solid transparent',
-              background: '#3b82f6',
-              color: '#fff',
-            }}
-          >
-            Allow
-          </button>
+      <div
+        ref={dialogRef}
+        role="dialog"
+        aria-modal="true"
+        aria-labelledby={`${id}-title`}
+        className="flex max-h-[90vh] w-full max-w-lg flex-col rounded-lg border border-border bg-background shadow-xl"
+      >
+        <div className="p-5 pb-3">
+          <h2 id={`${id}-title`} className="text-base font-semibold text-foreground">
+            {t('title', { name: current.pluginName })}
+          </h2>
+          <p className="mt-1 text-sm text-muted-foreground">{t('intro')}</p>
+          {risky && (
+            <p className="mt-2 rounded-md bg-warning/10 px-3 py-2 text-xs text-foreground">{t('high_risk_note')}</p>
+          )}
         </div>
-        <div style={{ marginTop: 12, fontSize: 11, color: 'var(--muted-foreground, #94a3b8)', textAlign: 'right' }}>
-          Plugin: {current.pluginId}
+        <div className="min-h-0 flex-1 overflow-y-auto px-5">
+          <PluginPermissionList
+            permissions={current.permissions}
+            httpOrigins={current.httpOrigins}
+            apiPostPaths={current.apiPostPaths}
+          />
+        </div>
+        <div className="flex flex-col gap-3 p-5 pt-4 sm:flex-row sm:items-center sm:justify-between">
+          <span className="text-xs text-muted-foreground">{t('revoke_hint')}</span>
+          <div className="flex justify-end gap-2">
+            <Button variant="outline" className="whitespace-nowrap" onClick={() => resolveHead(false)}>{t('deny')}</Button>
+            <Button autoFocus className="whitespace-nowrap" onClick={() => resolveHead(true)}>{t('allow')}</Button>
+          </div>
         </div>
       </div>
     </div>
diff --git a/components/plugins/plugin-dialog-host.tsx b/components/plugins/plugin-dialog-host.tsx
index 1a9d3a650..e3bb43df2 100644
--- a/components/plugins/plugin-dialog-host.tsx
+++ b/components/plugins/plugin-dialog-host.tsx
@@ -5,9 +5,22 @@
 // a time. Closing the modal advances the queue. Prompts collect one or more
 // (optionally masked) fields so plugins never fall back to `window.prompt`,
 // which the sandbox blocks.
+//
+// They look like the app's own dialogs: a custom dialog (api.ui.openDialog)
+// is the filter editor's layout, with the plugin's buttons (kit
+// DialogButtons) drawn by the host in its footer; confirm, alert and prompt
+// are the app's ConfirmDialog and PromptDialog.
 
-import React, { useEffect, useMemo, useState, useSyncExternalStore } from 'react';
-import { head, resolveHead, subscribe } from '@/lib/plugin-sandbox/host-dialog';
+import React, { useCallback, useEffect, useId, useMemo, useRef, useState, useSyncExternalStore } from 'react';
+import { useTranslations } from 'next-intl';
+import { cancelForPlugin, head, overlay, resolveDialog, subscribe, type DialogRequest } from '@/lib/plugin-sandbox/host-dialog';
+import type { DialogButtonSpec } from '@/lib/plugin-sandbox/ui-kit/dialog-buttons';
+import { usePluginStore } from '@/stores/plugin-store';
+import { toast } from '@/stores/toast-store';
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { iconForName, Loader2, MoreHorizontal, Power, Puzzle, X } from '@/components/icons';
+import { cn } from '@/lib/utils';
 import { PluginIframeSlot } from './plugin-iframe-slot';
 import type { SlotName } from '@/lib/plugin-types';
 
@@ -25,10 +38,72 @@ function renderMessage(message?: string): React.ReactNode {
 }
 
 export function PluginDialogHost(): React.JSX.Element | null {
-  const current = useSyncExternalStore(subscribe, head, () => null);
+  const base = useSyncExternalStore(subscribe, head, () => null);
+  const top = useSyncExternalStore(subscribe, overlay, () => null);
+  const t = useTranslations('plugins.dialog');
+
+  // Say so when a plugin was turned off for failing; otherwise it just
+  // stops working with no hint why.
+  useEffect(() => {
+    const onDisabled = (e: Event) => {
+      const id = (e as CustomEvent<{ pluginId: string }>).detail?.pluginId;
+      const name = usePluginStore.getState().plugins.find((p) => p.id === id)?.name ?? id;
+      if (id) toast.warning(t('toast_auto_disabled', { name }));
+    };
+    window.addEventListener('plugin:auto-disabled', onDisabled);
+    return () => window.removeEventListener('plugin:auto-disabled', onDisabled);
+  }, [t]);
+
+  return (
+    <>
+      {base && <PluginDialogView key={base.id} current={base} layer={top ? 'below' : 'only'} />}
+      {top && <PluginDialogView key={top.id} current={top} layer="above" />}
+    </>
+  );
+}
+
+const DIALOG_BUTTON_VARIANT = { primary: 'default', secondary: 'outline', ghost: 'ghost', destructive: 'destructive' } as const;
+const DIALOG_BUTTON_ID_RE = /^[A-Za-z0-9._-]{1,40}$/;
+export const MAX_DIALOG_BUTTONS = 4;
+
+/** The buttons a plugin dialog asked for (kit DialogButtons), checked. */
+export function readDialogButtons(value: unknown): DialogButtonSpec[] {
+  if (!Array.isArray(value)) return [];
+  const out: DialogButtonSpec[] = [];
+  for (const raw of value.slice(0, MAX_DIALOG_BUTTONS)) {
+    if (!raw || typeof raw !== 'object') continue;
+    const b = raw as Record<string, unknown>;
+    if (typeof b.id !== 'string' || !DIALOG_BUTTON_ID_RE.test(b.id)) continue;
+    if (typeof b.label !== 'string') continue;
+    // eslint-disable-next-line no-control-regex -- one line of text
+    const label = b.label.replace(/[\u0000-\u001f\u007f]+/g, ' ').trim().slice(0, 40);
+    if (!label) continue;
+    const variant = b.variant === 'secondary' || b.variant === 'ghost' || b.variant === 'destructive' ? b.variant : 'primary';
+    const icon = typeof b.icon === 'string' && /^[A-Za-z0-9:-]{1,48}$/.test(b.icon) ? b.icon : undefined;
+    out.push({
+      id: b.id, label, variant,
+      ...(b.disabled === true ? { disabled: true } : {}),
+      ...(b.busy === true ? { busy: true } : {}),
+      ...(icon ? { icon } : {}),
+    });
+  }
+  return out;
+}
+
+/**
+ * One plugin dialog. `below`: a custom dialog with a confirm or prompt of
+ * the same plugin open on top of it; it stays mounted but takes no keys.
+ */
+function PluginDialogView({ current, layer }: { current: DialogRequest; layer: 'only' | 'below' | 'above' }): React.JSX.Element | null {
+  const t = useTranslations('plugins.dialog');
+  const titleId = useId();
+  const pluginName = usePluginStore((s) => s.plugins.find((p) => p.id === current?.pluginId)?.name);
+  const disablePlugin = usePluginStore((s) => s.disablePlugin);
+  const resolveThis = (result: unknown) => resolveDialog(current.id, result);
 
   const isPrompt = current?.kind === 'prompt';
   const fields = useMemo(() => (isPrompt ? current?.fields ?? [] : []), [isPrompt, current]);
+  const hasPassword = fields.some((f) => f.type === 'password');
 
   // Field values for a prompt, re-initialised whenever a new dialog surfaces.
   const [values, setValues] = useState<Record<string, string>>({});
@@ -39,13 +114,39 @@ export function PluginDialogHost(): React.JSX.Element | null {
     setValues(init);
   }, [current]);
 
+  // Footer buttons of a custom dialog: the plugin declares them, the host
+  // draws them and passes each click back as `dialogButtonClick` ({ id, n }).
+  const [buttons, setButtons] = useState<DialogButtonSpec[]>([]);
+  const [buttonClick, setButtonClick] = useState<{ id: string; n: number }>({ id: '', n: 0 });
+  const setDialogButtons = useCallback((value: unknown) => { setButtons(readDialogButtons(value)); }, []);
+  const pressButton = (id: string) => setButtonClick((c) => ({ id, n: c.n + 1 }));
+
+  // The custom slot's onResult answers its own dialog only; a stray second
+  // call after it closed must not resolve the next one in the queue.
+  const customProps = useMemo(() => {
+    if (current?.kind !== 'custom') return undefined;
+    const id = current.id;
+    return {
+      ...(current.extraProps ?? {}),
+      onResult: (value: unknown) => resolveDialog(id, value),
+      setDialogButtons,
+      dialogButtonClick: buttonClick,
+    };
+  }, [current, setDialogButtons, buttonClick]);
+
   const canSubmit = fields.every((f) => !f.required || (values[f.name] ?? '').length > 0);
 
-  const cancel = () => resolveHead(current?.kind === 'prompt' || current?.kind === 'custom' ? null : false);
-  const submitPrompt = () => { if (canSubmit) resolveHead(values); };
+  const cancel = () => resolveThis(current?.kind === 'prompt' || current?.kind === 'custom' ? null : false);
+  const submitPrompt = () => { if (canSubmit) resolveThis(values); };
+  const turnOff = () => {
+    if (!current) return;
+    const id = current.pluginId;
+    cancelForPlugin(id);
+    disablePlugin(id);
+  };
 
   useEffect(() => {
-    if (!current) return;
+    if (!current || layer === 'below') return;
     function onKey(e: KeyboardEvent) {
       if (e.key === 'Escape') {
         e.preventDefault();
@@ -56,7 +157,7 @@ export function PluginDialogHost(): React.JSX.Element | null {
         // Custom dialogs resolve only via their own onResult callback or the
         // host's X/Escape - an Enter press has no defined meaning for them.
         e.preventDefault();
-        resolveHead(true);
+        resolveThis(true);
       }
     }
     document.addEventListener('keydown', onKey, true);
@@ -66,137 +167,193 @@ export function PluginDialogHost(): React.JSX.Element | null {
 
   if (!current) return null;
 
-  const confirmLabel = current.confirmLabel ?? (current.kind === 'alert' ? 'OK' : current.kind === 'prompt' ? 'Submit' : 'Confirm');
-  const cancelLabel = current.cancelLabel ?? 'Cancel';
+  const name = pluginName ?? current.pluginId;
+  const confirmLabel = current.confirmLabel ?? (current.kind === 'alert' ? t('ok') : current.kind === 'prompt' ? t('submit') : t('confirm'));
+  const cancelLabel = current.cancelLabel ?? t('cancel');
+  const custom = current.kind === 'custom';
 
-  const btnBase: React.CSSProperties = { padding: '8px 16px', borderRadius: 8, fontSize: 13, fontWeight: 500, cursor: 'pointer' };
-  const secondaryBtn: React.CSSProperties = { ...btnBase, border: '1px solid var(--color-border, #e2e8f0)', background: 'transparent', color: 'inherit' };
-  const primaryBtn: React.CSSProperties = { ...btnBase, border: '1px solid transparent', background: 'var(--color-primary, #3b82f6)', color: 'var(--color-primary-foreground, #fff)' };
+  // Who is asking, under the title: plugins choose the title and message, so
+  // the host names the plugin in a place the plugin can't change.
+  const attribution = (
+    <p className="mt-0.5 flex items-center gap-1 text-xs text-muted-foreground" data-plugin-dialog-source="">
+      <Puzzle className="h-3 w-3 flex-shrink-0" aria-hidden="true" />
+      <span className="min-w-0 truncate">{t('from_plugin', { name })}</span>
+    </p>
+  );
+  const message = current.message ? (
+    <p className="mb-4 whitespace-pre-wrap text-sm text-muted-foreground [overflow-wrap:anywhere]">
+      {renderMessage(current.message)}
+    </p>
+  ) : null;
 
   return (
     <div
       role="dialog"
       aria-modal="true"
-      aria-labelledby="plugin-dialog-title"
-      style={{
-        position: 'fixed',
-        inset: 0,
-        background: 'rgba(0,0,0,0.5)',
-        display: 'flex',
-        alignItems: 'center',
-        justifyContent: 'center',
-        zIndex: 100000,
-      }}
+      aria-labelledby={titleId}
+      aria-hidden={layer === 'below' ? true : undefined}
+      className={layer === 'above'
+        ? 'fixed inset-0 z-[100001] flex items-center justify-center bg-black/30 p-4'
+        : 'fixed inset-0 z-[100000] flex items-center justify-center bg-black/50 backdrop-blur-[1px] p-4 animate-in fade-in duration-150'}
       onMouseDown={(e) => {
         if (e.target === e.currentTarget) cancel();
       }}
     >
       <div
-        style={{
-          background: 'var(--color-popover, #fff)',
-          color: 'var(--color-popover-foreground, #0f172a)',
-          border: '1px solid var(--color-border, #e2e8f0)',
-          borderRadius: 12,
-          padding: 20,
-          maxWidth: current.kind === 'custom' ? (current.width ?? 560) : 480,
-          maxHeight: current.kind === 'custom' ? '85vh' : undefined,
-          overflowY: current.kind === 'custom' ? 'auto' : undefined,
-          width: '92%',
-          boxShadow: '0 16px 48px rgba(0,0,0,0.35)',
-        }}
+        className="flex w-full flex-col overflow-hidden rounded-lg border border-border bg-background text-foreground shadow-xl animate-in zoom-in-95 duration-200"
+        style={{ maxWidth: custom ? (current.width ?? 560) : 448, maxHeight: '90vh' }}
+        data-plugin-dialog={current.pluginId}
       >
-        <div style={{ display: 'flex', alignItems: 'flex-start', justifyContent: 'space-between', gap: 12 }}>
-          <h2 id="plugin-dialog-title" style={{ fontSize: 16, fontWeight: 600, margin: '0 0 10px 0' }}>
-            {current.title}
-          </h2>
-          {current.kind === 'custom' && (
-            <button
-              type="button"
-              onClick={cancel}
-              aria-label="Close"
-              style={{ border: 'none', background: 'transparent', cursor: 'pointer', fontSize: 18, lineHeight: 1, padding: 0, color: 'inherit' }}
-            >
-              ✕
-            </button>
-          )}
-        </div>
-        {current.message && (
-          <p style={{ fontSize: 13, lineHeight: 1.5, margin: '0 0 16px 0', color: 'var(--color-muted-foreground, #64748b)', whiteSpace: 'pre-wrap', overflowWrap: 'anywhere' }}>
-            {renderMessage(current.message)}
-          </p>
-        )}
-        {current.kind === 'custom' ? (
-          <PluginIframeSlot
-            pluginId={current.pluginId}
-            slot={(current.slot ?? 'plugin-dialog') as SlotName}
-            extraProps={{ ...(current.extraProps ?? {}), onResult: (value: unknown) => resolveHead(value) }}
-          />
-        ) : isPrompt ? (
-          <form onSubmit={(e) => { e.preventDefault(); submitPrompt(); }}>
-            <div style={{ display: 'flex', flexDirection: 'column', gap: 12, marginBottom: 16 }}>
-              {fields.map((f, i) => (
-                <label key={f.name} style={{ display: 'flex', flexDirection: 'column', gap: 4 }}>
-                  <span style={{ fontSize: 12, fontWeight: 500 }}>
-                    {f.label}{f.required ? ' *' : ''}
-                  </span>
-                  <input
-                    type={f.type === 'password' ? 'password' : 'text'}
-                    value={values[f.name] ?? ''}
-                    placeholder={f.placeholder}
-                    autoFocus={i === 0}
-                    autoComplete={f.type === 'password' ? 'off' : undefined}
-                    onChange={(e) => setValues((v) => ({ ...v, [f.name]: e.target.value }))}
-                    style={{
-                      fontSize: 13,
-                      padding: '8px 10px',
-                      borderRadius: 8,
-                      border: '1px solid var(--color-input, var(--color-border, #cbd5e1))',
-                      background: 'var(--color-background, #fff)',
-                      color: 'inherit',
-                      outline: 'none',
-                      width: '100%',
-                      boxSizing: 'border-box',
-                    }}
-                  />
-                </label>
-              ))}
-            </div>
-            <div style={{ display: 'flex', gap: 8, justifyContent: 'flex-end' }}>
-              <button type="button" onClick={cancel} style={secondaryBtn}>{cancelLabel}</button>
+        {custom ? (
+          <>
+            <div className="flex items-start gap-1 px-6 py-4 border-b border-border">
+              <div className="min-w-0 flex-1 pe-2">
+                <h2 id={titleId} className="text-lg font-semibold text-foreground [overflow-wrap:anywhere]">{current.title}</h2>
+                {attribution}
+              </div>
+              <PluginDialogMenu name={name} onTurnOff={turnOff} />
               <button
-                type="submit"
-                disabled={!canSubmit}
-                style={{ ...primaryBtn, opacity: canSubmit ? 1 : 0.5, cursor: canSubmit ? 'pointer' : 'not-allowed' }}
+                type="button"
+                onClick={cancel}
+                aria-label={t('close')}
+                className="p-1.5 rounded-md hover:bg-muted transition-colors duration-150 text-muted-foreground hover:text-foreground"
               >
-                {confirmLabel}
+                <X className="w-5 h-5" />
               </button>
             </div>
-          </form>
-        ) : (
-          <div style={{ display: 'flex', gap: 8, justifyContent: 'flex-end' }}>
-            {current.kind === 'confirm' && (
-              <button type="button" autoFocus={!!current.danger} onClick={cancel} style={secondaryBtn}>
-                {cancelLabel}
-              </button>
+            <div className="min-h-0 flex-1 overflow-y-auto px-6 py-4">
+              {message}
+              <PluginIframeSlot
+                pluginId={current.pluginId}
+                slot={(current.slot ?? 'plugin-dialog') as SlotName}
+                extraProps={customProps}
+              />
+            </div>
+            {buttons.length > 0 && (
+              <div className="flex flex-wrap items-center justify-end gap-2 px-6 py-4 border-t border-border" data-plugin-dialog-buttons="">
+                {buttons.map((b) => (
+                  <Button
+                    key={b.id}
+                    type="button"
+                    variant={DIALOG_BUTTON_VARIANT[b.variant ?? 'primary']}
+                    disabled={b.disabled || b.busy}
+                    aria-busy={b.busy || undefined}
+                    className="gap-1.5"
+                    onClick={() => pressButton(b.id)}
+                  >
+                    {b.busy ? <Loader2 className="w-4 h-4 animate-spin" aria-hidden="true" /> : <FooterIcon name={b.icon} />}
+                    {b.label}
+                  </Button>
+                ))}
+              </div>
             )}
-            <button
-              type="button"
-              autoFocus={current.kind === 'alert' || !current.danger}
-              onClick={() => resolveHead(true)}
-              style={{
-                ...primaryBtn,
-                background: current.danger ? 'var(--color-destructive, #dc2626)' : 'var(--color-primary, #3b82f6)',
-                color: current.danger ? 'var(--color-destructive-foreground, #fff)' : 'var(--color-primary-foreground, #fff)',
-              }}
-            >
-              {confirmLabel}
-            </button>
-          </div>
+          </>
+        ) : (
+          <>
+            <div className="flex items-start gap-1 px-6 pt-6">
+              <div className="min-w-0 flex-1 pe-2">
+                <h2 id={titleId} className="text-lg font-semibold text-foreground [overflow-wrap:anywhere]">{current.title}</h2>
+                {attribution}
+              </div>
+              <PluginDialogMenu name={name} onTurnOff={turnOff} />
+            </div>
+            <div className="px-6 pt-3 pb-6">
+              {message}
+              {isPrompt ? (
+                <form onSubmit={(e) => { e.preventDefault(); submitPrompt(); }}>
+                  <div className="mb-6 flex flex-col gap-4">
+                    {fields.map((f, i) => (
+                      <label key={f.name} className="block">
+                        <span className="text-sm font-medium mb-1 block text-foreground">
+                          {f.label}{f.required && <span className="text-destructive"> *</span>}
+                        </span>
+                        <Input
+                          type={f.type === 'password' ? 'password' : 'text'}
+                          value={values[f.name] ?? ''}
+                          placeholder={f.placeholder}
+                          autoFocus={i === 0}
+                          autoComplete={f.type === 'password' ? 'off' : undefined}
+                          onChange={(e) => setValues((v) => ({ ...v, [f.name]: e.target.value }))}
+                        />
+                      </label>
+                    ))}
+                    {hasPassword && (
+                      <p className="rounded-md bg-warning/10 px-3 py-2 text-xs text-foreground">{t('password_note', { name })}</p>
+                    )}
+                  </div>
+                  <div className="flex items-center justify-end gap-3">
+                    <Button type="button" variant="outline" onClick={cancel}>{cancelLabel}</Button>
+                    <Button type="submit" disabled={!canSubmit}>{confirmLabel}</Button>
+                  </div>
+                </form>
+              ) : (
+                <div className={cn('flex items-center justify-end gap-3', !current.message && 'mt-3')}>
+                  {current.kind === 'confirm' && (
+                    <Button type="button" variant="outline" autoFocus={!!current.danger} onClick={cancel}>{cancelLabel}</Button>
+                  )}
+                  <Button
+                    type="button"
+                    variant={current.danger ? 'destructive' : 'default'}
+                    autoFocus={current.kind === 'alert' || !current.danger}
+                    onClick={() => resolveThis(true)}
+                  >
+                    {confirmLabel}
+                  </Button>
+                </div>
+              )}
+            </div>
+          </>
         )}
-        <div style={{ marginTop: 12, fontSize: 11, color: 'var(--color-muted-foreground, #94a3b8)', textAlign: 'right' }}>
-          From plugin: {current.pluginId}
-        </div>
       </div>
     </div>
   );
 }
+
+/** A footer button's icon by name; unknown names show none. */
+function FooterIcon({ name }: { name?: string }) {
+  const Glyph = name ? iconForName(name) : null;
+  return Glyph ? <Glyph className="w-4 h-4" aria-hidden="true" /> : null;
+}
+
+/** The "⋯" menu in a plugin dialog's header: the way out of a plugin that keeps asking. */
+function PluginDialogMenu({ name, onTurnOff }: { name: string; onTurnOff: () => void }) {
+  const t = useTranslations('plugins.dialog');
+  const [open, setOpen] = useState(false);
+  const ref = useRef<HTMLDivElement>(null);
+  useEffect(() => {
+    if (!open) return;
+    const onDown = (e: MouseEvent) => {
+      if (ref.current && !ref.current.contains(e.target as Node)) setOpen(false);
+    };
+    document.addEventListener('mousedown', onDown, true);
+    return () => document.removeEventListener('mousedown', onDown, true);
+  }, [open]);
+  return (
+    <div ref={ref} className="relative flex-shrink-0">
+      <button
+        type="button"
+        onClick={() => setOpen((v) => !v)}
+        aria-haspopup="menu"
+        aria-expanded={open}
+        aria-label={t('plugin_menu', { name })}
+        title={t('plugin_menu', { name })}
+        className={cn('p-1.5 rounded-md hover:bg-muted transition-colors duration-150 text-muted-foreground hover:text-foreground', open && 'bg-muted text-foreground')}
+      >
+        <MoreHorizontal className="w-5 h-5" />
+      </button>
+      {open && (
+        <div role="menu" className="absolute end-0 top-full z-10 mt-1 min-w-[200px] rounded-md border border-border bg-background py-1 shadow-lg">
+          <button
+            type="button"
+            role="menuitem"
+            onClick={() => { setOpen(false); onTurnOff(); }}
+            className="w-full px-3 py-1.5 text-sm text-start flex items-center gap-2 transition-colors duration-150 text-destructive hover:bg-destructive/10 focus:outline-none focus:bg-destructive/10"
+          >
+            <Power className="w-4 h-4 flex-shrink-0" />
+            <span className="flex-1">{t('turn_off', { name })}</span>
+          </button>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/components/plugins/plugin-iframe-slot.tsx b/components/plugins/plugin-iframe-slot.tsx
index b2b1e5b23..0eda9b2ec 100644
--- a/components/plugins/plugin-iframe-slot.tsx
+++ b/components/plugins/plugin-iframe-slot.tsx
@@ -6,10 +6,12 @@
 // null-origin context; its height is pushed back via postMessage and applied
 // to a wrapper <div>.
 
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import type { SlotName } from '@/lib/plugin-types';
 import { get as getActivePlugin } from '@/lib/plugin-sandbox/registry';
 import { createSlotInstance, type SandboxInstance } from '@/lib/plugin-sandbox/host-bridge';
+import { slotPropsFor } from '@/lib/plugin-sandbox/permissions';
+import { isInlineSlot } from '@/lib/plugin-sandbox/slot-layout';
 import { snapshotHostTheme } from '@/lib/plugin-sandbox/host-theme';
 import { useThemeStore } from '@/stores/theme-store';
 
@@ -23,9 +25,19 @@ export function PluginIframeSlot({ pluginId, slot, extraProps }: Props) {
   const wrapperRef = useRef<HTMLDivElement>(null);
   const instanceRef = useRef<SandboxInstance | null>(null);
   const [height, setHeight] = useState<number>(0);
+  const [width, setWidth] = useState<number | undefined>(undefined);
+  const inline = isInlineSlot(slot);
   // null = pending, true/false = decided
   const [show, setShow] = useState<boolean | null>(null);
 
+  // What the plugin may see of the surface the slot sits on. Everything the
+  // plugin receives (shouldShow context, mount props, updates) goes through
+  // this, so a ui:* permission never hands over mail, events or contacts.
+  const props = useMemo(() => {
+    const active = getActivePlugin(pluginId);
+    return active ? slotPropsFor(active.plugin, slot, extraProps ?? {}) : {};
+  }, [pluginId, slot, extraProps]);
+
   // Decide whether to mount based on the plugin's shouldShow (background-side).
   useEffect(() => {
     const active = getActivePlugin(pluginId);
@@ -35,11 +47,11 @@ export function PluginIframeSlot({ pluginId, slot, extraProps }: Props) {
     if (!offer.hasShouldShow) { setShow(true); return; }
     let cancelled = false;
     active.background
-      .evaluateShouldShow(slot, extraProps ?? {})
+      .evaluateShouldShow(slot, props)
       .then((s) => { if (!cancelled) setShow(s); })
       .catch(() => { if (!cancelled) setShow(false); });
     return () => { cancelled = true; };
-  }, [pluginId, slot, extraProps]);
+  }, [pluginId, slot, props]);
 
   // Spawn / tear down the slot iframe.
   useEffect(() => {
@@ -53,24 +65,27 @@ export function PluginIframeSlot({ pluginId, slot, extraProps }: Props) {
       code: active.code,
       locale,
       tier: active.tier,
-      extraProps: extraProps ?? {},
+      extraProps: props,
       hostContainer: wrapperRef.current,
-      onResize: (h) => setHeight(h),
+      onResize: (h, w) => {
+        setHeight(h);
+        if (w !== undefined) setWidth(w);
+      },
     });
     instanceRef.current = inst;
     return () => {
       try { inst.destroy(); } catch { /* ignore */ }
       instanceRef.current = null;
     };
-    // We intentionally don't depend on extraProps here - propagating prop
+    // We intentionally don't depend on props here - propagating prop
     // changes happens via postMessage below to avoid iframe churn.
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [show, pluginId, slot]);
 
   // Push prop updates without remount.
   useEffect(() => {
-    instanceRef.current?.updateProps(extraProps ?? {});
-  }, [extraProps]);
+    instanceRef.current?.updateProps(props);
+  }, [props]);
 
   // Re-theme the live slot iframe when the host theme changes (dark/light
   // toggle or custom theme switch), without tearing down the iframe. Reacting
@@ -80,8 +95,20 @@ export function PluginIframeSlot({ pluginId, slot, extraProps }: Props) {
   const activeThemeId = useThemeStore((s) => s.activeThemeId);
   useEffect(() => {
     instanceRef.current?.setTheme(snapshotHostTheme());
+    // The store may apply the new theme to the page after this render: read
+    // it again a frame later, so the frame never keeps the old values.
+    const frame = requestAnimationFrame(() => instanceRef.current?.setTheme(snapshotHostTheme()));
+    return () => cancelAnimationFrame(frame);
   }, [resolvedTheme, activeThemeId]);
 
   if (show !== true) return null;
-  return <div ref={wrapperRef} style={{ height, minHeight: height }} data-plugin-iframe-slot={`${pluginId}:${slot}`} />;
+  return (
+    <div
+      ref={wrapperRef}
+      style={inline
+        ? { display: 'inline-block', verticalAlign: 'middle', height, width: width ?? 0, maxWidth: '100%', overflow: 'hidden' }
+        : { height, minHeight: height }}
+      data-plugin-iframe-slot={`${pluginId}:${slot}`}
+    />
+  );
 }
diff --git a/components/plugins/plugin-page-app.tsx b/components/plugins/plugin-page-app.tsx
new file mode 100644
index 000000000..8a0f76939
--- /dev/null
+++ b/components/plugins/plugin-page-app.tsx
@@ -0,0 +1,165 @@
+"use client";
+
+import { useEffect, useMemo, useState, useSyncExternalStore } from "react";
+import { useTranslations } from "next-intl";
+import { Link } from "@/i18n/navigation";
+import { Loader2, Puzzle } from "@/components/icons";
+import { useAuthStore, redirectToLogin, saveRedirectAfterLogin } from "@/stores/auth-store";
+import { useEmailStore } from "@/stores/email-store";
+import { usePluginStore } from "@/stores/plugin-store";
+import { NavigationRail } from "@/components/layout/navigation-rail";
+import { SidebarAppsModal } from "@/components/layout/sidebar-apps-modal";
+import { InlineAppView } from "@/components/layout/inline-app-view";
+import { MvTopBar } from "@/components/layout/mv-top-bar";
+import { AppTopBannerSlot } from "@/components/plugins/app-top-banner-slot";
+import { PluginIframeSlot } from "@/components/plugins/plugin-iframe-slot";
+import { useSidebarApps } from "@/hooks/use-sidebar-apps";
+import { useIsEmbedded } from "@/hooks/use-is-embedded";
+import { useIsMobile } from "@/hooks/use-media-query";
+import { useMountainViewShell } from "@/hooks/use-mountain-view-shell";
+import { useDocumentTitle } from "@/hooks/use-document-title";
+import { findPage, subscribePages } from "@/lib/plugin-sandbox/pages";
+import { offersForSlot, subscribe as subscribeSlots } from "@/lib/plugin-sandbox/registry";
+import { cn } from "@/lib/utils";
+
+export interface PluginPageAppProps {
+  /** Path segments after `/apps`: `[pluginId, pageId, ...subPath]`. */
+  linkSegments?: string[];
+}
+
+/**
+ * A page a plugin added with api.ui.setPages, at /apps/<pluginId>/<pageId>.
+ * The app's own frame (navigation rail, or Mountain View's top bar, and the
+ * phone navigation) stays around it; the plugin's `app-page` slot fills the
+ * content area and gets the rest of the path as `path`.
+ */
+export function PluginPageApp({ linkSegments = [] }: PluginPageAppProps) {
+  const t = useTranslations("plugin_pages");
+  const [pluginId = "", pageId = "", ...rest] = linkSegments;
+  const subPath = rest.join("/");
+
+  const { isAuthenticated, logout, checkAuth, isLoading: authLoading } = useAuthStore();
+  const [initialCheckDone, setInitialCheckDone] = useState(
+    () => useAuthStore.getState().isAuthenticated && !!useAuthStore.getState().client,
+  );
+  const { quota, isPushConnected } = useEmailStore();
+  const { showAppsModal, inlineApp, loadedApps, handleManageApps, handleInlineApp, closeInlineApp, closeAppsModal } = useSidebarApps();
+  const isMobile = useIsMobile();
+  const isEmbedded = useIsEmbedded();
+  const mvShell = useMountainViewShell(isEmbedded);
+  const pluginsReady = usePluginStore((s) => s.initialized);
+
+  const page = useSyncExternalStore(
+    subscribePages,
+    () => findPage(pluginId, pageId),
+    () => null,
+  );
+  const offersPage = useSyncExternalStore(
+    subscribeSlots,
+    () => offersForSlot("app-page").some((o) => o.pluginId === pluginId),
+    () => false,
+  );
+  useDocumentTitle(page?.title ?? null);
+
+  useEffect(() => {
+    const state = useAuthStore.getState();
+    if (state.isAuthenticated && state.client) {
+      setInitialCheckDone(true);
+      return;
+    }
+    checkAuth().finally(() => setInitialCheckDone(true));
+  }, [checkAuth]);
+
+  useEffect(() => {
+    if (initialCheckDone && !isAuthenticated && !authLoading) {
+      saveRedirectAfterLogin();
+      redirectToLogin();
+    }
+  }, [initialCheckDone, isAuthenticated, authLoading]);
+
+  // Opened straight from a link or a reload: the plugins have not been
+  // started yet on this page load (mail and settings do the same).
+  useEffect(() => {
+    if (isAuthenticated) void usePluginStore.getState().initializePlugins();
+  }, [isAuthenticated]);
+
+  const extraProps = useMemo(() => ({ pageId, path: subPath }), [pageId, subPath]);
+
+  if (!isAuthenticated) return null;
+
+  const available = !!page && offersPage;
+  let content: React.ReactNode;
+  if (available) {
+    content = (
+      <div className="flex-1 min-h-0 overflow-y-auto" data-plugin-page={`${pluginId}/${pageId}`}>
+        <PluginIframeSlot key={`${pluginId}/${pageId}`} pluginId={pluginId} slot="app-page" extraProps={extraProps} />
+      </div>
+    );
+  } else if (!pluginsReady) {
+    content = (
+      <div className="flex flex-1 items-center justify-center">
+        <Loader2 className="w-6 h-6 text-muted-foreground animate-spin" aria-label={t("loading")} />
+      </div>
+    );
+  } else {
+    content = (
+      <div className="flex flex-1 items-center justify-center p-4">
+        <div className="max-w-sm text-center space-y-3">
+          <Puzzle className="w-10 h-10 text-muted-foreground mx-auto" />
+          <p className="text-sm font-medium text-foreground">{t("not_available_title")}</p>
+          <p className="text-xs text-muted-foreground">{t("not_available_description")}</p>
+          <Link href="/" className="inline-block text-sm text-primary hover:underline underline-offset-2">
+            {t("back_to_mail")}
+          </Link>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className={cn("flex flex-col overflow-hidden pt-[env(safe-area-inset-top)]", mvShell ? "bg-[var(--mv-canvas)]" : "bg-background", isEmbedded ? "h-full" : "h-dvh")}>
+      <AppTopBannerSlot />
+      {mvShell && (
+        <MvTopBar
+          showMenuButton={false}
+          onManageApps={handleManageApps}
+          onInlineApp={handleInlineApp}
+          onCloseInlineApp={closeInlineApp}
+          activeAppId={inlineApp?.id ?? null}
+        />
+      )}
+      <div data-mv-card={mvShell ? "" : undefined} className={cn("flex flex-1 min-h-0 overflow-hidden", mvShell && "mb-4 mx-4")}>
+        {!isMobile && !isEmbedded && !mvShell && (
+          <div className="w-14 bg-secondary flex flex-col flex-shrink-0" style={{ borderRight: "1px solid rgba(128, 128, 128, 0.3)" }}>
+            <NavigationRail
+              collapsed
+              quota={quota}
+              isPushConnected={isPushConnected}
+              onLogout={logout}
+              onManageApps={handleManageApps}
+              onInlineApp={handleInlineApp}
+              onCloseInlineApp={closeInlineApp}
+              activeAppId={inlineApp?.id ?? null}
+            />
+          </div>
+        )}
+        <div className="flex flex-col flex-1 min-w-0">
+          {inlineApp && <InlineAppView apps={loadedApps} activeAppId={inlineApp.id} onClose={closeInlineApp} />}
+          <div className={cn("flex flex-col flex-1 min-h-0", inlineApp && "hidden")}>
+            {content}
+          </div>
+          {isMobile && !isEmbedded && (
+            <NavigationRail
+              orientation="horizontal"
+              onManageApps={handleManageApps}
+              onInlineApp={handleInlineApp}
+              onCloseInlineApp={closeInlineApp}
+              activeAppId={inlineApp?.id ?? null}
+            />
+          )}
+        </div>
+      </div>
+      <SidebarAppsModal isOpen={showAppsModal} onClose={closeAppsModal} />
+    </div>
+  );
+}
diff --git a/components/plugins/plugin-permission-list.tsx b/components/plugins/plugin-permission-list.tsx
new file mode 100644
index 000000000..71b91ffb9
--- /dev/null
+++ b/components/plugins/plugin-permission-list.tsx
@@ -0,0 +1,57 @@
+'use client';
+
+import { useTranslations } from 'next-intl';
+import { AlertTriangle } from '@/components/icons';
+import { cn } from '@/lib/utils';
+import { HIGH_RISK_PERMISSIONS, permissionKey, visiblePermissions } from '@/lib/plugin-sandbox/permission-text';
+
+interface PluginPermissionListProps {
+  permissions: readonly string[];
+  /** Sites the plugin may send requests to (manifest httpOrigins). */
+  httpOrigins?: readonly string[];
+  /** Server endpoints it may call with the user's login (apiPostPaths). */
+  apiPostPaths?: readonly string[];
+  compact?: boolean;
+}
+
+/** Plain-language list of what a plugin may do, high-risk items first. */
+export function PluginPermissionList({ permissions, httpOrigins, apiPostPaths, compact }: PluginPermissionListProps) {
+  const t = useTranslations('plugins.permissions');
+  const perms = visiblePermissions(permissions);
+  if (perms.length === 0) {
+    return <p className="text-xs text-muted-foreground">{t('none')}</p>;
+  }
+  return (
+    <ul className={cn('space-y-1.5', compact && 'space-y-1')}>
+      {perms.map((perm) => {
+        const key = permissionKey(perm);
+        const risky = HIGH_RISK_PERMISSIONS.has(perm);
+        const targets = perm === 'http:fetch' ? httpOrigins : perm === 'http:post' ? apiPostPaths : undefined;
+        return (
+          <li
+            key={perm}
+            className={cn(
+              'rounded-md border px-3 py-2',
+              risky ? 'border-warning/40 bg-warning/10' : 'border-border bg-muted/40',
+            )}
+          >
+            <div className="flex items-start gap-2">
+              {risky && <AlertTriangle className="mt-0.5 h-3.5 w-3.5 flex-shrink-0 text-warning" aria-label={t('high_risk')} />}
+              <div className="min-w-0">
+                <div className="text-sm font-medium text-foreground">{t(`${key}.title`)}</div>
+                {!compact && <div className="text-xs text-muted-foreground">{t(`${key}.body`)}</div>}
+                {targets && targets.length > 0 && (
+                  <ul className="mt-1 space-y-0.5">
+                    {targets.map((target) => (
+                      <li key={target} className="break-all font-mono text-[11px] text-foreground">{target}</li>
+                    ))}
+                  </ul>
+                )}
+              </div>
+            </div>
+          </li>
+        );
+      })}
+    </ul>
+  );
+}
diff --git a/components/plugins/plugin-sidebar-sections.tsx b/components/plugins/plugin-sidebar-sections.tsx
new file mode 100644
index 000000000..f52f3bff9
--- /dev/null
+++ b/components/plugins/plugin-sidebar-sections.tsx
@@ -0,0 +1,86 @@
+'use client';
+
+import { useId, useMemo, useState, useSyncExternalStore } from 'react';
+import { ChevronDown, ChevronRight } from '@/components/icons';
+import { get as getActivePlugin, offersForSlot, subscribe } from '@/lib/plugin-sandbox/registry';
+import { sectionTitle, subscribeSectionTitles } from '@/lib/plugin-sandbox/section-titles';
+import { PluginIframeSlot } from './plugin-iframe-slot';
+
+const STORAGE_PREFIX = 'plugin-sidebar-section-collapsed:';
+
+function readCollapsed(pluginId: string): boolean {
+  try {
+    return localStorage.getItem(STORAGE_PREFIX + pluginId) === '1';
+  } catch {
+    return false;
+  }
+}
+
+function writeCollapsed(pluginId: string, collapsed: boolean): void {
+  try {
+    if (collapsed) localStorage.setItem(STORAGE_PREFIX + pluginId, '1');
+    else localStorage.removeItem(STORAGE_PREFIX + pluginId);
+  } catch {
+    // Storage may be blocked; the section just opens expanded next time.
+  }
+}
+
+function PluginSidebarSection({ pluginId, extraProps }: { pluginId: string; extraProps: Record<string, unknown> }) {
+  const [collapsed, setCollapsed] = useState(() => readCollapsed(pluginId));
+  const bodyId = useId();
+  const title = useSyncExternalStore(subscribeSectionTitles, () => sectionTitle(pluginId), () => undefined);
+  const name = title || getActivePlugin(pluginId)?.plugin.name || pluginId;
+
+  const toggle = () => {
+    setCollapsed((prev) => {
+      writeCollapsed(pluginId, !prev);
+      return !prev;
+    });
+  };
+
+  return (
+    <div data-plugin-sidebar-section={pluginId}>
+      {/* Same look as the sidebar's own section headers (Folders, Tags). */}
+      <button
+        type="button"
+        onClick={toggle}
+        aria-expanded={!collapsed}
+        aria-controls={bodyId}
+        className="group w-full flex items-center pb-1 pt-5 px-3 select-none rounded-sm hover:bg-muted/40 transition-colors"
+      >
+        {collapsed ? (
+          <ChevronRight className="w-3.5 h-3.5 text-muted-foreground flex-shrink-0 rtl:-scale-x-100" />
+        ) : (
+          <ChevronDown className="w-3.5 h-3.5 text-muted-foreground flex-shrink-0" />
+        )}
+        <span className="ms-1.5 text-sm font-semibold text-foreground truncate">{name}</span>
+      </button>
+      {/* A collapsed section has no iframe at all, so it costs nothing. */}
+      <div id={bodyId} hidden={collapsed}>
+        {!collapsed && <PluginIframeSlot pluginId={pluginId} slot="sidebar-section" extraProps={extraProps} />}
+      </div>
+    </div>
+  );
+}
+
+/**
+ * The `sidebar-section` slot: one collapsible section per plugin in the mail
+ * sidebar, below the folders and tags. The header carries the title the plugin
+ * set (api.ui.setSectionTitle), or its name;
+ * whether it is folded is remembered per plugin in this browser.
+ */
+export function PluginSidebarSections({ mailboxId }: { mailboxId: string | null }) {
+  const getSnapshot = () => offersForSlot('sidebar-section');
+  const offers = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+  const extraProps = useMemo(() => ({ mailboxId }), [mailboxId]);
+
+  if (offers.length === 0) return null;
+
+  return (
+    <div data-plugin-slot="sidebar-section">
+      {offers.map((offer) => (
+        <PluginSidebarSection key={offer.pluginId} pluginId={offer.pluginId} extraProps={extraProps} />
+      ))}
+    </div>
+  );
+}
diff --git a/components/plugins/plugin-slot.tsx b/components/plugins/plugin-slot.tsx
index babdc534d..50a4a340f 100644
--- a/components/plugins/plugin-slot.tsx
+++ b/components/plugins/plugin-slot.tsx
@@ -4,6 +4,8 @@ import React, { useSyncExternalStore } from 'react';
 import type { SlotName } from '@/lib/plugin-types';
 import { offersForSlot, subscribe } from '@/lib/plugin-sandbox/registry';
 import { PluginIframeSlot } from './plugin-iframe-slot';
+import { isInlineSlot } from '@/lib/plugin-sandbox/slot-layout';
+import { cn } from '@/lib/utils';
 
 interface PluginSlotProps {
   name: SlotName;
@@ -17,8 +19,12 @@ export function PluginSlot({ name, className, extraProps }: PluginSlotProps) {
 
   if (offers.length === 0) return null;
 
+  // Inline slots line up next to each other in a toolbar row.
   return (
-    <div className={className} data-plugin-slot={name}>
+    <div
+      className={isInlineSlot(name) ? cn('inline-flex flex-wrap items-center gap-1', className) : className}
+      data-plugin-slot={name}
+    >
       {offers.map((offer) => (
         <PluginIframeSlot
           key={offer.pluginId}
diff --git a/components/pro/pro-compose-tab-body.tsx b/components/pro/pro-compose-tab-body.tsx
index f7d83a926..84fdd5c90 100644
--- a/components/pro/pro-compose-tab-body.tsx
+++ b/components/pro/pro-compose-tab-body.tsx
@@ -12,6 +12,7 @@ import { toast } from "@/stores/toast-store";
 import { useProTabStore, registerProTabCloseInterceptor, type ProComposeTabData } from "@/stores/pro-tab-store";
 import { debug } from "@/lib/debug";
 import { threadKeyFor } from "@/lib/thread-utils";
+import { announceSent } from "@/lib/plugin-after-send";
 
 interface ProComposeTabBodyProps {
   tabId: string;
@@ -89,6 +90,7 @@ export function ProComposeTabBody({ tabId, data }: ProComposeTabBodyProps) {
         { localAccountId: sendData.localAccountId },
       );
       submitted = true;
+      announceSent(result, sendData);
 
       if (result.scheduled) {
         await handleScheduledSendCreated();
@@ -217,6 +219,9 @@ export function ProComposeTabBody({ tabId, data }: ProComposeTabBodyProps) {
           replyTo={data.replyTo}
           initialDraftText={data.initialDraftText}
           initialData={data.initialData}
+          prefill={data.prefill}
+          sessionKey={`pro-${tabId}-${data.sessionId}`}
+          sourceEmailId={data.sourceEmailId ?? undefined}
           composeFromAccountEmail={composeFromAccountEmail}
           onSend={handleSend}
           onScheduledSendCreated={handleScheduledSendCreated}
diff --git a/components/pro/pro-email-tab-body.tsx b/components/pro/pro-email-tab-body.tsx
index ed29e0d55..416bda8ef 100644
--- a/components/pro/pro-email-tab-body.tsx
+++ b/components/pro/pro-email-tab-body.tsx
@@ -11,7 +11,9 @@ import { useProMultiAccountIdentities } from "@/hooks/use-pro-multi-account-iden
 import { findDraftIdentityId } from "@/lib/reply-identity";
 import { useSettingsStore } from "@/stores/settings-store";
 import { toast } from "@/stores/toast-store";
-import { useProTabStore, type ProEmailTabData, type ProReplyContext } from "@/stores/pro-tab-store";
+import { useProTabStore, type ProComposeTabData, type ProEmailTabData, type ProReplyContext } from "@/stores/pro-tab-store";
+import { emailHooks } from "@/lib/plugin-hooks";
+import { composeOptionsFor, runBeforeCompose, type ComposePrefill } from "@/lib/plugin-compose-gate";
 import type { Email } from "@/lib/jmap/types";
 import type { IJMAPClient } from "@/lib/jmap/client-interface";
 import { buildReplySubject, buildForwardSubject } from "@/lib/subject-prefix";
@@ -92,12 +94,38 @@ export function ProEmailView({ emailId, client: clientOverride, accountId, onLoa
   const identities = useIdentityStore((s) => s.identities);
   const multiAccountIdentities = useProMultiAccountIdentities();
 
-  const openComposeTab = useProTabStore((s) => s.openComposeTab);
+  const openComposeTabNow = useProTabStore((s) => s.openComposeTab);
 
   const [email, setEmail] = useState<Email | null>(null);
   const [isLoading, setIsLoading] = useState(true);
   const composerSessionIdRef = useRef(0);
 
+  // Every compose tab opened from here asks onBeforeCompose first: a plugin
+  // may stop it or prefill it. Opens straight away when nobody listens.
+  const openComposeTab = useCallback((
+    data: Omit<ProComposeTabData, 'sessionId'>,
+    fields: Omit<NonNullable<Parameters<typeof composeOptionsFor>[1]>, 'ownEmails' | 'replyPrefix' | 'forwardPrefix'>,
+    onOpened?: () => void,
+  ) => {
+    const open = (prefill: ComposePrefill | null) => {
+      composerSessionIdRef.current += 1;
+      openComposeTabNow({ ...data, sessionId: composerSessionIdRef.current, prefill });
+      onOpened?.();
+    };
+    if (emailHooks.onBeforeCompose.size === 0) {
+      open(null);
+      return;
+    }
+    void runBeforeCompose(composeOptionsFor(data.mode, {
+      ...fields,
+      ownEmails: identities.map((i) => i.email).filter((e): e is string => Boolean(e)),
+      replyPrefix: t('email_composer.prefix.reply'),
+      forwardPrefix: t('email_composer.prefix.forward'),
+    })).then((prefill) => {
+      if (prefill) open(Object.keys(prefill).length > 0 ? prefill : null);
+    });
+  }, [identities, openComposeTabNow, t]);
+
   // Held in a ref so a host passing an inline callback doesn't refetch the
   // message on every render.
   const onLoadedRef = useRef(onLoaded);
@@ -134,39 +162,33 @@ export function ProEmailView({ emailId, client: clientOverride, accountId, onLoa
 
   const handleReply = useCallback((draftText?: string) => {
     if (!email) return;
-    composerSessionIdRef.current += 1;
     openComposeTab({
-      sessionId: composerSessionIdRef.current,
       mode: 'reply',
       replyTo: buildReplyContext(email),
       sourceEmailId: email.id,
       initialDraftText: draftText,
       title: buildReplySubject(email.subject || t('email_composer.new_message'), t('email_composer.prefix.reply')),
-    });
+    }, { source: email, body: draftText ?? '' });
   }, [email, openComposeTab, t]);
 
   const handleReplyAll = useCallback(() => {
     if (!email) return;
-    composerSessionIdRef.current += 1;
     openComposeTab({
-      sessionId: composerSessionIdRef.current,
       mode: 'replyAll',
       replyTo: buildReplyContext(email),
       sourceEmailId: email.id,
       title: buildReplySubject(email.subject || t('email_composer.new_message'), t('email_composer.prefix.reply')),
-    });
+    }, { source: email });
   }, [email, openComposeTab, t]);
 
   const handleForward = useCallback(() => {
     if (!email) return;
-    composerSessionIdRef.current += 1;
     openComposeTab({
-      sessionId: composerSessionIdRef.current,
       mode: 'forward',
       replyTo: buildReplyContext(email),
       sourceEmailId: email.id,
       title: buildForwardSubject(email.subject || t('email_composer.new_message'), t('email_composer.prefix.forward')),
-    });
+    }, { source: email });
   }, [email, openComposeTab, t]);
 
   // Mirrors handleForward, but attaches the original as a message/rfc822
@@ -194,9 +216,7 @@ export function ProEmailView({ emailId, client: clientOverride, accountId, onLoa
     });
     if (!payload) return;
 
-    composerSessionIdRef.current += 1;
     openComposeTab({
-      sessionId: composerSessionIdRef.current,
       mode: 'forward',
       replyTo: {
         subject: email.subject,
@@ -210,7 +230,7 @@ export function ProEmailView({ emailId, client: clientOverride, accountId, onLoa
       // above uses - reusing payload.subject here would give the tab an
       // empty title instead of e.g. "Fwd: New message".
       title: buildForwardSubject(email.subject || t('email_composer.new_message'), t('email_composer.prefix.forward')),
-    });
+    }, { subject: payload.subject });
   }, [email, openComposeTab, t]);
 
   const handleDelete = useCallback(async () => {
@@ -339,9 +359,9 @@ export function ProEmailView({ emailId, client: clientOverride, accountId, onLoa
       : identities;
     const matchedIdentityId = findDraftIdentityId(composerIdentities, email.from?.[0]);
 
-    composerSessionIdRef.current += 1;
+    const draftSubject = email.subject && email.subject !== t('email_composer.no_subject') ? email.subject : '';
+    const addresses = (list: Email['to']) => (list ?? []).map((a) => a.email).filter(Boolean);
     openComposeTab({
-      sessionId: composerSessionIdRef.current,
       mode: 'compose',
       title: email.subject || t('email_composer.new_message'),
       initialData: {
@@ -363,8 +383,7 @@ export function ProEmailView({ emailId, client: clientOverride, accountId, onLoa
         // composer without its files and the next save stripped them.
         attachments: email.attachments,
       },
-    });
-    onClose();
+    }, { to: addresses(email.to), cc: addresses(email.cc), subject: draftSubject, body: bodyText }, onClose);
   }, [email, identities, multiAccountIdentities, openComposeTab, onClose, t]);
 
   return (
diff --git a/components/pro/pro-folder-tab-body.tsx b/components/pro/pro-folder-tab-body.tsx
index 642d730a2..3132e3ff2 100644
--- a/components/pro/pro-folder-tab-body.tsx
+++ b/components/pro/pro-folder-tab-body.tsx
@@ -14,6 +14,7 @@ import { useProTabStore, type ProFolderTabData } from "@/stores/pro-tab-store";
 import { useDeviceDetection } from "@/hooks/use-media-query";
 import { usePaneId } from "@/hooks/use-pane-context";
 import type { Email, Mailbox } from "@/lib/jmap/types";
+import { emailHooks } from "@/lib/plugin-hooks";
 
 interface ProFolderTabBodyProps {
   tabId: string;
@@ -118,16 +119,24 @@ export function ProFolderTabBody({ tabId, data }: ProFolderTabBodyProps) {
     }
   }, [hasMore, isLoadingMore, isLoading, loadPage, emails.length]);
 
-  const markRowAsRead = useCallback((email: Email) => {
+  const markRowAsRead = useCallback(async (email: Email) => {
     if (!client || email.keywords?.$seen) return;
+    // Straight to the client: the store's markAsRead only serves emails in
+    // its own (global) list, which this tab's rows are not part of. So the
+    // plugin hooks the store action fires are fired here.
+    if (emailHooks.onBeforeEmailReadStateChange.size > 0
+      && !(await emailHooks.onBeforeEmailReadStateChange.intercept({ emailIds: [email.id], read: true }))) {
+      return;
+    }
     setEmails((prev) => prev.map((e) => e.id === email.id
       ? { ...e, keywords: { ...e.keywords, $seen: true } }
       : e));
-    // Straight to the client: the store's markAsRead only serves emails in
-    // its own (global) list, which this tab's rows are not part of.
-    void client.markAsRead(email.id, true, jmapAccountId).catch((err) => {
+    try {
+      await client.markAsRead(email.id, true, jmapAccountId);
+      void emailHooks.onEmailReadStateChange.emit({ emailIds: [email.id], read: true });
+    } catch (err) {
       console.error('Mark as read failed:', err);
-    });
+    }
   }, [client, jmapAccountId]);
 
   const openAsEmailTab = useCallback((email: Email, reuseReader: boolean) => {
@@ -143,7 +152,7 @@ export function ProFolderTabBody({ tabId, data }: ProFolderTabBodyProps) {
   }, [data.mailboxId, paneId, t]);
 
   const handleRowClick = useCallback((email: Email) => {
-    markRowAsRead(email);
+    void markRowAsRead(email);
     if (isMobile) {
       // No room for a reading pane - promote to a dedicated email tab.
       openAsEmailTab(email, true);
diff --git a/components/providers/plugin-app-events.tsx b/components/providers/plugin-app-events.tsx
new file mode 100644
index 000000000..f16b5146d
--- /dev/null
+++ b/components/providers/plugin-app-events.tsx
@@ -0,0 +1,141 @@
+'use client';
+
+// Window, navigation and app lifecycle events for plugins. Mounted once in
+// the localized layout, so plugins hear about them on every page; they used
+// to be wired inside the mail view and stopped in Calendar, Contacts, Files
+// and Settings.
+
+import { useEffect, useRef } from 'react';
+import { usePathname } from 'next/navigation';
+import { appLifecycleHooks, routerHooks, toastHooks, uiHooks } from '@/lib/plugin-hooks';
+import { usePluginStore } from '@/stores/plugin-store';
+import { useAuthStore } from '@/stores/auth-store';
+import { useAccountStore } from '@/stores/account-store';
+
+/** How often onInterval fires. */
+export const PLUGIN_INTERVAL_MS = 60_000;
+
+type SelectionSource = 'email-body' | 'composer' | 'task-detail' | 'event-detail' | 'other';
+
+function selectionSource(anchorEl: Element | null): { source: SelectionSource; emailId?: string } {
+  if (!anchorEl) return { source: 'other' };
+  if (anchorEl.closest('[data-plugin-source="email-body"], iframe.email-body, .email-viewer-body')) {
+    const idEl = anchorEl.closest('[data-email-id]') as HTMLElement | null;
+    return { source: 'email-body', emailId: idEl?.dataset.emailId };
+  }
+  if (anchorEl.closest('[data-plugin-source="composer"], .email-composer')) return { source: 'composer' };
+  if (anchorEl.closest('[data-plugin-source="task-detail"]')) return { source: 'task-detail' };
+  if (anchorEl.closest('[data-plugin-source="event-detail"]')) return { source: 'event-detail' };
+  return { source: 'other' };
+}
+
+export function PluginAppEvents() {
+  // Window and document events.
+  useEffect(() => {
+    if (typeof window === 'undefined') return;
+    const onFocus = () => { void appLifecycleHooks.onWindowFocus.emit({}); };
+    const onBlur = () => { void appLifecycleHooks.onWindowBlur.emit({}); };
+    const onOnline = () => { void appLifecycleHooks.onOnline.emit({}); };
+    const onOffline = () => { void appLifecycleHooks.onOffline.emit({}); };
+    const onVisibility = () => {
+      void appLifecycleHooks.onVisibilityChange.emit({ visible: document.visibilityState === 'visible' });
+    };
+    // Synchronous: the page may be gone before an async handler runs.
+    const onBeforeUnload = () => { appLifecycleHooks.onBeforeUnload.emitSync({}); };
+    const onError = (event: ErrorEvent) => {
+      void appLifecycleHooks.onAppError.emit({ message: String(event.message || 'Unknown error').slice(0, 500) });
+    };
+    const onRejection = (event: PromiseRejectionEvent) => {
+      const reason = event.reason instanceof Error ? event.reason.message : String(event.reason ?? 'Unhandled rejection');
+      void appLifecycleHooks.onAppError.emit({ message: reason.slice(0, 500) });
+    };
+
+    let selectionTimer: ReturnType<typeof setTimeout> | null = null;
+    const onSelectionChange = () => {
+      if (selectionTimer) clearTimeout(selectionTimer);
+      selectionTimer = setTimeout(() => {
+        if (uiHooks.onTextSelectionChange.size === 0) return;
+        const sel = document.getSelection();
+        const text = sel?.toString() ?? '';
+        if (!text) return;
+        const anchorNode = sel?.anchorNode as Node | null;
+        const anchorEl = (anchorNode?.nodeType === Node.ELEMENT_NODE
+          ? anchorNode as Element
+          : anchorNode?.parentElement) ?? null;
+        void uiHooks.onTextSelectionChange.emit({ text, ...selectionSource(anchorEl) });
+      }, 150);
+    };
+
+    const onSwMessage = (e: MessageEvent) => {
+      const msg = e.data as { kind?: string; tag?: string; data?: unknown } | null;
+      if (msg && msg.kind === 'notificationclick' && typeof msg.tag === 'string') {
+        // App notifications (new mail, reminders): the tag only. Their data
+        // names messages and events, which this hook's permission doesn't cover.
+        void toastHooks.onNotificationClick.emit({ tag: msg.tag });
+      }
+    };
+
+    const interval = setInterval(() => { void appLifecycleHooks.onInterval.emit({ now: new Date().toISOString() }); }, PLUGIN_INTERVAL_MS);
+
+    window.addEventListener('focus', onFocus);
+    window.addEventListener('blur', onBlur);
+    window.addEventListener('online', onOnline);
+    window.addEventListener('offline', onOffline);
+    window.addEventListener('beforeunload', onBeforeUnload);
+    window.addEventListener('error', onError);
+    window.addEventListener('unhandledrejection', onRejection);
+    document.addEventListener('visibilitychange', onVisibility);
+    document.addEventListener('selectionchange', onSelectionChange);
+    navigator.serviceWorker?.addEventListener('message', onSwMessage);
+    return () => {
+      clearInterval(interval);
+      window.removeEventListener('focus', onFocus);
+      window.removeEventListener('blur', onBlur);
+      window.removeEventListener('online', onOnline);
+      window.removeEventListener('offline', onOffline);
+      window.removeEventListener('beforeunload', onBeforeUnload);
+      window.removeEventListener('error', onError);
+      window.removeEventListener('unhandledrejection', onRejection);
+      document.removeEventListener('visibilitychange', onVisibility);
+      document.removeEventListener('selectionchange', onSelectionChange);
+      if (selectionTimer) clearTimeout(selectionTimer);
+      navigator.serviceWorker?.removeEventListener('message', onSwMessage);
+    };
+  }, []);
+
+  // Navigation between pages of the app.
+  const pathname = usePathname();
+  const prevPathnameRef = useRef<string | null>(null);
+  useEffect(() => {
+    if (!pathname) return;
+    const from = prevPathnameRef.current;
+    if (from === pathname) return;
+    if (from !== null) {
+      void routerHooks.onRouteLeave.emit({ path: from });
+      void routerHooks.onNavigate.emit({ path: pathname, from });
+    }
+    void routerHooks.onRouteEnter.emit({ path: pathname });
+    prevPathnameRef.current = pathname;
+  }, [pathname]);
+
+  // onAppReady: once per page load, when the user is signed in and the
+  // plugins have been started, so every plugin enabled at start hears it.
+  const pluginsReady = usePluginStore((s) => s.initialized);
+  const signedIn = useAuthStore((s) => s.isAuthenticated);
+
+  // Start the plugins on whichever page the user lands on. They used to start
+  // only from the mail view, so a plugin's sidebar entry, page or reminders
+  // were missing on Calendar, Contacts, Files or Settings opened directly.
+  useEffect(() => {
+    if (signedIn) void usePluginStore.getState().initializePlugins();
+  }, [signedIn]);
+
+  const readyFired = useRef(false);
+  useEffect(() => {
+    if (readyFired.current || !pluginsReady || !signedIn) return;
+    readyFired.current = true;
+    void appLifecycleHooks.onAppReady.emit({ accountId: useAccountStore.getState().activeAccountId });
+  }, [pluginsReady, signedIn]);
+
+  return null;
+}
diff --git a/components/providers/plugin-oauth-callback-listener.tsx b/components/providers/plugin-oauth-callback-listener.tsx
index 3b4299257..e610c9665 100644
--- a/components/providers/plugin-oauth-callback-listener.tsx
+++ b/components/providers/plugin-oauth-callback-listener.tsx
@@ -20,6 +20,7 @@ import { authHooks } from '@/lib/plugin-hooks';
 import {
   PLUGIN_OAUTH_EVENT as EVENT_NAME,
   PLUGIN_OAUTH_STORAGE_KEY as STORAGE_KEY,
+  takeOAuthStateOwner,
   type OAuthCallbackPayload,
 } from '@/lib/plugin-oauth';
 import { usePathname } from 'next/navigation';
@@ -83,7 +84,13 @@ export function PluginOAuthCallbackListener() {
       lastCode = code;
       lastState = payload.state ?? null;
       lastAt = now;
-      void authHooks.onOAuthCallback.emit(payload);
+      // Only the plugin that created this state gets the code.
+      const pluginId = takeOAuthStateOwner(payload.state);
+      if (pluginId) {
+        void authHooks.onOAuthCallback.emitTo(pluginId, payload);
+      } else {
+        console.warn('[plugin-oauth] callback with a state no plugin asked for; ignored');
+      }
       // Best-effort cleanup so a reload doesn't replay an old payload.
       try { localStorage.removeItem(STORAGE_KEY); } catch { /* ignore */ }
     };
diff --git a/components/settings/__tests__/plugins-settings-labels.test.tsx b/components/settings/__tests__/plugins-settings-labels.test.tsx
new file mode 100644
index 000000000..5b31a7617
--- /dev/null
+++ b/components/settings/__tests__/plugins-settings-labels.test.tsx
@@ -0,0 +1,37 @@
+import { describe, it, expect, vi } from 'vitest';
+import { fireEvent, render, screen } from '@testing-library/react';
+
+vi.mock('next-intl', () => ({ useTranslations: () => (key: string) => key, useLocale: () => 'de' }));
+vi.mock('@/hooks/use-config', () => ({ useConfig: () => ({ demoMode: false }) }));
+
+import { PluginsSettings } from '../plugins-settings';
+import { usePluginStore } from '@/stores/plugin-store';
+import { usePolicyStore } from '@/stores/policy-store';
+import type { InstalledPlugin } from '@/lib/plugin-types';
+
+const PLUGIN = {
+  id: 'p', name: 'P', version: '1.0.0', author: 'a', description: 'd', type: 'hook', permissions: [], entrypoint: 'index.js',
+  enabled: true, status: 'running', managed: true, settings: {},
+  settingsSchema: {
+    mode: { type: 'select', label: 'settings.mode', description: 'settings.mode_help', default: 'fast', options: ['fast', 'careful'] },
+    plain: { type: 'boolean', label: 'Plain label', default: false },
+  },
+  locales: { de: { 'settings.mode': 'Modus', 'settings.mode_help': 'Wie gearbeitet wird', fast: 'Schnell' } },
+} as unknown as InstalledPlugin;
+
+describe('plugin settings labels', () => {
+  it('shows labels, descriptions and options from the plugin\'s own translations', () => {
+    usePolicyStore.setState({ loaded: true, isFeatureEnabled: () => true, isPluginForceEnabled: () => false } as never);
+    usePluginStore.setState({ plugins: [PLUGIN], initialized: true, initializePlugins: vi.fn() } as never);
+
+    render(<PluginsSettings />);
+    fireEvent.click(screen.getByText('P'));
+
+    expect(screen.getByText('Modus')).toBeInTheDocument();
+    expect(screen.getByText('Wie gearbeitet wird')).toBeInTheDocument();
+    expect(screen.getByRole('option', { name: 'Schnell' })).toBeInTheDocument();
+    // No translation: shown as written.
+    expect(screen.getByRole('option', { name: 'careful' })).toBeInTheDocument();
+    expect(screen.getByText('Plain label')).toBeInTheDocument();
+  });
+});
diff --git a/components/settings/__tests__/settings-plugin-page.test.tsx b/components/settings/__tests__/settings-plugin-page.test.tsx
new file mode 100644
index 000000000..622628fe3
--- /dev/null
+++ b/components/settings/__tests__/settings-plugin-page.test.tsx
@@ -0,0 +1,127 @@
+import React from 'react';
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { InstalledPlugin } from '@/lib/plugin-types';
+
+// settings-page: a page of its own in Settings for each plugin that offers
+// one, listed under a "Plugins" group with the plugin's name.
+
+const createSlotInstance = vi.fn((..._args: unknown[]) => ({ destroy: vi.fn(), updateProps: vi.fn(), setTheme: vi.fn() }));
+vi.mock('@/lib/plugin-sandbox/host-bridge', () => ({
+  createSlotInstance: (...args: unknown[]) => createSlotInstance(...args),
+}));
+vi.mock('@/lib/plugin-sandbox/host-theme', () => ({ snapshotHostTheme: () => ({}) }));
+vi.mock('next-intl', () => ({
+  useTranslations: (ns?: string) => (key: string) => (ns ? `${ns}.${key}` : key),
+  useMessages: () => ({}),
+  useLocale: () => 'en',
+  useFormatter: () => ({ dateTime: String, relativeTime: String, number: String }),
+}));
+vi.mock('@/hooks/use-media-query', () => ({
+  useIsDesktop: () => true,
+  useIsMobile: () => false,
+  useMediaQuery: () => false,
+  useDeviceDetection: () => ({ isMobile: false, isTablet: false, isDesktop: true }),
+}));
+vi.mock('@/hooks/use-config', () => ({ useConfig: () => ({ appName: 'Mail', stalwartFeaturesEnabled: false }) }));
+vi.mock('@/components/layout/navigation-rail', () => ({ NavigationRail: () => null }));
+vi.mock('@/components/layout/sidebar-apps-modal', () => ({ SidebarAppsModal: () => null }));
+vi.mock('@/components/plugins/app-top-banner-slot', () => ({ AppTopBannerSlot: () => null }));
+vi.mock('@/components/settings/appearance-settings', () => ({ AppearanceSettings: () => <div>appearance pane</div> }));
+
+const { SettingsApp } = await import('../settings-app');
+const registry = await import('@/lib/plugin-sandbox/registry');
+const { useAuthStore } = await import('@/stores/auth-store');
+const { usePluginStore } = await import('@/stores/plugin-store');
+const { useThemeStore } = await import('@/stores/theme-store');
+
+function activate(id: string, name: string, slots: string[]) {
+  const plugin: InstalledPlugin = {
+    id, name, version: '1.0.0', author: '', description: '', type: 'ui-extension',
+    permissions: ['ui:settings-section'], grantedPermissions: ['ui:settings-section'], entrypoint: 'index.js',
+    enabled: true, status: 'running', settings: {},
+  };
+  registry.register({
+    plugin, code: '', tier: 'untrusted',
+    background: { evaluateShouldShow: vi.fn(async () => true) } as never,
+    slotOffers: slots.map((slot) => ({ name: slot as never, order: 100, hasShouldShow: false })),
+    hookDisposables: [],
+  });
+}
+
+beforeEach(() => {
+  createSlotInstance.mockClear();
+  vi.stubGlobal('fetch', vi.fn().mockRejectedValue(new Error('Unexpected network request')));
+  try { localStorage.setItem('settings-active-tab', 'appearance'); } catch { /* ignore */ }
+  // Every capability check answers "no"; ids are plain strings.
+  const client = new Proxy({}, {
+    get: (_t, prop) => (prop === 'then' ? undefined : (prop === 'getAccountId' ? () => 'acc' : () => null)),
+  });
+  useAuthStore.setState({ isAuthenticated: true, isLoading: false, client: client as never });
+  usePluginStore.setState({ initializePlugins: vi.fn().mockResolvedValue(undefined) });
+  useThemeStore.setState({ syncServerThemes: vi.fn().mockResolvedValue(undefined) } as never);
+});
+afterEach(() => {
+  for (const p of registry.all()) registry.deregister(p.plugin.id);
+  vi.unstubAllGlobals();
+});
+
+describe('Settings plugin pages', () => {
+  it('has no Plugins group without a plugin that offers a page', () => {
+    activate('smime', 'S/MIME', ['settings-section']);
+    render(<SettingsApp linkSegments={[]} />);
+
+    expect(screen.queryByText('plugin_pages.settings_group')).toBeNull();
+  });
+
+  it('lists the plugin by name under Plugins and opens its page full width', async () => {
+    activate('kanban', 'Kanban', ['settings-page']);
+    const { container } = render(<SettingsApp linkSegments={[]} />);
+
+    const group = screen.getByText('plugin_pages.settings_group');
+    const entry = screen.getByRole('button', { name: /Kanban/ });
+    expect(group.compareDocumentPosition(entry) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
+    expect(createSlotInstance).not.toHaveBeenCalled();
+
+    act(() => { fireEvent.click(entry); });
+
+    const pane = container.querySelector('[data-plugin-slot="settings-page"]')!;
+    expect(pane).not.toBeNull();
+    expect(pane.parentElement?.className).not.toContain('max-w-3xl');
+    await waitFor(() => expect(createSlotInstance).toHaveBeenCalled());
+    const opts = createSlotInstance.mock.calls[0][0] as { slot: string; plugin: { id: string } };
+    expect(opts.slot).toBe('settings-page');
+    expect(opts.plugin.id).toBe('kanban');
+  });
+
+  it('gives a plugin with both a page and a section one entry, with the section on its page', async () => {
+    activate('showcase', 'Showcase', ['settings-section', 'settings-page']);
+    const { container } = render(<SettingsApp linkSegments={[]} />);
+
+    const entries = screen.getAllByRole('button', { name: /Showcase/ });
+    expect(entries).toHaveLength(1);
+
+    act(() => { fireEvent.click(entries[0]); });
+    await waitFor(() => expect(createSlotInstance).toHaveBeenCalledTimes(2));
+    const slots = createSlotInstance.mock.calls.map((call) => (call[0] as { slot: string }).slot);
+    expect(slots.sort()).toEqual(['settings-page', 'settings-section']);
+    const section = container.querySelector('[data-plugin-slot="settings-section"]')!;
+    const page = container.querySelector('[data-plugin-slot="settings-page"]')!;
+    expect(section.compareDocumentPosition(page) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
+  });
+
+  it('opens the page of such a plugin from an old link to its section', async () => {
+    activate('showcase', 'Showcase', ['settings-section', 'settings-page']);
+    const { container } = render(<SettingsApp linkSegments={['plugin:showcase']} />);
+
+    await waitFor(() => expect(container.querySelector('[data-plugin-slot="settings-page"]')).not.toBeNull());
+  });
+
+  it('opens the page from a /settings/plugin-page:<id> link', async () => {
+    activate('kanban', 'Kanban', ['settings-page']);
+    render(<SettingsApp linkSegments={['plugin-page:kanban']} />);
+
+    await waitFor(() => expect(createSlotInstance).toHaveBeenCalled());
+    expect((createSlotInstance.mock.calls[0][0] as { slot: string }).slot).toBe('settings-page');
+  });
+});
diff --git a/components/settings/plugins-settings.tsx b/components/settings/plugins-settings.tsx
index b529bf882..9188fdd79 100644
--- a/components/settings/plugins-settings.tsx
+++ b/components/settings/plugins-settings.tsx
@@ -1,13 +1,21 @@
 'use client';
 
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useRef } from 'react';
+import { useLocale, useTranslations } from 'next-intl';
 import { usePluginStore } from '@/stores/plugin-store';
 import { usePolicyStore } from '@/stores/policy-store';
+import { useConfig } from '@/hooks/use-config';
 import { SettingsSection, ToggleSwitch } from './settings-section';
 import { cn } from '@/lib/utils';
-import { AlertTriangle, Puzzle, Lock, Server } from '@/components/icons';
+import { AlertTriangle, Puzzle, Lock, Server, Upload, Trash2, Loader2 } from '@/components/icons';
 import { toast } from '@/stores/toast-store';
+import { Button } from '@/components/ui/button';
+import { ConfirmDialog } from '@/components/ui/confirm-dialog';
+import { PluginPermissionList } from '@/components/plugins/plugin-permission-list';
 import type { InstalledPlugin, PluginStatus, SettingFieldSchema } from '@/lib/plugin-types';
+import { effectiveSettings } from '@/lib/plugin-settings';
+import { lookup } from '@/lib/plugin-sandbox/plugin-i18n';
+import { forgetCredentials, listConnectedAccounts, type ConnectedAccount } from '@/lib/plugin-sandbox/connect-dialog';
 
 const STATUS_COLORS: Record<PluginStatus, string> = {
   installed: 'bg-muted text-muted-foreground',
@@ -17,10 +25,19 @@ const STATUS_COLORS: Record<PluginStatus, string> = {
   error: 'bg-red-100 text-red-700 dark:bg-red-900/30 dark:text-red-400',
 };
 
+/** Errors the store records as codes, so they can be shown translated. */
+const ERROR_CODES = new Set(['user-plugins-off', 'approval-unavailable', 'approval-denied', 'approval-pending', 'auto-disabled']);
+
 export function PluginsSettings() {
-  const { plugins, enablePlugin, disablePlugin, updatePluginSettings, initializePlugins, initialized } = usePluginStore();
-  const { isFeatureEnabled, isPluginForceEnabled, isPluginApproved, fetchPolicy, loaded } = usePolicyStore();
+  const t = useTranslations('plugins.settings');
+  const { plugins, installPlugin, uninstallPlugin, enablePlugin, disablePlugin, updatePluginSettings, initializePlugins, initialized } = usePluginStore();
+  const { isFeatureEnabled, isPluginForceEnabled, fetchPolicy, loaded } = usePolicyStore();
+  const { demoMode } = useConfig();
   const [expandedPlugin, setExpandedPlugin] = useState<string | null>(null);
+  const [installing, setInstalling] = useState(false);
+  const [installError, setInstallError] = useState<string | null>(null);
+  const [removing, setRemoving] = useState<InstalledPlugin | null>(null);
+  const fileInput = useRef<HTMLInputElement>(null);
 
   useEffect(() => {
     if (!loaded) {
@@ -45,67 +62,137 @@ export function PluginsSettings() {
     return null;
   }
 
+  const uploadsAllowed = isFeatureEnabled('pluginsUploadEnabled') && !demoMode;
+  const requireApproval = isFeatureEnabled('requirePluginApproval');
+
   const handleToggle = async (plugin: InstalledPlugin) => {
     if (!initialized) return;
 
-    const isForceEnabled = plugin.forceEnabled || isPluginForceEnabled(plugin.id);
-    if (isForceEnabled) {
-      toast.info(`Plugin "${plugin.name}" is forced by admin and cannot be disabled`);
-      return;
-    }
-
-    const requireApproval = isFeatureEnabled('requirePluginApproval');
-    const isApproved = plugin.adminApproved || plugin.managed || isPluginApproved(plugin.id);
-    if (!plugin.enabled && requireApproval && !isApproved) {
-      toast.info(`Plugin "${plugin.name}" requires admin approval before it can be enabled`);
+    if (plugin.forceEnabled || isPluginForceEnabled(plugin.id)) {
+      toast.info(t('toast_forced', { name: plugin.name }));
       return;
     }
 
     if (plugin.enabled) {
       disablePlugin(plugin.id);
-      toast.info(`Plugin "${plugin.name}" disabled`);
-    } else {
-      await enablePlugin(plugin.id);
-      toast.success(`Plugin "${plugin.name}" enabled`);
+      toast.info(t('toast_disabled', { name: plugin.name }));
+      return;
+    }
+    await enablePlugin(plugin.id);
+    const after = usePluginStore.getState().plugins.find((p) => p.id === plugin.id);
+    if (after?.enabled) {
+      toast.success(t('toast_enabled', { name: plugin.name }));
+    } else if (after?.error === 'approval-pending') {
+      toast.info(t('toast_approval_requested', { name: plugin.name }));
+    }
+  };
+
+  const handleInstall = async (file: File | undefined) => {
+    if (!file) return;
+    setInstalling(true);
+    setInstallError(null);
+    try {
+      const result = await installPlugin(file);
+      if (!result.success) {
+        setInstallError(
+          result.reason === 'uploads-disabled' ? t('install_uploads_off')
+            : result.reason === 'managed-id' ? t('install_managed_id')
+            : t('install_invalid', { details: result.error ?? '' }),
+        );
+        return;
+      }
+      toast.success(result.approvalStatus === 'pending'
+        ? t('toast_installed_pending')
+        : t('toast_installed'));
+    } finally {
+      setInstalling(false);
+      if (fileInput.current) fileInput.current.value = '';
     }
   };
 
   return (
-    <SettingsSection title="Plugins" description="Plugins deployed by your administrator. Toggle to enable or disable for your account.">
-      {/* Plugin List */}
+    <SettingsSection
+      title={t('title')}
+      description={demoMode ? t('description_demo') : uploadsAllowed ? t('description_uploads') : t('description')}
+    >
+      {uploadsAllowed && (
+        <div className="space-y-2">
+          <div className="flex flex-wrap items-center gap-2">
+            <Button
+              variant="outline"
+              size="sm"
+              onClick={() => fileInput.current?.click()}
+              disabled={installing}
+            >
+              {installing ? <Loader2 className="h-4 w-4 animate-spin" /> : <Upload className="h-4 w-4" />}
+              {t('install_button')}
+            </Button>
+            <span className="text-xs text-muted-foreground">
+              {requireApproval ? t('install_hint_approval') : t('install_hint')}
+            </span>
+            <input
+              ref={fileInput}
+              type="file"
+              accept=".zip,application/zip"
+              className="sr-only"
+              aria-label={t('install_button')}
+              onChange={(e) => handleInstall(e.target.files?.[0])}
+            />
+          </div>
+          {installError && (
+            <div role="alert" className="flex items-start gap-2 rounded-md bg-destructive/10 p-2 text-xs text-destructive">
+              <AlertTriangle className="mt-0.5 h-3.5 w-3.5 flex-shrink-0" />
+              <span className="break-words">{installError}</span>
+            </div>
+          )}
+        </div>
+      )}
+
       {plugins.length === 0 ? (
         <div className="flex flex-col items-center justify-center py-12 text-center">
-          <Puzzle className="w-12 h-12 text-muted-foreground/30 mb-3" />
-          <p className="text-sm text-muted-foreground mb-1">No plugins available</p>
-          <p className="text-xs text-muted-foreground/70">Your administrator has not deployed any plugins</p>
+          <Puzzle className="mb-3 h-12 w-12 text-muted-foreground/30" />
+          <p className="mb-1 text-sm text-muted-foreground">{t('empty_title')}</p>
+          <p className="text-xs text-muted-foreground/70">
+            {demoMode ? t('empty_demo') : uploadsAllowed ? t('empty_uploads') : t('empty_admin')}
+          </p>
         </div>
       ) : (
         <div className="space-y-2">
-          {plugins.map(plugin => {
-            const requireApproval = isFeatureEnabled('requirePluginApproval');
-            const isApproved = plugin.adminApproved || plugin.managed || isPluginApproved(plugin.id);
-            const needsApproval = requireApproval && !isApproved;
-            return (
+          {plugins.map(plugin => (
             <PluginCard
               key={plugin.id}
               plugin={plugin}
               isExpanded={expandedPlugin === plugin.id}
               isForceEnabled={plugin.forceEnabled || isPluginForceEnabled(plugin.id)}
-              isManaged={Boolean(plugin.managed)}
-              needsApproval={needsApproval}
               controlsDisabled={!initialized}
               onToggleExpand={() => setExpandedPlugin(expandedPlugin === plugin.id ? null : plugin.id)}
               onToggle={() => handleToggle(plugin)}
+              onRemove={() => setRemoving(plugin)}
               onUpdateSettings={(settings) => updatePluginSettings(plugin.id, settings)}
             />
-            );
-          })}
+          ))}
         </div>
       )}
 
       {!initialized && plugins.length > 0 && (
-        <p className="text-xs text-muted-foreground">Syncing plugin policy and managed state...</p>
+        <p className="text-xs text-muted-foreground">{t('syncing')}</p>
       )}
+
+      <ConfirmDialog
+        isOpen={removing !== null}
+        onClose={() => setRemoving(null)}
+        onConfirm={() => {
+          if (removing) {
+            uninstallPlugin(removing.id);
+            toast.info(t('toast_removed', { name: removing.name }));
+          }
+          setRemoving(null);
+        }}
+        title={t('remove_title', { name: removing?.name ?? '' })}
+        message={t('remove_message')}
+        confirmText={t('remove_confirm')}
+        variant="destructive"
+      />
     </SettingsSection>
   );
 }
@@ -116,15 +203,23 @@ interface PluginCardProps {
   plugin: InstalledPlugin;
   isExpanded: boolean;
   isForceEnabled: boolean;
-  isManaged: boolean;
-  needsApproval: boolean;
   controlsDisabled: boolean;
   onToggleExpand: () => void;
   onToggle: () => void;
+  onRemove: () => void;
   onUpdateSettings: (settings: Record<string, unknown>) => void;
 }
 
-function PluginCard({ plugin, isExpanded, isForceEnabled, isManaged, needsApproval, controlsDisabled, onToggleExpand, onToggle, onUpdateSettings }: PluginCardProps) {
+function PluginCard({ plugin, isExpanded, isForceEnabled, controlsDisabled, onToggleExpand, onToggle, onRemove, onUpdateSettings }: PluginCardProps) {
+  const t = useTranslations('plugins.settings');
+  const locale = useLocale();
+  const isManaged = Boolean(plugin.managed);
+  const awaiting = !isManaged && plugin.approvalStatus === 'pending';
+  const denied = !isManaged && plugin.approvalStatus === 'denied';
+  const errorText = plugin.error
+    ? ERROR_CODES.has(plugin.error) ? t(`error_${plugin.error.replace(/-/g, '_')}`) : plugin.error
+    : null;
+
   return (
     <div
       data-search-label={plugin.name}
@@ -133,137 +228,201 @@ function PluginCard({ plugin, isExpanded, isForceEnabled, isManaged, needsApprov
         plugin.status === 'error' ? 'border-destructive/40' : 'border-border',
       )}
     >
-      {/* Header */}
       <div className="flex items-center gap-3 p-3">
-        <div className="flex-1 min-w-0 cursor-pointer" onClick={onToggleExpand}>
-          <div className="flex items-center gap-2">
-            <span className="text-sm font-medium text-foreground truncate">{plugin.name}</span>
-            <span className={cn('text-[10px] px-1.5 py-0.5 rounded-full font-medium', STATUS_COLORS[plugin.status])}>
-              {plugin.status}
+        <button
+          type="button"
+          className="min-w-0 flex-1 text-left"
+          onClick={onToggleExpand}
+          aria-expanded={isExpanded}
+        >
+          <div className="flex flex-wrap items-center gap-x-2 gap-y-1">
+            <span className="truncate text-sm font-medium text-foreground">{plugin.name}</span>
+            <span className={cn('rounded-full px-1.5 py-0.5 text-[10px] font-medium', STATUS_COLORS[plugin.status])}>
+              {t(`status_${plugin.status}`)}
             </span>
             {isForceEnabled && (
-              <span className="text-[10px] px-1.5 py-0.5 rounded-full font-medium bg-amber-100 text-amber-700 dark:bg-amber-900/30 dark:text-amber-400 flex items-center gap-0.5">
-                <Lock className="w-2.5 h-2.5" /> Forced
+              <span className="flex items-center gap-0.5 rounded-full bg-amber-100 px-1.5 py-0.5 text-[10px] font-medium text-amber-700 dark:bg-amber-900/30 dark:text-amber-400">
+                <Lock className="h-2.5 w-2.5" /> {t('badge_forced')}
               </span>
             )}
-            {isManaged && (
-              <span className="text-[10px] px-1.5 py-0.5 rounded-full font-medium bg-cyan-100 text-cyan-700 dark:bg-cyan-900/30 dark:text-cyan-400 flex items-center gap-0.5">
-                <Server className="w-2.5 h-2.5" /> Managed
-              </span>
-            )}
-            {needsApproval && (
-              <span className="text-[10px] px-1.5 py-0.5 rounded-full font-medium bg-orange-100 text-orange-700 dark:bg-orange-900/30 dark:text-orange-400">
-                Awaiting approval
+            <span className={cn(
+              'flex items-center gap-0.5 rounded-full px-1.5 py-0.5 text-[10px] font-medium',
+              isManaged
+                ? 'bg-cyan-100 text-cyan-700 dark:bg-cyan-900/30 dark:text-cyan-400'
+                : 'bg-muted text-muted-foreground',
+            )}>
+              {isManaged && <Server className="h-2.5 w-2.5" />} {isManaged ? t('badge_managed') : t('badge_yours')}
+            </span>
+            {awaiting && (
+              <span className="rounded-full bg-orange-100 px-1.5 py-0.5 text-[10px] font-medium text-orange-700 dark:bg-orange-900/30 dark:text-orange-400">
+                {t('badge_awaiting')}
               </span>
             )}
           </div>
-          <div className="flex items-center gap-2 mt-0.5">
-            <span className="text-xs text-muted-foreground">{plugin.author}</span>
-            <span className="text-xs text-muted-foreground/50">v{plugin.version}</span>
-            <span className="text-xs text-muted-foreground/50">{plugin.type}</span>
+          <div className="mt-0.5 flex items-center gap-2">
+            <span className="truncate text-xs text-muted-foreground">{plugin.author}</span>
+            <span className="text-xs text-muted-foreground/70">v{plugin.version}</span>
           </div>
-        </div>
+        </button>
 
-        <div className="flex items-center gap-2 flex-shrink-0">
-          <ToggleSwitch checked={plugin.enabled} onChange={onToggle} disabled={controlsDisabled || isForceEnabled || needsApproval} />
+        <div className="flex flex-shrink-0 items-center gap-2">
+          <ToggleSwitch
+            checked={plugin.enabled}
+            onChange={onToggle}
+            disabled={controlsDisabled || isForceEnabled || denied}
+            ariaLabel={t('toggle_label', { name: plugin.name })}
+          />
         </div>
       </div>
 
-      {/* Expanded Details */}
       {isExpanded && (
-        <div className="border-t border-border p-3 space-y-3">
-          {isForceEnabled && (
-            <p className="text-xs text-amber-600 dark:text-amber-400">This plugin is forced by an administrator and cannot be disabled.</p>
-          )}
+        <div className="space-y-3 border-t border-border p-3">
+          {isForceEnabled && <p className="text-xs text-amber-600 dark:text-amber-400">{t('forced_note')}</p>}
 
-          {needsApproval && (
-            <p className="text-xs text-orange-600 dark:text-orange-400">This plugin is awaiting admin approval and cannot be enabled until an administrator approves it.</p>
-          )}
+          {plugin.description && <p className="text-xs text-muted-foreground">{plugin.description}</p>}
 
-          {/* Description */}
-          {plugin.description && (
-            <p className="text-xs text-muted-foreground">{plugin.description}</p>
-          )}
-
-          {/* Error */}
-          {plugin.error && (
-            <div className="flex items-start gap-2 p-2 rounded bg-destructive/10 text-destructive text-xs">
-              <AlertTriangle className="w-3.5 h-3.5 flex-shrink-0 mt-0.5" />
-              <span>{plugin.error}</span>
+          {errorText && (
+            <div className="flex items-start gap-2 rounded bg-destructive/10 p-2 text-xs text-destructive">
+              <AlertTriangle className="mt-0.5 h-3.5 w-3.5 flex-shrink-0" />
+              <span className="break-words">{errorText}</span>
             </div>
           )}
 
-          {/* Permissions */}
-          {plugin.permissions.length > 0 && (
-            <div>
-              <span className="text-xs font-medium text-foreground">Permissions:</span>
-              <div className="flex flex-wrap gap-1 mt-1">
-                {plugin.permissions.map(perm => (
-                  <span key={perm} className="text-[10px] px-1.5 py-0.5 rounded bg-muted text-muted-foreground">
-                    {perm}
-                  </span>
-                ))}
-              </div>
+          <div>
+            <span className="text-xs font-medium text-foreground">
+              {isManaged ? t('permissions_managed') : t('permissions')}
+            </span>
+            <div className="mt-1.5">
+              <PluginPermissionList
+                permissions={plugin.permissions}
+                httpOrigins={plugin.httpOrigins}
+                apiPostPaths={plugin.apiPostPaths}
+                compact
+              />
             </div>
-          )}
+          </div>
 
-          {/* Settings (auto-generated from schema) */}
           {plugin.settingsSchema && Object.keys(plugin.settingsSchema).length > 0 && (
             <div className="space-y-2">
-              <span className="text-xs font-medium text-foreground">Settings:</span>
+              <span className="text-xs font-medium text-foreground">{t('settings')}</span>
               {Object.entries(plugin.settingsSchema).map(([key, schema]) => (
                 <PluginSettingField
                   key={key}
                   fieldKey={key}
                   schema={schema}
-                  value={plugin.settings[key] ?? schema.default}
+                  translate={(text) => (plugin.locales ? lookup(plugin.locales, locale, text) ?? text : text)}
+                  value={effectiveSettings(plugin)[key]}
                   onChange={(value) => onUpdateSettings({ [key]: value })}
                 />
               ))}
             </div>
           )}
+
+          {plugin.credentials && Object.values(plugin.credentials).some((c) => c.scope === 'user') && (
+            <ConnectedAccounts pluginId={plugin.id} />
+          )}
+
+          {!isManaged && (
+            <div className="flex justify-end">
+              <Button variant="ghost" size="sm" onClick={onRemove} className="text-destructive hover:text-destructive">
+                <Trash2 className="h-4 w-4" />
+                {t('remove')}
+              </Button>
+            </div>
+          )}
         </div>
       )}
     </div>
   );
 }
 
+// ─── Connected accounts ──────────────────────────────────────
+
+/** Accounts the user connected for this plugin through the secret proxy. */
+function ConnectedAccounts({ pluginId }: { pluginId: string }) {
+  const t = useTranslations('plugins.settings');
+  const [accounts, setAccounts] = useState<ConnectedAccount[] | null>(null);
+
+  useEffect(() => {
+    let live = true;
+    void listConnectedAccounts(pluginId).then((list) => { if (live) setAccounts(list); });
+    return () => { live = false; };
+  }, [pluginId]);
+
+  if (!accounts || accounts.length === 0) return null;
+
+  const disconnect = async (account: ConnectedAccount) => {
+    if (await forgetCredentials(pluginId, account.credentialId)) {
+      setAccounts((list) => (list ?? []).filter((a) => a.credentialId !== account.credentialId));
+    } else {
+      toast.error(t('disconnect_failed', { label: account.label }));
+    }
+  };
+
+  return (
+    <div className="space-y-1.5">
+      <span className="text-xs font-medium text-foreground">{t('accounts_heading')}</span>
+      {accounts.map((account) => {
+        const host = new URL(account.origin).host;
+        return (
+          <div key={account.credentialId} className="flex items-center justify-between gap-2 text-xs">
+            <span className="min-w-0 truncate text-muted-foreground">
+              {account.connected
+                ? t('account_on', { label: account.username ? `${account.label} (${account.username})` : account.label, host })
+                : t('account_waiting', { label: account.label, host })}
+            </span>
+            <Button variant="ghost" size="sm" onClick={() => void disconnect(account)}>{t('disconnect')}</Button>
+          </div>
+        );
+      })}
+    </div>
+  );
+}
+
 // ─── Auto-generated Setting Field ────────────────────────────
 
 interface PluginSettingFieldProps {
   fieldKey: string;
   schema: SettingFieldSchema;
+  /**
+   * A label, description or option that names a key in the plugin's own
+   * translations (manifest `locales`) is shown translated; other text as is.
+   */
+  translate?: (text: string) => string;
   value: unknown;
   onChange: (value: unknown) => void;
 }
 
-function PluginSettingField({ schema, value, onChange }: PluginSettingFieldProps) {
+function PluginSettingField({ fieldKey, schema: raw, value, onChange, translate = (text) => text }: PluginSettingFieldProps) {
+  const inputId = `plugin-setting-${fieldKey}`;
+  const schema = { ...raw, label: translate(raw.label), ...(raw.description ? { description: translate(raw.description) } : {}) };
   switch (schema.type) {
     case 'boolean':
       return (
-        <div data-search-label={schema.label} className="flex items-center justify-between">
+        <div data-search-label={schema.label} className="flex items-center justify-between gap-3">
           <div>
             <span className="text-xs text-foreground">{schema.label}</span>
             {schema.description && <p className="text-[10px] text-muted-foreground">{schema.description}</p>}
           </div>
-          <ToggleSwitch checked={value as boolean} onChange={(v) => onChange(v)} />
+          <ToggleSwitch checked={value as boolean} onChange={(v) => onChange(v)} ariaLabel={schema.label} />
         </div>
       );
 
     case 'select':
       return (
-        <div data-search-label={schema.label} className="flex items-center justify-between">
+        <div data-search-label={schema.label} className="flex items-center justify-between gap-3">
           <div>
-            <span className="text-xs text-foreground">{schema.label}</span>
+            <label htmlFor={inputId} className="text-xs text-foreground">{schema.label}</label>
             {schema.description && <p className="text-[10px] text-muted-foreground">{schema.description}</p>}
           </div>
           <select
+            id={inputId}
             value={String(value)}
             onChange={(e) => onChange(e.target.value)}
-            className="text-xs bg-background border border-border rounded px-2 py-1 text-foreground"
+            className="rounded border border-border bg-background px-2 py-1 text-xs text-foreground"
           >
-            {schema.options?.map(opt => (
-              <option key={opt} value={opt}>{opt}</option>
+            {(Array.isArray(schema.options) ? schema.options : []).map(opt => (
+              <option key={opt} value={opt}>{translate(opt)}</option>
             ))}
           </select>
         </div>
@@ -272,31 +431,33 @@ function PluginSettingField({ schema, value, onChange }: PluginSettingFieldProps
     case 'string':
       return (
         <div data-search-label={schema.label}>
-          <span className="text-xs text-foreground">{schema.label}</span>
+          <label htmlFor={inputId} className="text-xs text-foreground">{schema.label}</label>
           {schema.description && <p className="text-[10px] text-muted-foreground">{schema.description}</p>}
           <input
+            id={inputId}
             type="text"
             value={String(value ?? '')}
             onChange={(e) => onChange(e.target.value)}
-            className="mt-1 w-full text-xs bg-background border border-border rounded px-2 py-1 text-foreground"
+            className="mt-1 w-full rounded border border-border bg-background px-2 py-1 text-xs text-foreground"
           />
         </div>
       );
 
     case 'number':
       return (
-        <div data-search-label={schema.label} className="flex items-center justify-between">
+        <div data-search-label={schema.label} className="flex items-center justify-between gap-3">
           <div>
-            <span className="text-xs text-foreground">{schema.label}</span>
+            <label htmlFor={inputId} className="text-xs text-foreground">{schema.label}</label>
             {schema.description && <p className="text-[10px] text-muted-foreground">{schema.description}</p>}
           </div>
           <input
+            id={inputId}
             type="number"
             value={Number(value ?? schema.default ?? 0)}
             min={schema.min}
             max={schema.max}
             onChange={(e) => onChange(Number(e.target.value))}
-            className="w-20 text-xs bg-background border border-border rounded px-2 py-1 text-foreground"
+            className="w-20 rounded border border-border bg-background px-2 py-1 text-xs text-foreground"
           />
         </div>
       );
diff --git a/components/settings/settings-app.tsx b/components/settings/settings-app.tsx
index 659eb5013..be232a5e9 100644
--- a/components/settings/settings-app.tsx
+++ b/components/settings/settings-app.tsx
@@ -108,13 +108,17 @@ import { useMountainViewShell } from "@/hooks/use-mountain-view-shell";
 
 type Tab = SettingsSearchTab;
 
-type TabGroup = 'general' | 'appearance' | 'mail' | 'privacy' | 'apps' | 'advanced';
+type TabGroup = 'general' | 'appearance' | 'mail' | 'privacy' | 'apps' | 'plugins' | 'advanced';
 
 // A plugin that exposes a `settings-section` slot gets its own first-class
 // Settings entry, keyed `plugin:<id>`, so its UI (e.g. S/MIME key import) is
 // discoverable as a menu point rather than buried inside another panel.
 type PluginTabId = `plugin:${string}`;
-type SettingsTabId = Tab | PluginTabId;
+// A plugin that offers a `settings-page` slot gets a page of its own under the
+// "Plugins" group, keyed `plugin-page:<id>`, drawn at the full content width.
+type PluginPageTabId = `plugin-page:${string}`;
+type SettingsTabId = Tab | PluginTabId | PluginPageTabId;
+const PLUGIN_PAGE_PREFIX = 'plugin-page:';
 
 interface TabDef {
   id: SettingsTabId;
@@ -151,7 +155,7 @@ const tabIcons: Record<Tab, AppIcon> = {
   debug: Bug,
 };
 
-const tabGroupOrder: TabGroup[] = ['general', 'appearance', 'mail', 'privacy', 'apps', 'advanced'];
+const tabGroupOrder: TabGroup[] = ['general', 'appearance', 'mail', 'privacy', 'apps', 'plugins', 'advanced'];
 
 // Map legacy tab IDs to current ones; runs once on read of localStorage.
 const LEGACY_TAB_MAP: Record<string, Tab> = {
@@ -194,6 +198,7 @@ function tabFromDeepLink(segments: string[] | null | undefined): SettingsTabId |
   const migrated = raw in LEGACY_TAB_MAP ? LEGACY_TAB_MAP[raw] : raw;
   if (migrated in tabIcons) return migrated as SettingsTabId;
   if (migrated.startsWith('plugin:')) return migrated as SettingsTabId;
+  if (migrated.startsWith(PLUGIN_PAGE_PREFIX)) return migrated as SettingsTabId;
   return null;
 }
 
@@ -242,6 +247,15 @@ export function SettingsApp({ linkSegments: routeSegments }: SettingsAppProps =
     () => pluginOffersForSlot('settings-section'),
     () => pluginOffersForSlot('settings-section'),
   );
+  // Active plugins that offer a `settings-page` slot: one page each.
+  const pluginPageOffers = useSyncExternalStore(
+    pluginRegistrySubscribe,
+    () => pluginOffersForSlot('settings-page'),
+    () => pluginOffersForSlot('settings-page'),
+  );
+  const tPluginPages = useTranslations('plugin_pages');
+  const pluginPageIds = useMemo(() => new Set(pluginPageOffers.map((offer) => offer.pluginId)), [pluginPageOffers]);
+  const pluginSectionIds = useMemo(() => new Set(pluginSettingsOffers.map((offer) => offer.pluginId)), [pluginSettingsOffers]);
   // Consume the one-shot deep-link key so a section gear only steers this one
   // open, never the persisted default for future Settings-button clicks.
   useEffect(() => {
@@ -572,13 +586,23 @@ export function SettingsApp({ linkSegments: routeSegments }: SettingsAppProps =
     ...(isFeatureEnabled('sidebarAppsEnabled') ? [{ id: 'sidebar_apps' as Tab, label: t('tabs.sidebar_apps'), icon: tabIcons.sidebar_apps, group: 'apps' as TabGroup }] : []),
     // Plugin-contributed settings pages: one entry per active plugin that
     // offers a `settings-section` slot (e.g. S/MIME key & certificate manager).
-    ...pluginSettingsOffers.map((offer): TabDef => ({
+    // A plugin that also has a page of its own gets that entry only, with the
+    // section on its page, instead of two entries with the same name.
+    ...pluginSettingsOffers.filter((offer) => !pluginPageIds.has(offer.pluginId)).map((offer): TabDef => ({
       id: `plugin:${offer.pluginId}` as PluginTabId,
       label: getActivePlugin(offer.pluginId)?.plugin.name ?? offer.pluginId,
       icon: Puzzle,
       group: 'apps',
     })),
 
+    // Plugins: a page of its own for each plugin that offers one.
+    ...pluginPageOffers.map((offer): TabDef => ({
+      id: `${PLUGIN_PAGE_PREFIX}${offer.pluginId}` as PluginPageTabId,
+      label: getActivePlugin(offer.pluginId)?.plugin.name || offer.pluginId,
+      icon: Puzzle,
+      group: 'plugins',
+    })),
+
     // Advanced
     { id: 'about_data', label: t('tabs.about_data'), icon: tabIcons.about_data, group: 'advanced' },
     ...(isFeatureEnabled('pluginsEnabled') ? [{ id: 'plugins' as Tab, label: 'Plugins', icon: tabIcons.plugins, group: 'advanced' as TabGroup }] : []),
@@ -605,7 +629,7 @@ export function SettingsApp({ linkSegments: routeSegments }: SettingsAppProps =
   const groupedTabs = tabGroupOrder
     .map((group) => ({
       group,
-      label: t(`tab_groups.${group}`),
+      label: group === 'plugins' ? tPluginPages('settings_group') : t(`tab_groups.${group}`),
       items: visibleTabs.filter((tab) => tab.group === group),
     }))
     .filter((g) => g.items.length > 0);
@@ -637,9 +661,15 @@ export function SettingsApp({ linkSegments: routeSegments }: SettingsAppProps =
   // If active tab is not in the visible list (e.g., feature disabled, or scoped
   // mode hides it), fall back. In scoped mode fall back to the first scoped tab;
   // otherwise the usual 'appearance' default.
-  const isActiveVisible = visibleTabs.some((tab) => tab.id === activeTab);
+  // An old link or remembered tab to the section of a plugin that now has a
+  // page of its own opens that page, where the section is.
+  const sectionPluginId = activeTab.startsWith('plugin:') ? activeTab.slice('plugin:'.length) : null;
+  const requestedTab: SettingsTabId = sectionPluginId && pluginPageIds.has(sectionPluginId)
+    ? (`${PLUGIN_PAGE_PREFIX}${sectionPluginId}` as PluginPageTabId)
+    : activeTab;
+  const isActiveVisible = visibleTabs.some((tab) => tab.id === requestedTab);
   const effectiveActiveTab: SettingsTabId = isActiveVisible
-    ? activeTab
+    ? requestedTab
     : (managedAccountId ? (visibleTabs[0]?.id ?? 'appearance') : 'appearance');
 
   const handleTabSelect = (tabId: SettingsTabId) => {
@@ -715,6 +745,28 @@ export function SettingsApp({ linkSegments: routeSegments }: SettingsAppProps =
           slot="settings-section"
         />
       )}
+      {effectiveActiveTab.startsWith(PLUGIN_PAGE_PREFIX) && (
+        <>
+          {/* The plugin's settings-section, on its page rather than as a
+              second entry with the same name. */}
+          {pluginSectionIds.has(effectiveActiveTab.slice(PLUGIN_PAGE_PREFIX.length)) && (
+            <div className="max-w-3xl mb-6" data-plugin-slot="settings-section">
+              <PluginIframeSlot
+                key={`${effectiveActiveTab}:section`}
+                pluginId={effectiveActiveTab.slice(PLUGIN_PAGE_PREFIX.length)}
+                slot="settings-section"
+              />
+            </div>
+          )}
+          <div className="w-full" data-plugin-slot="settings-page">
+            <PluginIframeSlot
+              key={effectiveActiveTab}
+              pluginId={effectiveActiveTab.slice(PLUGIN_PAGE_PREFIX.length)}
+              slot="settings-page"
+            />
+          </div>
+        </>
+      )}
     </>
   );
 
@@ -1010,7 +1062,7 @@ export function SettingsApp({ linkSegments: routeSegments }: SettingsAppProps =
       />
 
       <div ref={attachContentScroll} className="flex-1 overflow-y-auto">
-        <div className="max-w-3xl mx-auto px-6 py-6">
+        <div className={effectiveActiveTab.startsWith(PLUGIN_PAGE_PREFIX) ? "px-6 py-6" : "max-w-3xl mx-auto px-6 py-6"}>
           {renderTabContent()}
         </div>
       </div>
diff --git a/components/settings/vacation-settings.tsx b/components/settings/vacation-settings.tsx
index 523f61534..8087f6f4e 100644
--- a/components/settings/vacation-settings.tsx
+++ b/components/settings/vacation-settings.tsx
@@ -300,7 +300,7 @@ export function VacationSettings() {
     const { sanitizedHtml, textBody } = payload;
 
     try {
-      await updateVacationResponse(client, {
+      const saved = await updateVacationResponse(client, {
         isEnabled: localEnabled,
         fromDate: localFromDate || null,
         toDate: localToDate || null,
@@ -311,7 +311,8 @@ export function VacationSettings() {
         audience: audienceChanged ? audienceSettings : undefined,
       }, managedAccountId ?? undefined);
 
-      toast.success(tNotifications('vacation_saved'));
+      // false: a plugin stopped the change and is expected to have said why.
+      if (saved) toast.success(tNotifications('vacation_saved'));
     } catch (error) {
       console.error('Failed to save vacation response:', error);
       toast.error(tNotifications(
diff --git a/components/ui/__tests__/context-menu-fit.test.tsx b/components/ui/__tests__/context-menu-fit.test.tsx
new file mode 100644
index 000000000..c9c95da28
--- /dev/null
+++ b/components/ui/__tests__/context-menu-fit.test.tsx
@@ -0,0 +1,59 @@
+import { act, render, screen } from '@testing-library/react';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { ContextMenu, ContextMenuItem } from '../context-menu';
+
+// A menu that grows after it opened (a plugin frame in it reports its
+// height late) must be moved up again so it stays inside the window.
+
+function rect(left: number, top: number, width: number, height: number): DOMRect {
+  return { left, top, width, height, right: left + width, bottom: top + height, x: left, y: top, toJSON: () => ({}) } as DOMRect;
+}
+
+let resize: (() => void) | null = null;
+class ManualResizeObserver {
+  constructor(cb: () => void) { resize = cb; }
+  observe() {}
+  unobserve() {}
+  disconnect() { resize = null; }
+}
+
+afterEach(() => {
+  vi.restoreAllMocks();
+  vi.unstubAllGlobals();
+  resize = null;
+});
+
+describe('ContextMenu fit', () => {
+  it('moves up when its content grows past the bottom of the window', () => {
+    vi.stubGlobal('ResizeObserver', ManualResizeObserver);
+    Object.defineProperty(window, 'innerHeight', { value: 800, configurable: true });
+    Object.defineProperty(window, 'innerWidth', { value: 1280, configurable: true });
+    let height = 200;
+    vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(function (this: HTMLElement) {
+      return this.getAttribute('role') === 'menu' ? rect(0, 0, 220, height) : rect(0, 0, 0, 0);
+    });
+
+    render(
+      <ContextMenu isOpen position={{ x: 400, y: 500 }} onClose={() => {}}>
+        <ContextMenuItem label="Reply" onClick={() => {}} />
+      </ContextMenu>,
+    );
+    const menu = screen.getByRole('menu');
+    expect(menu.style.top).toBe('500px');
+
+    height = 624;
+    act(() => resize?.());
+    expect(menu.style.top).toBe(`${800 - 624 - 10}px`);
+  });
+
+  it('scrolls inside instead of running off a short window', () => {
+    render(
+      <ContextMenu isOpen position={{ x: 10, y: 10 }} onClose={() => {}}>
+        <ContextMenuItem label="Reply" onClick={() => {}} />
+      </ContextMenu>,
+    );
+    const inner = screen.getByRole('menu').firstElementChild as HTMLElement;
+    expect(inner.className).toContain('overflow-y-auto');
+    expect(inner.style.maxHeight).toMatch(/100vh/);
+  });
+});
diff --git a/components/ui/avatar.tsx b/components/ui/avatar.tsx
index ce1ad23df..2478c78a6 100644
--- a/components/ui/avatar.tsx
+++ b/components/ui/avatar.tsx
@@ -165,8 +165,7 @@ export function Avatar({ name, email, contactPhotoUri, size = "md", className, d
     setPluginAvatarFailed(false);
     if (!email || avatarHooks.onAvatarResolve.size === 0) return;
     let cancelled = false;
-    avatarHooks.onAvatarResolve
-      .transform(null as string | null, { email, name })
+    avatarHooks.onAvatarResolve.transform(null as string | null, { email, name })
       .then((url) => { if (!cancelled) setPluginAvatarUrl(url); })
       .catch(() => { if (!cancelled) setPluginAvatarFailed(true); });
     return () => { cancelled = true; };
diff --git a/components/ui/context-menu.tsx b/components/ui/context-menu.tsx
index dbe9b0b25..a8dc532a8 100644
--- a/components/ui/context-menu.tsx
+++ b/components/ui/context-menu.tsx
@@ -35,6 +35,9 @@ export const ContextMenu = forwardRef<HTMLDivElement, ContextMenuProps>(
     // `mounted` must be a dependency: on the very first open the menu isn't
     // in the DOM yet (mounted is still false), so this effect has to re-run
     // after the mount flip or the menu stays visibility:hidden.
+    //
+    // The menu can grow after it opened (a plugin frame in it reports its
+    // height later), so it is clamped again whenever its size changes.
     useLayoutEffect(() => {
       if (!isOpen) {
         setAdjustedPosition(null);
@@ -43,23 +46,30 @@ export const ContextMenu = forwardRef<HTMLDivElement, ContextMenuProps>(
       const node = localRef.current;
       if (!node) return;
 
-      const rect = node.getBoundingClientRect();
-      const vw = window.innerWidth;
-      const vh = window.innerHeight;
+      const clamp = () => {
+        const rect = node.getBoundingClientRect();
+        const vw = window.innerWidth;
+        const vh = window.innerHeight;
 
-      let x = position.x;
-      let y = position.y;
+        let x = position.x;
+        let y = position.y;
 
-      if (x + rect.width > vw - VIEWPORT_MARGIN) {
-        x = vw - rect.width - VIEWPORT_MARGIN;
-      }
-      if (y + rect.height > vh - VIEWPORT_MARGIN) {
-        y = vh - rect.height - VIEWPORT_MARGIN;
-      }
-      x = Math.max(VIEWPORT_MARGIN, x);
-      y = Math.max(VIEWPORT_MARGIN, y);
+        if (x + rect.width > vw - VIEWPORT_MARGIN) {
+          x = vw - rect.width - VIEWPORT_MARGIN;
+        }
+        if (y + rect.height > vh - VIEWPORT_MARGIN) {
+          y = vh - rect.height - VIEWPORT_MARGIN;
+        }
+        x = Math.max(VIEWPORT_MARGIN, x);
+        y = Math.max(VIEWPORT_MARGIN, y);
 
-      setAdjustedPosition({ x, y });
+        setAdjustedPosition((prev) => (prev && prev.x === x && prev.y === y ? prev : { x, y }));
+      };
+      clamp();
+      if (typeof ResizeObserver === "undefined") return;
+      const observer = new ResizeObserver(clamp);
+      observer.observe(node);
+      return () => observer.disconnect();
     }, [isOpen, mounted, position.x, position.y]);
 
     const setRefs = (node: HTMLDivElement | null) => {
@@ -90,7 +100,8 @@ export const ContextMenu = forwardRef<HTMLDivElement, ContextMenuProps>(
         role="menu"
         aria-orientation="vertical"
       >
-        <div className="py-1">
+        {/* Taller than the window: scroll inside the menu. */}
+        <div className="py-1 overflow-y-auto" style={{ maxHeight: `calc(100vh - ${2 * VIEWPORT_MARGIN + 2}px)` }}>
           {children}
         </div>
       </div>,
diff --git a/components/ui/toast.tsx b/components/ui/toast.tsx
index 28c7dbd91..f385face2 100644
--- a/components/ui/toast.tsx
+++ b/components/ui/toast.tsx
@@ -19,6 +19,11 @@ export interface Toast {
   message?: string;
   duration?: number;
   onClick?: () => void;
+  /**
+   * Called when the user closes the toast: the close button, a click on the
+   * toast or on one of its actions. Not called when it times out.
+   */
+  onDismiss?: () => void;
   icon?: React.ReactNode;
   action?: ToastAction;
   secondaryAction?: ToastAction;
@@ -90,6 +95,15 @@ export function ToastItem({ toast, onClose }: ToastProps) {
     setTimeout(() => onClose(toast.id), 280);
   }, [onClose, toast.id]);
 
+  const dismissByUser = useCallback(() => {
+    try {
+      toast.onDismiss?.();
+    } catch {
+      // A failing listener must not keep the toast on screen.
+    }
+    dismiss();
+  }, [toast, dismiss]);
+
   useEffect(() => {
     if (!toast.duration || toast.duration <= 0 || isProgress) return;
 
@@ -112,7 +126,7 @@ export function ToastItem({ toast, onClose }: ToastProps) {
         e.stopPropagation();
         try {
           action.onClick();
-          dismiss();
+          dismissByUser();
         } catch {
           // Don't close toast on error so user can retry
         }
@@ -141,7 +155,7 @@ export function ToastItem({ toast, onClose }: ToastProps) {
       onClick={() => {
         if (toast.onClick && !toast.action) {
           toast.onClick();
-          dismiss();
+          dismissByUser();
         }
       }}
     >
@@ -180,7 +194,7 @@ export function ToastItem({ toast, onClose }: ToastProps) {
       <button
         onClick={(e) => {
           e.stopPropagation();
-          dismiss();
+          dismissByUser();
         }}
         className={cn(
           "flex-shrink-0 p-1 rounded-md transition-all",
diff --git a/contexts/drag-drop-context.tsx b/contexts/drag-drop-context.tsx
index 97c498e34..465b90f80 100644
--- a/contexts/drag-drop-context.tsx
+++ b/contexts/drag-drop-context.tsx
@@ -1,7 +1,8 @@
 "use client";
 
-import { createContext, useContext, useState, useCallback, ReactNode } from "react";
+import { createContext, useContext, useState, useCallback, useRef, ReactNode } from "react";
 import { Email } from "@/lib/jmap/types";
+import { dragDropHooks } from "@/lib/plugin-hooks";
 
 interface DragDropState {
   isDragging: boolean;
@@ -13,6 +14,8 @@ interface DragDropState {
 interface DragDropContextValue extends DragDropState {
   startDrag: (emails: Email[], sourceMailboxId: string) => void;
   endDrag: () => void;
+  /** A drop target accepted the dragged messages. */
+  markDropped: () => void;
 }
 
 const initialState: DragDropState = {
@@ -26,8 +29,13 @@ const DragDropContext = createContext<DragDropContextValue | null>(null);
 
 export function DragDropProvider({ children }: { children: ReactNode }) {
   const [state, setState] = useState<DragDropState>(initialState);
+  // The drag plugins were told about; endDrag runs more than once per drag
+  // (the drop target and the dragged row both call it).
+  const current = useRef<{ ids: string[]; dropped: boolean } | null>(null);
 
   const startDrag = useCallback((emails: Email[], sourceMailboxId: string) => {
+    current.current = { ids: emails.map((e) => e.id), dropped: false };
+    void dragDropHooks.onDragStart.emit({ kind: "email", ids: current.current.ids });
     setState({
       isDragging: true,
       draggedEmails: emails,
@@ -37,11 +45,18 @@ export function DragDropProvider({ children }: { children: ReactNode }) {
   }, []);
 
   const endDrag = useCallback(() => {
+    const drag = current.current;
+    current.current = null;
+    if (drag) void dragDropHooks.onDragEnd.emit({ kind: "email", ids: drag.ids, dropped: drag.dropped });
     setState(initialState);
   }, []);
 
+  const markDropped = useCallback(() => {
+    if (current.current) current.current.dropped = true;
+  }, []);
+
   return (
-    <DragDropContext.Provider value={{ ...state, startDrag, endDrag }}>
+    <DragDropContext.Provider value={{ ...state, startDrag, endDrag, markDropped }}>
       {children}
     </DragDropContext.Provider>
   );
diff --git a/hooks/__tests__/plugin-ui-hooks.test.tsx b/hooks/__tests__/plugin-ui-hooks.test.tsx
new file mode 100644
index 000000000..60b7e7e33
--- /dev/null
+++ b/hooks/__tests__/plugin-ui-hooks.test.tsx
@@ -0,0 +1,156 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { act, renderHook } from '@testing-library/react';
+import type { ReactNode, DragEvent } from 'react';
+import { clearAllHooks, dragDropHooks, sidebarAppHooks, uiHooks } from '@/lib/plugin-hooks';
+import { useUIStore } from '@/stores/ui-store';
+import { useAuthStore } from '@/stores/auth-store';
+import { useEmailStore } from '@/stores/email-store';
+import { DragDropProvider, useDragDropContext } from '@/contexts/drag-drop-context';
+import { useMailboxDrop } from '../use-mailbox-drop';
+import { useTagDrop } from '../use-tag-drop';
+import { useSidebarApps } from '../use-sidebar-apps';
+import type { Email, Mailbox } from '@/lib/jmap/types';
+
+function listen(bus: { register: (id: string, fn: (...a: unknown[]) => unknown) => unknown }) {
+  const fn = vi.fn();
+  bus.register('test', fn);
+  return fn;
+}
+
+const wrapper = ({ children }: { children: ReactNode }) => <DragDropProvider>{children}</DragDropProvider>;
+
+function dropEvent(ids: string[]): DragEvent<HTMLDivElement> {
+  return {
+    preventDefault() {}, stopPropagation() {},
+    dataTransfer: { getData: () => JSON.stringify(ids) },
+  } as unknown as DragEvent<HTMLDivElement>;
+}
+
+const EMAIL = { id: 'm1', mailboxIds: { inbox: true }, keywords: {} } as unknown as Email;
+
+beforeEach(() => {
+  clearAllHooks();
+  useUIStore.setState({ activeView: 'list', sidebarOpen: false, sidebarCollapsed: false, isMobile: true, isTablet: false, isDesktop: false });
+});
+
+describe('layout hooks', () => {
+  it('reports view, sidebar and device changes', () => {
+    const view = listen(uiHooks.onViewChange);
+    const toggle = listen(uiHooks.onSidebarToggle);
+    const collapse = listen(uiHooks.onSidebarCollapse);
+    const device = listen(uiHooks.onDeviceTypeChange);
+
+    useUIStore.getState().showEmailViewer();
+    useUIStore.getState().toggleSidebar();
+    useUIStore.getState().setSidebarCollapsed(true);
+    useUIStore.getState().setDeviceType(false, false, true);
+    useUIStore.getState().setDeviceType(false, false, true);
+
+    expect(view).toHaveBeenCalledWith({ view: 'viewer' });
+    expect(toggle).toHaveBeenCalledWith({ open: true });
+    expect(collapse).toHaveBeenCalledWith({ collapsed: true });
+    expect(device.mock.calls).toEqual([[{ deviceType: 'desktop' }]]);
+  });
+
+  it('reports Back on the phone', () => {
+    const back = listen(uiHooks.onMobileBack);
+
+    useUIStore.getState().goBack();
+
+    expect(back).toHaveBeenCalledTimes(1);
+  });
+
+  it('reports a column once the resize ends, not during the drag', () => {
+    const resized = listen(uiHooks.onColumnResize);
+    const start = useUIStore.getState().sidebarWidth;
+
+    useUIStore.getState().setSidebarWidth(start + 10);
+    useUIStore.getState().setSidebarWidth(start + 20);
+    expect(resized).not.toHaveBeenCalled();
+    useUIStore.getState().persistColumnWidths();
+
+    expect(resized.mock.calls).toEqual([[{ column: 'sidebar', width: useUIStore.getState().sidebarWidth }]]);
+  });
+});
+
+describe('drag and drop hooks', () => {
+  beforeEach(() => {
+    useAuthStore.setState({ client: {} as never });
+    useEmailStore.setState({
+      emails: [EMAIL], mailboxes: [], selectedEmailKeys: new Set(),
+      moveEmailsToMailbox: vi.fn().mockResolvedValue(undefined),
+      refreshCurrentMailbox: vi.fn().mockResolvedValue(undefined),
+      setEmailKeywords: vi.fn().mockResolvedValue(undefined),
+      fetchEmails: vi.fn().mockResolvedValue(undefined),
+      fetchTagCounts: vi.fn(),
+      clearSelection: vi.fn(),
+    } as never);
+  });
+
+  it('reports a drag of messages dropped on a folder', async () => {
+    const started = listen(dragDropHooks.onDragStart);
+    const ended = listen(dragDropHooks.onDragEnd);
+    const dropped = listen(dragDropHooks.onEmailDrop);
+    const target = { id: 'archive', myRights: { mayAddItems: true } } as unknown as Mailbox;
+    const { result } = renderHook(
+      () => ({ ctx: useDragDropContext(), drop: useMailboxDrop({ mailbox: target, onSuccess: () => {} }) }),
+      { wrapper },
+    );
+
+    act(() => { result.current.ctx.startDrag([EMAIL], 'inbox'); });
+    await act(async () => { await result.current.drop.dropHandlers.onDrop(dropEvent(['m1'])); });
+
+    expect(started).toHaveBeenCalledWith({ kind: 'email', ids: ['m1'] });
+    expect(dropped).toHaveBeenCalledWith({ emailIds: ['m1'], targetMailboxId: 'archive' });
+    expect(ended.mock.calls).toEqual([[{ kind: 'email', ids: ['m1'], dropped: true }]]);
+  });
+
+  it('reports a drag that ended without a drop', () => {
+    const ended = listen(dragDropHooks.onDragEnd);
+    const { result } = renderHook(() => useDragDropContext(), { wrapper });
+
+    act(() => { result.current.startDrag([EMAIL], 'inbox'); });
+    act(() => { result.current.endDrag(); });
+    act(() => { result.current.endDrag(); });
+
+    expect(ended.mock.calls).toEqual([[{ kind: 'email', ids: ['m1'], dropped: false }]]);
+  });
+
+  it('reports messages dropped on a tag', async () => {
+    const tagged = listen(dragDropHooks.onTagDrop);
+    const { result } = renderHook(
+      () => ({ ctx: useDragDropContext(), drop: useTagDrop({ tagId: 'work', onSuccess: () => {} }) }),
+      { wrapper },
+    );
+
+    act(() => { result.current.ctx.startDrag([EMAIL], 'inbox'); });
+    await act(async () => { await result.current.drop.dropHandlers.onDrop(dropEvent(['m1'])); });
+
+    expect(tagged).toHaveBeenCalledWith({ emailIds: ['m1'], keyword: '$label:work' });
+  });
+});
+
+describe('sidebar app hooks', () => {
+  it('reports an app opening, and closing when the page goes away', () => {
+    const opened = listen(sidebarAppHooks.onSidebarAppOpen);
+    const closed = listen(sidebarAppHooks.onSidebarAppClose);
+    // An app picked just before a reload opens on mount.
+    sessionStorage.setItem('bulwark:pending-inline-app', JSON.stringify({ id: 'wiki', url: 'https://wiki.example.org', name: 'Wiki' }));
+    const { unmount } = renderHook(() => useSidebarApps());
+
+    expect(opened).toHaveBeenCalledWith({ appId: 'wiki' });
+    expect(closed).not.toHaveBeenCalled();
+    unmount();
+    expect(closed).toHaveBeenCalledWith({ appId: 'wiki' });
+  });
+
+  it('reports an app the user closes', () => {
+    const closed = listen(sidebarAppHooks.onSidebarAppClose);
+    sessionStorage.setItem('bulwark:pending-inline-app', JSON.stringify({ id: 'wiki', url: 'https://wiki.example.org', name: 'Wiki' }));
+    const { result } = renderHook(() => useSidebarApps());
+
+    act(() => { result.current.closeInlineApp(); });
+
+    expect(closed.mock.calls).toEqual([[{ appId: 'wiki' }]]);
+  });
+});
diff --git a/hooks/__tests__/use-calendar-alerts-hooks.test.tsx b/hooks/__tests__/use-calendar-alerts-hooks.test.tsx
new file mode 100644
index 000000000..9a17672d9
--- /dev/null
+++ b/hooks/__tests__/use-calendar-alerts-hooks.test.tsx
@@ -0,0 +1,95 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { act, fireEvent, render, renderHook, screen, waitFor } from '@testing-library/react';
+import { useCalendarAlerts } from '../use-calendar-alerts';
+import { ToastContainer } from '@/components/ui/toast';
+import { useAuthStore } from '@/stores/auth-store';
+import { useCalendarStore } from '@/stores/calendar-store';
+import { useCalendarNotificationStore } from '@/stores/calendar-notification-store';
+import { useSettingsStore } from '@/stores/settings-store';
+import { useToastStore } from '@/stores/toast-store';
+import { calendarHooks, clearAllHooks } from '@/lib/plugin-hooks';
+import type { CalendarEvent } from '@/lib/jmap/types';
+
+// A reminder that fires tells plugins (onCalendarAlert); the user closing
+// its toast tells them it was dismissed (onCalendarAlertAcknowledge). A
+// toast that just times out is not a dismissal.
+
+const fireTime = new Date(Date.now() - 60_000).toISOString();
+
+const event = {
+  id: 'e1',
+  uid: 'uid-1',
+  title: 'Dentist',
+  start: new Date(Date.now() + 10 * 60_000).toISOString().slice(0, 19),
+  utcStart: new Date(Date.now() + 10 * 60_000).toISOString(),
+  duration: 'PT1H',
+  calendarIds: { c1: true },
+  useDefaultAlerts: false,
+  alerts: {
+    a1: { '@type': 'Alert', action: 'display', trigger: { '@type': 'AbsoluteTrigger', when: fireTime } },
+  },
+} as unknown as CalendarEvent;
+
+function Toasts() {
+  const toasts = useToastStore((s) => s.toasts);
+  const removeToast = useToastStore((s) => s.removeToast);
+  return <ToastContainer toasts={toasts} onClose={removeToast} />;
+}
+
+beforeEach(() => {
+  clearAllHooks();
+  useToastStore.setState({ toasts: [] });
+  useCalendarNotificationStore.getState().clearAll();
+  useAuthStore.setState({ isAuthenticated: true, client: null });
+  useSettingsStore.setState({ calendarNotificationsEnabled: true, calendarNotificationSound: false, enableCalendarTasks: false });
+  useCalendarStore.setState({ events: [event], calendars: [] });
+});
+
+afterEach(() => {
+  vi.useRealTimers();
+});
+
+describe('reminder hooks', () => {
+  it('reports a fired reminder once, and its dismissal when the user closes it', async () => {
+    const fired = vi.fn();
+    const acknowledged = vi.fn();
+    calendarHooks.onCalendarAlert.register('t', fired);
+    calendarHooks.onCalendarAlertAcknowledge.register('t', acknowledged);
+
+    renderHook(() => useCalendarAlerts());
+    render(<Toasts />);
+
+    await waitFor(() => expect(fired).toHaveBeenCalledTimes(1));
+    expect(fired).toHaveBeenCalledWith({
+      id: 'a1', eventId: 'e1', eventTitle: 'Dentist', triggerTime: new Date(fireTime).toISOString(),
+    });
+    expect(acknowledged).not.toHaveBeenCalled();
+
+    const close = screen.getByText('Dentist').closest('.toast-item')!.querySelector('button:last-of-type')!;
+    fireEvent.click(close);
+    expect(acknowledged).toHaveBeenCalledTimes(1);
+    expect(acknowledged).toHaveBeenCalledWith({ alertId: 'a1', eventId: 'e1' });
+
+    // Re-checking does not fire the same reminder again.
+    act(() => { useCalendarStore.setState({ events: [{ ...event }] }); });
+    expect(fired).toHaveBeenCalledTimes(1);
+  });
+});
+
+describe('toast onDismiss', () => {
+  it('runs when the user closes the toast, not when it times out', () => {
+    vi.useFakeTimers();
+    const onDismiss = vi.fn();
+    render(<Toasts />);
+
+    act(() => { useToastStore.getState().addToast({ type: 'info', title: 'Times out', duration: 1000, onDismiss }); });
+    act(() => { vi.advanceTimersByTime(2000); });
+    expect(screen.queryByText('Times out')).toBeNull();
+    expect(onDismiss).not.toHaveBeenCalled();
+
+    act(() => { useToastStore.getState().addToast({ type: 'info', title: 'Closed', duration: 10_000, onDismiss }); });
+    const close = screen.getByText('Closed').closest('.toast-item')!.querySelector('button:last-of-type')!;
+    fireEvent.click(close);
+    expect(onDismiss).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/hooks/__tests__/use-keyboard-shortcuts-plugin-hooks.test.ts b/hooks/__tests__/use-keyboard-shortcuts-plugin-hooks.test.ts
new file mode 100644
index 000000000..44ff9faa2
--- /dev/null
+++ b/hooks/__tests__/use-keyboard-shortcuts-plugin-hooks.test.ts
@@ -0,0 +1,50 @@
+import { renderHook } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { clearAllHooks, keyboardHooks } from '@/lib/plugin-hooks';
+import { useKeyboardShortcuts } from '../use-keyboard-shortcuts';
+
+function press(key: string, code: string, init: KeyboardEventInit = {}) {
+  document.dispatchEvent(new KeyboardEvent('keydown', { key, code, bubbles: true, ...init }));
+}
+
+const flush = () => new Promise((r) => setTimeout(r, 0));
+
+beforeEach(() => clearAllHooks());
+
+describe('shortcut hooks', () => {
+  it('runs the shortcut and tells plugins after it ran', () => {
+    const onArchive = vi.fn();
+    const after = vi.fn();
+    keyboardHooks.onAfterShortcut.register('p', after);
+    renderHook(() => useKeyboardShortcuts({ emails: [], selectedEmailId: 'e1', handlers: { onArchive } }));
+
+    press('e', 'KeyE');
+
+    expect(onArchive).toHaveBeenCalledTimes(1);
+    expect(after).toHaveBeenCalledWith({ key: 'e', action: 'archive' });
+  });
+
+  it('lets a plugin stop a shortcut', async () => {
+    const onReplyAll = vi.fn();
+    const before = vi.fn().mockReturnValue(false);
+    keyboardHooks.onBeforeShortcut.register('p', before);
+    renderHook(() => useKeyboardShortcuts({ emails: [], selectedEmailId: 'e1', handlers: { onReplyAll } }));
+
+    press('R', 'KeyR', { shiftKey: true });
+    await flush();
+
+    expect(before).toHaveBeenCalledWith({ key: 'shift+r', action: 'reply-all' });
+    expect(onReplyAll).not.toHaveBeenCalled();
+  });
+
+  it('runs the shortcut when the plugin lets it through', async () => {
+    const onCompose = vi.fn();
+    keyboardHooks.onBeforeShortcut.register('p', () => true);
+    renderHook(() => useKeyboardShortcuts({ emails: [], handlers: { onCompose } }));
+
+    press('c', 'KeyC');
+    await flush();
+
+    expect(onCompose).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/hooks/use-calendar-alerts.ts b/hooks/use-calendar-alerts.ts
index fb5102e2e..eef44e35e 100644
--- a/hooks/use-calendar-alerts.ts
+++ b/hooks/use-calendar-alerts.ts
@@ -13,6 +13,7 @@ import { getPendingAlerts, getPendingTaskAlerts, buildAlertKey } from '@/lib/cal
 import { playNotificationSound } from '@/lib/notification-sound';
 import { getPathPrefix } from '@/lib/browser-navigation';
 import type { CalendarEvent } from '@/lib/jmap/types';
+import { calendarHooks } from '@/lib/plugin-hooks';
 
 const CHECK_INTERVAL_MS = 60 * 1000;
 const PROACTIVE_FETCH_HOURS = 24;
@@ -55,6 +56,13 @@ export function useCalendarAlerts() {
         const diffMs = (alert.event.utcStart ? new Date(alert.event.utcStart).getTime() : parseISO(alert.event.start).getTime()) - now;
         const diffMin = Math.round(diffMs / 60000);
 
+        void calendarHooks.onCalendarAlert.emit({
+          id: alert.alertId,
+          eventId: alert.eventId,
+          eventTitle: alert.event.title || '',
+          triggerTime: new Date(alert.fireTimeMs).toISOString(),
+        });
+
         const timeLabel = diffMin <= 0
           ? t('alert_now')
           : t('alert_in_minutes', { count: diffMin });
@@ -71,6 +79,9 @@ export function useCalendarAlerts() {
           onClick: () => {
             window.location.href = `${getPathPrefix(locale)}/${locale}/calendar`;
           },
+          onDismiss: () => {
+            void calendarHooks.onCalendarAlertAcknowledge.emit({ alertId: alert.alertId, eventId: alert.eventId });
+          },
         });
       }
 
diff --git a/hooks/use-keyboard-shortcuts.ts b/hooks/use-keyboard-shortcuts.ts
index 21e9231cc..8c8579114 100644
--- a/hooks/use-keyboard-shortcuts.ts
+++ b/hooks/use-keyboard-shortcuts.ts
@@ -3,6 +3,7 @@
 import { useEffect, useCallback, useRef } from "react";
 import { Email } from "@/lib/jmap/types";
 import { isEditableEventTarget } from "@/lib/keyboard";
+import { keyboardHooks } from "@/lib/plugin-hooks";
 import type { InterfaceLayout } from "@/stores/settings-store";
 
 export interface KeyboardShortcutHandlers {
@@ -120,6 +121,22 @@ export function useKeyboardShortcuts({
 
       const h = handlersRef.current;
       const key = physicalShortcutKey(event);
+      const keyName = `${event.ctrlKey || event.metaKey ? "mod+" : ""}${event.shiftKey && key.length === 1 && /[a-z]/.test(key) ? "shift+" : ""}${key}`;
+      // Runs a shortcut's action. Plugins may stop it first (onBeforeShortcut)
+      // and hear about it after; with no plugin listening it runs at once.
+      const run = (action: string, fn: (() => void) | undefined) => {
+        if (!fn) return;
+        const payload = { key: keyName, action };
+        const done = () => {
+          fn();
+          void keyboardHooks.onAfterShortcut.emit(payload);
+        };
+        if (keyboardHooks.onBeforeShortcut.size === 0) {
+          done();
+          return;
+        }
+        void keyboardHooks.onBeforeShortcut.intercept(payload).then((ok) => { if (ok) done(); });
+      };
       const hasModifier = event.ctrlKey || event.metaKey || event.altKey;
 
       // Shortcuts that work with modifiers
@@ -128,7 +145,7 @@ export function useKeyboardShortcuts({
           case "a":
             // Ctrl/Cmd + A: Select all
             event.preventDefault();
-            h.onSelectAll?.();
+            run("select-all", h.onSelectAll);
             return;
         }
       }
@@ -146,7 +163,8 @@ export function useKeyboardShortcuts({
         const target = GO_TO_KEYS[key];
         if (target && h.onGoToMailbox) {
           event.preventDefault();
-          h.onGoToMailbox(target);
+          const goTo = h.onGoToMailbox;
+          run(`go-to-${target}`, () => goTo(target));
           return;
         }
       }
@@ -156,27 +174,26 @@ export function useKeyboardShortcuts({
         case "j":
         case "arrowdown":
           event.preventDefault();
-          h.onNextEmail?.();
+          run("next-email", h.onNextEmail);
           break;
 
         case "k":
         case "arrowup":
           event.preventDefault();
-          h.onPreviousEmail?.();
+          run("previous-email", h.onPreviousEmail);
           break;
 
         case "enter":
         case "o":
           if (selectedEmailId) {
             event.preventDefault();
-            h.onOpenEmail?.();
+            run("open-email", h.onOpenEmail);
           }
           break;
 
         case "escape":
           event.preventDefault();
-          h.onCloseEmail?.();
-          h.onDeselectAll?.();
+          run("close", h.onCloseEmail || h.onDeselectAll ? () => { h.onCloseEmail?.(); h.onDeselectAll?.(); } : undefined);
           break;
 
         // Email actions (only when email is selected)
@@ -184,9 +201,9 @@ export function useKeyboardShortcuts({
           if (selectedEmailId) {
             event.preventDefault();
             if (event.shiftKey) {
-              h.onReplyAll?.();
+              run("reply-all", h.onReplyAll);
             } else {
-              h.onReply?.();
+              run("reply", h.onReply);
             }
           }
           break;
@@ -194,28 +211,28 @@ export function useKeyboardShortcuts({
         case "a":
           if (selectedEmailId) {
             event.preventDefault();
-            h.onReplyAll?.();
+            run("reply-all", h.onReplyAll);
           }
           break;
 
         case "f":
           if (selectedEmailId) {
             event.preventDefault();
-            h.onForward?.();
+            run("forward", h.onForward);
           }
           break;
 
         case "s":
           if (selectedEmailId) {
             event.preventDefault();
-            h.onToggleStar?.();
+            run("toggle-star", h.onToggleStar);
           }
           break;
 
         case "e":
           if (hasBatchTarget) {
             event.preventDefault();
-            h.onArchive?.();
+            run("archive", h.onArchive);
           }
           break;
 
@@ -224,51 +241,51 @@ export function useKeyboardShortcuts({
         case "backspace":
           if (hasBatchTarget) {
             event.preventDefault();
-            h.onDelete?.();
+            run("delete", h.onDelete);
           }
           break;
 
         case "u":
           if (hasBatchTarget) {
             event.preventDefault();
-            h.onMarkAsUnread?.();
+            run("mark-as-unread", h.onMarkAsUnread);
           }
           break;
 
         case "i":
           if (hasBatchTarget && event.shiftKey) {
             event.preventDefault();
-            h.onMarkAsRead?.();
+            run("mark-as-read", h.onMarkAsRead);
           }
           break;
 
         case "!":
           if (hasBatchTarget) {
             event.preventDefault();
-            h.onToggleSpam?.();
+            run("toggle-spam", h.onToggleSpam);
           }
           break;
 
         // Global actions
         case "c":
           event.preventDefault();
-          h.onCompose?.();
+          run("compose", h.onCompose);
           break;
 
         case "/":
           event.preventDefault();
-          h.onFocusSearch?.();
+          run("focus-search", h.onFocusSearch);
           break;
 
         case "?":
           event.preventDefault();
-          h.onShowHelp?.();
+          run("show-help", h.onShowHelp);
           break;
 
         case "g":
           if (event.shiftKey) {
             event.preventDefault();
-            h.onRefresh?.();
+            run("refresh", h.onRefresh);
           } else if (mountainViewKeys && h.onGoToMailbox) {
             // Arm the sequence; the next key either completes it or lapses.
             event.preventDefault();
@@ -283,11 +300,11 @@ export function useKeyboardShortcuts({
           if (mountainViewKeys) {
             if (selectedEmailId) {
               event.preventDefault();
-              h.onToggleSelection?.();
+              run("toggle-selection", h.onToggleSelection);
             }
           } else if (selectedEmailId) {
             event.preventDefault();
-            h.onToggleThreadExpansion?.();
+            run("toggle-thread-expansion", h.onToggleThreadExpansion);
           }
           break;
       }
@@ -347,6 +364,8 @@ export interface ShortcutEntry {
   readonly key: string;
   readonly description: string;
   readonly layout?: InterfaceLayout;
+  /** Listed only in the Pro shell, or only outside it. */
+  readonly shell?: "pro" | "standard";
 }
 
 // Shortcut definitions for the help modal
@@ -372,7 +391,8 @@ export const KEYBOARD_SHORTCUTS = {
   global: [
     { key: "c", description: "shortcuts.global.compose" },
     { key: "/", description: "shortcuts.global.search" },
-    { key: "Ctrl/⌘ + K", description: "shortcuts.global.global_search" },
+    { key: "Ctrl/⌘ + K", description: "shortcuts.global.global_search", shell: "pro" },
+    { key: "Ctrl/⌘ + K", description: "command_palette.open", shell: "standard" },
     { key: "?", description: "shortcuts.global.help" },
     { key: "Shift + G", description: "shortcuts.global.refresh" },
     { key: "Ctrl + A", description: "shortcuts.global.select_all" },
diff --git a/hooks/use-mailbox-drop.ts b/hooks/use-mailbox-drop.ts
index 61c6792f8..ebc443e15 100644
--- a/hooks/use-mailbox-drop.ts
+++ b/hooks/use-mailbox-drop.ts
@@ -6,6 +6,7 @@ import { useEmailStore } from "@/stores/email-store";
 import { emailKeyFor } from "@/lib/thread-utils";
 import { useAuthStore } from "@/stores/auth-store";
 import { useDragDropContext } from "@/contexts/drag-drop-context";
+import { dragDropHooks } from "@/lib/plugin-hooks";
 import { toast } from "@/stores/toast-store";
 import { getMailboxPath } from "@/lib/utils";
 
@@ -67,7 +68,7 @@ export function useMailboxDrop({ mailbox, onDropComplete, onSuccess, onError }:
   const [isOver, setIsOver] = useState(false);
   const { client } = useAuthStore();
   const { moveEmailsToMailbox, crossAccountMoveEmails, selectedEmailKeys, clearSelection, refreshCurrentMailbox, mailboxes } = useEmailStore();
-  const { isDragging, sourceMailboxId, draggedEmails, endDrag } = useDragDropContext();
+  const { isDragging, sourceMailboxId, draggedEmails, endDrag, markDropped } = useDragDropContext();
 
   // Determine if this is a valid drop target
   const isValidTarget = useCallback(() => {
@@ -129,6 +130,7 @@ export function useMailboxDrop({ mailbox, onDropComplete, onSuccess, onError }:
       }
 
       const emailIds: string[] = JSON.parse(emailIdsJson);
+      markDropped();
 
       // Group dragged emails by source account. In single-account flows this
       // collapses to one bucket; in unified view or the Pro multi-account
@@ -183,6 +185,7 @@ export function useMailboxDrop({ mailbox, onDropComplete, onSuccess, onError }:
         // Single-account or same-account-shared move: bulk JMAP request.
         await moveEmailsToMailbox(client, emailIds, mailbox.id);
       }
+      void dragDropHooks.onEmailDrop.emit({ emailIds, targetMailboxId: mailbox.id });
 
       // Clear selection if any selected emails were moved. The selection is
       // keyed by owning account, so compare the dragged emails, not their ids.
@@ -224,7 +227,7 @@ export function useMailboxDrop({ mailbox, onDropComplete, onSuccess, onError }:
     } finally {
       endDrag();
     }
-  }, [client, mailbox, mailboxes, isValidTarget, moveEmailsToMailbox, crossAccountMoveEmails, draggedEmails, sourceMailboxId, selectedEmailKeys, clearSelection, refreshCurrentMailbox, endDrag, onDropComplete, onSuccess, onError]);
+  }, [client, mailbox, mailboxes, isValidTarget, moveEmailsToMailbox, crossAccountMoveEmails, draggedEmails, sourceMailboxId, selectedEmailKeys, clearSelection, refreshCurrentMailbox, endDrag, markDropped, onDropComplete, onSuccess, onError]);
 
   const valid = isValidTarget();
 
diff --git a/hooks/use-plugin-pages.ts b/hooks/use-plugin-pages.ts
new file mode 100644
index 000000000..beb64a7c9
--- /dev/null
+++ b/hooks/use-plugin-pages.ts
@@ -0,0 +1,20 @@
+"use client";
+
+import { useSyncExternalStore } from 'react';
+import { allPages, subscribePages, type RegisteredPage } from '@/lib/plugin-sandbox/pages';
+
+/** Pages plugins registered with api.ui.setPages, in install order. */
+export function usePluginPages(): RegisteredPage[] {
+  return useSyncExternalStore(subscribePages, allPages, allPages);
+}
+
+/** The in-app route of a plugin page: /apps/<pluginId>/<pageId>. */
+export function pluginPageHref(page: Pick<RegisteredPage, 'pluginId' | 'id'>): string {
+  return `/apps/${encodeURIComponent(page.pluginId)}/${encodeURIComponent(page.id)}`;
+}
+
+/** Whether `pathname` (locale already stripped) shows this page. */
+export function isPluginPageActive(pathname: string, page: Pick<RegisteredPage, 'pluginId' | 'id'>): boolean {
+  const href = pluginPageHref(page);
+  return pathname === href || pathname.startsWith(`${href}/`);
+}
diff --git a/hooks/use-plugin-signature.ts b/hooks/use-plugin-signature.ts
new file mode 100644
index 000000000..0208ceb19
--- /dev/null
+++ b/hooks/use-plugin-signature.ts
@@ -0,0 +1,62 @@
+import { useEffect, useMemo, useState } from 'react';
+import type { Identity } from '@/lib/jmap/types';
+import { identityHooks } from '@/lib/plugin-hooks';
+
+interface RenderedSignature {
+  identityId: string;
+  source: string;
+  html: string;
+  text: string;
+}
+
+const sourceKey = (identity: Identity) => JSON.stringify([identity.htmlSignature ?? '', identity.textSignature ?? '']);
+
+/**
+ * The signature the composer inserts for `identity`, after plugins had their
+ * say through onSignatureRender. Returns the identity unchanged while no
+ * plugin listens, and until a plugin's result arrives; after that, a copy
+ * with the plugin's htmlSignature and textSignature. Every place that builds
+ * a signature (the initial body, the identity swap, drafts, the send path)
+ * reads the identity this returns, so they all insert the same text. The HTML
+ * goes through the composer's signature sanitizer like any other signature.
+ *
+ * `revision` changes each time a plugin result is applied, so the composer
+ * can swap the signature already in the body.
+ */
+export function usePluginSignature(identity: Identity | null | undefined): {
+  identity: Identity | null | undefined;
+  revision: number;
+} {
+  const [rendered, setRendered] = useState<RenderedSignature | null>(null);
+  const [revision, setRevision] = useState(0);
+  const id = identity?.id;
+  const source = identity ? sourceKey(identity) : '';
+
+  useEffect(() => {
+    if (!identity || !id || identityHooks.onSignatureRender.size === 0) return;
+    let cancelled = false;
+    const initial = { html: identity.htmlSignature ?? '', text: identity.textSignature ?? '' };
+    void identityHooks.onSignatureRender.transform(initial, { identityId: id }).then((result: unknown) => {
+      if (cancelled) return;
+      const r = result as { html?: unknown; text?: unknown } | null;
+      const html = typeof r?.html === 'string' ? r.html : initial.html;
+      const text = typeof r?.text === 'string' ? r.text : initial.text;
+      if (html === initial.html && text === initial.text) return;
+      setRendered({ identityId: id, source, html, text });
+      setRevision((n) => n + 1);
+    });
+    return () => { cancelled = true; };
+    // Keyed to the identity and its signature text, not the object, which is
+    // rebuilt on unrelated store updates.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [id, source]);
+
+  const result = useMemo(() => {
+    if (!identity || !rendered || rendered.identityId !== identity.id || rendered.source !== sourceKey(identity)) {
+      return identity;
+    }
+    return { ...identity, htmlSignature: rendered.html, textSignature: rendered.text };
+  }, [identity, rendered]);
+
+  return { identity: result, revision };
+}
diff --git a/hooks/use-sidebar-apps.ts b/hooks/use-sidebar-apps.ts
index b198a8f7a..5cdc9e816 100644
--- a/hooks/use-sidebar-apps.ts
+++ b/hooks/use-sidebar-apps.ts
@@ -3,6 +3,7 @@ import { useSettingsStore } from '@/stores/settings-store';
 import { useManagedSidebarApps } from '@/hooks/use-resolved-sidebar-apps';
 import { appUrlToFrameOrigin, inlineAppFrameOrigins } from '@/lib/security/app-frame-origins';
 import { readAppFrameOrigins, writeAppFrameOrigins } from '@/lib/security/app-frame-origins-client';
+import { sidebarAppHooks } from '@/lib/plugin-hooks';
 
 export interface InlineAppState {
   id: string;
@@ -48,6 +49,15 @@ export function useSidebarApps() {
   // opening one must not trigger the reload below.
   const managedOrigins = useMemo(() => inlineAppFrameOrigins(managedApps), [managedApps]);
 
+  // Plugins hear when an app opens, and when it closes: closed by the user,
+  // replaced by another app, or gone because the user left the page.
+  const inlineAppId = inlineApp?.id ?? null;
+  useEffect(() => {
+    if (!inlineAppId) return;
+    void sidebarAppHooks.onSidebarAppOpen.emit({ appId: inlineAppId });
+    return () => { void sidebarAppHooks.onSidebarAppClose.emit({ appId: inlineAppId }); };
+  }, [inlineAppId]);
+
   const openInlineApp = useCallback((app: InlineAppState) => {
     setInlineApp(app);
     setLoadedApps((prev) => (prev.some((a) => a.id === app.id) ? prev : [...prev, app]));
diff --git a/hooks/use-tag-drop.ts b/hooks/use-tag-drop.ts
index cb99edb8b..761f57617 100644
--- a/hooks/use-tag-drop.ts
+++ b/hooks/use-tag-drop.ts
@@ -4,6 +4,7 @@ import { useCallback, useState, DragEvent } from "react";
 import { useEmailStore } from "@/stores/email-store";
 import { useAuthStore } from "@/stores/auth-store";
 import { useDragDropContext } from "@/contexts/drag-drop-context";
+import { dragDropHooks } from "@/lib/plugin-hooks";
 
 
 interface UseTagDropOptions {
@@ -27,7 +28,7 @@ export function useTagDrop({ tagId, onSuccess, onError }: UseTagDropOptions): Us
   const [isOver, setIsOver] = useState(false);
   const { client } = useAuthStore();
   const { fetchEmails, fetchTagCounts, selectedMailbox } = useEmailStore();
-  const { isDragging, endDrag } = useDragDropContext();
+  const { isDragging, endDrag, markDropped } = useDragDropContext();
 
   const handleDragOver = useCallback((e: DragEvent<HTMLDivElement>) => {
     e.preventDefault();
@@ -71,6 +72,7 @@ export function useTagDrop({ tagId, onSuccess, onError }: UseTagDropOptions): Us
       }
 
       const emailIds: string[] = JSON.parse(emailIdsJson);
+      markDropped();
 
       for (const emailId of emailIds) {
         // Read fresh state to avoid stale closures
@@ -87,6 +89,8 @@ export function useTagDrop({ tagId, onSuccess, onError }: UseTagDropOptions): Us
         await emailState.setEmailKeywords(client, emailId, keywords);
       }
 
+      void dragDropHooks.onTagDrop.emit({ emailIds, keyword: `$label:${tagId}` });
+
       // Refresh the email list
       await fetchEmails(client, selectedMailbox);
 
@@ -100,7 +104,7 @@ export function useTagDrop({ tagId, onSuccess, onError }: UseTagDropOptions): Us
     } finally {
       endDrag();
     }
-  }, [client, isDragging, tagId, fetchEmails, fetchTagCounts, selectedMailbox, endDrag, onSuccess, onError]);
+  }, [client, isDragging, tagId, fetchEmails, fetchTagCounts, selectedMailbox, endDrag, markDropped, onSuccess, onError]);
 
   return {
     dropHandlers: {
diff --git a/lib/__tests__/app-commands.test.tsx b/lib/__tests__/app-commands.test.tsx
new file mode 100644
index 000000000..898b1d649
--- /dev/null
+++ b/lib/__tests__/app-commands.test.tsx
@@ -0,0 +1,38 @@
+import { render } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
+import { parkAppCommand, peekParkedAppCommand, requestAppCommand, useAppCommands } from '../app-commands';
+
+function Surface({ compose, enabled = true }: { compose: () => void; enabled?: boolean }) {
+  useAppCommands({ compose }, enabled);
+  return null;
+}
+
+describe('palette commands for the mail page', () => {
+  it('reports a command nobody took', () => {
+    expect(requestAppCommand('compose')).toBe(false);
+  });
+
+  it('runs a command on the mounted surface', () => {
+    const compose = vi.fn();
+    render(<Surface compose={compose} />);
+    expect(requestAppCommand('compose')).toBe(true);
+    expect(compose).toHaveBeenCalledTimes(1);
+    // A command the surface has no handler for stays untaken.
+    expect(requestAppCommand('search')).toBe(false);
+  });
+
+  it('runs a parked command once the surface is ready, and only once', () => {
+    const compose = vi.fn();
+    parkAppCommand('compose');
+    const { rerender } = render(<Surface compose={compose} enabled={false} />);
+    expect(compose).not.toHaveBeenCalled();
+
+    rerender(<Surface compose={compose} enabled />);
+    expect(compose).toHaveBeenCalledTimes(1);
+    expect(peekParkedAppCommand()).toBeNull();
+
+    rerender(<Surface compose={compose} enabled={false} />);
+    rerender(<Surface compose={compose} enabled />);
+    expect(compose).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/lib/__tests__/extension-package.test.ts b/lib/__tests__/extension-package.test.ts
new file mode 100644
index 000000000..bf1f0f81c
--- /dev/null
+++ b/lib/__tests__/extension-package.test.ts
@@ -0,0 +1,144 @@
+import { describe, it, expect } from 'vitest';
+import JSZip from 'jszip';
+import {
+  checkPluginManifest,
+  compareVersions,
+  readPluginPackage,
+  MAX_ENTRY_BYTES,
+  MAX_ZIP_ENTRIES,
+} from '../extension-package';
+
+const BASE = {
+  id: 'demo-plugin', name: 'Demo', version: '1.0.0', author: 'me', description: 'd',
+  type: 'hook', permissions: ['email:read'], entrypoint: 'index.js',
+};
+
+async function zipOf(files: Record<string, string | Uint8Array>): Promise<Uint8Array> {
+  const zip = new JSZip();
+  for (const [name, data] of Object.entries(files)) zip.file(name, data);
+  return zip.generateAsync({ type: 'uint8array', compression: 'DEFLATE' });
+}
+
+describe('checkPluginManifest', () => {
+  it('accepts a normal manifest and keeps only checked fields', () => {
+    const { manifest, errors } = checkPluginManifest({ ...BASE, somethingElse: 1, locales: { de: { a: 'b' } } });
+
+    expect(errors).toEqual([]);
+    expect(manifest).toMatchObject({ id: 'demo-plugin', permissions: ['email:read'], locales: { de: { a: 'b' } } });
+    expect(manifest).not.toHaveProperty('somethingElse');
+  });
+
+  it('refuses permissions given as a string', () => {
+    // As a string, "crypto:full email:send" used to pass validation and then
+    // grant both through String.prototype.includes.
+    const { manifest, errors } = checkPluginManifest({ ...BASE, permissions: 'crypto:full email:send' });
+
+    expect(manifest).toBeNull();
+    expect(errors.join()).toMatch(/must be a list of strings/);
+  });
+
+  it('refuses unknown permissions', () => {
+    expect(checkPluginManifest({ ...BASE, permissions: ['email:read', 'root:all'] }).errors.join())
+      .toMatch(/Unknown permissions: root:all/);
+  });
+
+  it.each(['../index.js', '/index.js', 'a/../../x.js', 'index.css', 'a\\b.js'])('refuses entrypoint %s', (entrypoint) => {
+    expect(checkPluginManifest({ ...BASE, entrypoint }).manifest).toBeNull();
+  });
+
+  it('refuses a select setting whose options are not a list', () => {
+    const { errors } = checkPluginManifest({
+      ...BASE,
+      settingsSchema: { mode: { type: 'select', label: 'Mode', default: 'a', options: 'a,b' } },
+    });
+
+    expect(errors.join()).toMatch(/settingsSchema\.mode\.options/);
+  });
+
+  it('refuses a number default outside min/max', () => {
+    const { errors } = checkPluginManifest({
+      ...BASE,
+      settingsSchema: { size: { type: 'number', label: 'Size', default: 900, min: 16, max: 512 } },
+    });
+
+    expect(errors.join()).toMatch(/outside min\/max/);
+  });
+
+  it('drops invalid origins with a warning instead of storing them', () => {
+    const { manifest, warnings } = checkPluginManifest({
+      ...BASE,
+      permissions: ['http:fetch'],
+      httpOrigins: ['https://api.example.com', 'https://*.com', 'http://plain.example'],
+    });
+
+    expect(manifest?.httpOrigins).toEqual(['https://api.example.com']);
+    expect(warnings.join()).toMatch(/\*\.com/);
+  });
+
+  it('refuses a plugin that needs a newer Bulwark', () => {
+    expect(checkPluginManifest({ ...BASE, minAppVersion: '9.0.0' }, { appVersion: '1.9.2' }).errors.join())
+      .toMatch(/Needs Bulwark 9\.0\.0/);
+  });
+
+  it('refuses a privileged plugin without crypto:full', () => {
+    expect(checkPluginManifest({ ...BASE, tier: 'privileged' }).manifest).toBeNull();
+  });
+});
+
+describe('readPluginPackage', () => {
+  it('reads manifest and code from a package in a sub folder', async () => {
+    const data = await zipOf({ 'demo/manifest.json': JSON.stringify(BASE), 'demo/index.js': 'module.exports = {}' });
+
+    const pkg = await readPluginPackage(data);
+
+    expect(pkg.code).toBe('module.exports = {}');
+    expect(pkg.manifest.id).toBe('demo-plugin');
+  });
+
+  it('stops inflating a file that unpacks past the limit (ZIP bomb)', async () => {
+    // ~25 KB compressed, more than the per-file cap once inflated.
+    const data = await zipOf({
+      'manifest.json': JSON.stringify(BASE),
+      'index.js': new Uint8Array(MAX_ENTRY_BYTES + 1024),
+    });
+    expect(data.byteLength).toBeLessThan(200 * 1024);
+
+    await expect(readPluginPackage(data)).rejects.toThrow(/larger than .* once unpacked/);
+  });
+
+  it('refuses a ZIP with too many entries', async () => {
+    const files: Record<string, string> = { 'manifest.json': JSON.stringify(BASE), 'index.js': '' };
+    for (let i = 0; i < MAX_ZIP_ENTRIES; i++) files[`f${i}.json`] = '{}';
+
+    await expect(readPluginPackage(await zipOf(files))).rejects.toThrow(/entries/);
+  });
+
+  it('refuses disallowed file types', async () => {
+    const data = await zipOf({ 'manifest.json': JSON.stringify(BASE), 'index.js': '', 'run.exe': 'MZ' });
+
+    await expect(readPluginPackage(data)).rejects.toThrow(/run\.exe/);
+  });
+
+  it('refuses a package whose id is not the expected one', async () => {
+    const data = await zipOf({ 'manifest.json': JSON.stringify(BASE), 'index.js': '' });
+
+    await expect(readPluginPackage(data, { expectedId: 'other' })).rejects.toThrow(/does not match/);
+  });
+});
+
+describe('compareVersions', () => {
+  it('compares numerically', () => {
+    expect(compareVersions('1.10.0', '1.9.9')).toBe(1);
+    expect(compareVersions('1.2.0', '1.2.0-beta.1')).toBe(0);
+    expect(compareVersions('0.9.0', '1.0.0')).toBe(-1);
+  });
+});
+
+describe('deprecated permissions', () => {
+  it('drops smime:read with a warning instead of refusing the plugin', () => {
+    const { manifest, warnings } = checkPluginManifest({ ...BASE, permissions: ['email:read', 'smime:read'] });
+
+    expect(manifest?.permissions).toEqual(['email:read']);
+    expect(warnings.join()).toMatch(/smime:read/);
+  });
+});
diff --git a/lib/__tests__/host-theme.test.ts b/lib/__tests__/host-theme.test.ts
index 4542480e0..b3c480c3f 100644
--- a/lib/__tests__/host-theme.test.ts
+++ b/lib/__tests__/host-theme.test.ts
@@ -19,6 +19,11 @@ describe('host-theme', () => {
       expect(css).toContain('background: transparent;');
     });
 
+    it("applies the user's font size so rem units in a slot match the app", () => {
+      const css = themeSnapshotToCSS({ dark: false, fontFamily: 'x', vars: { '--font-size-base': '17px' } });
+      expect(css).toMatch(/:root \{[^}]*font-size: var\(--font-size-base\);/);
+    });
+
     it('reports a dark color-scheme when dark', () => {
       const css = themeSnapshotToCSS({ dark: true, fontFamily: 'sans-serif', vars: {} });
       expect(css).toContain('color-scheme: dark;');
diff --git a/lib/__tests__/plugin-actions-proxy-api.test.ts b/lib/__tests__/plugin-actions-proxy-api.test.ts
new file mode 100644
index 000000000..67e90e59d
--- /dev/null
+++ b/lib/__tests__/plugin-actions-proxy-api.test.ts
@@ -0,0 +1,160 @@
+import { beforeEach, describe, it, expect, vi } from 'vitest';
+import type { InstalledPlugin } from '../plugin-types';
+
+const apiFetch = vi.hoisted(() => vi.fn());
+vi.mock('@/lib/browser-navigation', async (orig) => ({
+  ...(await orig<typeof import('@/lib/browser-navigation')>()),
+  apiFetch: (...args: unknown[]) => apiFetch(...args),
+}));
+const registryEntries = vi.hoisted(() => [] as unknown[]);
+vi.mock('../plugin-sandbox/registry', async (orig) => ({
+  ...(await orig<typeof import('../plugin-sandbox/registry')>()),
+  all: () => registryEntries,
+}));
+
+import { dispatchApiCall } from '../plugin-sandbox/host-api';
+import { actionsFor, resetActions, runAction, checkActions } from '../plugin-sandbox/actions';
+import { dayLabelsByDate, resetDayLabels } from '../plugin-sandbox/day-labels';
+import { allPages, resetPages } from '../plugin-sandbox/pages';
+import type { StreamSink } from '../plugin-sandbox/proxy-client';
+import '../plugin-sandbox/loader';
+
+function plugin(overrides: Partial<InstalledPlugin> = {}): InstalledPlugin {
+  return {
+    id: 'p1', name: 'Plugin One', version: '1.0.0', author: '', description: '', type: 'hook',
+    permissions: [], entrypoint: 'index.js', enabled: true, status: 'running', settings: {}, managed: true,
+    ...overrides,
+  };
+}
+
+beforeEach(() => {
+  apiFetch.mockReset();
+  resetActions();
+  resetDayLabels();
+  resetPages();
+  registryEntries.length = 0;
+});
+
+describe('ui.setActions', () => {
+  it('puts a plugin\'s buttons on a surface it may use', async () => {
+    await dispatchApiCall(plugin({ permissions: ['ui:message-list'] }), 'ui.setActions', ['message-row-actions', [
+      { id: 'b', label: 'Second', order: 2 }, { id: 'a', label: 'First', order: 1, icon: 'archive' },
+    ]]);
+
+    expect(actionsFor('message-row-actions').map((a) => [a.pluginId, a.id])).toEqual([['p1', 'a'], ['p1', 'b']]);
+  });
+
+  it('refuses a surface the plugin has no permission for, and frame slots', async () => {
+    await expect(dispatchApiCall(plugin({ permissions: ['ui:toolbar'] }), 'ui.setActions', ['message-row-actions', []]))
+      .rejects.toThrow(/may not add actions/);
+    await expect(dispatchApiCall(plugin({ permissions: ['ui:email-banner'] }), 'ui.setActions', ['email-banner', []]))
+      .rejects.toThrow(/not a surface that takes actions/);
+    expect(actionsFor('message-row-actions')).toEqual([]);
+  });
+
+  it('checks what it is given', () => {
+    expect(() => checkActions([{ id: 'x', label: '' }])).toThrow(/label/);
+    expect(() => checkActions([{ id: 'x', label: 'X' }, { id: 'x', label: 'Y' }])).toThrow(/twice/);
+    expect(() => checkActions(Array.from({ length: 9 }, (_, i) => ({ id: `a${i}`, label: 'A' })))).toThrow(/At most/);
+    expect(() => checkActions([{ id: 'x', label: 'X', icon: '<svg>' }])).toThrow(/icon/);
+  });
+
+  it('sends a click to the plugin with only the context it may see', async () => {
+    const invokeHook = vi.fn().mockResolvedValue(undefined);
+    const p = plugin({ permissions: ['ui:message-list'] });
+    registryEntries.push({ plugin: p, background: { invokeHook } });
+    await dispatchApiCall(p, 'ui.setActions', ['message-row-actions', [{ id: 'task', label: 'Make a task' }]]);
+
+    await runAction(actionsFor('message-row-actions')[0], 'message-row-actions', { emailId: 'e1', secretStuff: 1 });
+
+    // emailId needs email:read, which this plugin lacks.
+    expect(invokeHook).toHaveBeenCalledWith('onAction', [{ surface: 'message-row-actions', actionId: 'task', context: {} }]);
+
+    p.permissions.push('email:read');
+    await runAction(actionsFor('message-row-actions')[0], 'message-row-actions', { emailId: 'e1', secretStuff: 1 });
+    expect(invokeHook).toHaveBeenLastCalledWith('onAction', [{ surface: 'message-row-actions', actionId: 'task', context: { emailId: 'e1' } }]);
+  });
+});
+
+describe('day labels and pages', () => {
+  it('stores labels by date, behind ui:calendar-action', async () => {
+    await expect(dispatchApiCall(plugin(), 'ui.setDayLabels', [[{ date: '2026-12-24', text: 'Holiday' }]])).rejects.toThrow(/lacks permission/);
+    await dispatchApiCall(plugin({ permissions: ['ui:calendar-action'] }), 'ui.setDayLabels', [[{ date: '2026-12-24', text: 'Holiday', dot: true }]]);
+
+    expect(dayLabelsByDate().get('2026-12-24')).toEqual([expect.objectContaining({ text: 'Holiday', dot: true, pluginId: 'p1' })]);
+    await expect(dispatchApiCall(plugin({ permissions: ['ui:calendar-action'] }), 'ui.setDayLabels', [[{ date: '24.12.2026', text: 'x' }]])).rejects.toThrow(/YYYY-MM-DD/);
+  });
+
+  it('registers pages behind ui:app-page', async () => {
+    await dispatchApiCall(plugin({ permissions: ['ui:app-page'] }), 'ui.setPages', [[{ id: 'files', title: 'Nextcloud', icon: 'cloud' }]]);
+
+    expect(allPages()).toEqual([expect.objectContaining({ pluginId: 'p1', id: 'files', title: 'Nextcloud' })]);
+    await expect(dispatchApiCall(plugin({ permissions: ['ui:app-page'] }), 'ui.setPages', [[{ id: 'A B', title: 'x' }]])).rejects.toThrow(/id/);
+  });
+});
+
+describe('proxy.fetch', () => {
+  const proxied = plugin({
+    permissions: ['http:proxy'],
+    credentials: { cloud: { label: 'Nextcloud', scope: 'user', inject: { type: 'basic' } } },
+  });
+
+  it('sends the request to the server proxy and returns the answer', async () => {
+    apiFetch.mockResolvedValue(new Response('{"ok":1}', { status: 200, headers: { 'content-type': 'application/json' } }));
+
+    const res = await dispatchApiCall(proxied, 'proxy.fetch', ['cloud', 'https://cloud.example.org/ocs/v2.php/cloud/user', {
+      method: 'GET', headers: { 'OCS-APIRequest': 'true' }, responseType: 'json',
+    }]);
+
+    expect(res).toMatchObject({ status: 200, ok: true, body: { ok: 1 } });
+    const [url, init] = apiFetch.mock.calls[0];
+    expect(url).toBe('/api/plugin-proxy?plugin=p1&credential=cloud&url=https%3A%2F%2Fcloud.example.org%2Focs%2Fv2.php%2Fcloud%2Fuser');
+    expect(init.headers).toMatchObject({ 'OCS-APIRequest': 'true', 'x-bulwark-method': 'GET' });
+  });
+
+  it('refuses a credential the manifest does not declare, and plugins without http:proxy', async () => {
+    await expect(dispatchApiCall(proxied, 'proxy.fetch', ['other', 'https://a.example', {}])).rejects.toThrow(/declares no credential/);
+    await expect(dispatchApiCall({ ...proxied, permissions: [] }, 'proxy.fetch', ['cloud', 'https://a.example', {}])).rejects.toThrow(/lacks permission/);
+    expect(apiFetch).not.toHaveBeenCalled();
+  });
+
+  it('tells the plugin when the proxy itself refused', async () => {
+    apiFetch.mockResolvedValue(new Response('{"error":"Too many requests","code":"rate_limited"}', {
+      status: 429, headers: { 'content-type': 'application/json', 'x-bulwark-proxy-error': 'rate_limited' },
+    }));
+
+    const res = await dispatchApiCall(proxied, 'proxy.fetch', ['cloud', 'https://cloud.example.org/x', {}]);
+
+    expect(res).toMatchObject({ status: 429, ok: false, proxyError: 'rate_limited', body: 'Too many requests' });
+  });
+
+  it('streams the answer to a request with a body (an AI reply), through fetch', async () => {
+    apiFetch.mockResolvedValue(new Response(new ReadableStream({
+      start(c) { c.enqueue(new TextEncoder().encode('data: hi')); c.close(); },
+    }), { status: 200 }));
+    const sent: Parameters<StreamSink['sendStream']>[0][] = [];
+    const sink: StreamSink = { sendStream: (m) => { sent.push(m); } };
+
+    await dispatchApiCall(proxied, 'proxy.fetch', ['cloud', 'https://cloud.example.org/x', { method: 'POST', body: '{"stream":true}', responseType: 'stream', streamId: 'abc124' }], { sink });
+    await vi.waitFor(() => expect(sent.at(-1)?.type).toBe('stream-end'));
+
+    expect(apiFetch).toHaveBeenCalled();
+    expect(sent.some((m) => m.type === 'stream-chunk')).toBe(true);
+  });
+
+  it('streams a large answer to the iframe in chunks', async () => {
+    const encoder = new TextEncoder();
+    apiFetch.mockResolvedValue(new Response(new ReadableStream({
+      start(c) { c.enqueue(encoder.encode('data: one\n\n')); c.enqueue(encoder.encode('data: two\n\n')); c.close(); },
+    }), { status: 200, headers: { 'content-type': 'text/event-stream' } }));
+    const sent: Parameters<StreamSink['sendStream']>[0][] = [];
+    const sink: StreamSink = { sendStream: (m) => { sent.push(m); } };
+
+    const res = await dispatchApiCall(proxied, 'proxy.fetch', ['cloud', 'https://cloud.example.org/x', { responseType: 'stream', streamId: 'abc123' }], { sink });
+    await vi.waitFor(() => expect(sent.at(-1)?.type).toBe('stream-end'));
+
+    expect(res).toMatchObject({ status: 200, ok: true });
+    const text = sent.filter((m) => m.type === 'stream-chunk').map((m) => new TextDecoder().decode((m as { chunk: ArrayBuffer }).chunk)).join('');
+    expect(text).toBe('data: one\n\ndata: two\n\n');
+  });
+});
diff --git a/lib/__tests__/plugin-after-send.test.ts b/lib/__tests__/plugin-after-send.test.ts
new file mode 100644
index 000000000..5e1f1a7bb
--- /dev/null
+++ b/lib/__tests__/plugin-after-send.test.ts
@@ -0,0 +1,46 @@
+// @vitest-environment node
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { emailHooks, clearAllHooks } from '../plugin-hooks';
+import { announceSent, cancelAnnouncedSend, releaseAnnouncedSend, resetAnnouncedSends } from '../plugin-after-send';
+
+const message = { to: ['bob@example.com'], cc: [], bcc: [], subject: 'Hi' };
+
+beforeEach(() => {
+  vi.useFakeTimers();
+  clearAllHooks();
+  resetAnnouncedSends();
+});
+afterEach(() => vi.useRealTimers());
+
+describe('announceSent for a send held back for undo', () => {
+  const held = () => ({ scheduled: true, emailId: 'e1', emailSubmissionId: 's1', sendAt: new Date(Date.now() + 10_000).toISOString() });
+
+  it('reports when the hold runs out', () => {
+    const sent = vi.fn();
+    emailHooks.onAfterEmailSend.register('t', sent);
+    announceSent(held(), message);
+    vi.advanceTimersByTime(9_000);
+    expect(sent).not.toHaveBeenCalled();
+    vi.advanceTimersByTime(1_000);
+    expect(sent).toHaveBeenCalledWith({ emailId: 'e1', submissionId: 's1', ...message, scheduledFor: null });
+  });
+
+  it('reports at once on "Send now"', () => {
+    const sent = vi.fn();
+    emailHooks.onAfterEmailSend.register('t', sent);
+    announceSent(held(), message);
+    releaseAnnouncedSend('s1');
+    expect(sent).toHaveBeenCalledTimes(1);
+    vi.advanceTimersByTime(20_000);
+    expect(sent).toHaveBeenCalledTimes(1);
+  });
+
+  it('never reports an undone send', () => {
+    const sent = vi.fn();
+    emailHooks.onAfterEmailSend.register('t', sent);
+    announceSent(held(), message);
+    cancelAnnouncedSend('s1');
+    vi.advanceTimersByTime(20_000);
+    expect(sent).not.toHaveBeenCalled();
+  });
+});
diff --git a/lib/__tests__/plugin-api-gates.test.ts b/lib/__tests__/plugin-api-gates.test.ts
index b267c495f..7e5205a4d 100644
--- a/lib/__tests__/plugin-api-gates.test.ts
+++ b/lib/__tests__/plugin-api-gates.test.ts
@@ -305,3 +305,103 @@ describe('native keyword extension API', () => {
     }
   });
 });
+
+describe('jmap.uploadBlob', () => {
+  it('is open to an untrusted plugin with email:blob-write, for composer attachment sources', async () => {
+    const p = plugin({ permissions: ['email:blob-write'], grantedPermissions: ['email:blob-write'] });
+    expect(await gateError(p, 'jmap.uploadBlob', [new Uint8Array(1), 'a.bin', 'application/octet-stream']))
+      .not.toMatch(GATE_FAILURE);
+  });
+
+  it('still needs email:blob-write', async () => {
+    expect(await gateError(plugin(), 'jmap.uploadBlob', [new Uint8Array(1), 'a.bin', 'x/y']))
+      .toMatch(/lacks permission "email:blob-write"/);
+  });
+
+  describe('checks what it uploads', () => {
+    const uploader = () => plugin({ permissions: ['email:blob-write'], grantedPermissions: ['email:blob-write'] });
+    const uploadBlob = vi.fn(async (file: File) => ({ blobId: 'b1', size: file.size, type: file.type, name: file.name }));
+    let maxSizeUpload = 0;
+    const session = () => useAuthStore.setState({ client: { uploadBlob, getMaxSizeUpload: () => maxSizeUpload } as never });
+
+    afterEach(() => {
+      uploadBlob.mockClear();
+      maxSizeUpload = 0;
+      useAuthStore.setState({ client: null });
+    });
+
+    it('refuses a missing or blank name, a bad media type and content that is not bytes', async () => {
+      session();
+      expect(await gateError(uploader(), 'jmap.uploadBlob', [new Uint8Array(1), '', 'text/plain'])).toMatch(/name must be 1-255 characters/);
+      expect(await gateError(uploader(), 'jmap.uploadBlob', [new Uint8Array(1), '\u0000\u0001', 'text/plain'])).toMatch(/name must be 1-255 characters/);
+      expect(await gateError(uploader(), 'jmap.uploadBlob', [new Uint8Array(1), 'x'.repeat(256), 'text/plain'])).toMatch(/name must be 1-255 characters/);
+      expect(await gateError(uploader(), 'jmap.uploadBlob', [new Uint8Array(1), 'a.txt', 'text/plain; charset=utf-8'])).toMatch(/type is not a media type/);
+      expect(await gateError(uploader(), 'jmap.uploadBlob', [new Uint8Array(1), 'a.txt', 42])).toMatch(/type must be a string/);
+      expect(await gateError(uploader(), 'jmap.uploadBlob', ['hello', 'a.txt', 'text/plain'])).toMatch(/content must be a Uint8Array/);
+      expect(uploadBlob).not.toHaveBeenCalled();
+    });
+
+    it('caps the size at the server limit, or 50 MB when the server names none', async () => {
+      session();
+      maxSizeUpload = 10;
+      expect(await gateError(uploader(), 'jmap.uploadBlob', [new Uint8Array(11), 'a.bin', 'application/octet-stream'])).toMatch(/more than the 10 bytes allowed/);
+      expect(await gateError(uploader(), 'jmap.uploadBlob', [new Uint8Array(10), 'a.bin', 'application/octet-stream'])).toBe('');
+
+      maxSizeUpload = 0;
+      expect(await gateError(uploader(), 'jmap.uploadBlob', [new Uint8Array(50 * 1024 * 1024 + 1), 'a.bin', 'application/octet-stream']))
+        .toMatch(/more than the 52428800 bytes allowed/);
+      expect(uploadBlob).toHaveBeenCalledTimes(1);
+    });
+
+    it('uploads a clean file under its name and type', async () => {
+      session();
+      await dispatchApiCall(uploader(), 'jmap.uploadBlob', [new Uint8Array([1, 2, 3]), 'scan\u0007.pdf', 'application/pdf']);
+      const file = uploadBlob.mock.calls[0][0];
+      expect(file.name).toBe('scan.pdf');
+      expect(file.type).toBe('application/pdf');
+      expect(file.size).toBe(3);
+    });
+  });
+});
+
+describe('email.setKeyword and email.removeKeyword', () => {
+  const setKeyword = vi.fn(async () => {});
+  const removeKeyword = vi.fn(async () => {});
+  afterEach(() => {
+    setKeyword.mockClear();
+    removeKeyword.mockClear();
+    useAuthStore.setState({ client: null });
+  });
+
+  it('check the email id and account id like jmap.setKeyword does', async () => {
+    useAuthStore.setState({ client: { setKeyword, removeKeyword } as never });
+    const writer = plugin({ permissions: ['email:write'], grantedPermissions: ['email:write'] });
+    for (const method of ['email.setKeyword', 'email.removeKeyword']) {
+      expect(await gateError(writer, method, [undefined, '$label:work'])).toMatch(/emailId is required/);
+      expect(await gateError(writer, method, ['', '$label:work'])).toMatch(/emailId is required/);
+      expect(await gateError(writer, method, [{ id: 'e1' }, '$label:work'])).toMatch(/emailId is required/);
+      expect(await gateError(writer, method, ['e1', '$label:work', 7])).toMatch(/accountId must be a non-empty string/);
+    }
+    expect(setKeyword).not.toHaveBeenCalled();
+    expect(removeKeyword).not.toHaveBeenCalled();
+
+    await dispatchApiCall(writer, 'email.setKeyword', ['e1', '$label:work', 'acc-2']);
+    expect(setKeyword).toHaveBeenCalledWith('e1', '$label:work', 'acc-2');
+    await dispatchApiCall(writer, 'email.removeKeyword', ['e1', '$label:work']);
+    expect(removeKeyword).toHaveBeenCalledWith('e1', '$label:work', undefined);
+  });
+});
+
+describe('WebAuthn PRF salt', () => {
+  it("uses the calling plugin's id, not the one in the arguments", async () => {
+    const get = vi.fn(async () => { throw new Error('stop'); });
+    Object.defineProperty(navigator, 'credentials', { value: { get }, configurable: true });
+    const p = plugin({ id: 'mine', permissions: ['crypto:full'], managed: true, tier: 'privileged' });
+
+    await dispatchApiCall(p, 'crypto.getWebAuthn', [[1, 2, 3], 'someone-else'], { privileged: true }).catch(() => {});
+
+    const salt = (get.mock.calls[0] as unknown as [{ publicKey: { extensions: { prf: { eval: { first: Uint8Array } } } } }])[0]
+      .publicKey.extensions.prf.eval.first;
+    expect(new TextDecoder().decode(salt)).toBe('bulwark-plugins-v1mine');
+  });
+});
diff --git a/lib/__tests__/plugin-bundle-fetch.test.ts b/lib/__tests__/plugin-bundle-fetch.test.ts
index 17bcf11f8..bac7bb5de 100644
--- a/lib/__tests__/plugin-bundle-fetch.test.ts
+++ b/lib/__tests__/plugin-bundle-fetch.test.ts
@@ -59,6 +59,14 @@ describe('downloadManagedBundle', () => {
     expect(console.warn).toHaveBeenCalled();
   });
 
+  it('refuses an unsigned bundle for a plugin that must be signed', async () => {
+    // Privileged plugins run with the app's own rights; without the
+    // install-time signature anyone who can write the bundle file decides
+    // what they run.
+    mocks.apiFetch.mockResolvedValue(response('code'));
+    await expect(downloadManagedBundle('my-plugin', 'abc', { requireSignature: true })).rejects.toThrow(/not signed/);
+  });
+
   it('reports an HTTP failure with the status', async () => {
     mocks.apiFetch.mockResolvedValue(response('', { ok: false, status: 404 }));
     await expect(downloadManagedBundle('my-plugin')).rejects.toThrow(/HTTP 404/);
diff --git a/lib/__tests__/plugin-compose-gate.test.ts b/lib/__tests__/plugin-compose-gate.test.ts
new file mode 100644
index 000000000..e1d03e1f8
--- /dev/null
+++ b/lib/__tests__/plugin-compose-gate.test.ts
@@ -0,0 +1,78 @@
+// @vitest-environment node
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { emailHooks, clearAllHooks } from '../plugin-hooks';
+import { runBeforeCompose, composeOptionsFor, acceptComposeOptions } from '../plugin-compose-gate';
+import { formatMailto, parseMailto } from '../protocol-handlers/mailto';
+
+beforeEach(() => clearAllHooks());
+
+const blank = { mode: 'new' as const, to: [], cc: [], subject: '', body: '' };
+
+describe('runBeforeCompose', () => {
+  it('lets the composer open with no prefill when nobody listens', async () => {
+    expect(await runBeforeCompose(blank)).toEqual({});
+  });
+
+  it('stops the composer when a plugin returns false', async () => {
+    emailHooks.onBeforeCompose.register('p', () => false);
+    expect(await runBeforeCompose(blank)).toBeNull();
+  });
+
+  it('returns only the fields a plugin changed', async () => {
+    const handler = vi.fn((o: Record<string, unknown>) => ({ ...o, subject: 'Status', body: 'Hi team,\n' }));
+    emailHooks.onBeforeCompose.register('p', handler);
+    const opts = { mode: 'reply' as const, to: ['alice@example.com'], cc: [], subject: 'Re: Plans', body: '' };
+    expect(await runBeforeCompose(opts)).toEqual({ subject: 'Status', body: 'Hi team,\n' });
+    expect(handler).toHaveBeenCalledWith(opts);
+  });
+});
+
+describe('acceptComposeOptions', () => {
+  it('keeps clean strings and ignores the wrong types', () => {
+    const out = acceptComposeOptions({
+      to: ['a@example.com', 42, '  ', 'b@example.com\r\nBcc: evil@example.com'],
+      cc: 'not a list',
+      subject: 'Hello\nworld',
+      body: 'Line 1\r\nLine 2\u0007',
+      mode: 'forward',
+    }, blank);
+    expect(out).toEqual({
+      mode: 'new',
+      to: ['a@example.com', 'b@example.comBcc: evil@example.com'],
+      cc: [],
+      subject: 'Helloworld',
+      body: 'Line 1\nLine 2',
+    });
+  });
+
+  it('ignores anything but an object', () => {
+    expect(acceptComposeOptions('x', blank)).toBeUndefined();
+    expect(acceptComposeOptions([], blank)).toBeUndefined();
+  });
+});
+
+describe('composeOptionsFor', () => {
+  it('describes a reply the way the composer fills it in', () => {
+    const source = {
+      from: [{ name: 'Alice', email: 'alice@example.com' }],
+      to: [{ email: 'me@example.com' }, { email: 'bob@example.com' }],
+      cc: [{ email: 'carol@example.com' }],
+      subject: 'Plans',
+    };
+    expect(composeOptionsFor('replyAll', { source, ownEmails: ['me@example.com'], replyPrefix: 'Re:' })).toEqual({
+      mode: 'reply-all',
+      to: ['Alice <alice@example.com>', 'bob@example.com'],
+      cc: ['carol@example.com'],
+      subject: 'Re: Plans',
+      body: '',
+    });
+    expect(composeOptionsFor('forward', { source, forwardPrefix: 'Fwd:' })).toMatchObject({ mode: 'forward', to: [], subject: 'Fwd: Plans' });
+  });
+});
+
+describe('formatMailto', () => {
+  it('round-trips through parseMailto', () => {
+    const fields = { to: ['a@example.com', 'b@example.com'], cc: ['c@example.com'], bcc: [], subject: 'Hi & bye', body: 'Line\nnext' };
+    expect(parseMailto(formatMailto(fields))).toEqual(fields);
+  });
+});
diff --git a/lib/__tests__/plugin-hook-catalog.test.ts b/lib/__tests__/plugin-hook-catalog.test.ts
new file mode 100644
index 000000000..b9c1cbfdb
--- /dev/null
+++ b/lib/__tests__/plugin-hook-catalog.test.ts
@@ -0,0 +1,75 @@
+// @vitest-environment node
+import fs from 'node:fs';
+import path from 'node:path';
+import { describe, it, expect } from 'vitest';
+import { HOOK_CATALOG, type HookGroup } from '../plugin-hook-catalog';
+import * as hooks from '../plugin-hooks';
+import { ALL_PERMISSIONS } from '../plugin-types';
+
+const root = path.resolve(__dirname, '../..');
+
+/** Every HookBus by name, from all the exported hook groups. */
+function allBuses(): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [groupName, group] of Object.entries(hooks)) {
+    if (!groupName.endsWith('Hooks') || typeof group !== 'object' || group === null) continue;
+    for (const [hookName, bus] of Object.entries(group)) {
+      if (bus instanceof hooks.HookBus) out[hookName] = groupName;
+    }
+  }
+  return out;
+}
+
+function sourceFiles(dir: string): string[] {
+  const out: string[] = [];
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    if (['node_modules', '.next', 'repos', '__tests__', '.git', 'local-data', 'integration', 'scripts'].includes(entry.name)) continue;
+    const full = path.join(dir, entry.name);
+    if (entry.isDirectory()) out.push(...sourceFiles(full));
+    else if (/\.(tsx?)$/.test(entry.name) && !/\.test\./.test(entry.name)) out.push(full);
+  }
+  return out;
+}
+
+const sources = ['app', 'components', 'contexts', 'hooks', 'lib', 'stores'].flatMap((d) => sourceFiles(path.join(root, d)))
+  .map((f) => fs.readFileSync(f, 'utf8'))
+  .join('\n');
+
+/** A call site that fires the hook: `xHooks.onFoo.emit(` and friends. */
+function isFired(hookName: string, groupName: string): boolean {
+  const re = new RegExp(`\\b${groupName}\\.${hookName}\\s*\\.(emit|emitSync|emitTo|intercept|interceptOutcome|interceptWithValue|transform|takeOver)\\b`);
+  return re.test(sources);
+}
+
+// Groups whose call sites are still being wired in this branch. Each
+// commit that wires a group removes it here, and the test then insists every
+// hook in it has a call site.
+const NOT_YET_WIRED = new Set<HookGroup>([]);
+
+describe('hook catalogue', () => {
+  const buses = allBuses();
+
+  it('has a bus for every catalogued hook and no bus without an entry', () => {
+    expect(Object.keys(buses).sort()).toEqual(Object.keys(HOOK_CATALOG).sort());
+  });
+
+  it('gates every hook behind a permission the host knows', () => {
+    const known = new Set<string>(ALL_PERMISSIONS);
+    const unknown = Object.entries(HOOK_CATALOG).filter(([, spec]) => !known.has(spec.permission)).map(([n]) => n);
+    expect(unknown).toEqual([]);
+  });
+
+  const groups = [...new Set(Object.values(HOOK_CATALOG).map((s) => s.group))];
+  it.each(groups)('fires every %s hook somewhere in the app', (group) => {
+    const missing = Object.entries(HOOK_CATALOG)
+      .filter(([name, spec]) => spec.group === group && !isFired(name, buses[name]))
+      .map(([name]) => name);
+    if (NOT_YET_WIRED.has(group)) {
+      // Still being wired: the list must not claim a group is unwired once
+      // it is fully wired, or the check would never switch on.
+      expect(missing.length, `${group} is fully wired; remove it from NOT_YET_WIRED`).toBeGreaterThan(0);
+    } else {
+      expect(missing).toEqual([]);
+    }
+  });
+});
diff --git a/lib/__tests__/plugin-hook-result.test.ts b/lib/__tests__/plugin-hook-result.test.ts
new file mode 100644
index 000000000..8b043041d
--- /dev/null
+++ b/lib/__tests__/plugin-hook-result.test.ts
@@ -0,0 +1,96 @@
+// @vitest-environment node
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { clearAllHooks, uiHooks, pluginErrorTracker } from '../plugin-hooks';
+import { interceptWithResult, acceptLinkRewrite, resolveExternalLink } from '../plugin-hook-result';
+
+
+beforeEach(() => {
+  clearAllHooks();
+  pluginErrorTracker.resetAll();
+});
+
+describe('interceptWithResult', () => {
+  it('lets the action through unchanged without handlers', async () => {
+    const ctx = { href: 'https://a.example/' };
+    expect(await interceptWithResult(uiHooks.onBeforeExternalLink, ctx, acceptLinkRewrite))
+      .toEqual({ allowed: true, value: ctx });
+  });
+
+  it('stops on false and does not ask later handlers', async () => {
+    const later = vi.fn();
+    uiHooks.onBeforeExternalLink.register('a', () => false);
+    uiHooks.onBeforeExternalLink.register('b', later);
+    const out = await interceptWithResult(uiHooks.onBeforeExternalLink, { href: 'https://a.example/' }, acceptLinkRewrite);
+    expect(out).toEqual({ allowed: false });
+    expect(later).not.toHaveBeenCalled();
+  });
+
+  it('takes a returned { href } and hands it to the next handler', async () => {
+    const second = vi.fn(() => undefined);
+    uiHooks.onBeforeExternalLink.register('a', () => ({ href: 'https://proxy.example/?u=1' }));
+    uiHooks.onBeforeExternalLink.register('b', second);
+    const out = await interceptWithResult(uiHooks.onBeforeExternalLink, { href: 'https://a.example/', emailId: 'e1' }, acceptLinkRewrite);
+    expect(out).toEqual({ allowed: true, value: { href: 'https://proxy.example/?u=1', emailId: 'e1' } });
+    expect(second).toHaveBeenCalledWith({ href: 'https://proxy.example/?u=1', emailId: 'e1' });
+  });
+
+  it('calls every handler once', async () => {
+    const handler = vi.fn(() => ({ href: 'https://b.example/' }));
+    uiHooks.onBeforeExternalLink.register('a', handler);
+    await interceptWithResult(uiHooks.onBeforeExternalLink, { href: 'https://a.example/' }, acceptLinkRewrite);
+    expect(handler).toHaveBeenCalledTimes(1);
+  });
+
+  it('skips a handler that throws (fails open)', async () => {
+    uiHooks.onBeforeExternalLink.register('a', () => { throw new Error('boom'); });
+    const out = await interceptWithResult(uiHooks.onBeforeExternalLink, { href: 'https://a.example/' }, acceptLinkRewrite);
+    expect(out).toEqual({ allowed: true, value: { href: 'https://a.example/' } });
+  });
+});
+
+describe('acceptLinkRewrite', () => {
+  const cur = { href: 'https://a.example/' };
+  it.each([
+    'javascript:alert(1)',
+    'data:text/html,hi',
+    '/settings',
+    'mailto:x@example.com',
+    'https://',
+  ])('ignores %s', (href) => {
+    expect(acceptLinkRewrite({ href }, cur)).toBeUndefined();
+  });
+
+  it('ignores anything but an object with a string href', () => {
+    expect(acceptLinkRewrite('https://b.example/', cur)).toBeUndefined();
+    expect(acceptLinkRewrite({ href: 42 }, cur)).toBeUndefined();
+  });
+
+  it('takes an http(s) address', () => {
+    expect(acceptLinkRewrite({ href: ' HTTP://b.example/x ' }, cur)).toEqual({ href: 'HTTP://b.example/x' });
+  });
+});
+
+describe('resolveExternalLink (a link clicked in a message)', () => {
+  const ctx = { href: 'https://a.example/', emailId: 'e1' };
+
+  it('opens the original address without plugins', async () => {
+    expect(await resolveExternalLink(ctx)).toBe('https://a.example/');
+  });
+
+  it('opens the address a plugin returns', async () => {
+    const handler = vi.fn(() => ({ href: 'https://proxy.example/?u=a' }));
+    uiHooks.onBeforeExternalLink.register('p', handler);
+    expect(await resolveExternalLink(ctx)).toBe('https://proxy.example/?u=a');
+    expect(handler).toHaveBeenCalledWith(ctx);
+  });
+
+  it('opens nothing when a plugin returns false', async () => {
+    uiHooks.onBeforeExternalLink.register('p', () => false);
+    expect(await resolveExternalLink(ctx)).toBeNull();
+  });
+
+  it('keeps the original when the rewrite is not a web address', async () => {
+    uiHooks.onBeforeExternalLink.register('p', () => ({ href: 'javascript:alert(1)' }));
+    expect(await resolveExternalLink(ctx)).toBe('https://a.example/');
+  });
+});
diff --git a/lib/__tests__/plugin-hooks.test.ts b/lib/__tests__/plugin-hooks.test.ts
index a90cc4226..94f65ceea 100644
--- a/lib/__tests__/plugin-hooks.test.ts
+++ b/lib/__tests__/plugin-hooks.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { HookBus, pluginErrorTracker, removeAllPluginHooks, clearAllHooks, emailHooks, calendarHooks, isExternalAttachmentResult } from '../plugin-hooks';
+import { HookBus, pluginErrorTracker, removeAllPluginHooks, clearAllHooks, emailHooks, calendarHooks, isExternalAttachmentResult, setHookTimeoutListener } from '../plugin-hooks';
 import type { CalendarEventFormView } from '../plugin-types';
 
 beforeEach(() => {
@@ -417,3 +417,46 @@ describe('clearAllHooks', () => {
     expect(calendarHooks.onCalendarEventOpen.size).toBe(0);
   });
 });
+
+describe('onBeforeEmailSend fails closed', () => {
+  it('does not send when the plugin never answers', async () => {
+    // A plugin that shows a confirm and waits for the user used to let the
+    // mail go out after 60 s, with the dialog still on screen.
+    vi.useFakeTimers();
+    const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+    try {
+      emailHooks.onBeforeEmailSend.register('guard', () => new Promise(() => {}));
+      const result = emailHooks.onBeforeEmailSend.intercept({});
+      await vi.advanceTimersByTimeAsync(10 * 60_000 + 100);
+      expect(await result).toBe(false);
+    } finally {
+      consoleSpy.mockRestore();
+      vi.useRealTimers();
+    }
+  });
+
+  it('does not send when the plugin throws', async () => {
+    const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+    emailHooks.onBeforeEmailSend.register('guard', () => { throw new Error('boom'); });
+    expect(await emailHooks.onBeforeEmailSend.intercept({})).toBe(false);
+    consoleSpy.mockRestore();
+  });
+
+  it('closes the dialogs of a plugin whose hook ran out of time', async () => {
+    vi.useFakeTimers();
+    const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+    const onTimeout = vi.fn();
+    setHookTimeoutListener(onTimeout);
+    try {
+      emailHooks.onBeforeReply.register('slow', () => new Promise(() => {}));
+      const result = emailHooks.onBeforeReply.intercept({});
+      await vi.advanceTimersByTimeAsync(60_000 + 100);
+      expect(await result).toBe(true);
+      expect(onTimeout).toHaveBeenCalledWith('slow');
+    } finally {
+      setHookTimeoutListener(null);
+      consoleSpy.mockRestore();
+      vi.useRealTimers();
+    }
+  });
+});
diff --git a/lib/__tests__/plugin-host-api-limits.test.ts b/lib/__tests__/plugin-host-api-limits.test.ts
new file mode 100644
index 000000000..f03ceb558
--- /dev/null
+++ b/lib/__tests__/plugin-host-api-limits.test.ts
@@ -0,0 +1,111 @@
+import { afterEach, beforeEach, describe, it, expect, vi } from 'vitest';
+import type { InstalledPlugin } from '../plugin-types';
+
+const toast = vi.hoisted(() => ({ success: vi.fn(), error: vi.fn(), info: vi.fn(), warning: vi.fn() }));
+vi.mock('@/stores/toast-store', () => ({ toast }));
+const fetchMock = vi.hoisted(() => vi.fn());
+vi.mock('@/lib/browser-navigation', async (orig) => ({
+  ...(await orig<typeof import('@/lib/browser-navigation')>()),
+  apiFetch: (...args: unknown[]) => fetchMock(...args),
+}));
+
+import { dispatchApiCall, PLUGIN_STORAGE_QUOTA_BYTES, safeDownloadName, doGetPublicKeyFromWKD, getWkdHash } from '../plugin-sandbox/host-api';
+
+function plugin(overrides: Partial<InstalledPlugin> = {}): InstalledPlugin {
+  return {
+    id: 'limits', name: 'Limits', version: '1.0.0', author: '', description: '', type: 'hook',
+    permissions: [], entrypoint: 'index.js', enabled: true, status: 'running', settings: {},
+    ...overrides,
+  };
+}
+
+beforeEach(() => {
+  localStorage.clear();
+  vi.clearAllMocks();
+});
+afterEach(() => {
+  vi.useRealTimers();
+});
+
+describe('plugin storage quota', () => {
+  it('refuses a write that would take the plugin past its share', async () => {
+    // Without a cap one plugin could fill localStorage and break sign-in.
+    const half = 'x'.repeat(PLUGIN_STORAGE_QUOTA_BYTES / 2);
+    await dispatchApiCall(plugin(), 'storage.set', ['a', half]);
+
+    await expect(dispatchApiCall(plugin(), 'storage.set', ['b', half])).rejects.toThrow(/storage is full/);
+  });
+
+  it('lets a plugin overwrite a key within its share', async () => {
+    const big = 'x'.repeat(PLUGIN_STORAGE_QUOTA_BYTES * 0.8);
+    await dispatchApiCall(plugin(), 'storage.set', ['a', big]);
+    await expect(dispatchApiCall(plugin(), 'storage.set', ['a', big])).resolves.toBeUndefined();
+  });
+});
+
+describe('ui.downloadFile', () => {
+  const p = plugin({ permissions: ['ui:download-file'], grantedPermissions: ['ui:download-file'] });
+
+  it.each([
+    ['invoice.pdf.exe', 'application/pdf'],
+    ['page.html', 'text/plain'],
+    ['report.txt', 'text/html'],
+    ['logo.svg', 'image/svg+xml'],
+  ])('refuses %s (%s)', async (filename, contentType) => {
+    await expect(dispatchApiCall(p, 'ui.downloadFile', [{ content: 'x', filename, contentType }]))
+      .rejects.toThrow(/can't be downloaded/);
+  });
+
+  it('strips paths and direction tricks from the name', () => {
+    expect(safeDownloadName('../../etc/passwd')).toBe('_.._etc_passwd');
+    expect(safeDownloadName('invoice‮fdp.exe')).toBe('invoicefdp.exe');
+    expect(safeDownloadName('')).toBe('download');
+  });
+});
+
+describe('toasts', () => {
+  it('caps how many toasts a plugin shows in a burst', async () => {
+    for (let i = 0; i < 20; i++) await dispatchApiCall(plugin(), 'toast.info', [`n${i}`]);
+    expect(toast.info).toHaveBeenCalledTimes(5);
+  });
+
+  it('shortens very long messages', async () => {
+    await dispatchApiCall(plugin({ id: 'long' }), 'toast.error', ['x'.repeat(5000)]);
+    expect((toast.error.mock.calls[0][0] as string).length).toBeLessThanOrEqual(300);
+  });
+});
+
+describe('admin config writes', () => {
+  it('tells the plugin when the server refused the write', async () => {
+    // A 403 used to look like success.
+    fetchMock.mockResolvedValue(new Response('{}', { status: 403 }));
+    const p = plugin({ permissions: ['admin:config'], grantedPermissions: ['admin:config'] });
+    await expect(dispatchApiCall(p, 'admin.setConfig', ['k', 'v'])).rejects.toThrow(/only an administrator/);
+  });
+});
+
+describe('WKD lookup', () => {
+  it('refuses an address whose domain is not a host name', async () => {
+    const fetchSpy = vi.spyOn(globalThis, 'fetch');
+    expect(await doGetPublicKeyFromWKD('a@evil.example/x?')).toMatchObject({ status: 'ERROR' });
+    expect(fetchSpy).not.toHaveBeenCalled();
+    fetchSpy.mockRestore();
+  });
+});
+
+describe('WKD hash', () => {
+  it('matches the RFC example (Joe.Doe)', async () => {
+    // draft-koch-openpgp-webkey-service: "Joe.Doe" → iy9q119eutrkn8s1mk4r39qejnbu3n5q
+    expect(await getWkdHash('Joe.Doe')).toBe('iy9q119eutrkn8s1mk4r39qejnbu3n5q');
+  });
+});
+
+describe('api.user.getTimeZone', () => {
+  it('gives the zone the app shows times in', async () => {
+    const { useSettingsStore } = await import('@/stores/settings-store');
+    useSettingsStore.setState({ timeZone: 'Asia/Tokyo' } as never);
+    expect(await dispatchApiCall(plugin(), 'user.getTimeZone', [])).toBe('Asia/Tokyo');
+    useSettingsStore.setState({ timeZone: 'auto' } as never);
+    expect(await dispatchApiCall(plugin(), 'user.getTimeZone', [])).toBe(Intl.DateTimeFormat().resolvedOptions().timeZone);
+  });
+});
diff --git a/lib/__tests__/plugin-host-bridge-origin.test.ts b/lib/__tests__/plugin-host-bridge-origin.test.ts
new file mode 100644
index 000000000..e51fb49fd
--- /dev/null
+++ b/lib/__tests__/plugin-host-bridge-origin.test.ts
@@ -0,0 +1,209 @@
+import { afterEach, describe, it, expect, vi } from 'vitest';
+import type { InstalledPlugin } from '../plugin-types';
+
+vi.mock('../plugin-sandbox/host-api', () => ({
+  dispatchApiCall: vi.fn(async () => 'ok'),
+}));
+
+import { createBackgroundInstance, createSlotInstance } from '../plugin-sandbox/host-bridge';
+import { dispatchApiCall } from '../plugin-sandbox/host-api';
+
+function plugin(): InstalledPlugin {
+  return {
+    id: 'p1', name: 'P', version: '1.0.0', author: '', description: '', type: 'hook',
+    permissions: [], entrypoint: 'index.js', enabled: true, status: 'running', settings: {},
+  };
+}
+
+function post(source: Window | null, origin: string, data: unknown) {
+  window.dispatchEvent(new MessageEvent('message', { data, origin, source }));
+}
+
+const instances: Array<{ destroy(): void }> = [];
+afterEach(() => {
+  for (const i of instances.splice(0)) i.destroy();
+  vi.clearAllMocks();
+});
+
+describe('host bridge origin pin for untrusted sandboxes', () => {
+  it('answers API requests from the null-origin sandbox document', async () => {
+    const inst = createBackgroundInstance({ plugin: plugin(), code: '', locale: 'en', tier: 'untrusted' });
+    instances.push(inst);
+
+    post(inst.iframe.contentWindow, 'null', { type: 'api-request', id: '1', method: 'storage.keys', args: [] });
+    await new Promise((r) => setTimeout(r, 0));
+
+    expect(dispatchApiCall).toHaveBeenCalledTimes(1);
+  });
+
+  it('ignores the same frame once it has navigated to another origin', async () => {
+    // A sandboxed frame may navigate itself. The page it lands on is no
+    // longer under the sandbox CSP, so it must not inherit the RPC channel.
+    const inst = createBackgroundInstance({ plugin: plugin(), code: '', locale: 'en', tier: 'untrusted' });
+    instances.push(inst);
+
+    post(inst.iframe.contentWindow, 'https://attacker.example', { type: 'api-request', id: '1', method: 'storage.keys', args: [] });
+    await new Promise((r) => setTimeout(r, 0));
+
+    expect(dispatchApiCall).not.toHaveBeenCalled();
+  });
+});
+
+describe('init payload settings', () => {
+  it('hands a new iframe the settings with defaults filled in', async () => {
+    const p = {
+      ...plugin(),
+      settings: { size: 64 },
+      settingsSchema: {
+        size: { type: 'number' as const, label: 'Size', default: 160 },
+        mode: { type: 'select' as const, label: 'Mode', default: 'auto', options: ['auto', 'manual'] },
+      },
+    };
+    const inst = createBackgroundInstance({ plugin: p, code: '', locale: 'en', tier: 'untrusted' });
+    instances.push(inst);
+    const sent = vi.spyOn(inst.iframe.contentWindow!, 'postMessage');
+
+    post(inst.iframe.contentWindow, 'null', { type: 'sandbox-ready' });
+    await new Promise((r) => setTimeout(r, 0));
+
+    const init = sent.mock.calls.map(([msg]) => msg as { type: string; payload?: { manifest: { settings: unknown } } }).find((m) => m.type === 'init');
+    expect(init?.payload?.manifest.settings).toEqual({ size: 64, mode: 'auto' });
+  });
+});
+
+describe('slot sizing', () => {
+  function slot(name: 'email-banner' | 'composer-toolbar') {
+    const onResize = vi.fn();
+    const inst = createSlotInstance({
+      plugin: plugin(), slot: name, code: '', locale: 'en', tier: 'untrusted', extraProps: {},
+      hostContainer: document.body, onResize,
+    });
+    instances.push(inst);
+    return { inst, onResize };
+  }
+
+  it('ignores a height that is not a number and caps a huge one', async () => {
+    const { inst, onResize } = slot('email-banner');
+    post(inst.iframe.contentWindow, 'null', { type: 'slot-resize', height: Number.NaN });
+    post(inst.iframe.contentWindow, 'null', { type: 'slot-resize', height: 1e9 });
+    await new Promise((r) => setTimeout(r, 0));
+
+    expect(onResize).toHaveBeenCalledTimes(1);
+    expect(inst.iframe.style.height).toBe('2000px');
+  });
+
+  it('sizes a toolbar slot to the width of its content', async () => {
+    // A toolbar slot's iframe used to get no width in the composer's
+    // button row and squeezed its content to one letter per line.
+    const { inst, onResize } = slot('composer-toolbar');
+    post(inst.iframe.contentWindow, 'null', { type: 'slot-resize', height: 32, width: 120 });
+    await new Promise((r) => setTimeout(r, 0));
+
+    expect(inst.iframe.style.width).toBe('120px');
+    expect(onResize).toHaveBeenCalledWith(32, 120);
+  });
+
+  it('keeps a block slot at full width whatever it reports', async () => {
+    const { inst } = slot('email-banner');
+    post(inst.iframe.contentWindow, 'null', { type: 'slot-resize', height: 40, width: 120 });
+    await new Promise((r) => setTimeout(r, 0));
+
+    expect(inst.iframe.style.width).toBe('100%');
+  });
+});
+
+describe('shouldShow context', () => {
+  it('leaves host callbacks out instead of failing to post them', async () => {
+    const inst = createBackgroundInstance({ plugin: plugin(), code: '', locale: 'en', tier: 'untrusted' });
+    instances.push(inst);
+    const sent = vi.spyOn(inst.iframe.contentWindow!, 'postMessage');
+
+    void inst.evaluateShouldShow('composer-attachment-source', { onAttach: () => {}, nested: { cb: () => {}, n: 1 } });
+
+    const msg = sent.mock.calls.map(([m]) => m as { type: string; context?: unknown }).find((m) => m.type === 'slot-should-show');
+    expect(msg?.context).toEqual({ nested: { n: 1 } });
+  });
+});
+
+describe('host bookkeeping', () => {
+  it('fails a hook call whose arguments cannot be sent, without keeping it pending', async () => {
+    const inst = createBackgroundInstance({ plugin: plugin(), code: '', locale: 'en', tier: 'untrusted' });
+    instances.push(inst);
+    vi.spyOn(inst.iframe.contentWindow!, 'postMessage').mockImplementation(() => { throw new DOMException('no clone', 'DataCloneError'); });
+
+    await expect(inst.invokeHook('onEmailOpen', [() => {}])).rejects.toThrow(/no clone/);
+    expect((inst as unknown as { pendingHookInvokes: Map<string, unknown> }).pendingHookInvokes.size).toBe(0);
+  });
+
+  it('drops callbacks of props that were replaced', () => {
+    const inst = createSlotInstance({
+      plugin: plugin(), slot: 'email-banner', code: '', locale: 'en', tier: 'untrusted', extraProps: { a: () => 1 },
+      hostContainer: document.body, onResize: () => {},
+    });
+    instances.push(inst);
+    const table = (inst as unknown as { callbackTable: Map<string, unknown> }).callbackTable;
+
+    for (let i = 0; i < 50; i++) inst.updateProps({ onAttach: () => i });
+
+    expect(table.size).toBe(1);
+  });
+});
+
+describe('plugin frame permissions', () => {
+  it('may write to the clipboard and use forms, nothing more', () => {
+    const inst = createBackgroundInstance({ plugin: plugin(), code: '', locale: 'en', tier: 'untrusted' });
+    try {
+      expect(inst.iframe.getAttribute('allow')).toBe('clipboard-write');
+      expect(inst.iframe.getAttribute('sandbox')?.split(' ').sort()).toEqual(
+        process.env.NODE_ENV === 'development' ? ['allow-same-origin', 'allow-scripts'] : ['allow-forms', 'allow-scripts'],
+      );
+    } finally {
+      inst.destroy();
+    }
+  });
+});
+
+describe('plugin frame color scheme', () => {
+  // A frame whose document says dark while the iframe element says light gets
+  // an opaque white canvas from the browser: dark text tokens on white.
+  it('gives the iframe element the color-scheme the frame declares, at start and on a theme change', () => {
+    document.documentElement.classList.add('dark');
+    try {
+      const inst = createSlotInstance({
+        plugin: plugin(), slot: 'plugin-dialog', code: '', locale: 'en', tier: 'untrusted', extraProps: {},
+        hostContainer: document.body, onResize: () => {},
+      });
+      instances.push(inst);
+      expect(inst.iframe.style.colorScheme).toBe('dark');
+      inst.setTheme({ dark: false, fontFamily: 'sans-serif', vars: {} });
+      expect(inst.iframe.style.colorScheme).toBe('light');
+      inst.setTheme({ dark: true, fontFamily: 'sans-serif', vars: {} });
+      expect(inst.iframe.style.colorScheme).toBe('dark');
+    } finally {
+      document.documentElement.classList.remove('dark');
+    }
+  });
+});
+
+describe('plugin frames follow the page theme', () => {
+  // The theme can change without the theme store: settings synced from the
+  // server after load, a custom theme's stylesheet. Frames must follow what
+  // the page shows, or a dark page gets light frames.
+  it('pushes the new theme to open frames when the page root turns dark', async () => {
+    const inst = createSlotInstance({
+      plugin: plugin(), slot: 'plugin-dialog', code: '', locale: 'en', tier: 'untrusted', extraProps: {},
+      hostContainer: document.body, onResize: () => {},
+    });
+    instances.push(inst);
+    expect(inst.iframe.style.colorScheme).toBe('light');
+    document.documentElement.classList.add('dark');
+    try {
+      await new Promise((r) => setTimeout(r, 50));
+      expect(inst.iframe.style.colorScheme).toBe('dark');
+    } finally {
+      document.documentElement.classList.remove('dark');
+      await new Promise((r) => setTimeout(r, 50));
+    }
+    expect(inst.iframe.style.colorScheme).toBe('light');
+  });
+});
diff --git a/lib/__tests__/plugin-host-calendar-tasks.test.ts b/lib/__tests__/plugin-host-calendar-tasks.test.ts
new file mode 100644
index 000000000..4d561a38d
--- /dev/null
+++ b/lib/__tests__/plugin-host-calendar-tasks.test.ts
@@ -0,0 +1,245 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { InstalledPlugin } from '../plugin-types';
+import type { IJMAPClient } from '../jmap/client-interface';
+import type { Calendar, CalendarEvent, CalendarTask } from '../jmap/types';
+import { useAuthStore } from '@/stores/auth-store';
+import { useCalendarStore } from '@/stores/calendar-store';
+import { useTaskStore } from '@/stores/task-store';
+import { useIdentityStore } from '@/stores/identity-store';
+import { useSettingsStore } from '@/stores/settings-store';
+import { calendarHooks, taskHooks } from '../plugin-hooks';
+
+vi.mock('@/stores/toast-store', () => ({
+  toast: { success: vi.fn(), error: vi.fn(), info: vi.fn(), warning: vi.fn() },
+}));
+
+import { dispatchApiCall } from '../plugin-sandbox/host-api';
+
+function plugin(perms: string[]): InstalledPlugin {
+  return {
+    id: 'planner', name: 'Planner', version: '1.0.0', author: 'test', description: '',
+    type: 'hook', permissions: perms, grantedPermissions: perms, entrypoint: 'index.js',
+    enabled: true, status: 'running', settings: {},
+  };
+}
+
+const READ = plugin(['calendar:read', 'tasks:read']);
+const WRITE = plugin(['calendar:read', 'calendar:write', 'tasks:read', 'tasks:write']);
+const NONE = plugin([]);
+
+const work = { id: 'cal-work', name: 'Work', color: '#f00', isVisible: true, isDefault: true, isTasksOnly: false } as Calendar;
+const todo = { id: 'cal-todo', name: 'To do', color: null, isVisible: true, isDefault: false, isTasksOnly: true } as Calendar;
+
+function event(over: Partial<CalendarEvent>): CalendarEvent {
+  return {
+    id: 'e1', uid: 'u1', calendarIds: { 'cal-work': true }, title: 'Standup', description: '',
+    start: '2026-05-04T09:00:00', duration: 'PT15M', timeZone: 'Europe/Berlin', showWithoutTime: false,
+    utcStart: '2026-05-04T07:00:00Z', utcEnd: '2026-05-04T07:15:00Z', status: 'confirmed',
+    participants: null, recurrenceRules: null, keywords: null, locations: null,
+    ...over,
+  } as CalendarEvent;
+}
+
+function task(over: Partial<CalendarTask>): CalendarTask {
+  return {
+    id: 't1', uid: 'tu1', '@type': 'Task', calendarIds: { 'cal-todo': true }, title: 'Pay rent',
+    description: '', due: '2026-05-01', showWithoutTime: true, progress: 'needs-action', priority: 0,
+    keywords: null,
+    ...over,
+  } as CalendarTask;
+}
+
+let client: Record<string, ReturnType<typeof vi.fn>>;
+
+beforeEach(() => {
+  client = {
+    queryAllCalendarEvents: vi.fn(async () => [
+      event({ id: 'late', start: '2026-05-06T10:00:00', utcStart: '2026-05-06T08:00:00Z', calendarIds: { 'cal-home': true } }),
+      event({}),
+    ]),
+    getCalendarEvent: vi.fn(async (id: string) => (id === 'e1' ? event({}) : null)),
+    createCalendarEvent: vi.fn(async (e: Partial<CalendarEvent>) => event({ ...e, id: 'new-1' })),
+    updateCalendarEvent: vi.fn(async () => undefined),
+    deleteCalendarEvent: vi.fn(async () => undefined),
+    getCalendarTasks: vi.fn(async () => [task({}), task({ id: 't2', title: 'Done', progress: 'completed' })]),
+    createCalendarTask: vi.fn(async (t: Partial<CalendarTask>) => task({ ...t, id: 'new-t' })),
+    updateCalendarTask: vi.fn(async (id: string) => id),
+    deleteCalendarTask: vi.fn(async () => undefined),
+  };
+  useAuthStore.setState({ client: client as unknown as IJMAPClient });
+  useCalendarStore.setState({ calendars: [work, todo], events: [], error: null });
+  useTaskStore.setState({ tasks: [] });
+  useIdentityStore.setState({
+    identities: [{ id: 'id1', name: 'Ann', email: 'ann@example.com' }] as never,
+    preferredPrimaryId: null,
+  });
+  useSettingsStore.setState({ timeZone: 'Europe/Berlin' } as never);
+});
+
+afterEach(() => {
+  useAuthStore.setState({ client: null });
+  useCalendarStore.setState({ calendars: [], events: [] });
+  useTaskStore.setState({ tasks: [] });
+  useIdentityStore.setState({ identities: [] });
+  calendarHooks.onBeforeEventCreate.removePlugin('veto');
+  taskHooks.onBeforeTaskDelete.removePlugin('veto');
+});
+
+const call = (p: InstalledPlugin, method: string, ...args: unknown[]) => dispatchApiCall(p, method, args);
+
+describe('api.calendar', () => {
+  it('lists calendars as plain views', async () => {
+    expect(await call(READ, 'calendar.listCalendars')).toEqual([
+      { id: 'cal-work', name: 'Work', color: '#f00', isVisible: true, isDefault: true, isTasksOnly: false },
+      { id: 'cal-todo', name: 'To do', color: '', isVisible: true, isDefault: false, isTasksOnly: true },
+    ]);
+  });
+
+  it('returns events in a range earliest first, filtered by calendar', async () => {
+    const all = await call(READ, 'calendar.getEvents', { from: '2026-05-01', to: '2026-06-01' }) as { id: string }[];
+    expect(all.map((e) => e.id)).toEqual(['e1', 'late']);
+    expect(client.queryAllCalendarEvents).toHaveBeenCalledWith({ after: '2026-05-01T00:00:00', before: '2026-06-01T00:00:00' });
+    const work = await call(READ, 'calendar.getEvents', { from: '2026-05-01', to: '2026-06-01', calendarIds: ['cal-work'] }) as { id: string; title: string }[];
+    expect(work).toEqual([expect.objectContaining({ id: 'e1', title: 'Standup', calendarId: 'cal-work' })]);
+  });
+
+  it('refuses a range over a year, a reversed range and junk dates', async () => {
+    await expect(call(READ, 'calendar.getEvents', { from: '2026-01-01', to: '2027-01-03' })).rejects.toThrow(/at most 366 days/);
+    await expect(call(READ, 'calendar.getEvents', { from: '2026-05-02', to: '2026-05-01' })).rejects.toThrow(/after from/);
+    await expect(call(READ, 'calendar.getEvents', { from: '2026-02-30', to: '2026-03-01' })).rejects.toThrow(/not a real date/);
+    await expect(call(READ, 'calendar.getEvents', { from: 'tomorrow', to: '2026-03-01' })).rejects.toThrow(/must look like/);
+    expect(client.queryAllCalendarEvents).not.toHaveBeenCalled();
+  });
+
+  it('gets one event or null', async () => {
+    expect(await call(READ, 'calendar.getEvent', 'e1')).toEqual(expect.objectContaining({ id: 'e1', title: 'Standup' }));
+    expect(await call(READ, 'calendar.getEvent', 'missing')).toBeNull();
+    await expect(call(READ, 'calendar.getEvent', 42)).rejects.toThrow(/id must be a string/);
+  });
+
+  it('needs calendar:read to read and calendar:write to change', async () => {
+    await expect(call(NONE, 'calendar.getEvents', { from: '2026-05-01', to: '2026-05-02' })).rejects.toThrow(/lacks permission "calendar:read"/);
+    await expect(call(READ, 'calendar.createEvent', { title: 'x', start: '2026-05-01' })).rejects.toThrow(/lacks permission "calendar:write"/);
+    await expect(call(READ, 'calendar.deleteEvent', 'e1')).rejects.toThrow(/lacks permission "calendar:write"/);
+    expect(client.deleteCalendarEvent).not.toHaveBeenCalled();
+  });
+
+  it('creates a timed event from the plugin shape, in the default calendar, without invitations', async () => {
+    const created = await call(WRITE, 'calendar.createEvent', {
+      title: ' Review ', start: '2026-05-04T14:00', end: '2026-05-04T15:30', location: 'Room 1',
+      participants: [{ email: 'bob@example.com', name: 'Bob' }],
+    });
+    expect(created).toEqual(expect.objectContaining({ id: 'new-1', title: 'Review', location: 'Room 1' }));
+    const [sent, sendScheduling] = client.createCalendarEvent.mock.calls[0];
+    expect(sendScheduling).toBe(false);
+    expect(sent).toEqual(expect.objectContaining({
+      title: 'Review', start: '2026-05-04T14:00:00', duration: 'PT1H30M', timeZone: 'Europe/Berlin',
+      showWithoutTime: false, calendarIds: { 'cal-work': true }, organizerCalendarAddress: 'mailto:ann@example.com',
+    }));
+    const emails = Object.values(sent.participants as Record<string, { email: string }>).map((p) => p.email);
+    expect(emails).toEqual(['ann@example.com', 'bob@example.com']);
+    // The store saw it, so the calendar on screen shows it.
+    expect(useCalendarStore.getState().events.map((e) => e.id)).toContain('new-1');
+  });
+
+  it('creates an all-day event with an exclusive end', async () => {
+    await call(WRITE, 'calendar.createEvent', { title: 'Trip', start: '2026-05-01', end: '2026-05-04' });
+    expect(client.createCalendarEvent.mock.calls[0][0]).toEqual(expect.objectContaining({
+      start: '2026-05-01T00:00:00', duration: 'P3D', timeZone: null, showWithoutTime: true,
+    }));
+  });
+
+  it('creates a yearly event under a uid in the plugin namespace', async () => {
+    await call(WRITE, 'calendar.createEvent', {
+      title: 'Birthday of Ada', start: '2026-12-10', uid: 'contact-42', repeat: { frequency: 'yearly' },
+    });
+
+    const sent = client.createCalendarEvent.mock.calls[0][0];
+    expect(sent.uid).toMatch(/^contact-42@.+\.plugin\.bulwark$/);
+    expect(sent.recurrenceRules).toEqual([expect.objectContaining({ '@type': 'RecurrenceRule', frequency: 'yearly', interval: 1, count: null, until: null })]);
+  });
+
+  it('checks repeat and uid', async () => {
+    await expect(call(WRITE, 'calendar.createEvent', { title: 'x', start: '2026-05-01', repeat: { frequency: 'hourly' } })).rejects.toThrow(/repeat.frequency/);
+    await expect(call(WRITE, 'calendar.createEvent', { title: 'x', start: '2026-05-01', repeat: { frequency: 'daily', count: 3, until: '2026-06-01' } })).rejects.toThrow(/not both/);
+    await expect(call(WRITE, 'calendar.createEvent', { title: 'x', start: '2026-05-01', uid: 'a b' })).rejects.toThrow(/uid must be/);
+    await expect(call(WRITE, 'calendar.updateEvent', 'e1', { uid: 'other' })).rejects.toThrow(/unknown property "uid"/);
+    expect(client.createCalendarEvent).not.toHaveBeenCalled();
+  });
+
+  it('refuses arbitrary JSCalendar fields and bad input', async () => {
+    await expect(call(WRITE, 'calendar.createEvent', { title: 'x', start: '2026-05-01', recurrenceRules: [] }))
+      .rejects.toThrow(/unknown property "recurrenceRules"/);
+    await expect(call(WRITE, 'calendar.createEvent', { title: '', start: '2026-05-01' })).rejects.toThrow(/title must be 1-500/);
+    await expect(call(WRITE, 'calendar.createEvent', { title: 'x', start: '2026-05-01T10:00', timeZone: 'Mars/Base' }))
+      .rejects.toThrow(/not a known time zone/);
+    await expect(call(WRITE, 'calendar.createEvent', { title: 'x', start: '2026-05-01T10:00', end: '2026-05-01T09:00' }))
+      .rejects.toThrow(/end must be after start/);
+    await expect(call(WRITE, 'calendar.createEvent', { title: 'x', start: '2026-05-01', calendarId: 'nope' }))
+      .rejects.toThrow(/no calendar with id "nope"/);
+    expect(client.createCalendarEvent).not.toHaveBeenCalled();
+  });
+
+  it('goes through the store, so another plugin can stop a create', async () => {
+    calendarHooks.onBeforeEventCreate.register('veto', () => false);
+    expect(await call(WRITE, 'calendar.createEvent', { title: 'x', start: '2026-05-01' })).toBeNull();
+    expect(client.createCalendarEvent).not.toHaveBeenCalled();
+  });
+
+  it('updates times against the event as it is and deletes through the store', async () => {
+    await call(WRITE, 'calendar.updateEvent', 'e1', { start: '2026-05-04T10:00' });
+    expect(client.updateCalendarEvent).toHaveBeenCalledWith('e1', expect.objectContaining({
+      start: '2026-05-04T10:00:00', duration: 'PT15M', timeZone: 'Europe/Berlin',
+    }), false, undefined);
+    await call(WRITE, 'calendar.deleteEvent', 'e1');
+    expect(client.deleteCalendarEvent).toHaveBeenCalledWith('e1', false, undefined);
+    await expect(call(WRITE, 'calendar.deleteEvent', 'missing')).rejects.toThrow(/no event with id "missing"/);
+    await expect(call(WRITE, 'calendar.updateEvent', 'e1', {})).rejects.toThrow(/patch is empty/);
+  });
+});
+
+describe('api.tasks', () => {
+  it('lists open tasks, or all with includeCompleted', async () => {
+    expect((await call(READ, 'tasks.list') as { id: string }[]).map((t) => t.id)).toEqual(['t1']);
+    expect((await call(READ, 'tasks.list', { includeCompleted: true }) as { id: string }[]).map((t) => t.id)).toEqual(['t1', 't2']);
+    expect(await call(READ, 'tasks.get', 't2')).toEqual(expect.objectContaining({ id: 't2', isComplete: true }));
+    await expect(call(READ, 'tasks.list', { includeCompleted: 'yes' })).rejects.toThrow(/true or false/);
+  });
+
+  it('needs tasks:read and tasks:write', async () => {
+    await expect(call(NONE, 'tasks.list')).rejects.toThrow(/lacks permission "tasks:read"/);
+    await expect(call(READ, 'tasks.create', { title: 'x' })).rejects.toThrow(/lacks permission "tasks:write"/);
+    expect(client.createCalendarTask).not.toHaveBeenCalled();
+  });
+
+  it('creates a task in the tasks calendar', async () => {
+    const created = await call(WRITE, 'tasks.create', { title: 'Call Bob', due: '2026-05-02T17:00', priority: 1 });
+    expect(created).toEqual(expect.objectContaining({ id: 'new-t', title: 'Call Bob', priority: 1 }));
+    expect(client.createCalendarTask).toHaveBeenCalledWith(expect.objectContaining({
+      title: 'Call Bob', due: '2026-05-02T17:00:00', showWithoutTime: false, priority: 1,
+      progress: 'needs-action', calendarIds: { 'cal-todo': true },
+    }));
+  });
+
+  it('refuses bad task input', async () => {
+    await expect(call(WRITE, 'tasks.create', { title: 'x', priority: 12 })).rejects.toThrow(/priority must be a whole number from 0 to 9/);
+    await expect(call(WRITE, 'tasks.create', { title: 'x', progress: 'completed' })).rejects.toThrow(/unknown property "progress"/);
+    await expect(call(WRITE, 'tasks.create', { title: 'x', due: '2026-05-02T17:00Z' })).rejects.toThrow(/without Z/);
+    expect(client.createCalendarTask).not.toHaveBeenCalled();
+  });
+
+  it('completes, updates and deletes through the store', async () => {
+    await call(WRITE, 'tasks.setComplete', 't1', true);
+    expect(client.updateCalendarTask).toHaveBeenCalledWith('t1', { progress: 'completed' });
+    client.updateCalendarTask.mockClear();
+    await call(WRITE, 'tasks.setComplete', 't2', true);
+    expect(client.updateCalendarTask).not.toHaveBeenCalled();
+    await call(WRITE, 'tasks.update', 't1', { due: null, title: 'Pay rent today' });
+    expect(client.updateCalendarTask).toHaveBeenCalledWith('t1', { title: 'Pay rent today', due: null, showWithoutTime: true });
+
+    taskHooks.onBeforeTaskDelete.register('veto', () => false);
+    await call(WRITE, 'tasks.delete', 't1');
+    expect(client.deleteCalendarTask).not.toHaveBeenCalled();
+    await expect(call(WRITE, 'tasks.delete', 'nope')).rejects.toThrow(/no task with id "nope"/);
+  });
+});
diff --git a/lib/__tests__/plugin-host-compose-drafts.test.ts b/lib/__tests__/plugin-host-compose-drafts.test.ts
new file mode 100644
index 000000000..0bcca4b02
--- /dev/null
+++ b/lib/__tests__/plugin-host-compose-drafts.test.ts
@@ -0,0 +1,180 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { InstalledPlugin } from '../plugin-types';
+import type { IJMAPClient } from '../jmap/client-interface';
+import { useAuthStore } from '@/stores/auth-store';
+import { useIdentityStore } from '@/stores/identity-store';
+import { INTERNAL_MAILTO_EVENT, type ParsedMailto } from '../protocol-handlers/mailto';
+import { PLUGIN_REPLY_EVENT, type PluginReplyRequest } from '../plugin-sandbox/host-api-compose';
+import { consumePendingMailto } from '../protocol-handlers/session';
+import { resetPluginRateLimits } from '../plugin-sandbox/host-api-input';
+import { HIGH_RISK_PERMISSIONS } from '../plugin-sandbox/permission-text';
+import { ALL_PERMISSIONS } from '../plugin-types';
+
+vi.mock('@/stores/toast-store', () => ({
+  toast: { success: vi.fn(), error: vi.fn(), info: vi.fn(), warning: vi.fn() },
+}));
+
+import { dispatchApiCall } from '../plugin-sandbox/host-api';
+
+function plugin(perms: string[], id = 'cloud'): InstalledPlugin {
+  return {
+    id, name: 'Cloud', version: '1.0.0', author: 'test', description: '',
+    type: 'hook', permissions: perms, grantedPermissions: perms, entrypoint: 'index.js',
+    enabled: true, status: 'running', settings: {},
+  };
+}
+
+const COMPOSER = plugin(['compose:open']);
+const DRAFTER = plugin(['email:write']);
+const call = (p: InstalledPlugin, method: string, ...args: unknown[]) => dispatchApiCall(p, method, args);
+const pdf = { blobId: 'b1', name: 'report.pdf', type: 'application/pdf', size: 1200 };
+
+describe('api.compose.open', () => {
+  let taken: ParsedMailto[];
+  const listener = (event: Event) => {
+    event.preventDefault();
+    taken.push((event as CustomEvent<ParsedMailto>).detail);
+  };
+
+  beforeEach(() => {
+    taken = [];
+    resetPluginRateLimits();
+    window.addEventListener(INTERNAL_MAILTO_EVENT, listener);
+  });
+  afterEach(() => {
+    window.removeEventListener(INTERNAL_MAILTO_EVENT, listener);
+    sessionStorage.clear();
+  });
+
+  it('hands the mail page a filled-in draft, like an in-app mailto: link', async () => {
+    expect(await call(COMPOSER, 'compose.open', {
+      to: ['Bob <bob@example.com>'], cc: ['carol@example.com'], subject: 'Report', body: 'See attached', attachments: [pdf],
+    })).toBe('opened');
+    expect(taken).toEqual([{
+      to: ['Bob <bob@example.com>'], cc: ['carol@example.com'], bcc: [], subject: 'Report', body: 'See attached', attachments: [pdf],
+      // onMailtoIntercept sees a mailto: URL for it too.
+      href: expect.stringMatching(/^mailto:/),
+    }]);
+  });
+
+  it('sanitises an HTML body and sends it as htmlBody', async () => {
+    await call(COMPOSER, 'compose.open', { body: '<p>Hi <b>there</b></p><img src=x onerror="steal()">', isHtml: true });
+    expect(taken[0].htmlBody).toContain('<b>there</b>');
+    expect(taken[0].htmlBody).not.toContain('onerror');
+    expect(taken[0].body).toMatch(/Hi there/);
+  });
+
+  it('parks the draft for the mail page when none is on screen', async () => {
+    window.removeEventListener(INTERNAL_MAILTO_EVENT, listener);
+    // jsdom does not navigate; the call still reports where it is going.
+    expect(await call(COMPOSER, 'compose.open', { to: ['bob@example.com'], subject: 'Hi' })).toBe('navigating');
+    expect(consumePendingMailto()).toEqual(expect.objectContaining({ to: ['bob@example.com'], subject: 'Hi' }));
+  });
+
+  it('refuses bad addresses, header injection, too many recipients and odd attachments', async () => {
+    await expect(call(COMPOSER, 'compose.open', { to: ['nobody'] })).rejects.toThrow(/to\[0\] is not a valid address/);
+    await expect(call(COMPOSER, 'compose.open', { subject: 'Hi\r\nBcc: x@example.com' })).rejects.toThrow(/subject must be one line/);
+    const many = Array.from({ length: 101 }, (_, i) => `u${i}@example.com`);
+    await expect(call(COMPOSER, 'compose.open', { to: many })).rejects.toThrow(/at most 100 addresses/);
+    await expect(call(COMPOSER, 'compose.open', { to: many.slice(0, 60), cc: many.slice(60) })).rejects.toThrow(/at most 100 recipients in all/);
+    await expect(call(COMPOSER, 'compose.open', { attachments: [{ ...pdf, type: 'not a type' }] })).rejects.toThrow(/not a media type/);
+    await expect(call(COMPOSER, 'compose.open', { from: 'boss@example.com' })).rejects.toThrow(/unknown property "from"/);
+    expect(taken).toEqual([]);
+  });
+
+  it('opens at most five times a minute per plugin', async () => {
+    for (let i = 0; i < 5; i++) await call(COMPOSER, 'compose.open', {});
+    await expect(call(COMPOSER, 'compose.open', {})).rejects.toThrow(/at most 5 times a minute/);
+    expect(await call(plugin(['compose:open'], 'other'), 'compose.open', {})).toBe('opened');
+    expect(taken).toHaveLength(6);
+  });
+
+  it('needs compose:open, a new permission that is not marked high risk', async () => {
+    await expect(call(plugin(['email:send']), 'compose.open', {})).rejects.toThrow(/lacks permission "compose:open"/);
+    expect(taken).toEqual([]);
+    expect(ALL_PERMISSIONS).toContain('compose:open');
+    expect(HIGH_RISK_PERMISSIONS.has('compose:open')).toBe(false);
+  });
+});
+
+describe('api.compose.reply', () => {
+  // The mail page, with message E1 open in the reader.
+  let taken: PluginReplyRequest[];
+  const mailPage = (event: Event) => {
+    const req = (event as CustomEvent<PluginReplyRequest>).detail;
+    if (req.emailId !== 'E1') return;
+    event.preventDefault();
+    taken.push(req);
+  };
+  beforeEach(() => {
+    taken = [];
+    resetPluginRateLimits();
+    window.addEventListener(PLUGIN_REPLY_EVENT, mailPage);
+  });
+  afterEach(() => window.removeEventListener(PLUGIN_REPLY_EVENT, mailPage));
+
+  it('asks the mail page to reply to the open message with the text', async () => {
+    expect(await call(COMPOSER, 'compose.reply', 'E1', { text: 'Thursday works for me.' })).toBe(true);
+    expect(await call(COMPOSER, 'compose.reply', 'E1', { text: 'Fine by all of us.', all: true })).toBe(true);
+    expect(taken).toEqual([
+      { emailId: 'E1', text: 'Thursday works for me.', all: false },
+      { emailId: 'E1', text: 'Fine by all of us.', all: true },
+    ]);
+  });
+
+  it('refuses a message that is not open, and needs compose:open', async () => {
+    await expect(call(COMPOSER, 'compose.reply', 'E2', { text: 'x' })).rejects.toThrow(/not open in the reader/);
+    await expect(call(DRAFTER, 'compose.reply', 'E1', { text: 'x' })).rejects.toThrow(/lacks permission "compose:open"/);
+    await expect(call(COMPOSER, 'compose.reply', 'E1', { text: 'x', to: ['eve@example.com'] })).rejects.toThrow(/unknown property "to"/);
+    expect(taken).toEqual([]);
+  });
+});
+
+describe('api.drafts.create', () => {
+  let createDraft: ReturnType<typeof vi.fn>;
+
+  beforeEach(() => {
+    resetPluginRateLimits();
+    createDraft = vi.fn(async () => 'draft-1');
+    useAuthStore.setState({ client: { createDraft } as unknown as IJMAPClient });
+    useIdentityStore.setState({
+      identities: [
+        { id: 'id-a', name: 'Ann', email: 'ann@example.com' },
+        { id: 'id-b', name: 'Ann Work', email: 'ann@work.example' },
+      ] as never,
+      preferredPrimaryId: 'id-b',
+    });
+  });
+  afterEach(() => {
+    useAuthStore.setState({ client: null });
+    useIdentityStore.setState({ identities: [], preferredPrimaryId: null });
+  });
+
+  it('saves a draft from the default identity and returns its id', async () => {
+    expect(await call(DRAFTER, 'drafts.create', {
+      to: ['bob@example.com'], subject: 'Notes', body: '<p>Hello</p><script>x()</script>', isHtml: true, attachments: [pdf],
+    })).toBe('draft-1');
+    const [to, subject, text, cc, bcc, identityId, fromEmail, draftId, attachments, fromName, html] = createDraft.mock.calls[0];
+    expect({ to, subject, cc, bcc, identityId, fromEmail, draftId, fromName }).toEqual({
+      to: ['bob@example.com'], subject: 'Notes', cc: [], bcc: [], identityId: 'id-b',
+      fromEmail: 'ann@work.example', draftId: undefined, fromName: 'Ann Work',
+    });
+    expect(text).toMatch(/Hello/);
+    expect(html).toContain('<p>Hello</p>');
+    expect(html).not.toContain('script');
+    expect(attachments).toEqual([{ ...pdf, disposition: 'attachment' }]);
+  });
+
+  it('needs email:write and valid input', async () => {
+    await expect(call(plugin(['compose:open']), 'drafts.create', {})).rejects.toThrow(/lacks permission "email:write"/);
+    await expect(call(DRAFTER, 'drafts.create', { to: 'bob@example.com' })).rejects.toThrow(/to must be an array/);
+    await expect(call(DRAFTER, 'drafts.create', { attachments: [{ blobId: 'b1' }] })).rejects.toThrow(/attachments\[0\]\.type must be a string/);
+    expect(createDraft).not.toHaveBeenCalled();
+  });
+
+  it('saves at most ten drafts a minute', async () => {
+    for (let i = 0; i < 10; i++) await call(DRAFTER, 'drafts.create', {});
+    await expect(call(DRAFTER, 'drafts.create', {})).rejects.toThrow(/at most 10 drafts a minute/);
+    expect(createDraft).toHaveBeenCalledTimes(10);
+  });
+});
diff --git a/lib/__tests__/plugin-host-composer.test.ts b/lib/__tests__/plugin-host-composer.test.ts
new file mode 100644
index 000000000..dec0bbc79
--- /dev/null
+++ b/lib/__tests__/plugin-host-composer.test.ts
@@ -0,0 +1,175 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { InstalledPlugin } from '../plugin-types';
+import { HIGH_RISK_PERMISSIONS } from '../plugin-sandbox/permission-text';
+import { registerComposer, resetComposers, type ComposerHandle } from '../plugin-sandbox/composer-registry';
+import { plainOwnRange, replaceTextareaRange } from '../plugin-sandbox/composer-edit';
+import { resetPluginRateLimits } from '../plugin-sandbox/host-api-input';
+
+vi.mock('@/stores/toast-store', () => ({ toast: { success: vi.fn(), error: vi.fn(), info: vi.fn(), warning: vi.fn() } }));
+
+const { dispatchApiCall } = await import('../plugin-sandbox/host-api');
+
+// api.composer on the host: which permission each call needs, what it
+// accepts, and that a plugin reaches only a composer whose id it was given.
+
+function plugin(perms: string[]): InstalledPlugin {
+  return {
+    id: 'assistant', name: 'Assistant', version: '1.0.0', author: 'test', description: '',
+    type: 'hook', permissions: perms, grantedPermissions: perms, entrypoint: 'index.js',
+    enabled: true, status: 'running', settings: {},
+  };
+}
+
+function fakeHandle(): ComposerHandle & { calls: unknown[][] } {
+  const calls: unknown[][] = [];
+  return {
+    calls,
+    readBody: () => ({ html: '<p>Hello</p>', text: 'Hello' }),
+    readSelection: () => ({ html: '', text: '', empty: true }),
+    replaceBody: (...a) => { calls.push(['replaceBody', ...a]); return true; },
+    replaceSelection: (...a) => { calls.push(['replaceSelection', ...a]); return true; },
+    attach: async (...a) => { calls.push(['attach', ...a]); return true; },
+  };
+}
+
+const READ = plugin(['compose:read']);
+const WRITE = plugin(['compose:write']);
+const call = (p: InstalledPlugin, method: string, ...args: unknown[]) => dispatchApiCall(p, method, args);
+
+beforeEach(() => resetPluginRateLimits());
+afterEach(() => resetComposers());
+
+describe('api.composer', () => {
+  it('reads the open message with compose:read only', async () => {
+    const { id } = registerComposer(fakeHandle());
+    expect(await call(READ, 'composer.getBody', id)).toEqual({ html: '<p>Hello</p>', text: 'Hello' });
+    await expect(call(WRITE, 'composer.getBody', id)).rejects.toThrow(/lacks permission "compose:read"/);
+  });
+
+  it('changes it with compose:write only', async () => {
+    const handle = fakeHandle();
+    const { id } = registerComposer(handle);
+    await expect(call(READ, 'composer.replaceBody', id, { text: 'x' })).rejects.toThrow(/lacks permission "compose:write"/);
+    await expect(call(READ, 'composer.replaceSelection', id, { text: 'x' })).rejects.toThrow(/lacks permission "compose:write"/);
+    expect(handle.calls).toEqual([]);
+    expect(await call(WRITE, 'composer.replaceSelection', id, { text: 'Dear Bob,\nthanks' }, { below: true })).toBe(true);
+    expect(handle.calls[0]).toEqual(['replaceSelection', '<p>Dear Bob,</p><p>thanks</p>', 'Dear Bob,\nthanks', { below: true }]);
+  });
+
+  it('turns plain text into escaped paragraphs and runs HTML through the sanitiser', async () => {
+    const handle = fakeHandle();
+    const { id } = registerComposer(handle);
+    await call(WRITE, 'composer.replaceBody', id, { text: '<b>not bold</b>' });
+    await call(WRITE, 'composer.replaceBody', id, { html: '<p onclick="x()">Hi<script>alert(1)</script></p>' });
+    expect(handle.calls[0][1]).toBe('<p>&lt;b&gt;not bold&lt;/b&gt;</p>');
+    expect(handle.calls[1][1]).not.toMatch(/onclick|script/);
+    expect(handle.calls[1][1]).toContain('Hi');
+  });
+
+  it('keeps lists, quotes and headings a plugin sends as HTML', async () => {
+    const handle = fakeHandle();
+    const { id } = registerComposer(handle);
+    await call(WRITE, 'composer.replaceSelection', id, { html: '<h3>Files</h3><ul><li><a href="https://cloud.example.org/s/1">a.pdf</a></li></ul><blockquote>q</blockquote>' });
+    const html = handle.calls[0][1] as string;
+    expect(html).toContain('<ul><li><a href="https://cloud.example.org/s/1">a.pdf</a></li></ul>');
+    expect(html).toContain('<h3>Files</h3>');
+    expect(html).toContain('<blockquote>q</blockquote>');
+  });
+
+  it('reaches only a composer that is open, by the id it handed out', async () => {
+    const { unregister } = registerComposer(fakeHandle());
+    await expect(call(READ, 'composer.getBody', 'guess')).rejects.toThrow(/not open any more/);
+    await expect(call(READ, 'composer.getBody')).rejects.toThrow(/composerId must be a string/);
+    const second = registerComposer(fakeHandle());
+    second.unregister();
+    await expect(call(READ, 'composer.getBody', second.id)).rejects.toThrow(/not open any more/);
+    unregister();
+  });
+
+  it('refuses content that is neither or both of text and html, and odd options', async () => {
+    const { id } = registerComposer(fakeHandle());
+    await expect(call(WRITE, 'composer.replaceBody', id, {})).rejects.toThrow(/either text or html/);
+    await expect(call(WRITE, 'composer.replaceBody', id, { text: 'a', html: '<p>a</p>' })).rejects.toThrow(/either text or html/);
+    await expect(call(WRITE, 'composer.replaceBody', id, { markdown: '*a*' })).rejects.toThrow(/unknown property "markdown"/);
+    await expect(call(WRITE, 'composer.replaceSelection', id, { text: 'a' }, { at: 'end' })).rejects.toThrow(/unknown property "at"/);
+    await expect(call(WRITE, 'composer.replaceBody', id, { text: 'x'.repeat(512 * 1024 + 1) })).rejects.toThrow(/at most/);
+  });
+
+  it('attaches an uploaded blob with email:blob-write, checking the fields', async () => {
+    const handle = fakeHandle();
+    const { id } = registerComposer(handle);
+    const attacher = plugin(['email:blob-write']);
+    await expect(call(WRITE, 'composer.attach', id, { blobId: 'B1', name: 'a.pdf', size: 1 })).rejects.toThrow(/lacks permission "email:blob-write"/);
+    expect(await call(attacher, 'composer.attach', id, { blobId: 'B1', name: 'a.pdf', size: 10 })).toBe(true);
+    expect(handle.calls[0]).toEqual(['attach', { blobId: 'B1', name: 'a.pdf', type: 'application/octet-stream', size: 10 }]);
+    await expect(call(attacher, 'composer.attach', id, { blobId: 'B1', name: 'a.pdf', size: -1 })).rejects.toThrow(/whole number/);
+    await expect(call(attacher, 'composer.attach', id, { blobId: 'B1', name: '', size: 1 })).rejects.toThrow(/name/);
+  });
+
+  it('allows 60 edits a minute', async () => {
+    const { id } = registerComposer(fakeHandle());
+    for (let i = 0; i < 60; i++) await call(WRITE, 'composer.replaceBody', id, { text: `${i}` });
+    await expect(call(WRITE, 'composer.replaceBody', id, { text: 'one more' })).rejects.toThrow(/at most 60 edits a minute/);
+  });
+
+  it('counts reading the draft as ordinary, not high-risk; the plugin still needs a composer id', () => {
+    expect(HIGH_RISK_PERMISSIONS.has('compose:read')).toBe(false);
+    expect(HIGH_RISK_PERMISSIONS.has('compose:write')).toBe(false);
+  });
+});
+
+describe('plain-text composer', () => {
+  it('finds the own text above the signature separator, the quote header and the quote', () => {
+    const body = 'Hi Bob,\nsure.\n\n-- \nAlice\n\nOn Monday, Bob wrote:\n> Can you?';
+    const { from, to } = plainOwnRange(body, { replyLike: true });
+    expect(body.slice(from, to)).toBe('Hi Bob,\nsure.');
+    const reply = 'Thanks!\n\nOn Monday, Bob wrote:\n> Can you?';
+    expect(reply.slice(0, plainOwnRange(reply, { replyLike: true }).to)).toBe('Thanks!');
+    const sig = 'Hello\n\nAlice Example\nACME';
+    expect(sig.slice(0, plainOwnRange(sig, { signature: 'Alice Example\nACME' }).to)).toBe('Hello');
+    const fwd = 'FYI\n\n---------- Forwarded message ----------\nFrom: Bob';
+    expect(fwd.slice(0, plainOwnRange(fwd, { forwardedSeparator: '---------- Forwarded message ----------' }).to)).toBe('FYI');
+  });
+
+  it('edits the textarea through the browser\'s editing command, so its undo keeps working', () => {
+    const textarea = document.createElement('textarea');
+    textarea.value = 'Hello Bob,\n\n-- \nAlice';
+    document.body.appendChild(textarea);
+    const exec = vi.fn((_cmd: string, _ui: boolean, text: string) => {
+      textarea.setRangeText(text, textarea.selectionStart, textarea.selectionEnd, 'end');
+      return true;
+    });
+    const doc = document as unknown as { execCommand: unknown };
+    const original = doc.execCommand;
+    doc.execCommand = exec;
+    const input = vi.fn();
+    textarea.addEventListener('input', input);
+    try {
+      replaceTextareaRange(textarea, 0, 10, 'Hi Bob,');
+      expect(exec).toHaveBeenCalledWith('insertText', false, 'Hi Bob,');
+      expect(textarea.value).toBe('Hi Bob,\n\n-- \nAlice');
+    } finally {
+      doc.execCommand = original;
+      textarea.remove();
+    }
+  });
+
+  it('falls back to setRangeText and an input event where the command is missing', () => {
+    const textarea = document.createElement('textarea');
+    textarea.value = 'Hello';
+    document.body.appendChild(textarea);
+    const input = vi.fn();
+    textarea.addEventListener('input', input);
+    const doc = document as unknown as { execCommand: unknown };
+    const original = doc.execCommand;
+    doc.execCommand = () => false;
+    try {
+      replaceTextareaRange(textarea, 0, 5, 'Hi');
+      expect(textarea.value).toBe('Hi');
+      expect(input).toHaveBeenCalledTimes(1);
+    } finally {
+      doc.execCommand = original;
+      textarea.remove();
+    }
+  });
+});
diff --git a/lib/__tests__/plugin-host-dialog.test.ts b/lib/__tests__/plugin-host-dialog.test.ts
new file mode 100644
index 000000000..4194c0c81
--- /dev/null
+++ b/lib/__tests__/plugin-host-dialog.test.ts
@@ -0,0 +1,88 @@
+import { describe, it, expect, beforeEach } from 'vitest';
+import {
+  awaitDialog,
+  awaitCustomDialog,
+  cancelForPlugin,
+  head,
+  overlay,
+  resolveDialog,
+  resolveHead,
+  resetDialogLimits,
+  MAX_DIALOGS_PER_MINUTE,
+} from '../plugin-sandbox/host-dialog';
+
+function confirm(pluginId: string) {
+  return awaitDialog({ pluginId, kind: 'confirm', title: 't', message: 'm' });
+}
+
+beforeEach(() => {
+  while (head()) resolveHead(false);
+  resetDialogLimits();
+});
+
+describe('plugin dialog queue', () => {
+  it('lets a plugin ask one question on top of its own large dialog', async () => {
+    const custom = awaitCustomDialog({ pluginId: 'ai', title: 'Assistant', message: '', slot: 'plugin-dialog' });
+    const question = confirm('ai');
+    await expect(confirm('ai')).rejects.toThrow(/already has a dialog open/);
+
+    const top = overlay();
+    expect(top?.kind).toBe('confirm');
+    resolveDialog(top!.id, true);
+
+    expect(await question).toBe(true);
+    // The large dialog is still open underneath.
+    expect(head()?.kind).toBe('custom');
+    expect(overlay()).toBeNull();
+    resolveHead(null);
+    expect(await custom).toBeNull();
+  });
+
+  it('lets a plugin have one dialog open at a time', async () => {
+    // A plugin opening dialogs in a loop used to cover the whole app; the
+    // user could not reach Settings to turn it off.
+    const first = confirm('looper');
+    await expect(confirm('looper')).rejects.toThrow(/already has a dialog open/);
+    resolveHead(true);
+    expect(await first).toBe(true);
+  });
+
+  it('does not let one plugin block dialogs of another', async () => {
+    const a = confirm('a');
+    const b = confirm('b');
+    resolveHead(true);
+    resolveHead(false);
+    expect(await a).toBe(true);
+    expect(await b).toBe(false);
+  });
+
+  it('limits how many dialogs a plugin opens per minute', async () => {
+    for (let i = 0; i < MAX_DIALOGS_PER_MINUTE; i++) {
+      const p = confirm('chatty');
+      resolveHead(true);
+      await p;
+    }
+    await expect(confirm('chatty')).rejects.toThrow(/too many dialogs/);
+  });
+
+  it("resolves a custom dialog's own entry, not the next one in the queue", async () => {
+    const custom = awaitCustomDialog({ pluginId: 'a', title: 't', message: '', slot: 'plugin-dialog' });
+    const id = head()!.id;
+    const other = confirm('b');
+
+    resolveDialog(id, 'picked');
+    resolveDialog(id, 'again'); // a second onResult call after the dialog closed
+
+    expect(await custom).toBe('picked');
+    expect(head()?.pluginId).toBe('b');
+    resolveHead(false);
+    expect(await other).toBe(false);
+  });
+
+  it('cancels a plugin\'s dialogs when it is turned off', async () => {
+    const p = confirm('gone');
+    cancelForPlugin('gone');
+    expect(await p).toBe(false);
+    expect(head()).toBeNull();
+  });
+});
diff --git a/lib/__tests__/plugin-host-mail-bytes.test.ts b/lib/__tests__/plugin-host-mail-bytes.test.ts
new file mode 100644
index 000000000..dee905e22
--- /dev/null
+++ b/lib/__tests__/plugin-host-mail-bytes.test.ts
@@ -0,0 +1,102 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { InstalledPlugin } from '../plugin-types';
+import type { IJMAPClient } from '../jmap/client-interface';
+import type { Email } from '../jmap/types';
+import { useAuthStore } from '@/stores/auth-store';
+import { useEmailStore } from '@/stores/email-store';
+
+vi.mock('@/stores/toast-store', () => ({
+  toast: { success: vi.fn(), error: vi.fn(), info: vi.fn(), warning: vi.fn() },
+}));
+
+import { dispatchApiCall, MAX_PLUGIN_FETCH_BYTES } from '../plugin-sandbox/host-api';
+
+function plugin(perms: string[]): InstalledPlugin {
+  return {
+    id: 'archiver', name: 'Archiver', version: '1.0.0', author: 'test', description: '',
+    type: 'hook', permissions: perms, grantedPermissions: perms, entrypoint: 'index.js',
+    enabled: true, status: 'running', settings: {},
+  };
+}
+
+const ARCHIVER = plugin(['email:blob-read']);
+// Untrusted tier: no { privileged: true } here, which is the point.
+const call = (p: InstalledPlugin, method: string, ...args: unknown[]) => dispatchApiCall(p, method, args);
+
+const invoice = { partId: '2', blobId: 'blob-pdf', name: 'invoice.pdf', type: 'application/pdf', size: 3 };
+const huge = { partId: '3', blobId: 'blob-big', name: 'big.iso', type: 'application/octet-stream', size: MAX_PLUGIN_FETCH_BYTES + 1 };
+
+const message = {
+  id: 'm1', threadId: 't1', blobId: 'blob-raw', size: 4, mailboxIds: { inbox: true }, keywords: {},
+  subject: 'Invoice', receivedAt: '2026-05-01T10:00:00Z', attachments: [invoice, huge],
+} as unknown as Email;
+
+let client: Record<string, ReturnType<typeof vi.fn>>;
+
+beforeEach(() => {
+  client = {
+    getEmail: vi.fn(async (id: string) => (id === 'm1' ? message : null)),
+    fetchBlobArrayBuffer: vi.fn(async (blobId: string) => {
+      if (blobId === 'blob-raw') return new TextEncoder().encode('From').buffer;
+      return new Uint8Array([1, 2, 3]).buffer;
+    }),
+  };
+  useAuthStore.setState({ client: client as unknown as IJMAPClient });
+  useEmailStore.setState({ selectedEmail: null });
+});
+
+afterEach(() => {
+  useAuthStore.setState({ client: null });
+});
+
+describe('api.email.getAttachment', () => {
+  it('returns the bytes of an attachment of that message, to an untrusted plugin', async () => {
+    const result = await call(ARCHIVER, 'email.getAttachment', 'm1', 'blob-pdf') as {
+      name: string; type: string; size: number; data: ArrayBuffer;
+    };
+    expect(result.name).toBe('invoice.pdf');
+    expect(result.type).toBe('application/pdf');
+    expect(result.size).toBe(3);
+    expect(result.data).toBeInstanceOf(ArrayBuffer);
+    expect([...new Uint8Array(result.data)]).toEqual([1, 2, 3]);
+    expect(client.fetchBlobArrayBuffer).toHaveBeenCalledWith('blob-pdf', 'invoice.pdf', 'application/pdf');
+  });
+
+  it('refuses a blob that is not an attachment of that message', async () => {
+    await expect(call(ARCHIVER, 'email.getAttachment', 'm1', 'blob-raw')).rejects.toThrow(/not an attachment of this message/);
+    await expect(call(ARCHIVER, 'email.getAttachment', 'm1', 'someone-elses-blob')).rejects.toThrow(/not an attachment/);
+    await expect(call(ARCHIVER, 'email.getAttachment', 'missing', 'blob-pdf')).rejects.toThrow(/no message with id "missing"/);
+    expect(client.fetchBlobArrayBuffer).not.toHaveBeenCalled();
+  });
+
+  it('refuses attachments over 25 MB before downloading them', async () => {
+    await expect(call(ARCHIVER, 'email.getAttachment', 'm1', 'blob-big')).rejects.toThrow(/larger than 26214400 bytes/);
+    expect(client.fetchBlobArrayBuffer).not.toHaveBeenCalled();
+  });
+
+  it('needs email:blob-read, and string ids', async () => {
+    await expect(call(plugin(['email:read']), 'email.getAttachment', 'm1', 'blob-pdf')).rejects.toThrow(/lacks permission "email:blob-read"/);
+    await expect(call(ARCHIVER, 'email.getAttachment', 'm1', 7)).rejects.toThrow(/blobId must be a string/);
+    expect(client.fetchBlobArrayBuffer).not.toHaveBeenCalled();
+  });
+});
+
+describe('api.email.getRaw', () => {
+  it('returns the message source from its own blob', async () => {
+    const raw = await call(ARCHIVER, 'email.getRaw', 'm1') as ArrayBuffer;
+    expect(new TextDecoder().decode(raw)).toBe('From');
+    expect(client.fetchBlobArrayBuffer).toHaveBeenCalledWith('blob-raw', 'message.eml', 'message/rfc822');
+  });
+
+  it('refuses big messages, unknown ones and missing permission', async () => {
+    client.getEmail.mockResolvedValueOnce({ ...message, size: MAX_PLUGIN_FETCH_BYTES + 1 });
+    await expect(call(ARCHIVER, 'email.getRaw', 'm1')).rejects.toThrow(/larger than/);
+    await expect(call(ARCHIVER, 'email.getRaw', 'missing')).rejects.toThrow(/no message/);
+    await expect(call(plugin([]), 'email.getRaw', 'm1')).rejects.toThrow(/lacks permission "email:blob-read"/);
+    expect(client.fetchBlobArrayBuffer).not.toHaveBeenCalled();
+  });
+
+  it('leaves arbitrary blob reads to the privileged tier', async () => {
+    await expect(call(ARCHIVER, 'jmap.fetchBlob', 'blob-raw')).rejects.toThrow(/requires the privileged plugin tier/);
+  });
+});
diff --git a/lib/__tests__/plugin-host-mail-move.test.ts b/lib/__tests__/plugin-host-mail-move.test.ts
new file mode 100644
index 000000000..c1eb1b0bc
--- /dev/null
+++ b/lib/__tests__/plugin-host-mail-move.test.ts
@@ -0,0 +1,68 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { InstalledPlugin } from '../plugin-types';
+import type { IJMAPClient } from '../jmap/client-interface';
+import type { Mailbox } from '../jmap/types';
+import { useAuthStore } from '@/stores/auth-store';
+import { useEmailStore } from '@/stores/email-store';
+import { resetPluginRateLimits } from '../plugin-sandbox/host-api-input';
+
+vi.mock('@/stores/toast-store', () => ({
+  toast: { success: vi.fn(), error: vi.fn(), info: vi.fn(), warning: vi.fn() },
+}));
+
+import { dispatchApiCall } from '../plugin-sandbox/host-api';
+
+function plugin(perms: string[]): InstalledPlugin {
+  return {
+    id: 'mover', name: 'Mover', version: '1.0.0', author: 'test', description: '',
+    type: 'hook', permissions: perms, grantedPermissions: perms, entrypoint: 'index.js',
+    enabled: true, status: 'running', settings: {},
+  };
+}
+const WRITER = plugin(['email:write']);
+const call = (p: InstalledPlugin, method: string, ...args: unknown[]) => dispatchApiCall(p, method, args);
+
+const inbox = { id: 'inbox', name: 'Inbox', role: 'inbox' } as Mailbox;
+const archive = { id: 'arch', name: 'Archive', role: 'archive' } as Mailbox;
+const shared = { id: 'acc2:box', name: 'Team', isShared: true, accountId: 'acc2' } as unknown as Mailbox;
+let move: ReturnType<typeof vi.fn>;
+const client = {} as IJMAPClient;
+
+beforeEach(() => {
+  resetPluginRateLimits();
+  move = vi.fn(async () => {});
+  useAuthStore.setState({ client });
+  useEmailStore.setState({ mailboxes: [inbox, archive, shared], moveEmailsToMailbox: move } as never);
+});
+afterEach(() => {
+  useAuthStore.setState({ client: null });
+});
+
+describe('api.email.move and archive', () => {
+  it('moves through the store, so the hooks and the list follow', async () => {
+    await call(WRITER, 'email.move', ['m1', 'm2', 'm1'], 'inbox');
+    await call(WRITER, 'email.archive', ['m3']);
+
+    expect(move).toHaveBeenNthCalledWith(1, client, ['m1', 'm2'], 'inbox');
+    expect(move).toHaveBeenNthCalledWith(2, client, ['m3'], 'arch');
+  });
+
+  it('refuses unknown or shared folders, empty and huge lists, and plugins without email:write', async () => {
+    await expect(call(WRITER, 'email.move', ['m1'], 'nope')).rejects.toThrow(/no folder/);
+    await expect(call(WRITER, 'email.move', ['m1'], 'acc2:box')).rejects.toThrow(/no folder/);
+    await expect(call(WRITER, 'email.move', [], 'inbox')).rejects.toThrow(/non-empty/);
+    await expect(call(WRITER, 'email.move', Array.from({ length: 101 }, (_, i) => `m${i}`), 'inbox')).rejects.toThrow(/at most 100/);
+    await expect(call(plugin(['email:read']), 'email.archive', ['m1'])).rejects.toThrow(/lacks permission "email:write"/);
+    expect(move).not.toHaveBeenCalled();
+  });
+
+  it('says when there is no Archive folder', async () => {
+    useEmailStore.setState({ mailboxes: [inbox] });
+    await expect(call(WRITER, 'email.archive', ['m1'])).rejects.toThrow(/no Archive folder/);
+  });
+
+  it('limits how often a plugin moves mail', async () => {
+    for (let i = 0; i < 20; i++) await call(WRITER, 'email.move', ['m1'], 'inbox');
+    await expect(call(WRITER, 'email.move', ['m1'], 'inbox')).rejects.toThrow(/too many moves/);
+  });
+});
diff --git a/lib/__tests__/plugin-host-mail-read.test.ts b/lib/__tests__/plugin-host-mail-read.test.ts
new file mode 100644
index 000000000..9db3e13b1
--- /dev/null
+++ b/lib/__tests__/plugin-host-mail-read.test.ts
@@ -0,0 +1,119 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { InstalledPlugin } from '../plugin-types';
+import type { IJMAPClient } from '../jmap/client-interface';
+import type { Email, Mailbox } from '../jmap/types';
+import { useAuthStore } from '@/stores/auth-store';
+import { useEmailStore } from '@/stores/email-store';
+
+vi.mock('@/stores/toast-store', () => ({
+  toast: { success: vi.fn(), error: vi.fn(), info: vi.fn(), warning: vi.fn() },
+}));
+
+import { dispatchApiCall } from '../plugin-sandbox/host-api';
+
+function plugin(perms: string[]): InstalledPlugin {
+  return {
+    id: 'reader', name: 'Reader', version: '1.0.0', author: 'test', description: '',
+    type: 'hook', permissions: perms, grantedPermissions: perms, entrypoint: 'index.js',
+    enabled: true, status: 'running', settings: {},
+  };
+}
+
+const READER = plugin(['email:read']);
+const call = (p: InstalledPlugin, method: string, ...args: unknown[]) => dispatchApiCall(p, method, args);
+
+function mail(id: string, over: Partial<Email> = {}): Email {
+  return {
+    id, threadId: `t-${id}`, mailboxIds: { inbox: true }, keywords: { $seen: true },
+    from: [{ name: 'Bob', email: 'bob@example.com' }], to: [{ email: 'ann@example.com' }],
+    subject: `Subject ${id}`, receivedAt: '2026-05-01T10:00:00Z', preview: 'preview', size: 1234,
+    hasAttachment: false,
+    ...over,
+  } as Email;
+}
+
+const inbox = { id: 'inbox', name: 'Inbox', role: 'inbox', totalEmails: 12, unreadEmails: 3, sortOrder: 0 } as Mailbox;
+const shared = {
+  id: 'acc2:box', originalId: 'box', name: 'Team', role: undefined, parentId: undefined,
+  totalEmails: 1, unreadEmails: 0, isShared: true, accountId: 'acc2', sortOrder: 1,
+} as unknown as Mailbox;
+
+let client: Record<string, ReturnType<typeof vi.fn>>;
+
+beforeEach(() => {
+  client = {
+    getEmail: vi.fn(async (id: string) => (id === 'm1'
+      ? mail('m1', { textBody: [{ partId: '1' }], bodyValues: { 1: { value: 'Full body text' } } } as unknown as Partial<Email>)
+      : null)),
+    getEmails: vi.fn(async () => ({ emails: [mail('a'), mail('b')], hasMore: false, total: 2 })),
+    getMailboxes: vi.fn(async () => [inbox]),
+  };
+  useAuthStore.setState({ client: client as unknown as IJMAPClient });
+  useEmailStore.setState({ mailboxes: [inbox, shared], selectedEmail: null });
+});
+
+afterEach(() => {
+  useAuthStore.setState({ client: null });
+  useEmailStore.setState({ mailboxes: [], selectedEmail: null });
+});
+
+describe('api.email.get', () => {
+  it('returns any message with its body, not only the open one', async () => {
+    const view = await call(READER, 'email.get', 'm1') as { id: string; text: string; from: unknown };
+    expect(view).toEqual(expect.objectContaining({
+      id: 'm1', subject: 'Subject m1', text: 'Full body text', from: [{ name: 'Bob', email: 'bob@example.com' }],
+    }));
+    expect(client.getEmail).toHaveBeenCalledWith('m1');
+    expect(await call(READER, 'email.get', 'gone')).toBeNull();
+  });
+
+  it('uses the open message when its body is loaded', async () => {
+    useEmailStore.setState({ selectedEmail: mail('open', { bodyValues: { 1: { value: 'x' } }, textBody: [{ partId: '1' }] } as unknown as Partial<Email>) });
+    expect(await call(READER, 'email.get', 'open')).toEqual(expect.objectContaining({ id: 'open', text: 'x' }));
+    expect(client.getEmail).not.toHaveBeenCalled();
+  });
+
+  it('needs email:read and a string id', async () => {
+    await expect(call(plugin([]), 'email.get', 'm1')).rejects.toThrow(/lacks permission "email:read"/);
+    await expect(call(READER, 'email.get', { id: 'm1' })).rejects.toThrow(/emailId must be a string/);
+    expect(client.getEmail).not.toHaveBeenCalled();
+  });
+});
+
+describe('api.email.list', () => {
+  it('returns summaries of a folder page', async () => {
+    const list = await call(READER, 'email.list', { mailboxId: 'inbox', limit: 2, position: 10 }) as { id: string }[];
+    expect(list.map((e) => e.id)).toEqual(['a', 'b']);
+    expect(list[0]).not.toHaveProperty('text');
+    expect(client.getEmails).toHaveBeenCalledWith('inbox', undefined, 2, 10);
+  });
+
+  it('asks the owning account for a shared folder', async () => {
+    await call(READER, 'email.list', { mailboxId: 'acc2:box' });
+    expect(client.getEmails).toHaveBeenCalledWith('box', 'acc2', 50, 0);
+  });
+
+  it('caps the page at 100 and refuses unknown folders', async () => {
+    await expect(call(READER, 'email.list', { limit: 101 })).rejects.toThrow(/limit must be a whole number from 1 to 100/);
+    await expect(call(READER, 'email.list', { mailboxId: 'nope' })).rejects.toThrow(/no mailbox with id "nope"/);
+    await expect(call(READER, 'email.list', { mailbox: 'inbox' })).rejects.toThrow(/unknown property "mailbox"/);
+    await expect(call(plugin([]), 'email.list')).rejects.toThrow(/lacks permission "email:read"/);
+    expect(client.getEmails).not.toHaveBeenCalled();
+  });
+});
+
+describe('api.mailboxes.list', () => {
+  it('returns plain folder views', async () => {
+    expect(await call(READER, 'mailboxes.list')).toEqual([
+      { id: 'inbox', name: 'Inbox', role: 'inbox', parentId: null, totalEmails: 12, unreadEmails: 3 },
+      { id: 'acc2:box', name: 'Team', role: null, parentId: null, totalEmails: 1, unreadEmails: 0 },
+    ]);
+    await expect(call(plugin(['email:write']), 'mailboxes.list')).rejects.toThrow(/lacks permission "email:read"/);
+  });
+
+  it('asks the server when the app has not loaded folders yet', async () => {
+    useEmailStore.setState({ mailboxes: [] });
+    expect(await call(READER, 'mailboxes.list')).toHaveLength(1);
+    expect(client.getMailboxes).toHaveBeenCalled();
+  });
+});
diff --git a/lib/__tests__/plugin-host-notifications.test.ts b/lib/__tests__/plugin-host-notifications.test.ts
new file mode 100644
index 000000000..7c61eb725
--- /dev/null
+++ b/lib/__tests__/plugin-host-notifications.test.ts
@@ -0,0 +1,204 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { InstalledPlugin } from '../plugin-types';
+import { ALL_PERMISSIONS } from '../plugin-types';
+import { toastHooks } from '../plugin-hooks';
+import { resetPluginRateLimits } from '../plugin-sandbox/host-api-input';
+import { HIGH_RISK_PERMISSIONS } from '../plugin-sandbox/permission-text';
+
+const toastInfo = vi.fn();
+vi.mock('@/stores/toast-store', () => ({
+  toast: { success: vi.fn(), error: vi.fn(), info: (...a: unknown[]) => toastInfo(...a), warning: vi.fn() },
+}));
+
+const overview = vi.fn();
+vi.mock('../plugin-sandbox/connect-dialog', () => ({
+  credentialOverview: (...a: unknown[]) => overview(...a),
+}));
+
+import { dispatchApiCall } from '../plugin-sandbox/host-api';
+
+function plugin(id: string, perms = ['ui:notifications']): InstalledPlugin {
+  return {
+    id, name: id === 'rss' ? 'RSS Reader' : 'Other', version: '1.0.0', author: 'test', description: '',
+    type: 'hook', permissions: perms, grantedPermissions: perms, entrypoint: 'index.js',
+    enabled: true, status: 'running', settings: {},
+  };
+}
+
+const RSS = plugin('rss');
+const call = (p: InstalledPlugin, ...args: unknown[]) => dispatchApiCall(p, 'notifications.show', args);
+
+class FakeNotification {
+  static permission: NotificationPermission = 'granted';
+  static shown: FakeNotification[] = [];
+  onclick: (() => void) | null = null;
+  close = vi.fn();
+  constructor(public title: string, public options: NotificationOptions) {
+    FakeNotification.shown.push(this);
+  }
+}
+
+beforeEach(() => {
+  resetPluginRateLimits();
+  toastInfo.mockClear();
+  overview.mockReset();
+  overview.mockResolvedValue({ credentials: [], admin: [], adminOrigins: [] });
+  FakeNotification.shown = [];
+  FakeNotification.permission = 'granted';
+  vi.stubGlobal('Notification', FakeNotification);
+});
+
+afterEach(() => {
+  vi.unstubAllGlobals();
+  toastHooks.onNotificationClick.removePlugin('rss');
+  toastHooks.onNotificationClick.removePlugin('other');
+});
+
+describe('api.notifications.show', () => {
+  it('shows a system notification naming the plugin, with a tag scoped to it', async () => {
+    expect(await call(RSS, { title: '3 new posts', body: 'From Hacker News', tag: 'feed:hn' })).toBe('system');
+    const [n] = FakeNotification.shown;
+    expect(n.title).toBe('3 new posts');
+    expect(n.options.body).toBe('From Hacker News\nRSS Reader');
+    expect(n.options.tag).toBe('plugin:rss:feed:hn');
+    expect(toastInfo).not.toHaveBeenCalled();
+  });
+
+  it('falls back to a toast without notification permission', async () => {
+    FakeNotification.permission = 'default';
+    expect(await call(RSS, { title: 'Synced' })).toBe('toast');
+    expect(FakeNotification.shown).toHaveLength(0);
+    expect(toastInfo).toHaveBeenCalledWith('Synced', { message: 'RSS Reader' });
+  });
+
+  it('falls back to a toast when the browser refuses page notifications', async () => {
+    vi.stubGlobal('Notification', class extends FakeNotification {
+      constructor(title: string, options: NotificationOptions) {
+        super(title, options);
+        throw new TypeError('Illegal constructor');
+      }
+    });
+    expect(await call(RSS, { title: 'Synced', body: 'All feeds' })).toBe('toast');
+    expect(toastInfo).toHaveBeenCalledWith('Synced', { message: 'All feeds (RSS Reader)' });
+  });
+
+  it('tells only the sending plugin about a click', async () => {
+    const mine = vi.fn();
+    const theirs = vi.fn();
+    toastHooks.onNotificationClick.register('rss', mine);
+    toastHooks.onNotificationClick.register('other', theirs);
+    await call(RSS, { title: 'Hi', tag: 'x' });
+    FakeNotification.shown[0].onclick?.();
+    await Promise.resolve();
+    expect(mine).toHaveBeenCalledWith({ tag: 'x' });
+    expect(theirs).not.toHaveBeenCalled();
+    expect(FakeNotification.shown[0].close).toHaveBeenCalled();
+  });
+
+  it('allows five a minute per plugin', async () => {
+    for (let i = 0; i < 5; i++) await call(RSS, { title: `n${i}` });
+    await expect(call(RSS, { title: 'too many' })).rejects.toThrow(/at most 5 notifications a minute/);
+    expect(await call(plugin('other'), { title: 'mine' })).toBe('system');
+    expect(FakeNotification.shown).toHaveLength(6);
+  });
+
+  it('caps title and body, refuses odd tags and needs ui:notifications', async () => {
+    await expect(call(RSS, { title: 'x'.repeat(121) })).rejects.toThrow(/title must be 1-120 characters/);
+    await expect(call(RSS, { title: '' })).rejects.toThrow(/title must be 1-120/);
+    await expect(call(RSS, { title: 'ok', body: 'x'.repeat(301) })).rejects.toThrow(/body must be at most 300/);
+    await expect(call(RSS, { title: 'ok', tag: 'has space' })).rejects.toThrow(/tag must be/);
+    await expect(call(RSS, { title: 'ok', icon: 'https://evil.example/x.png' })).rejects.toThrow(/unknown property "icon"/);
+    await expect(call(plugin('rss', []), { title: 'ok' })).rejects.toThrow(/lacks permission "ui:notifications"/);
+    expect(FakeNotification.shown).toHaveLength(0);
+    expect(ALL_PERMISSIONS).toContain('ui:notifications');
+    expect(HIGH_RISK_PERMISSIONS.has('ui:notifications')).toBe(false);
+  });
+
+  it('keeps a notification to one line', async () => {
+    await call(RSS, { title: 'Line 1\nLine 2', body: 'a\r\nb' });
+    expect(FakeNotification.shown[0].title).toBe('Line 1 Line 2');
+    expect(FakeNotification.shown[0].options.body).toBe('a b\nRSS Reader');
+  });
+});
+
+describe('api.notifications.show in the notification panel', () => {
+  beforeEach(async () => {
+    const { useNotificationCenterStore } = await import('@/stores/notification-center-store');
+    useNotificationCenterStore.getState().clear();
+  });
+  const entries = async () => (await import('@/stores/notification-center-store')).useNotificationCenterStore.getState().entries;
+
+  it('lists each one with the plugin and its tag, shown as system notification or toast', async () => {
+    await call(RSS, { title: '3 new posts', body: 'From Hacker News', tag: 'feed:hn' });
+    FakeNotification.permission = 'default';
+    await call(RSS, { title: 'Synced' });
+
+    expect((await entries()).map((e) => [e.title, e.body, e.pluginId, e.pluginName, e.tag])).toEqual([
+      ['Synced', '', 'rss', 'RSS Reader', undefined],
+      ['3 new posts', 'From Hacker News', 'rss', 'RSS Reader', 'feed:hn'],
+    ]);
+  });
+
+  it('lists nothing the plugin was refused', async () => {
+    await expect(call(RSS, { title: 'ok', tag: 'has space' })).rejects.toThrow();
+    for (let i = 0; i < 5; i++) await call(RSS, { title: `n${i}` });
+    await expect(call(RSS, { title: 'too many' })).rejects.toThrow();
+    expect((await entries()).map((e) => e.title)).not.toContain('too many');
+    expect(await entries()).toHaveLength(5);
+  });
+});
+
+describe('api.notifications.show with a link', () => {
+  const PAPERLESS = { ...plugin('paperless', ['ui:notifications', 'http:proxy']), name: 'Paperless-ngx' };
+  const link = (url: string) => ({ title: 'project-notes is in Paperless now', action: { label: 'Open in Paperless', url } });
+  const entries = async () => (await import('@/stores/notification-center-store')).useNotificationCenterStore.getState().entries;
+
+  beforeEach(async () => {
+    FakeNotification.permission = 'default';
+    const { useNotificationCenterStore } = await import('@/stores/notification-center-store');
+    useNotificationCenterStore.getState().clear();
+  });
+
+  it('puts a button on the toast that opens the link in a new tab without a handle on the app', async () => {
+    overview.mockResolvedValue({ credentials: [], admin: [{ credentialId: 'shared', configured: true }], adminOrigins: ['https://paperless.example.com'] });
+    const open = vi.fn();
+    vi.stubGlobal('open', open);
+    expect(await call(PAPERLESS, link('https://paperless.example.com/documents/12/details'))).toBe('toast');
+    const options = toastInfo.mock.calls[0][1] as { action: { label: string; onClick: () => void } };
+    expect(options.action.label).toBe('Open in Paperless');
+    options.action.onClick();
+    expect(open).toHaveBeenCalledWith('https://paperless.example.com/documents/12/details', '_blank', 'noopener,noreferrer');
+    expect((await entries())[0].action).toEqual({ label: 'Open in Paperless', url: 'https://paperless.example.com/documents/12/details' });
+  });
+
+  it('accepts the server of a credential the user connected, and the manifest httpOrigins', async () => {
+    overview.mockResolvedValue({
+      credentials: [{ pluginId: 'paperless', credentialId: 'personal', label: 'P', origin: 'https://docs.alice.example', connected: true, updatedAt: '' }],
+      admin: [], adminOrigins: [],
+    });
+    await call(PAPERLESS, link('https://docs.alice.example/documents/?title__icontains=x'));
+    await call({ ...plugin('feeds'), httpOrigins: ['https://feeds.example.org'] }, link('https://feeds.example.org/item/1'));
+    expect((await entries()).map((e) => e.action?.url)).toEqual([
+      'https://feeds.example.org/item/1',
+      'https://docs.alice.example/documents/?title__icontains=x',
+    ]);
+  });
+
+  it('refuses a link to a server the plugin does not talk to, and shows nothing', async () => {
+    overview.mockResolvedValue({ credentials: [], admin: [], adminOrigins: ['https://paperless.example.com'] });
+    await expect(call(PAPERLESS, link('https://paperless.example.com.evil.example/login'))).rejects.toThrow(/action.url must be on a server the plugin talks to/);
+    await expect(call({ ...plugin('feeds'), httpOrigins: ['https://feeds.example.org'] }, link('https://phish.example/'))).rejects.toThrow(/action.url must be on a server/);
+    expect(toastInfo).not.toHaveBeenCalled();
+    expect(await entries()).toHaveLength(0);
+  });
+
+  it('refuses links that are not plain http(s)', async () => {
+    overview.mockResolvedValue({ credentials: [], admin: [], adminOrigins: ['https://paperless.example.com'] });
+    await expect(call(PAPERLESS, link('javascript:alert(1)'))).rejects.toThrow(/http or https/);
+    await expect(call(PAPERLESS, link('/documents/1'))).rejects.toThrow(/absolute URL/);
+    await expect(call(PAPERLESS, link('https://u:p@paperless.example.com/'))).rejects.toThrow(/user name or password/);
+    await expect(call(PAPERLESS, { title: 'x', action: { label: '', url: 'https://paperless.example.com/' } })).rejects.toThrow(/label/);
+    await expect(call(PAPERLESS, { title: 'x', action: { label: 'ok', url: 'https://paperless.example.com/', target: '_self' } })).rejects.toThrow(/unknown property "target"/);
+    expect(toastInfo).not.toHaveBeenCalled();
+  });
+});
diff --git a/lib/__tests__/plugin-host-settings-apis.test.ts b/lib/__tests__/plugin-host-settings-apis.test.ts
new file mode 100644
index 000000000..e244cf96c
--- /dev/null
+++ b/lib/__tests__/plugin-host-settings-apis.test.ts
@@ -0,0 +1,178 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { InstalledPlugin } from '../plugin-types';
+import type { IJMAPClient } from '../jmap/client-interface';
+import type { EmailTemplate } from '../template-types';
+import { useAuthStore } from '@/stores/auth-store';
+import { useTemplateStore } from '@/stores/template-store';
+import { useIdentityStore } from '@/stores/identity-store';
+import { useVacationStore } from '@/stores/vacation-store';
+import { HIGH_RISK_PERMISSIONS } from '../plugin-sandbox/permission-text';
+import { clearAllHooks, identityHooks } from '../plugin-hooks';
+
+vi.mock('@/stores/toast-store', () => ({
+  toast: { success: vi.fn(), error: vi.fn(), info: vi.fn(), warning: vi.fn() },
+}));
+
+import { dispatchApiCall } from '../plugin-sandbox/host-api';
+
+function plugin(perms: string[]): InstalledPlugin {
+  return {
+    id: 'helper', name: 'Helper', version: '1.0.0', author: 'test', description: '',
+    type: 'hook', permissions: perms, grantedPermissions: perms, entrypoint: 'index.js',
+    enabled: true, status: 'running', settings: {},
+  };
+}
+
+const ALL = plugin(['templates:read', 'templates:write', 'identity:write', 'vacation:read', 'vacation:write']);
+const READ_ONLY = plugin(['templates:read', 'identity:read', 'vacation:read']);
+const call = (p: InstalledPlugin, method: string, ...args: unknown[]) => dispatchApiCall(p, method, args);
+
+const greeting: EmailTemplate = {
+  id: 'tpl-1', name: 'Greeting', subject: 'Hello', body: 'Hi {{recipient_name}}', isHTML: false,
+  category: 'Sales', isFavorite: true, createdAt: '2026-01-01T00:00:00Z', updatedAt: '2026-01-01T00:00:00Z',
+};
+
+let client: Record<string, ReturnType<typeof vi.fn>>;
+
+beforeEach(() => {
+  client = {
+    updateIdentity: vi.fn(async () => undefined),
+    supportsVacationResponse: vi.fn(() => true),
+    supportsSieve: vi.fn(() => false),
+    getVacationResponse: vi.fn(async () => ({
+      id: 'singleton', isEnabled: true, fromDate: null, toDate: '2026-06-01T00:00:00Z',
+      subject: 'Away', textBody: 'Back in June', htmlBody: null,
+    })),
+    setVacationResponse: vi.fn(async () => undefined),
+  };
+  useAuthStore.setState({ client: client as unknown as IJMAPClient });
+  useTemplateStore.setState({ templates: [greeting], recentTemplateIds: [], deletedTemplateIds: {} });
+  useIdentityStore.setState({
+    identities: [{ id: 'id1', name: 'Ann', email: 'ann@example.com', replyTo: null, bcc: null, textSignature: '', htmlSignature: '', mayDelete: true }] as never,
+  });
+});
+
+afterEach(() => {
+  useAuthStore.setState({ client: null });
+  useTemplateStore.setState({ templates: [], deletedTemplateIds: {} });
+  useIdentityStore.setState({ identities: [] });
+  useVacationStore.getState().clearState();
+});
+
+describe('api.templates', () => {
+  it('lists and gets templates as views', async () => {
+    expect(await call(READ_ONLY, 'templates.list')).toEqual([
+      { id: 'tpl-1', name: 'Greeting', category: 'Sales', subject: 'Hello', body: 'Hi {{recipient_name}}', isHTML: false },
+    ]);
+    expect(await call(READ_ONLY, 'templates.get', 'tpl-1')).toEqual(expect.objectContaining({ name: 'Greeting' }));
+    expect(await call(READ_ONLY, 'templates.get', 'nope')).toBeNull();
+  });
+
+  it('needs templates:read and templates:write', async () => {
+    await expect(call(plugin([]), 'templates.list')).rejects.toThrow(/lacks permission "templates:read"/);
+    await expect(call(READ_ONLY, 'templates.create', { name: 'x' })).rejects.toThrow(/lacks permission "templates:write"/);
+    await expect(call(READ_ONLY, 'templates.delete', 'tpl-1')).rejects.toThrow(/lacks permission "templates:write"/);
+    expect(useTemplateStore.getState().templates).toHaveLength(1);
+  });
+
+  it('creates, updates and deletes through the store, sanitising HTML bodies', async () => {
+    const created = await call(ALL, 'templates.create', {
+      name: 'Rich', subject: 'S', body: '<p onclick="x()">Hi</p><script>alert(1)</script>', isHTML: true,
+    }) as { id: string; body: string };
+    expect(created.body).toContain('<p>Hi</p>');
+    expect(created.body).not.toMatch(/script|onclick/);
+    expect(useTemplateStore.getState().templates.map((t) => t.name)).toEqual(['Greeting', 'Rich']);
+
+    expect(await call(ALL, 'templates.update', 'tpl-1', { subject: 'Hi there' }))
+      .toEqual(expect.objectContaining({ id: 'tpl-1', subject: 'Hi there', body: 'Hi {{recipient_name}}' }));
+
+    await call(ALL, 'templates.delete', created.id);
+    expect(useTemplateStore.getState().templates.map((t) => t.id)).toEqual(['tpl-1']);
+    expect(useTemplateStore.getState().deletedTemplateIds).toHaveProperty(created.id);
+  });
+
+  it('refuses bad template input', async () => {
+    await expect(call(ALL, 'templates.create', { subject: 'no name' })).rejects.toThrow(/name is required/);
+    await expect(call(ALL, 'templates.create', { name: 'x', isFavorite: true })).rejects.toThrow(/unknown property "isFavorite"/);
+    await expect(call(ALL, 'templates.create', { name: 'x', body: 'a'.repeat(100_001) })).rejects.toThrow(/at most 100000/);
+    await expect(call(ALL, 'templates.update', 'nope', { name: 'x' })).rejects.toThrow(/no template with id "nope"/);
+    useTemplateStore.setState({ templates: Array.from({ length: 500 }, (_, i) => ({ ...greeting, id: `t${i}` })) });
+    await expect(call(ALL, 'templates.create', { name: 'one more' })).rejects.toThrow(/already 500 templates/);
+  });
+});
+
+describe('api.identities.update', () => {
+  it('changes name, reply-to and signatures and never the address', async () => {
+    const view = await call(ALL, 'identities.update', 'id1', {
+      name: 'Ann Smith',
+      replyTo: ['Desk <desk@example.com>'],
+      htmlSignature: '<b>Ann</b><img src=x onerror="steal()">',
+    });
+    const [id, updates] = client.updateIdentity.mock.calls[0];
+    expect(id).toBe('id1');
+    expect(updates).toEqual(expect.objectContaining({
+      name: 'Ann Smith', replyTo: [{ name: 'Desk', email: 'desk@example.com' }],
+    }));
+    expect(updates.htmlSignature).toContain('<b>Ann</b>');
+    expect(updates.htmlSignature).not.toContain('onerror');
+    expect(updates).not.toHaveProperty('email');
+    expect(view).toEqual(expect.objectContaining({ id: 'id1', name: 'Ann Smith', email: 'ann@example.com', replyTo: 'desk@example.com' }));
+    expect(useIdentityStore.getState().identities[0].name).toBe('Ann Smith');
+  });
+
+  it('refuses the address, bad addresses and unknown identities', async () => {
+    await expect(call(ALL, 'identities.update', 'id1', { email: 'evil@example.com' })).rejects.toThrow(/can't be changed/);
+    await expect(call(ALL, 'identities.update', 'id1', { replyTo: ['not an address'] })).rejects.toThrow(/not a valid address/);
+    await expect(call(ALL, 'identities.update', 'id1', { replyTo: ['a@example.com\r\nBcc: x@example.com'] })).rejects.toThrow(/not a valid address/);
+    await expect(call(ALL, 'identities.update', 'other', { name: 'x' })).rejects.toThrow(/no identity with id "other"/);
+    expect(client.updateIdentity).not.toHaveBeenCalled();
+  });
+
+  it('needs identity:write, which the consent dialog marks', async () => {
+    await expect(call(READ_ONLY, 'identities.update', 'id1', { name: 'x' })).rejects.toThrow(/lacks permission "identity:write"/);
+    expect(client.updateIdentity).not.toHaveBeenCalled();
+    expect(HIGH_RISK_PERMISSIONS.has('identity:write')).toBe(true);
+  });
+
+  it('lets another plugin stop the change, like one made in Settings', async () => {
+    identityHooks.onBeforeIdentityChange.register('guard', () => false);
+    try {
+      await expect(call(ALL, 'identities.update', 'id1', { name: 'x' })).resolves.toBeNull();
+      expect(client.updateIdentity).not.toHaveBeenCalled();
+    } finally {
+      clearAllHooks();
+    }
+  });
+});
+
+describe('api.vacation', () => {
+  it('reads the reply', async () => {
+    expect(await call(READ_ONLY, 'vacation.get')).toEqual({
+      isEnabled: true, subject: 'Away', textBody: 'Back in June', htmlBody: '', fromDate: null, toDate: '2026-06-01T00:00:00Z',
+    });
+  });
+
+  it('sets the reply through the store, sanitising HTML and deriving the text', async () => {
+    const saved = await call(ALL, 'vacation.set', {
+      isEnabled: true, subject: 'Out', htmlBody: '<p>Back <b>Monday</b></p><script>x()</script>',
+      fromDate: '2026-05-01T08:00:00+02:00', toDate: null,
+    });
+    const [updates] = client.setVacationResponse.mock.calls[0];
+    expect(updates).toEqual(expect.objectContaining({ isEnabled: true, subject: 'Out', fromDate: '2026-05-01T06:00:00.000Z', toDate: null }));
+    expect(updates.htmlBody).toContain('<b>Monday</b>');
+    expect(updates.htmlBody).not.toContain('script');
+    expect(updates.textBody).toMatch(/Back Monday/);
+    expect(saved).toEqual(expect.objectContaining({ isEnabled: true, subject: 'Out' }));
+    expect(useVacationStore.getState().subject).toBe('Out');
+  });
+
+  it('refuses bad input and needs vacation:write', async () => {
+    await expect(call(ALL, 'vacation.set', { subject: 'x' })).rejects.toThrow(/isEnabled must be true or false/);
+    await expect(call(ALL, 'vacation.set', { isEnabled: true, fromDate: 'next week' })).rejects.toThrow(/fromDate must be a date/);
+    await expect(call(ALL, 'vacation.set', { isEnabled: true, fromDate: '2026-06-01T00:00:00Z', toDate: '2026-05-01T00:00:00Z' }))
+      .rejects.toThrow(/toDate must be after fromDate/);
+    await expect(call(READ_ONLY, 'vacation.set', { isEnabled: false })).rejects.toThrow(/lacks permission "vacation:write"/);
+    expect(client.setVacationResponse).not.toHaveBeenCalled();
+    expect(HIGH_RISK_PERMISSIONS.has('vacation:write')).toBe(true);
+  });
+});
diff --git a/lib/__tests__/plugin-http-fetch.test.ts b/lib/__tests__/plugin-http-fetch.test.ts
new file mode 100644
index 000000000..55de6dbad
--- /dev/null
+++ b/lib/__tests__/plugin-http-fetch.test.ts
@@ -0,0 +1,75 @@
+import { afterEach, describe, it, expect, vi } from 'vitest';
+import type { InstalledPlugin } from '../plugin-types';
+
+vi.mock('@/stores/toast-store', () => ({
+  toast: { success: vi.fn(), error: vi.fn(), info: vi.fn(), warning: vi.fn() },
+}));
+
+import { dispatchApiCall, MAX_PLUGIN_FETCH_BYTES } from '../plugin-sandbox/host-api';
+
+function plugin(overrides: Partial<InstalledPlugin> = {}): InstalledPlugin {
+  return {
+    id: 'p1',
+    name: 'Test plugin',
+    version: '1.0.0',
+    author: 'test',
+    description: '',
+    type: 'hook',
+    permissions: ['http:fetch'],
+    grantedPermissions: ['http:fetch'],
+    httpOrigins: ['https://api.example.com'],
+    entrypoint: 'index.js',
+    enabled: true,
+    status: 'running',
+    settings: {},
+    ...overrides,
+  };
+}
+
+/** A fetch Response whose final URL is `url`, as after following redirects. */
+function responseAt(url: string, body: BodyInit = '{"ok":true}', init: ResponseInit = {}): Response {
+  const res = new Response(body, { status: 200, ...init });
+  Object.defineProperty(res, 'url', { value: url });
+  return res;
+}
+
+afterEach(() => {
+  vi.unstubAllGlobals();
+});
+
+describe('http.fetch', () => {
+  it('returns the response when it stays on an allowlisted origin', async () => {
+    vi.stubGlobal('fetch', vi.fn(async () => responseAt('https://api.example.com/v1/items')));
+
+    const result = await dispatchApiCall(plugin(), 'http.fetch', ['https://api.example.com/v1/items']) as { status: number; bodyText: string };
+
+    expect(result.status).toBe(200);
+    expect(result.bodyText).toBe('{"ok":true}');
+  });
+
+  it('refuses a response that a redirect moved off the allowlist', async () => {
+    // The request carries the webmail origin, so a server that trusts that
+    // origin in CORS would answer it; the plugin must not get to read it.
+    vi.stubGlobal('fetch', vi.fn(async () => responseAt('https://mail.example.org/jmap/session', '{"secret":1}')));
+
+    await expect(dispatchApiCall(plugin(), 'http.fetch', ['https://api.example.com/redirect']))
+      .rejects.toThrow(/redirected to https:\/\/mail\.example\.org/);
+  });
+
+  it('refuses a body larger than the cap', async () => {
+    const big = new Uint8Array(MAX_PLUGIN_FETCH_BYTES + 1);
+    vi.stubGlobal('fetch', vi.fn(async () => responseAt('https://api.example.com/big', big)));
+
+    await expect(dispatchApiCall(plugin(), 'http.fetch', ['https://api.example.com/big']))
+      .rejects.toThrow(/larger than/);
+  });
+
+  it('still refuses an origin that is not in the allowlist', async () => {
+    const fetchSpy = vi.fn();
+    vi.stubGlobal('fetch', fetchSpy);
+
+    await expect(dispatchApiCall(plugin(), 'http.fetch', ['https://evil.example/']))
+      .rejects.toThrow(/not in plugin httpOrigins/);
+    expect(fetchSpy).not.toHaveBeenCalled();
+  });
+});
diff --git a/lib/__tests__/plugin-i18n.test.ts b/lib/__tests__/plugin-i18n.test.ts
new file mode 100644
index 000000000..b1cc8a858
--- /dev/null
+++ b/lib/__tests__/plugin-i18n.test.ts
@@ -0,0 +1,41 @@
+import { describe, it, expect } from 'vitest';
+import { lookup, interpolate, localeChain, textDirection } from '../plugin-sandbox/plugin-i18n';
+
+const tables = {
+  en: { hello: 'Hello {name}', only_en: 'English only' },
+  de: { hello: 'Hallo {name}' },
+  'zh-TW': { hello: '你好 {name}' },
+};
+
+describe('plugin translations', () => {
+  it('falls back from a regional locale to its language', () => {
+    // de-CH used to skip straight to English.
+    expect(lookup(tables, 'de-CH', 'hello')).toBe('Hallo {name}');
+  });
+
+  it('matches locale names regardless of case', () => {
+    expect(lookup(tables, 'zh-tw', 'hello')).toBe('你好 {name}');
+  });
+
+  it('falls back to English, then reports a missing key', () => {
+    expect(lookup(tables, 'de', 'only_en')).toBe('English only');
+    expect(lookup(tables, 'de', 'missing')).toBeUndefined();
+  });
+
+  it('builds the chain most specific first', () => {
+    expect(localeChain('pt-BR')).toEqual(['pt-BR', 'pt', 'en']);
+  });
+
+  it('fills placeholders', () => {
+    expect(interpolate('Hallo {name}', { name: 'Ana' })).toBe('Hallo Ana');
+  });
+});
+
+describe('textDirection', () => {
+  it('is right-to-left for Arabic, Hebrew and Persian, with or without a region', () => {
+    expect(textDirection('ar')).toBe('rtl');
+    expect(textDirection('he-IL')).toBe('rtl');
+    expect(textDirection('fa')).toBe('rtl');
+    expect(textDirection('de-CH')).toBe('ltr');
+  });
+});
diff --git a/lib/__tests__/plugin-permission-coverage.test.ts b/lib/__tests__/plugin-permission-coverage.test.ts
new file mode 100644
index 000000000..71e78ad4f
--- /dev/null
+++ b/lib/__tests__/plugin-permission-coverage.test.ts
@@ -0,0 +1,85 @@
+import { readFileSync } from 'node:fs';
+import path from 'node:path';
+import { describe, expect, it, vi } from 'vitest';
+import { ALL_PERMISSIONS, IMPLICIT_PERMISSIONS } from '../plugin-types';
+import { HOOK_CATALOG } from '../plugin-hook-catalog';
+import { SLOT_CATALOG } from '../plugin-slot-catalog';
+
+vi.mock('@/stores/toast-store', () => ({
+  toast: { success: vi.fn(), error: vi.fn(), info: vi.fn(), warning: vi.fn() },
+}));
+
+import { PERM_PER_METHOD } from '../plugin-sandbox/host-api';
+
+const root = path.resolve(__dirname, '../..');
+
+/**
+ * Gates that live outside the three tables, each with the call that
+ * enforces it. The test reads the file, so a gate that is removed there
+ * no longer counts here.
+ */
+const OTHER_GATES: Record<string, { file: string; call: string }> = {
+  'ui:keyboard': { file: 'lib/plugin-sandbox/loader.ts', call: "pluginHasPermission(plugin, 'ui:keyboard')" },
+};
+
+/**
+ * Permissions in ALL_PERMISSIONS that nothing checks. A plugin could ask
+ * for one and the user would be asked to allow it, but it would grant
+ * nothing. None today; one added without a gate shows up here.
+ */
+const GATES_NOTHING: string[] = [];
+
+function gatedPermissions(): Map<string, string[]> {
+  const where = new Map<string, string[]>();
+  const add = (perm: string | null | undefined, by: string) => {
+    if (!perm) return;
+    where.set(perm, [...(where.get(perm) ?? []), by]);
+  };
+  for (const [method, perm] of Object.entries(PERM_PER_METHOD)) add(perm, `method ${method}`);
+  for (const [hook, spec] of Object.entries(HOOK_CATALOG)) add(spec.permission, `hook ${hook}`);
+  for (const [slot, spec] of Object.entries(SLOT_CATALOG)) {
+    for (const perm of spec.permissions) add(perm, `slot ${slot}`);
+    if (spec.props === '*') continue;
+    for (const [prop, perm] of Object.entries(spec.props)) add(perm, `slot prop ${slot}.${prop}`);
+  }
+  for (const perm of IMPLICIT_PERMISSIONS) add(perm, 'implicit');
+  for (const [perm, gate] of Object.entries(OTHER_GATES)) {
+    if (readFileSync(path.join(root, gate.file), 'utf8').includes(gate.call)) add(perm, gate.file);
+  }
+  return where;
+}
+
+describe('plugin permissions', () => {
+  it('every permission gates a method, hook or slot (or is a known gap)', () => {
+    const gated = gatedPermissions();
+    const ungated = ALL_PERMISSIONS.filter((perm) => !gated.has(perm));
+    expect(ungated).toEqual(GATES_NOTHING);
+  });
+
+  it('the tables only use permissions that exist', () => {
+    const known = new Set<string>(ALL_PERMISSIONS);
+    expect([...gatedPermissions().keys()].filter((perm) => !known.has(perm))).toEqual([]);
+  });
+
+  it('the new host APIs are behind the permissions they were given', () => {
+    expect(PERM_PER_METHOD).toMatchObject({
+      'calendar.getEvents': 'calendar:read',
+      'calendar.createEvent': 'calendar:write',
+      'tasks.list': 'tasks:read',
+      'tasks.setComplete': 'tasks:write',
+      'templates.list': 'templates:read',
+      'templates.create': 'templates:write',
+      'identities.update': 'identity:write',
+      'vacation.get': 'vacation:read',
+      'vacation.set': 'vacation:write',
+      'email.get': 'email:read',
+      'email.list': 'email:read',
+      'mailboxes.list': 'email:read',
+      'email.getAttachment': 'email:blob-read',
+      'email.getRaw': 'email:blob-read',
+      'compose.open': 'compose:open',
+      'drafts.create': 'email:write',
+      'notifications.show': 'ui:notifications',
+    });
+  });
+});
diff --git a/lib/__tests__/plugin-permission-text.test.ts b/lib/__tests__/plugin-permission-text.test.ts
new file mode 100644
index 000000000..64aa1ed4c
--- /dev/null
+++ b/lib/__tests__/plugin-permission-text.test.ts
@@ -0,0 +1,30 @@
+import { readdirSync, readFileSync } from 'node:fs';
+import path from 'node:path';
+import { describe, expect, it } from 'vitest';
+import { ALL_PERMISSIONS, IMPLICIT_PERMISSIONS } from '../plugin-types';
+import { permissionKey } from '../plugin-sandbox/permission-text';
+
+// Every permission a plugin can ask for is explained to the user in the
+// consent dialog and in Settings > Plugins, in their language.
+
+const LOCALES = path.resolve(__dirname, '../../locales');
+
+describe('permission texts', () => {
+  const implicit = new Set<string>(IMPLICIT_PERMISSIONS);
+  const shown = ALL_PERMISSIONS.filter((p) => !implicit.has(p));
+  const langs = readdirSync(LOCALES).filter((l) => !l.includes('.'));
+
+  it('covers all 27 locales', () => {
+    expect(langs).toHaveLength(27);
+  });
+
+  it.each(langs)('has a title and body for every permission in %s', (lang) => {
+    const strings = JSON.parse(readFileSync(path.join(LOCALES, lang, 'common.json'), 'utf8'));
+    const texts = strings.plugins?.permissions ?? {};
+    const missing = shown.filter((p) => {
+      const t = texts[permissionKey(p)];
+      return !t || typeof t.title !== 'string' || !t.title.trim() || typeof t.body !== 'string' || !t.body.trim();
+    });
+    expect(missing).toEqual([]);
+  });
+});
diff --git a/lib/__tests__/plugin-projection.test.ts b/lib/__tests__/plugin-projection.test.ts
new file mode 100644
index 000000000..29f6f7a2f
--- /dev/null
+++ b/lib/__tests__/plugin-projection.test.ts
@@ -0,0 +1,56 @@
+import { describe, it, expect } from 'vitest';
+import { contactToView, emailSummary, emailToReadView, eventToView, taskToView } from '../plugin-projection';
+import type { CalendarEvent, CalendarTask, ContactCard, Email } from '../jmap/types';
+
+describe('plugin projections', () => {
+  it('writes contact dates without a year as --MM-DD', () => {
+    const view = contactToView({
+      id: 'c1', addressBookIds: { ab: true },
+      name: { components: [{ kind: 'given', value: 'Ana' }, { kind: 'surname', value: 'Silva' }] },
+      anniversaries: {
+        a: { kind: 'birth', date: { '@type': 'PartialDate', month: 2, day: 29 } as never },
+        b: { kind: 'wedding', date: { '@type': 'PartialDate', year: 2010, month: 6, day: 5 } as never },
+      },
+    } as unknown as ContactCard);
+
+    expect(view.fullName).toBe('Ana Silva');
+    expect(view.anniversaries).toEqual([
+      { kind: 'birth', date: '--02-29' },
+      { kind: 'wedding', date: '2010-06-05' },
+    ]);
+  });
+
+  it('leaves the body out of an email summary', () => {
+    const summary = emailSummary({
+      id: 'm1', threadId: 't', mailboxIds: { inbox: true, old: false }, keywords: { $seen: true },
+      from: [{ email: 'a@x' }], to: [], subject: 'S', receivedAt: 'r', preview: 'p', hasAttachment: false, size: 9,
+      bodyValues: { 1: { value: 'secret body' } },
+    } as unknown as Email);
+
+    expect(summary.mailboxIds).toEqual(['inbox']);
+    expect(JSON.stringify(summary)).not.toContain('secret body');
+  });
+
+  it('marks recurring events and completed tasks', () => {
+    expect(eventToView({ id: 'e', uid: 'u', calendarIds: { c: true }, recurrenceRules: [{ frequency: 'yearly' }] } as unknown as CalendarEvent).isRecurring).toBe(true);
+    expect(taskToView({ id: 't', uid: 'u', calendarIds: {}, progress: 'completed' } as unknown as CalendarTask).isComplete).toBe(true);
+  });
+});
+
+describe('emailToReadView attachments', () => {
+  it('lists attachments with the blob id email.getAttachment takes, and marks inline images', () => {
+    const view = emailToReadView({
+      id: 'e1', threadId: 't1', mailboxIds: {}, keywords: {}, receivedAt: '2026-10-14T00:00:00Z', hasAttachment: true,
+      attachments: [
+        { partId: '2', blobId: 'b-pdf', name: 'invoice.pdf', type: 'application/pdf', size: 1234, disposition: 'attachment' },
+        { partId: '3', blobId: 'b-img', name: 'logo.png', type: 'image/png', size: 99, cid: 'logo@x' },
+        { partId: '4', name: 'broken' },
+      ],
+    } as never);
+
+    expect(view.attachments).toEqual([
+      { blobId: 'b-pdf', name: 'invoice.pdf', type: 'application/pdf', size: 1234, inline: false },
+      { blobId: 'b-img', name: 'logo.png', type: 'image/png', size: 99, inline: true },
+    ]);
+  });
+});
diff --git a/lib/__tests__/plugin-sandbox-loader.test.ts b/lib/__tests__/plugin-sandbox-loader.test.ts
index 9a2bd91cc..7875fd435 100644
--- a/lib/__tests__/plugin-sandbox-loader.test.ts
+++ b/lib/__tests__/plugin-sandbox-loader.test.ts
@@ -7,6 +7,8 @@ const mocks = vi.hoisted(() => ({
   saveCode: vi.fn(),
   downloadManagedBundle: vi.fn(),
   createBackgroundInstance: vi.fn(),
+  registerShortcuts: vi.fn((..._args: unknown[]) => () => {}),
+  setLocale: vi.fn(),
 }));
 
 vi.mock('../plugin-storage', () => ({
@@ -21,16 +23,17 @@ vi.mock('../plugin-sandbox/bundle-fetch', () => ({
 }));
 vi.mock('../plugin-sandbox/host-bridge', () => ({
   createBackgroundInstance: (...args: unknown[]) => mocks.createBackgroundInstance(...args),
+  forEachInstance: (_id: string | null, fn: (i: { setLocale: (l: string) => void }) => void) => fn({ setLocale: mocks.setLocale }),
   SandboxInstance: class {},
 }));
 vi.mock('../plugin-sandbox/host-api', () => ({
   cancelPluginDialogs: vi.fn(),
 }));
 vi.mock('../plugin-sandbox/shortcuts', () => ({
-  registerShortcuts: () => () => {},
+  registerShortcuts: (...args: unknown[]) => mocks.registerShortcuts(...args),
 }));
 
-import { loadSandboxedPlugin, unloadSandboxedPlugin, setSandboxStoreAccessor } from '../plugin-sandbox/loader';
+import { loadSandboxedPlugin, unloadSandboxedPlugin, setSandboxStoreAccessor, setSandboxLocale } from '../plugin-sandbox/loader';
 import { get as getActive } from '../plugin-sandbox/registry';
 
 const CODE = 'export default { activate() {} }';
@@ -104,7 +107,7 @@ describe('loadSandboxedPlugin bundle sourcing', () => {
     mocks.getCode.mockResolvedValue(null);
     mocks.downloadManagedBundle.mockResolvedValue(CODE);
     await loadSandboxedPlugin(plugin());
-    expect(mocks.downloadManagedBundle).toHaveBeenCalledWith('managed-plugin', HASH);
+    expect(mocks.downloadManagedBundle).toHaveBeenCalledWith('managed-plugin', HASH, { requireSignature: false });
     expect(mocks.saveCode).toHaveBeenCalledWith('managed-plugin', CODE);
     expect(lastStatus()).toMatchObject({ status: 'running' });
     expect(getActive('managed-plugin')?.code).toBe(CODE);
@@ -141,7 +144,7 @@ describe('loadSandboxedPlugin bundle sourcing', () => {
   it('accepts a managed bundle without a recorded hash (older records)', async () => {
     mocks.downloadManagedBundle.mockResolvedValue(CODE);
     await loadSandboxedPlugin(plugin({ bundleHash: undefined }));
-    expect(mocks.downloadManagedBundle).toHaveBeenCalledWith('managed-plugin', undefined);
+    expect(mocks.downloadManagedBundle).toHaveBeenCalledWith('managed-plugin', undefined, { requireSignature: false });
     expect(lastStatus()).toMatchObject({ status: 'running' });
   });
 
@@ -177,3 +180,76 @@ describe('loadSandboxedPlugin bundle sourcing', () => {
     expect(lastStatus()).toMatchObject({ status: 'error', error: expect.stringMatching(/integrity mismatch/) });
   });
 });
+
+describe('plugin shortcuts', () => {
+  const SHORTCUT = [{ id: 'new', keys: 'Alt+N', label: 'New' }];
+  function withShortcuts() {
+    return { ...fakeBackground(), initPromise: Promise.resolve({ hooks: [], slots: [], shortcuts: SHORTCUT }) };
+  }
+
+  it('does not install shortcuts for a plugin without ui:keyboard', async () => {
+    mocks.getCode.mockResolvedValue(CODE);
+    mocks.createBackgroundInstance.mockImplementation(withShortcuts);
+    mocks.registerShortcuts.mockClear();
+
+    await loadSandboxedPlugin(plugin());
+
+    expect(mocks.registerShortcuts).not.toHaveBeenCalled();
+  });
+
+  it('installs them with ui:keyboard', async () => {
+    mocks.getCode.mockResolvedValue(CODE);
+    mocks.createBackgroundInstance.mockImplementation(withShortcuts);
+    mocks.registerShortcuts.mockClear();
+
+    await loadSandboxedPlugin(plugin({ permissions: ['ui:keyboard'] }));
+
+    expect(mocks.registerShortcuts).toHaveBeenCalledWith(expect.anything(), SHORTCUT);
+  });
+});
+
+describe('setSandboxLocale', () => {
+  it('switches running plugins to the new language', () => {
+    // Running plugins used to keep the old language until a reload.
+    setSandboxLocale('en');
+    mocks.setLocale.mockClear();
+
+    setSandboxLocale('de');
+
+    expect(mocks.setLocale).toHaveBeenCalledWith('de');
+  });
+});
+
+describe('failing hooks', () => {
+  it('turns a plugin off on its third failure, not its second', async () => {
+    const { emailHooks, pluginErrorTracker } = await import('../plugin-hooks');
+    const { setupSandboxAutoDisable } = await import('../plugin-sandbox/loader');
+    const markAutoDisabled = vi.fn();
+    setSandboxStoreAccessor({ setPluginStatus: () => {}, markAutoDisabled });
+    setupSandboxAutoDisable();
+    pluginErrorTracker.reset('managed-plugin');
+    mocks.getCode.mockResolvedValue(CODE);
+    mocks.createBackgroundInstance.mockImplementation(() => ({
+      ...fakeBackground(),
+      initPromise: Promise.resolve({ hooks: ['onEmailOpen'], slots: [], shortcuts: [] }),
+      invokeHook: vi.fn(() => Promise.reject(new Error('boom'))),
+    }));
+    await loadSandboxedPlugin(plugin({ permissions: ['email:read'] }));
+
+    await emailHooks.onEmailOpen.emit({});
+    await emailHooks.onEmailOpen.emit({});
+    expect(markAutoDisabled).not.toHaveBeenCalled();
+    await emailHooks.onEmailOpen.emit({});
+    expect(markAutoDisabled).toHaveBeenCalledWith('managed-plugin');
+  });
+});
+
+describe('loading the same plugin twice', () => {
+  it('starts one background instance, also when the loads overlap', async () => {
+    mocks.getCode.mockResolvedValue(CODE);
+    await Promise.all([loadSandboxedPlugin(plugin()), loadSandboxedPlugin(plugin())]);
+    await loadSandboxedPlugin(plugin());
+
+    expect(mocks.createBackgroundInstance).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/lib/__tests__/plugin-sandbox-route-gate.test.ts b/lib/__tests__/plugin-sandbox-route-gate.test.ts
index ffd3bb318..4da191ba2 100644
--- a/lib/__tests__/plugin-sandbox-route-gate.test.ts
+++ b/lib/__tests__/plugin-sandbox-route-gate.test.ts
@@ -92,6 +92,39 @@ describe('plugin sandbox routes (GHSA-96cx-gx36-3g79)', () => {
     expect((await load(path)).status).toBe(403);
   });
 
+  // H-03: a plugin's network access must go through api.http.fetch, which
+  // checks the manifest's httpOrigins. If the iframe itself may reach any
+  // https origin, a plugin with only email:read can post every message it
+  // sees to its own server with fetch(), an <img>, a CSS url() or a font.
+  it.each(SANDBOX_ROUTES)('gives %s no direct network access beyond its own origin', async (path) => {
+    const response = await load(path, IFRAME_LOAD);
+    const directives: Record<string, string[]> = Object.fromEntries(
+      (response.headers.get('content-security-policy') ?? '')
+        .split(';')
+        .map((d) => d.trim().split(/\s+/))
+        .map(([name, ...sources]) => [name, sources]),
+    );
+
+    for (const name of ['connect-src', 'img-src', 'font-src', 'media-src', 'default-src']) {
+      const sources = directives[name] ?? [];
+      for (const wide of ['https:', 'http:', 'ws:', 'wss:', '*']) {
+        expect(sources, `${name} allows ${wide}`).not.toContain(wide);
+      }
+    }
+    // The router refetches the sandbox page itself, so its own origin stays.
+    expect(directives['connect-src']).toEqual(["'self'"]);
+    // Plugin frames may use forms (allow-forms) but not post them anywhere.
+    expect(directives['form-action']).toEqual(["'none'"]);
+  });
+
+  it('keeps https images and connections for the mail UI itself', async () => {
+    const response = await load('/en/mail', { 'sec-fetch-dest': 'document' });
+    const csp = response.headers.get('content-security-policy') ?? '';
+
+    expect(csp).toMatch(/img-src [^;]*https:/);
+    expect(csp).toMatch(/connect-src [^;]*https:/);
+  });
+
   it('leaves ordinary pages alone and never hands them the eval CSP', async () => {
     const response = await load('/en/calendar', { 'sec-fetch-dest': 'document', 'sec-fetch-site': 'none' });
 
diff --git a/lib/__tests__/plugin-secret-proxy.test.ts b/lib/__tests__/plugin-secret-proxy.test.ts
new file mode 100644
index 000000000..053a9eaf8
--- /dev/null
+++ b/lib/__tests__/plugin-secret-proxy.test.ts
@@ -0,0 +1,294 @@
+// @vitest-environment node
+import { describe, it, expect, beforeAll, afterAll, beforeEach, vi } from 'vitest';
+import http from 'node:http';
+import type { AddressInfo } from 'node:net';
+import { mkdtempSync, readFileSync, readdirSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+
+vi.mock('@/lib/admin/plugin-registry', () => ({ getPlugin: vi.fn(async () => null) }));
+vi.mock('@/lib/admin/plugin-config', () => ({ getPluginConfig: vi.fn(async () => ({})) }));
+const auditLines: Record<string, unknown>[] = [];
+vi.mock('@/lib/logger', () => ({
+  logger: {
+    info: (_msg: string, extra: Record<string, unknown>) => { auditLines.push(extra); },
+    warn: () => {}, error: () => {}, debug: () => {},
+  },
+}));
+
+import { getPlugin } from '@/lib/admin/plugin-registry';
+import { getPluginConfig } from '@/lib/admin/plugin-config';
+import { checkCredentials, authHeaderFor } from '../plugin-secrets/credentials';
+import {
+  deleteUserCredentials, getUserCredential, listUserCredentials, putUserCredential,
+} from '../plugin-secrets/vault';
+import { adminCredentialStatus, proxyRequest, ProxyError, PROXY_RATE_LIMIT, resetProxyLimits } from '../plugin-secrets/proxy';
+
+const USER = { username: 'alice@example.org', serverUrl: 'https://mail.example.org' };
+const OTHER = { username: 'bob@example.org', serverUrl: 'https://mail.example.org' };
+
+interface Seen { method: string; url: string; headers: http.IncomingHttpHeaders; body: string }
+let seen: Seen[] = [];
+let server: http.Server;
+let origin: string;
+let vaultDir: string;
+
+beforeAll(async () => {
+  process.env.SESSION_SECRET = 'test-secret-for-the-plugin-vault-0123456789';
+  vaultDir = mkdtempSync(path.join(tmpdir(), 'plugin-vault-'));
+  process.env.PLUGIN_SECRETS_DIR = vaultDir;
+  server = http.createServer((req, res) => {
+    const chunks: Buffer[] = [];
+    req.on('data', (c) => chunks.push(c));
+    req.on('end', () => {
+      seen.push({ method: req.method!, url: req.url!, headers: req.headers, body: Buffer.concat(chunks).toString() });
+      if (req.url === '/redirect-away') {
+        res.writeHead(302, { location: 'https://elsewhere.example/steal' });
+        return res.end();
+      }
+      if (req.url === '/.well-known/caldav') {
+        res.writeHead(307, { location: '/remote.php/dav/' });
+        return res.end();
+      }
+      if (req.url === '/login/poll') {
+        res.writeHead(200, { 'content-type': 'application/json' });
+        return res.end(JSON.stringify({ server: origin, loginName: 'alice', appPassword: 'app-pw-123' }));
+      }
+      res.writeHead(207, { 'content-type': 'application/xml', 'set-cookie': 'sid=upstream', dav: '1, 3', 'x-powered-by': 'php' });
+      res.end('<d:multistatus/>');
+    });
+  });
+  await new Promise<void>((r) => server.listen(0, '127.0.0.1', r));
+  origin = `http://127.0.0.1:${(server.address() as AddressInfo).port}`;
+  process.env.PLUGIN_PROXY_PRIVATE_ORIGINS = origin;
+});
+
+afterAll(() => {
+  server.close();
+  rmSync(vaultDir, { recursive: true, force: true });
+});
+
+beforeEach(async () => {
+  seen = [];
+  auditLines.length = 0;
+  resetProxyLimits();
+  await deleteUserCredentials(USER, 'nextcloud');
+  await deleteUserCredentials(OTHER, 'nextcloud');
+});
+
+async function connect(secret?: string) {
+  await putUserCredential(USER, 'nextcloud', 'cloud', {
+    origin, inject: { type: 'basic' }, label: 'Nextcloud', username: 'alice', ...(secret ? { secret } : {}),
+  });
+}
+
+function call(over: Partial<Parameters<typeof proxyRequest>[0]> = {}) {
+  return proxyRequest({
+    user: USER, pluginId: 'nextcloud', credentialId: 'cloud',
+    url: `${origin}/remote.php/dav/files/alice/`, method: 'PROPFIND',
+    headers: new Headers({ depth: '1', cookie: 'webmail-session=secret', 'content-type': 'application/xml' }),
+    body: null,
+    ...over,
+  });
+}
+
+describe('credential specs in the manifest', () => {
+  it('accepts a user credential and an admin one that points at a secret field', () => {
+    const { credentials, errors } = checkCredentials({
+      cloud: { label: 'Nextcloud', scope: 'user', inject: { type: 'basic' } },
+      ai: { label: 'OpenAI', scope: 'admin', inject: { type: 'bearer' }, secretKey: 'key', origin: 'https://api.openai.com' },
+    }, { key: { type: 'secret' } });
+
+    expect(errors).toEqual([]);
+    expect(credentials?.ai).toMatchObject({ scope: 'admin', secretKey: 'key', origin: 'https://api.openai.com' });
+  });
+
+  it('refuses an admin credential whose secret is a plain field, and headers the proxy owns', () => {
+    expect(checkCredentials({ ai: { label: 'AI', scope: 'admin', inject: { type: 'bearer' }, secretKey: 'key', origin: 'https://a.example' } },
+      { key: { type: 'string' } }).errors.join()).toMatch(/"secret" field/);
+    expect(checkCredentials({ x: { label: 'X', scope: 'user', inject: { type: 'header', name: 'Cookie' } } }, undefined).errors.join())
+      .toMatch(/inject is invalid/);
+  });
+
+  it('builds the auth header', () => {
+    expect(authHeaderFor({ type: 'basic' }, 'pw', 'alice')).toEqual(['authorization', `Basic ${Buffer.from('alice:pw').toString('base64')}`]);
+    expect(authHeaderFor({ type: 'header', name: 'x-api-key' }, 'k', undefined)).toEqual(['x-api-key', 'k']);
+    expect(authHeaderFor({ type: 'bearer' }, undefined, undefined)).toBeNull();
+  });
+});
+
+describe('vault', () => {
+  it('keeps secrets encrypted and out of the list', async () => {
+    await connect('app-pw');
+
+    expect((await getUserCredential(USER, 'nextcloud', 'cloud'))?.secret).toBe('app-pw');
+    const list = await listUserCredentials(USER);
+    expect(list).toEqual([expect.objectContaining({ pluginId: 'nextcloud', credentialId: 'cloud', origin, connected: true })]);
+    expect(JSON.stringify(list)).not.toContain('app-pw');
+    const files = readdirSync(vaultDir).map((f) => readFileSync(path.join(vaultDir, f), 'utf8'));
+    expect(files.join()).not.toContain('app-pw');
+  });
+
+  it('is per account', async () => {
+    await connect('app-pw');
+
+    expect(await getUserCredential(OTHER, 'nextcloud', 'cloud')).toBeNull();
+  });
+
+  it('drops the secret when the server address changes', async () => {
+    await connect('app-pw');
+    await putUserCredential(USER, 'nextcloud', 'cloud', { origin: 'https://evil.example', inject: { type: 'basic' }, label: 'Nextcloud' });
+
+    expect((await getUserCredential(USER, 'nextcloud', 'cloud'))?.secret).toBeUndefined();
+  });
+});
+
+describe('proxy', () => {
+  it('adds the secret, drops the browser cookie and filters what comes back', async () => {
+    await connect('app-pw');
+
+    const res = await call();
+
+    expect(res.status).toBe(207);
+    expect(await res.text()).toBe('<d:multistatus/>');
+    expect(seen[0].method).toBe('PROPFIND');
+    expect(seen[0].headers.authorization).toBe(`Basic ${Buffer.from('alice:app-pw').toString('base64')}`);
+    expect(seen[0].headers.cookie).toBeUndefined();
+    expect(seen[0].headers.depth).toBe('1');
+    expect(res.headers.get('set-cookie')).toBeNull();
+    expect(res.headers.get('x-powered-by')).toBeNull();
+    expect(res.headers.get('dav')).toBe('1, 3');
+  });
+
+  it('sends a request body with its length, not chunked', async () => {
+    await connect('app-pw');
+    const body = new Blob(['file contents']).stream();
+
+    const res = await call({ method: 'PUT', url: `${origin}/remote.php/dav/files/alice/a.txt`, body });
+    await res.text();
+
+    expect(seen[0].body).toBe('file contents');
+    // Django-based servers read a chunked multipart body as empty.
+    expect(seen[0].headers['content-length']).toBe('13');
+    expect(seen[0].headers['transfer-encoding']).toBeUndefined();
+  });
+
+  it('only sends a credential to its own server', async () => {
+    await connect('app-pw');
+
+    await expect(call({ url: 'https://elsewhere.example/x' })).rejects.toMatchObject({ code: 'wrong_origin', status: 403 });
+    expect(seen).toEqual([]);
+  });
+
+  it('refuses to follow a redirect to another server', async () => {
+    await connect('app-pw');
+
+    await expect(call({ method: 'GET', url: `${origin}/redirect-away` })).rejects.toMatchObject({ code: 'redirect_off_origin' });
+    expect(seen).toHaveLength(1);
+  });
+
+  it('follows a redirect on the same server with the body and says where it ended up', async () => {
+    await connect('app-pw');
+
+    const res = await call({ url: `${origin}/.well-known/caldav`, body: new Blob(['<propfind/>']).stream() });
+    await res.text();
+
+    expect(seen.map((r) => [r.method, r.url, r.body])).toEqual([
+      ['PROPFIND', '/.well-known/caldav', '<propfind/>'],
+      ['PROPFIND', '/remote.php/dav/', '<propfind/>'],
+    ]);
+    expect(res.headers.get('x-bulwark-url')).toBe(`${origin}/remote.php/dav/`);
+  });
+
+  it('refuses a WebDAV move to another server', async () => {
+    await connect('app-pw');
+
+    await expect(call({ method: 'MOVE', headers: new Headers({ destination: 'https://elsewhere.example/x' }) }))
+      .rejects.toMatchObject({ code: 'bad_destination' });
+    expect(seen).toEqual([]);
+  });
+
+  it('does not use a credential the user never connected', async () => {
+    await expect(call()).rejects.toBeInstanceOf(ProxyError);
+    await expect(call()).rejects.toMatchObject({ code: 'no_credential' });
+  });
+
+  it('stores a secret from a sign-in response and hides it from the plugin', async () => {
+    await connect();
+
+    const res = await call({ method: 'POST', url: `${origin}/login/poll`, capture: { secret: 'appPassword', username: 'loginName' } });
+    const body = await res.json();
+
+    expect(body).toEqual({ server: origin, captured: true });
+    const stored = await getUserCredential(USER, 'nextcloud', 'cloud');
+    expect(stored).toMatchObject({ secret: 'app-pw-123', username: 'alice' });
+  });
+
+  it('limits requests per minute', async () => {
+    await connect('app-pw');
+    // In batches below the concurrency cap, so only the per-minute limit applies.
+    for (let i = 0; i < PROXY_RATE_LIMIT; i += 6) {
+      const n = Math.min(6, PROXY_RATE_LIMIT - i);
+      await Promise.all(Array.from({ length: n }, async () => (await call()).text()));
+    }
+
+    await expect(call()).rejects.toMatchObject({ status: 429 });
+  }, 60_000);
+
+  it('writes an audit line without paths, headers or bodies', async () => {
+    await connect('app-pw');
+    await (await call()).text();
+    await new Promise((r) => setTimeout(r, 10));
+
+    expect(auditLines).toEqual([expect.objectContaining({ plugin: 'nextcloud', credential: 'cloud', method: 'PROPFIND', status: 207 })]);
+    expect(JSON.stringify(auditLines)).not.toMatch(/remote\.php|app-pw|alice@/);
+  });
+
+  it('uses an admin credential without a secret for a keyless service', async () => {
+    vi.mocked(getPlugin).mockResolvedValueOnce({
+      id: 'ai', enabled: true,
+      credentials: { local: { label: 'Ollama', scope: 'admin', inject: { type: 'none' }, secretKey: 'key', originKey: 'url' } },
+    } as never);
+    vi.mocked(getPluginConfig).mockResolvedValueOnce({ url: `${origin}/v1` });
+
+    const res = await call({ pluginId: 'ai', credentialId: 'local', method: 'POST', url: `${origin}/v1/chat` });
+    await res.text();
+
+    expect(seen[0].headers.authorization).toBeUndefined();
+  });
+
+  it('says which admin credentials are set up, without their secrets', async () => {
+    const plugin = {
+      id: 'ai', enabled: true,
+      credentials: {
+        llm: { label: 'LLM', scope: 'admin', inject: { type: 'bearer' }, secretKey: 'key', originKey: 'url' },
+        other: { label: 'Other', scope: 'admin', inject: { type: 'bearer' }, secretKey: 'otherKey', origin: 'https://o.example' },
+        own: { label: 'Own', scope: 'user', inject: { type: 'bearer' } },
+      },
+    };
+    vi.mocked(getPlugin).mockResolvedValue(plugin as never);
+    vi.mocked(getPluginConfig).mockResolvedValue({ key: 'sk-admin', url: `${origin}/v1` });
+    try {
+      const status = await adminCredentialStatus('ai');
+
+      expect(status).toEqual([{ credentialId: 'llm', configured: true }, { credentialId: 'other', configured: false }]);
+      expect(JSON.stringify(status)).not.toContain('sk-admin');
+    } finally {
+      vi.mocked(getPlugin).mockResolvedValue(null);
+      vi.mocked(getPluginConfig).mockResolvedValue({});
+    }
+  });
+
+  it('uses an admin credential for an installed plugin', async () => {
+    vi.mocked(getPlugin).mockResolvedValueOnce({
+      id: 'ai', enabled: true,
+      credentials: { llm: { label: 'LLM', scope: 'admin', inject: { type: 'bearer' }, secretKey: 'key', originKey: 'url' } },
+    } as never);
+    vi.mocked(getPluginConfig).mockResolvedValueOnce({ key: 'sk-admin', url: `${origin}/v1` });
+
+    const res = await call({ pluginId: 'ai', credentialId: 'llm', method: 'POST', url: `${origin}/v1/chat` });
+    await res.text();
+
+    expect(seen[0].headers.authorization).toBe('Bearer sk-admin');
+  });
+});
diff --git a/lib/__tests__/plugin-settings.test.ts b/lib/__tests__/plugin-settings.test.ts
new file mode 100644
index 000000000..347ad0bc9
--- /dev/null
+++ b/lib/__tests__/plugin-settings.test.ts
@@ -0,0 +1,30 @@
+import { describe, it, expect } from 'vitest';
+import { effectiveSettings } from '../plugin-settings';
+import type { SettingFieldSchema } from '../plugin-types';
+
+const schema: Record<string, SettingFieldSchema> = {
+  size: { type: 'number', label: 'Size', default: 160, min: 16, max: 512 },
+  mode: { type: 'select', label: 'Mode', default: 'auto', options: ['auto', 'manual'] },
+  on: { type: 'boolean', label: 'On', default: true },
+};
+
+describe('effectiveSettings', () => {
+  it('gives the plugin its defaults before the user saved anything', () => {
+    // Plugins used to get {} and had to repeat every default in code.
+    expect(effectiveSettings({ settings: {}, settingsSchema: schema })).toEqual({ size: 160, mode: 'auto', on: true });
+  });
+
+  it('keeps valid saved values', () => {
+    expect(effectiveSettings({ settings: { size: 64, mode: 'manual', on: false }, settingsSchema: schema }))
+      .toEqual({ size: 64, mode: 'manual', on: false });
+  });
+
+  it('replaces values the schema no longer accepts', () => {
+    const result = effectiveSettings({ settings: { size: 9999, mode: 'removed-option', on: 'yes', old: 1 }, settingsSchema: schema });
+    expect(result).toEqual({ size: 512, mode: 'auto', on: true });
+  });
+
+  it('passes settings through for a plugin without a schema', () => {
+    expect(effectiveSettings({ settings: { anything: 1 } })).toEqual({ anything: 1 });
+  });
+});
diff --git a/lib/__tests__/plugin-shortcuts.test.ts b/lib/__tests__/plugin-shortcuts.test.ts
new file mode 100644
index 000000000..3344609cb
--- /dev/null
+++ b/lib/__tests__/plugin-shortcuts.test.ts
@@ -0,0 +1,67 @@
+import { describe, it, expect, vi, afterEach } from 'vitest';
+import { registerShortcuts, isAllowedPluginCombo } from '../plugin-sandbox/shortcuts';
+import type { SandboxInstance } from '../plugin-sandbox/host-bridge';
+
+function instance(pluginId: string) {
+  return { pluginId, invokeHook: vi.fn(async () => undefined) } as unknown as SandboxInstance & { invokeHook: ReturnType<typeof vi.fn> };
+}
+
+const disposers: Array<() => void> = [];
+afterEach(() => {
+  while (disposers.length) disposers.pop()!();
+});
+
+function press(key: string, mods: Partial<Pick<KeyboardEvent, 'ctrlKey' | 'shiftKey' | 'altKey' | 'metaKey'>> = {}) {
+  const ev = new KeyboardEvent('keydown', { key, bubbles: true, cancelable: true, ...mods });
+  const outer = vi.fn();
+  document.body.addEventListener('keydown', outer);
+  document.body.dispatchEvent(ev);
+  document.body.removeEventListener('keydown', outer);
+  return { defaultPrevented: ev.defaultPrevented, reachedApp: outer.mock.calls.length > 0 };
+}
+
+describe('plugin keyboard shortcuts', () => {
+  it.each(['Escape', 'c', 'Shift+G', 'Ctrl+K', 'Ctrl+F', 'Ctrl+P', 'Cmd+W', 'Ctrl+Shift+T', 'Tab', 'Alt+Tab'])(
+    'refuses %s, which belongs to the app or the browser',
+    (combo) => {
+      expect(isAllowedPluginCombo(combo)).toBe(false);
+    },
+  );
+
+  it.each(['Alt+N', 'Alt+Shift+N', 'Ctrl+Shift+L', 'Ctrl+Alt+S', 'Cmd+Shift+Y'])('allows %s', (combo) => {
+    expect(isAllowedPluginCombo(combo)).toBe(true);
+  });
+
+  it('does not take Escape away from the app', async () => {
+    const plugin = instance('grabber');
+    disposers.push(registerShortcuts(plugin, [{ id: 'esc', keys: 'Escape', label: 'x' }]));
+
+    const result = press('Escape');
+
+    expect(plugin.invokeHook).not.toHaveBeenCalled();
+    expect(result.defaultPrevented).toBe(false);
+    expect(result.reachedApp).toBe(true);
+  });
+
+  it('runs an allowed shortcut without hiding the key from the rest of the app', async () => {
+    const plugin = instance('notes');
+    disposers.push(registerShortcuts(plugin, [{ id: 'new', keys: 'Alt+N', label: 'New note' }]));
+
+    const result = press('n', { altKey: true });
+
+    expect(plugin.invokeHook).toHaveBeenCalledWith('shortcut:new', []);
+    expect(result.reachedApp).toBe(true);
+  });
+
+  it('keeps the first plugin that claimed a combo', async () => {
+    const first = instance('first');
+    const second = instance('second');
+    disposers.push(registerShortcuts(first, [{ id: 'a', keys: 'Alt+J', label: 'a' }]));
+    disposers.push(registerShortcuts(second, [{ id: 'b', keys: 'Alt+J', label: 'b' }]));
+
+    press('j', { altKey: true });
+
+    expect(first.invokeHook).toHaveBeenCalled();
+    expect(second.invokeHook).not.toHaveBeenCalled();
+  });
+});
diff --git a/lib/__tests__/plugin-slot-catalog.test.ts b/lib/__tests__/plugin-slot-catalog.test.ts
new file mode 100644
index 000000000..acbcb9f7d
--- /dev/null
+++ b/lib/__tests__/plugin-slot-catalog.test.ts
@@ -0,0 +1,62 @@
+// @vitest-environment node
+import fs from 'node:fs';
+import path from 'node:path';
+import { describe, it, expect } from 'vitest';
+import { SLOT_CATALOG, type SlotArea } from '../plugin-slot-catalog';
+import { ALL_PERMISSIONS } from '../plugin-types';
+
+const root = path.resolve(__dirname, '../..');
+
+function sourceFiles(dir: string): string[] {
+  const out: string[] = [];
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    if (['node_modules', '.next', '__tests__'].includes(entry.name)) continue;
+    const full = path.join(dir, entry.name);
+    if (entry.isDirectory()) out.push(...sourceFiles(full));
+    else if (/\.tsx?$/.test(entry.name) && !/\.test\./.test(entry.name)) out.push(full);
+  }
+  return out;
+}
+
+const sources = ['app', 'components', 'hooks', 'lib'].flatMap((d) => sourceFiles(path.join(root, d)))
+  .map((f) => fs.readFileSync(f, 'utf8'))
+  .join('\n');
+
+/** A mount: `<PluginSlot name="x"`, `<PluginActions surface="x"`, or a slot passed as `slot="x"` / `slot: 'x'`. */
+function isMounted(name: string): boolean {
+  const n = name.replace(/[-]/g, '\\-');
+  return new RegExp(`(?:name|surface|slot)\\s*[=:]\\s*\\{?\\s*["'\`]${n}["'\`]`).test(sources)
+    // A fallback name: slot={(current.slot ?? 'plugin-dialog')}
+    || new RegExp(`slot\\s*\\?\\?\\s*["']${n}["']`).test(sources);
+}
+
+// Areas whose surfaces are still being mounted on this branch. Each commit
+// that finishes an area removes it here; the test then insists every
+// surface in it has a mount site.
+const NOT_YET_MOUNTED = new Set<SlotArea>([]);
+
+describe('slot catalogue', () => {
+  it('gates every surface behind permissions the host knows', () => {
+    const known = new Set<string>(ALL_PERMISSIONS);
+    const unknown: string[] = [];
+    for (const [name, spec] of Object.entries(SLOT_CATALOG)) {
+      for (const perm of spec.permissions) if (!known.has(perm)) unknown.push(`${name}: ${perm}`);
+      if (spec.props !== '*') {
+        for (const perm of Object.values(spec.props)) if (perm && !known.has(perm)) unknown.push(`${name} prop: ${perm}`);
+      }
+    }
+    expect(unknown).toEqual([]);
+  });
+
+  const areas = [...new Set(Object.values(SLOT_CATALOG).map((s) => s.area))];
+  it.each(areas)('mounts every %s surface somewhere in the app', (area) => {
+    const missing = Object.entries(SLOT_CATALOG)
+      .filter(([name, spec]) => spec.area === area && !isMounted(name))
+      .map(([name]) => name);
+    if (NOT_YET_MOUNTED.has(area)) {
+      expect(missing.length, `${area} is fully mounted; remove it from NOT_YET_MOUNTED`).toBeGreaterThan(0);
+    } else {
+      expect(missing).toEqual([]);
+    }
+  });
+});
diff --git a/lib/__tests__/plugin-slot-props.test.ts b/lib/__tests__/plugin-slot-props.test.ts
new file mode 100644
index 000000000..2e1ac4e02
--- /dev/null
+++ b/lib/__tests__/plugin-slot-props.test.ts
@@ -0,0 +1,63 @@
+import { describe, it, expect } from 'vitest';
+import type { InstalledPlugin, Permission } from '../plugin-types';
+import { slotPropsFor } from '../plugin-sandbox/permissions';
+
+function plugin(perms: Permission[]): InstalledPlugin {
+  return {
+    id: 'p1', name: 'P', version: '1.0.0', author: '', description: '', type: 'ui-extension',
+    permissions: perms, grantedPermissions: perms, entrypoint: 'index.js',
+    enabled: true, status: 'running', settings: {},
+  };
+}
+
+const EMAIL = { id: 'm1', subject: 'Salary review', text: 'confidential body' };
+
+describe('slot props follow read permissions', () => {
+  it('withholds the opened message from an email-banner plugin without email:read', () => {
+    // ui:email-banner only lets a plugin draw a banner. Handing it the body,
+    // headers and source would make it as good as email:read.
+    const props = slotPropsFor(plugin(['ui:email-banner']), 'email-banner', { email: EMAIL });
+
+    expect(props.email).toBeUndefined();
+  });
+
+  it('passes the message once the plugin also holds email:read', () => {
+    const props = slotPropsFor(plugin(['ui:email-banner', 'email:read']), 'email-banner', { email: EMAIL });
+
+    expect(props.email).toEqual(EMAIL);
+  });
+
+  it.each([
+    ['email-details-section', 'email', 'email:read'],
+    ['email-detail-sidebar', 'email', 'email:read'],
+    ['calendar-event-actions', 'eventData', 'calendar:read'],
+    ['contact-cryptokeys', 'cryptoKeys', 'contacts:read'],
+    ['app-top-banner', 'username', 'account:read'],
+    ['app-top-banner', 'serverUrl', 'account:read'],
+  ] as const)('%s.%s needs %s', (slot, key, perm) => {
+    const without = slotPropsFor(plugin([]), slot, { [key]: 'value' });
+    const withPerm = slotPropsFor(plugin([perm]), slot, { [key]: 'value' });
+
+    expect(without[key]).toBeUndefined();
+    expect(withPerm[key]).toBe('value');
+  });
+
+  it('drops props a slot does not declare', () => {
+    const props = slotPropsFor(plugin(['email:read']), 'email-footer', { email: EMAIL, extra: 1 });
+
+    expect(props).toEqual({});
+  });
+
+  it('keeps host callbacks that are part of the slot contract', () => {
+    const onAttach = () => {};
+    const props = slotPropsFor(plugin([]), 'composer-attachment-source', { onAttach });
+
+    expect(props.onAttach).toBe(onAttach);
+  });
+
+  it('passes a plugin dialog its own props unchanged', () => {
+    const props = slotPropsFor(plugin([]), 'plugin-dialog', { anything: { nested: true }, onResult: () => {} });
+
+    expect(Object.keys(props).sort()).toEqual(['anything', 'onResult']);
+  });
+});
diff --git a/lib/__tests__/plugin-store.test.ts b/lib/__tests__/plugin-store.test.ts
index d2376ea17..85cc01750 100644
--- a/lib/__tests__/plugin-store.test.ts
+++ b/lib/__tests__/plugin-store.test.ts
@@ -40,10 +40,15 @@ const mocks = vi.hoisted(() => ({
 vi.mock('@/lib/browser-navigation', () => ({
   apiFetch: (...args: unknown[]) => mocks.apiFetch(...args),
 }));
+const bridge = vi.hoisted(() => ({ setSettings: vi.fn() }));
+vi.mock('@/lib/plugin-sandbox/host-bridge', () => ({
+  forEachInstance: (_id: string, fn: (i: { setSettings: typeof bridge.setSettings }) => void) => fn({ setSettings: bridge.setSettings }),
+}));
 vi.mock('@/lib/plugin-sandbox/bundle-fetch', () => ({
   downloadManagedBundle: (...args: unknown[]) => mocks.downloadManagedBundle(...args),
 }));
 
+import { register as registerActive, deregister as deregisterActive, get as getActive } from '@/lib/plugin-sandbox/registry';
 // Import after mocks
 import { usePluginStore } from '@/stores/plugin-store';
 import { pluginStorage } from '@/lib/plugin-storage';
@@ -171,7 +176,7 @@ describe('usePluginStore', () => {
     it('installs a new server plugin and caches its bundle', async () => {
       await usePluginStore.getState().initializePlugins();
 
-      expect(mocks.downloadManagedBundle).toHaveBeenCalledWith('managed-plugin', 'hash-v1');
+      expect(mocks.downloadManagedBundle).toHaveBeenCalledWith('managed-plugin', 'hash-v1', { requireSignature: false });
       expect(pluginStorage.saveCode).toHaveBeenCalledWith('managed-plugin', 'bundle-code');
       const p = usePluginStore.getState().plugins.find(x => x.id === 'managed-plugin');
       expect(p).toMatchObject({ managed: true, enabled: true, bundleHash: 'hash-v1' });
@@ -183,7 +188,7 @@ describe('usePluginStore', () => {
 
       await usePluginStore.getState().initializePlugins();
 
-      expect(mocks.downloadManagedBundle).toHaveBeenCalledWith('managed-plugin', 'hash-v1');
+      expect(mocks.downloadManagedBundle).toHaveBeenCalledWith('managed-plugin', 'hash-v1', { requireSignature: false });
       expect(pluginStorage.saveCode).toHaveBeenCalledWith('managed-plugin', 'bundle-code');
       expect(usePluginStore.getState().plugins).toHaveLength(1);
     });
@@ -204,7 +209,7 @@ describe('usePluginStore', () => {
 
       await usePluginStore.getState().initializePlugins();
 
-      expect(mocks.downloadManagedBundle).toHaveBeenCalledWith('managed-plugin', 'hash-v1');
+      expect(mocks.downloadManagedBundle).toHaveBeenCalledWith('managed-plugin', 'hash-v1', { requireSignature: false });
       expect(usePluginStore.getState().plugins[0].bundleHash).toBe('hash-v1');
     });
 
@@ -221,3 +226,167 @@ describe('usePluginStore', () => {
     });
   });
 });
+
+describe('installPlugin', () => {
+  beforeEach(() => {
+    resetStore();
+  });
+
+  it('keeps the translations a plugin ships', async () => {
+    const { extractPlugin } = await import('@/lib/plugin-validator');
+    vi.mocked(extractPlugin).mockResolvedValueOnce({
+      valid: true, errors: [], warnings: [], preview: null, code: 'module.exports = {}',
+      manifest: {
+        id: 'translated', name: 'T', version: '1.0.0', author: 'a', description: '', type: 'hook',
+        permissions: [], entrypoint: 'index.js', locales: { de: { hello: 'Hallo' } },
+      },
+    });
+
+    const result = await usePluginStore.getState().installPlugin(new File(['x'], 'p.zip'));
+
+    expect(result.success).toBe(true);
+    expect(usePluginStore.getState().plugins[0].locales).toEqual({ de: { hello: 'Hallo' } });
+  });
+});
+
+describe('plugins the user installs', () => {
+  const MANIFEST = {
+    id: 'mine', name: 'Mine', version: '1.0.0', author: 'a', description: '', type: 'hook' as const,
+    permissions: [], entrypoint: 'index.js',
+  };
+
+  async function setFeatures(features: Record<string, boolean>) {
+    const { usePolicyStore } = await import('@/stores/policy-store');
+    const { DEFAULT_POLICY } = await import('@/lib/admin/types');
+    usePolicyStore.setState({ policy: { ...DEFAULT_POLICY, features: { ...DEFAULT_POLICY.features, ...features } } });
+  }
+
+  async function mockExtract() {
+    const { extractPlugin } = await import('@/lib/plugin-validator');
+    vi.mocked(extractPlugin).mockResolvedValue({
+      valid: true, errors: [], warnings: [], preview: null, code: 'module.exports = {}', manifest: MANIFEST,
+    });
+  }
+
+  beforeEach(() => {
+    resetStore();
+    localStorage.removeItem('server-managed-plugin-ids');
+    mocks.apiFetch.mockReset();
+  });
+
+  it('refuses an install when the admin turned uploads off', async () => {
+    await setFeatures({ pluginsUploadEnabled: false });
+    await mockExtract();
+
+    const result = await usePluginStore.getState().installPlugin(new File(['x'], 'p.zip'));
+
+    expect(result).toMatchObject({ success: false, reason: 'uploads-disabled' });
+    expect(usePluginStore.getState().plugins).toHaveLength(0);
+  });
+
+  it('refuses a package that reuses the id of an admin plugin', async () => {
+    await setFeatures({ pluginsUploadEnabled: true, requirePluginApproval: false });
+    await mockExtract();
+    usePluginStore.setState({ plugins: [mockPlugin({ id: 'mine', managed: true })] });
+
+    const result = await usePluginStore.getState().installPlugin(new File(['x'], 'p.zip'));
+
+    expect(result).toMatchObject({ success: false, reason: 'managed-id' });
+    expect(usePluginStore.getState().plugins[0].managed).toBe(true);
+  });
+
+  it('sends the package for approval and keeps it off until approved', async () => {
+    await setFeatures({ pluginsUploadEnabled: true, requirePluginApproval: true });
+    await mockExtract();
+    mocks.apiFetch.mockImplementation(async (url: string, init?: RequestInit) => {
+      if (init?.method === 'POST') return new Response(JSON.stringify({ status: 'pending' }));
+      return new Response(JSON.stringify({ status: 'pending' }));
+    });
+
+    const result = await usePluginStore.getState().installPlugin(new File(['x'], 'p.zip'));
+    await usePluginStore.getState().enablePlugin('mine');
+
+    expect(result.approvalStatus).toBe('pending');
+    const posted = mocks.apiFetch.mock.calls.find(([, init]) => (init as RequestInit | undefined)?.method === 'POST');
+    expect((posted?.[1] as RequestInit).body).toBeInstanceOf(FormData);
+    const plugin = usePluginStore.getState().plugins[0];
+    expect(plugin.enabled).toBe(false);
+    expect(plugin.error).toBe('approval-pending');
+  });
+
+  it('turns an approved package on', async () => {
+    await setFeatures({ pluginsUploadEnabled: true, requirePluginApproval: true });
+    await mockExtract();
+    mocks.apiFetch.mockImplementation(async () => new Response(JSON.stringify({ status: 'approved' })));
+
+    await usePluginStore.getState().installPlugin(new File(['x'], 'p.zip'));
+    await usePluginStore.getState().enablePlugin('mine');
+
+    expect(usePluginStore.getState().plugins[0].enabled).toBe(true);
+  });
+
+  it('does not load a user plugin whose approval was revoked', async () => {
+    await setFeatures({ pluginsUploadEnabled: true, requirePluginApproval: true });
+    const { loadPlugin } = await import('@/lib/plugin-loader');
+    vi.mocked(loadPlugin).mockClear();
+    usePluginStore.setState({ plugins: [mockPlugin({ id: 'mine', enabled: true, status: 'enabled', managed: false, approvalHash: 'a'.repeat(64) })] });
+    mocks.apiFetch.mockImplementation(async (url: string) =>
+      url.startsWith('/api/plugins') ? new Response(JSON.stringify({ plugins: [], themes: [] })) : new Response(JSON.stringify({ status: 'denied' })));
+
+    await usePluginStore.getState().initializePlugins();
+
+    expect(loadPlugin).not.toHaveBeenCalled();
+    expect(usePluginStore.getState().plugins[0].error).toBe('approval-denied');
+  });
+});
+
+describe('updatePluginSettings', () => {
+  it('sends the new settings to the running plugin right away', () => {
+    // Settings used to reach a plugin only after a reload.
+    resetStore();
+    bridge.setSettings.mockClear();
+    usePluginStore.setState({ plugins: [mockPlugin({
+      id: 'p', settings: {},
+      settingsSchema: { size: { type: 'number', label: 'Size', default: 160, min: 16, max: 512 } },
+    })] });
+
+    usePluginStore.getState().updatePluginSettings('p', { size: 9000 });
+
+    expect(usePluginStore.getState().plugins[0].settings.size).toBe(512);
+    expect(bridge.setSettings).toHaveBeenCalledWith({ size: 512 });
+  });
+
+  it('passes on settings that arrive another way, and new slots start with them', () => {
+    resetStore();
+    bridge.setSettings.mockClear();
+    const plugin = mockPlugin({ id: 'synced', settings: { zone: 'Europe/Berlin' } });
+    usePluginStore.setState({ plugins: [plugin] });
+    registerActive({ plugin, code: '', tier: 'untrusted', background: {}, slotOffers: [], hookDisposables: [] } as never);
+    try {
+      // A server sync replaces the plugin list without updatePluginSettings.
+      usePluginStore.setState({ plugins: [{ ...plugin, settings: { zone: 'Asia/Tokyo' } }] });
+
+      expect(bridge.setSettings).toHaveBeenCalledWith(expect.objectContaining({ zone: 'Asia/Tokyo' }));
+      expect(getActive('synced')?.plugin.settings).toEqual({ zone: 'Asia/Tokyo' });
+    } finally {
+      deregisterActive('synced');
+    }
+  });
+});
+
+describe('plugins the admin removed', () => {
+  it('lose what they stored, like an uninstalled plugin', async () => {
+    // Their data used to survive and come back when the admin re-added them.
+    resetStore();
+    localStorage.setItem('server-managed-plugin-ids', JSON.stringify(['gone']));
+    localStorage.setItem('plugin:gone:@acct:notes', '"secret"');
+    usePluginStore.setState({ plugins: [mockPlugin({ id: 'gone', managed: true })] });
+    mocks.apiFetch.mockImplementation(async () => new Response(JSON.stringify({ plugins: [], themes: [] })));
+
+    await usePluginStore.getState().initializePlugins();
+
+    expect(usePluginStore.getState().plugins.some((p) => p.id === 'gone')).toBe(false);
+    expect(localStorage.getItem('plugin:gone:@acct:notes')).toBeNull();
+    expect(pluginStorage.deletePreview).toHaveBeenCalledWith('gone');
+  });
+});
diff --git a/lib/__tests__/plugin-thread-expand.test.ts b/lib/__tests__/plugin-thread-expand.test.ts
new file mode 100644
index 000000000..109df770e
--- /dev/null
+++ b/lib/__tests__/plugin-thread-expand.test.ts
@@ -0,0 +1,22 @@
+// @vitest-environment node
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { emailHooks, clearAllHooks } from '../plugin-hooks';
+import { emitThreadExpand } from '../plugin-thread-expand';
+
+beforeEach(() => clearAllHooks());
+
+describe('emitThreadExpand', () => {
+  it('reports the thread id and its messages', () => {
+    const handler = vi.fn();
+    emailHooks.onThreadExpand.register('test', handler);
+    emitThreadExpand('acct/x:T1', [{ id: 'a', threadId: 'T1' }, { id: 'b', threadId: 'T1' }], true);
+    expect(handler).toHaveBeenCalledWith({ threadId: 'T1', emailIds: ['a', 'b'], expanded: true });
+  });
+
+  it('falls back to the id inside an account-scoped thread key', () => {
+    const handler = vi.fn();
+    emailHooks.onThreadExpand.register('test', handler);
+    emitThreadExpand('acct/x:T1', [], false);
+    expect(handler).toHaveBeenCalledWith({ threadId: 'T1', emailIds: [], expanded: false });
+  });
+});
diff --git a/lib/__tests__/plugin-ui-kit.test.tsx b/lib/__tests__/plugin-ui-kit.test.tsx
new file mode 100644
index 000000000..7b9d44a49
--- /dev/null
+++ b/lib/__tests__/plugin-ui-kit.test.tsx
@@ -0,0 +1,239 @@
+import React from 'react';
+import { readFileSync } from 'node:fs';
+import path from 'node:path';
+import { act, fireEvent, render, screen } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
+
+// The plugin UI kit (`@plugin-host/ui`): the app's controls for plugin
+// iframes. These tests hold it to the app's components, so a restyle of the
+// app shows up as a failing test here instead of plugins drifting off.
+
+vi.mock('next-intl', () => ({
+  useTranslations: () => (key: string, params?: Record<string, unknown>) =>
+    params ? `${key}(${Object.values(params).join(',')})` : key,
+}));
+
+const kit = await import('../plugin-sandbox/ui-kit');
+const { Button: AppButton } = await import('@/components/ui/button');
+const { Input: AppInput } = await import('@/components/ui/input');
+
+const ROOT = path.resolve(__dirname, '../..');
+const source = (file: string) => readFileSync(path.join(ROOT, file), 'utf8');
+const classesOf = (el: Element) => el.getAttribute('class')!.split(/\s+/).filter((c) => c !== 'bk').sort();
+
+describe('plugin UI kit components', () => {
+  it('renders the app\'s own Button and Input', () => {
+    render(<>
+      <kit.Button variant="secondary" size="sm">Cancel</kit.Button>
+      <AppButton variant="outline" size="sm" className="gap-1.5">Cancel app</AppButton>
+      <kit.Input placeholder="kit" />
+      <AppInput placeholder="app" />
+    </>);
+    expect(classesOf(screen.getByText('Cancel'))).toEqual(classesOf(screen.getByText('Cancel app')));
+    expect(classesOf(screen.getByPlaceholderText('kit'))).toEqual(classesOf(screen.getByPlaceholderText('app')));
+  });
+
+  it('maps primary, secondary, ghost and destructive onto the app\'s variants', () => {
+    render(<>
+      <kit.Button>Primary</kit.Button>
+      <kit.Button variant="ghost">Ghost</kit.Button>
+      <kit.Button variant="destructive">Delete</kit.Button>
+    </>);
+    expect(screen.getByText('Primary').className).toContain('bg-primary');
+    expect(screen.getByText('Ghost').className).toContain('hover:bg-accent');
+    expect(screen.getByText('Delete').className).toContain('bg-destructive');
+  });
+
+  it('copies its classes from the app components it stands for', () => {
+    // Each kit component that can't reuse an app component copies one; the
+    // copy must still be there, word for word.
+    const copies: [string, string][] = [
+      ['components/settings/settings-section.tsx', 'px-3 py-1.5 text-sm rounded-md bg-muted border border-border text-foreground focus:outline-none focus:ring-2 focus:ring-ring transition-colors duration-150'],
+      ['components/settings/settings-section.tsx', 'relative inline-flex h-6 w-11 items-center rounded-full transition-colors duration-150'],
+      ['components/settings/settings-section.tsx', 'inline-block h-4 w-4 transform rounded-full bg-background transition-transform duration-150'],
+      ['components/settings/settings-section.tsx', 'flex flex-col gap-2 sm:flex-row sm:items-start sm:justify-between sm:gap-4 py-3 border-b border-border last:border-0'],
+      ['components/settings/settings-section.tsx', 'px-3 py-1.5 text-xs rounded-md transition-colors duration-150'],
+      ['components/email/composer-toolbar-menu.tsx', 'mt-0.5 flex h-4 w-4 shrink-0 items-center justify-center rounded-sm border'],
+      ['components/calendar/ical-import-modal.tsx', 'flex items-center gap-1.5 px-4 py-2 text-sm font-medium border-b-2 transition-colors'],
+      ['components/files/file-empty-state.tsx', 'w-14 h-14 rounded-full bg-muted flex items-center justify-center mb-4'],
+      ['components/files/file-views.tsx', 'border-b border-border/60'],
+      ['components/files/files-header.tsx', 'px-1.5 py-1 rounded-md transition-colors truncate max-w-[16rem]'],
+      ['components/email/email-viewer.tsx', 'w-10 h-10 rounded-full'],
+      ['components/email/email-viewer.tsx', 'text-[10px] font-semibold uppercase tracking-wider text-muted-foreground'],
+      ['components/email/email-viewer.tsx', 'inline-flex items-center gap-1.5 text-sm text-muted-foreground hover:text-foreground px-3 py-1.5 rounded-md border border-border hover:bg-muted transition-colors min-h-[36px]'],
+      ['components/identity/identity-form.tsx', 'flex w-full rounded-md border border-input bg-background px-3 py-2 text-sm text-foreground transition-all duration-200'],
+    ];
+    const kitSource = source('lib/plugin-sandbox/ui-kit/components.tsx');
+    for (const [file, classes] of copies) {
+      expect(source(file), file).toContain(classes);
+      for (const word of classes.split(' ')) expect(kitSource, `${word} (from ${file})`).toContain(word);
+    }
+  });
+
+  it('puts bk on each root, which scopes the reset to kit elements', () => {
+    const { container } = render(<>
+      <kit.Select options={[{ value: 'a', label: 'A' }]} value="a" />
+      <kit.Checkbox checked label="Remember" />
+      <kit.EmptyState icon="cloud" title="Nothing yet" />
+      <kit.ListRow title="report.pdf" icon="report.pdf" meta={['1 MB']} />
+      <kit.Badge tone="success">Sent</kit.Badge>
+      <kit.DiffView parts={[{ type: 'same', text: 'Hi' }]} />
+    </>);
+    for (const child of Array.from(container.children)) expect(child.classList.contains('bk'), child.outerHTML.slice(0, 60)).toBe(true);
+  });
+
+  it('marks removed and added words in a change preview', () => {
+    const { container } = render(<kit.DiffView parts={[{ type: 'same', text: 'Hi ' }, { type: 'del', text: 'Bob' }, { type: 'add', text: 'Robert' }]} />);
+    expect(container.querySelector('del')).toHaveTextContent('Bob');
+    expect(container.querySelector('del')!.className).toContain('line-through');
+    expect(container.querySelector('ins')).toHaveTextContent('Robert');
+    expect(container.textContent).toBe('Hi BobRobert');
+  });
+
+  it('takes only #rgb and #rrggbb colours for a colour dot', () => {
+    const { container } = render(<>
+      <kit.ColorDot color="#3b82f6" label="Work" />
+      <kit.ColorDot color="red; background-image: url(https://evil.example/x)" />
+      <kit.ColorDot color="url(https://evil.example/x)" />
+    </>);
+    const dots = container.querySelectorAll('span');
+    expect((dots[0] as HTMLElement).style.backgroundColor).toBe('rgb(59, 130, 246)');
+    expect(dots[0]).toHaveAttribute('aria-label', 'Work');
+    expect((dots[1] as HTMLElement).getAttribute('style')).toBeNull();
+    expect(dots[1].className).toContain('bg-muted-foreground');
+    expect((dots[2] as HTMLElement).getAttribute('style')).toBeNull();
+  });
+
+  it('names the select box of a list row and a checkbox without a visible label', () => {
+    render(<>
+      <kit.ListRow title="report.pdf" checked={false} onCheck={() => {}} />
+      <kit.ListRow title="x" checkLabel="Select invoice" checked onCheck={() => {}} />
+      <kit.Checkbox checked={false} ariaLabel="Use for all" />
+    </>);
+    expect(screen.getByRole('checkbox', { name: 'report.pdf' })).toBeTruthy();
+    expect(screen.getByRole('checkbox', { name: 'Select invoice' })).toBeTruthy();
+    expect(screen.getByRole('checkbox', { name: 'Use for all' })).toBeTruthy();
+  });
+
+  it('lets fields share a row and shows details as label and value', () => {
+    const { container } = render(<>
+      <kit.Row fill><kit.Field label="Due"><kit.Input /></kit.Field><kit.Field label="Priority"><kit.Input /></kit.Field></kit.Row>
+      <kit.DetailList><kit.DetailRow label="Size">2 MB</kit.DetailRow></kit.DetailList>
+    </>);
+    expect(container.firstElementChild!.className).toContain('[&>*]:flex-1');
+    expect(container.querySelector('dt')).toHaveTextContent('Size');
+    expect(container.querySelector('dd')).toHaveTextContent('2 MB');
+  });
+
+  it('draws a checkbox the user can toggle by its label', () => {
+    const onChange = vi.fn();
+    render(<kit.Checkbox checked={false} onChange={onChange} label="Send as link" hint="For files over 10 MB" />);
+    fireEvent.click(screen.getByText('Send as link'));
+    expect(onChange).toHaveBeenCalledWith(true);
+    expect(screen.getByRole('checkbox', { name: 'Send as link' })).toHaveAttribute('aria-checked', 'false');
+  });
+
+  it('gives a Field\'s control the label', () => {
+    render(<kit.Field label="Title" hint="Shown in Paperless"><kit.Input /></kit.Field>);
+    expect(screen.getByLabelText('Title')).toBeInstanceOf(HTMLInputElement);
+    expect(screen.getByText('Shown in Paperless')).toBeTruthy();
+  });
+
+  it('is what the sandbox hands a plugin for require("@plugin-host/ui")', async () => {
+    const { makePluginRequire } = await import('../plugin-sandbox/runtime');
+    const req = makePluginRequire(null);
+    expect(req('@plugin-host/ui')).toBe(kit.pluginUiKit);
+    expect(kit.KIT_EXPORTS).toEqual(expect.arrayContaining(['Button', 'Input', 'Select', 'Checkbox', 'Field', 'Tabs', 'List', 'ListRow', 'Badge', 'EmptyState', 'PageHeader', 'Spinner', 'DialogButtons', 'InfoBar', 'Chip']));
+    expect(() => req('left-pad')).toThrow(/not available/);
+  });
+});
+
+describe('DialogButtons', () => {
+  it('hands its buttons to the host and runs onClick when the host reports a click', () => {
+    const setDialogButtons = vi.fn();
+    const onClick = vi.fn();
+    const ui = (n: number) => (
+      <kit.SlotPropsContext.Provider value={{ setDialogButtons, dialogButtonClick: { id: 'send', n } }}>
+        <kit.DialogButtons buttons={[{ id: 'cancel', label: 'Cancel', variant: 'secondary' }, { id: 'send', label: 'Send', busy: true }]} onClick={onClick} />
+      </kit.SlotPropsContext.Provider>
+    );
+    const { container, rerender } = render(ui(0));
+    expect(container.innerHTML).toBe('');
+    expect(setDialogButtons).toHaveBeenLastCalledWith([{ id: 'cancel', label: 'Cancel', variant: 'secondary' }, { id: 'send', label: 'Send', busy: true }]);
+    expect(onClick).not.toHaveBeenCalled();
+    rerender(ui(1));
+    expect(onClick).toHaveBeenCalledWith('send');
+    rerender(ui(1));
+    expect(onClick).toHaveBeenCalledTimes(1);
+  });
+
+  it('draws the buttons itself outside a host dialog', () => {
+    const onClick = vi.fn();
+    render(<kit.DialogButtons buttons={[{ id: 'ok', label: 'Save' }]} onClick={onClick} />);
+    fireEvent.click(screen.getByRole('button', { name: 'Save' }));
+    expect(onClick).toHaveBeenCalledWith('ok');
+  });
+});
+
+describe('plugin dialog footer', () => {
+  it('draws the plugin\'s buttons in the app\'s footer and passes clicks back', async () => {
+    let slotProps: Record<string, unknown> = {};
+    vi.doMock('@/components/plugins/plugin-iframe-slot', () => ({
+      PluginIframeSlot: ({ extraProps }: { extraProps: Record<string, unknown> }) => { slotProps = extraProps; return null; },
+    }));
+    const dialogs = await import('../plugin-sandbox/host-dialog');
+    const { PluginDialogHost } = await import('@/components/plugins/plugin-dialog-host');
+    render(<PluginDialogHost />);
+    let result: unknown;
+    act(() => { void dialogs.awaitCustomDialog({ pluginId: 'paperless', title: 'Send to Paperless', slot: 'plugin-dialog' } as never).then((r: unknown) => { result = r; }); });
+    expect(screen.getByRole('dialog', { name: 'Send to Paperless' })).toBeTruthy();
+    expect(screen.getByText('from_plugin(paperless)')).toBeTruthy();
+
+    act(() => (slotProps.setDialogButtons as (b: unknown) => void)([
+      { id: 'cancel', label: 'Cancel', variant: 'secondary' },
+      { id: 'send', label: 'Send', disabled: true, icon: 'send' },
+      { id: 'bad id!', label: 'Dropped' },
+      { id: 'x', label: '' },
+    ]));
+    const footer = document.querySelector('[data-plugin-dialog-buttons]')!;
+    const buttons = Array.from(footer.querySelectorAll('button'));
+    expect(buttons.map((b) => b.textContent)).toEqual(['Cancel', 'Send']);
+    expect(buttons[0].className).toContain('border-input');
+    expect(buttons[1]).toBeDisabled();
+    expect(buttons[1].querySelector('svg')).not.toBeNull();
+    expect(buttons[0].querySelector('svg')).toBeNull();
+
+    fireEvent.click(buttons[0]);
+    expect(slotProps.dialogButtonClick).toEqual({ id: 'cancel', n: 1 });
+    fireEvent.click(buttons[0]);
+    expect(slotProps.dialogButtonClick).toEqual({ id: 'cancel', n: 2 });
+
+    act(() => (slotProps.onResult as (v: unknown) => void)(null));
+    await act(async () => {});
+    expect(result).toBeNull();
+    vi.doUnmock('@/components/plugins/plugin-iframe-slot');
+  });
+});
+
+describe('plugin-kit.css', () => {
+  it('builds the kit\'s utilities without the global Tailwind reset', async () => {
+    const postcss = (await import('postcss')).default;
+    const tailwind = (await import('@tailwindcss/postcss')).default;
+    const file = path.join(ROOT, 'app/(sandbox)/plugin-kit.css');
+    const out = (await postcss([tailwind({ base: ROOT })]).process(readFileSync(file, 'utf8'), { from: file })).css;
+    expect(out).toContain('.bg-primary');
+    expect(out).toContain('.h-10');
+    expect(out).toContain('--color-primary: var(--color-primary)');
+    // Preflight would restyle every plugin written before the kit.
+    expect(out).not.toMatch(/(^|[\s,}])\*,\s*::after,\s*::before/);
+    expect(out).not.toMatch(/(^|\n)\s*html,\s*:host\s*\{/);
+    // Only the kit's sources are scanned: an app-only class stays out.
+    expect(out).not.toContain('.email-content-wrapper');
+    expect(out.length).toBeLessThan(80_000);
+    // Kit components whose root is the button itself (SidebarRow, RowAction)
+    // get the reset too, not only buttons inside a kit element.
+    const reset = out.split('}').find((rule) => /font:\s*inherit/.test(rule)) ?? '';
+    expect(reset).toMatch(/button\.bk/);
+    expect(reset).toMatch(/\.bk button/);
+  }, 60_000);
+});
diff --git a/lib/__tests__/theme-store-hooks.test.ts b/lib/__tests__/theme-store-hooks.test.ts
new file mode 100644
index 000000000..803bf84b8
--- /dev/null
+++ b/lib/__tests__/theme-store-hooks.test.ts
@@ -0,0 +1,30 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { clearAllHooks, themeHooks } from '@/lib/plugin-hooks';
+import { useThemeStore } from '@/stores/theme-store';
+
+beforeEach(() => {
+  clearAllHooks();
+  useThemeStore.setState({ theme: 'light', resolvedTheme: 'light', activeThemeId: null });
+});
+
+describe('theme hooks', () => {
+  it('tells plugins when the colour scheme changes', () => {
+    const fn = vi.fn();
+    themeHooks.onThemeChange.register('t', fn);
+
+    useThemeStore.getState().setTheme('dark');
+
+    expect(fn).toHaveBeenCalledWith({ theme: 'dark', resolved: 'dark' });
+  });
+
+  it('tells plugins when another theme is activated, and not when nothing changed', () => {
+    const fn = vi.fn();
+    themeHooks.onCustomThemeChange.register('t', fn);
+
+    useThemeStore.setState({ activeThemeId: 'ocean' });
+    useThemeStore.setState({ activeThemeId: 'ocean' });
+
+    expect(fn).toHaveBeenCalledTimes(1);
+    expect(fn).toHaveBeenCalledWith({ themeId: 'ocean' });
+  });
+});
diff --git a/lib/__tests__/theme-store-sync.test.ts b/lib/__tests__/theme-store-sync.test.ts
new file mode 100644
index 000000000..4486c6409
--- /dev/null
+++ b/lib/__tests__/theme-store-sync.test.ts
@@ -0,0 +1,96 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+
+const serverThemes: { themes: unknown[] } = { themes: [] };
+const assets: Record<string, string> = {};
+vi.mock('@/lib/browser-navigation', async (orig) => ({
+  ...(await orig<typeof import('@/lib/browser-navigation')>()),
+  apiFetch: vi.fn(async (url: string) => {
+    const path = url.split('?')[0];
+    if (path === '/api/plugins') return new Response(JSON.stringify({ plugins: [], ...serverThemes }));
+    return path in assets ? new Response(assets[path]) : new Response('missing', { status: 404 });
+  }),
+}));
+vi.mock('@/lib/plugin-storage', () => ({
+  pluginStorage: {
+    saveThemeCSS: vi.fn(async () => {}),
+    getThemeCSS: vi.fn(async () => null),
+    deleteThemeCSS: vi.fn(async () => {}),
+    deleteThemeSkin: vi.fn(async () => {}),
+    deletePreview: vi.fn(async () => {}),
+    getThemeSkin: vi.fn(async () => null),
+    saveThemeSkin: vi.fn(async () => {}),
+  },
+}));
+
+import { useThemeStore } from '@/stores/theme-store';
+import { pluginStorage } from '@/lib/plugin-storage';
+import type { InstalledTheme } from '@/lib/plugin-types';
+
+const CORP: InstalledTheme = {
+  id: 'corp', name: 'Corp', version: '1.0.0', author: 'IT', description: '',
+  css: ':root{--color-primary:red}', variants: ['light', 'dark'],
+  enabled: true, builtIn: false, managed: true, forceEnabled: true,
+};
+
+beforeEach(() => {
+  serverThemes.themes = [];
+  const builtIns = useThemeStore.getState().installedThemes.filter((t) => t.builtIn);
+  useThemeStore.setState({ installedThemes: [...builtIns, CORP], activeThemeId: 'corp' });
+});
+
+describe('server theme sync', () => {
+  it('drops a managed theme the admin deleted, and stops forcing it', async () => {
+    await useThemeStore.getState().syncServerThemes();
+
+    const state = useThemeStore.getState();
+    expect(state.installedThemes.some((t) => t.id === 'corp')).toBe(false);
+    expect(state.activeThemeId).toBeNull();
+    expect(pluginStorage.deleteThemeCSS).toHaveBeenCalledWith('corp');
+  });
+
+  it('keeps a theme the user installed themselves', async () => {
+    const mine: InstalledTheme = { ...CORP, id: 'mine', managed: false, forceEnabled: false };
+    useThemeStore.setState((s) => ({ installedThemes: [...s.installedThemes, mine] }));
+
+    await useThemeStore.getState().syncServerThemes();
+
+    expect(useThemeStore.getState().installedThemes.some((t) => t.id === 'mine')).toBe(true);
+  });
+
+  it('leaves everything alone when the server list could not be read', async () => {
+    const { apiFetch } = await import('@/lib/browser-navigation');
+    vi.mocked(apiFetch).mockResolvedValueOnce(new Response('nope', { status: 500 }));
+
+    await useThemeStore.getState().syncServerThemes();
+
+    expect(useThemeStore.getState().installedThemes.some((t) => t.id === 'corp')).toBe(true);
+  });
+});
+
+describe('server theme sync with skins', () => {
+  it('downloads the skin of a v2 theme', async () => {
+    useThemeStore.setState((s) => ({ installedThemes: s.installedThemes.filter((t) => t.builtIn), activeThemeId: null }));
+    serverThemes.themes = [{ id: 'ocean', name: 'Ocean', version: '1.0.0', author: 'a', description: '', variants: ['light'], forceEnabled: false, hasSkin: true, contentHash: 'h1' }];
+    assets['/api/admin/themes/ocean/css'] = ':root{--color-primary:#0066cc}';
+    assets['/api/admin/themes/ocean/skin'] = '.message-list{border-radius:8px}';
+
+    await useThemeStore.getState().syncServerThemes();
+
+    const ocean = useThemeStore.getState().installedThemes.find((t) => t.id === 'ocean');
+    expect(ocean?.skin).toContain('border-radius');
+    expect(pluginStorage.saveThemeSkin).toHaveBeenCalledWith('ocean', expect.stringContaining('border-radius'));
+  });
+
+  it('re-downloads a re-upload of the same version', async () => {
+    useThemeStore.setState((s) => ({
+      installedThemes: [...s.installedThemes.filter((t) => t.builtIn), { ...CORP, id: 'ocean', forceEnabled: false, version: '1.0.0', contentHash: 'h1', css: ':root{--color-primary:red}' }],
+      activeThemeId: null,
+    }));
+    serverThemes.themes = [{ id: 'ocean', name: 'Ocean', version: '1.0.0', author: 'a', description: '', variants: ['light'], forceEnabled: false, hasSkin: false, contentHash: 'h2' }];
+    assets['/api/admin/themes/ocean/css'] = ':root{--color-primary:blue}';
+
+    await useThemeStore.getState().syncServerThemes();
+
+    expect(useThemeStore.getState().installedThemes.find((t) => t.id === 'ocean')?.css).toContain('blue');
+  });
+});
diff --git a/lib/admin/__tests__/plugin-dev.test.ts b/lib/admin/__tests__/plugin-dev.test.ts
new file mode 100644
index 000000000..d060b798b
--- /dev/null
+++ b/lib/admin/__tests__/plugin-dev.test.ts
@@ -0,0 +1,57 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises';
+import path from 'node:path';
+import { tmpdir } from 'node:os';
+
+let dir: string;
+
+async function devPlugin(folder: string, manifest: Record<string, unknown>, files: Record<string, string> = { 'index.js': 'module.exports = {}' }) {
+  const p = path.join(dir, 'plugins', folder);
+  await mkdir(p, { recursive: true });
+  await writeFile(path.join(p, 'manifest.json'), JSON.stringify(manifest));
+  for (const [name, body] of Object.entries(files)) {
+    await mkdir(path.dirname(path.join(p, name)), { recursive: true });
+    await writeFile(path.join(p, name), body);
+  }
+}
+
+beforeEach(async () => {
+  dir = await mkdtemp(path.join(tmpdir(), 'bw-plugin-dev-'));
+  await mkdir(path.join(dir, 'config'), { recursive: true });
+  vi.stubEnv('PLUGIN_DEV_DIR', path.join(dir, 'plugins'));
+  vi.stubEnv('ADMIN_CONFIG_DIR', path.join(dir, 'config'));
+  vi.resetModules();
+});
+
+afterEach(async () => {
+  vi.unstubAllEnvs();
+  await rm(dir, { recursive: true, force: true });
+});
+
+const BASE = { name: 'Dev', version: '1.0.0', author: 'me', type: 'ui-extension', entrypoint: 'index.js' };
+
+describe('dev plugins', () => {
+  it('keeps locales, tier and frame origins', async () => {
+    await devPlugin('demo', {
+      ...BASE, id: 'demo', permissions: ['crypto:full'], tier: 'privileged',
+      locales: { de: { hi: 'Hallo' } }, frameOrigins: ['https://video.example.com'],
+    });
+    const { listDevPlugins } = await import('../plugin-dev');
+    const { getEnabledPluginFrameOrigins } = await import('../csp-frame-origins');
+
+    const [entry] = await listDevPlugins();
+
+    expect(entry.plugin.locales).toEqual({ de: { hi: 'Hallo' } });
+    expect(entry.plugin.tier).toBe('privileged');
+    expect(await getEnabledPluginFrameOrigins()).toContain('https://video.example.com');
+  });
+
+  it('refuses an entrypoint outside the plugin folder', async () => {
+    // The bundle route serves the file without a session.
+    await writeFile(path.join(dir, 'secret.js'), 'TOP SECRET');
+    await devPlugin('escape', { ...BASE, id: 'escape', entrypoint: '../../secret.js' });
+    const { listDevPlugins } = await import('../plugin-dev');
+
+    expect(await listDevPlugins()).toEqual([]);
+  });
+});
diff --git a/lib/admin/__tests__/plugin-registry-signature.test.ts b/lib/admin/__tests__/plugin-registry-signature.test.ts
new file mode 100644
index 000000000..0afd4c529
--- /dev/null
+++ b/lib/admin/__tests__/plugin-registry-signature.test.ts
@@ -0,0 +1,72 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { createPublicKey, verify } from 'node:crypto';
+import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
+import path from 'node:path';
+import { tmpdir } from 'node:os';
+
+let dir: string;
+
+beforeEach(async () => {
+  dir = await mkdtemp(path.join(tmpdir(), 'bw-plugin-registry-'));
+  vi.stubEnv('ADMIN_CONFIG_DIR', dir);
+  vi.resetModules();
+});
+
+afterEach(async () => {
+  vi.unstubAllEnvs();
+  await rm(dir, { recursive: true, force: true });
+});
+
+async function verifies(code: string, signature: string): Promise<boolean> {
+  const pem = await readFile(path.join(dir, 'plugin-signing.key'), 'utf-8');
+  const publicKey = createPublicKey(pem);
+  return verify(null, Buffer.from(code, 'utf-8'), publicKey, Buffer.from(signature, 'base64'));
+}
+
+const PLUGIN = {
+  id: 'signed-demo', name: 'S', version: '1.0.0', author: 'a', description: '', type: 'hook',
+  permissions: [], entrypoint: 'index.js', enabled: true, installedAt: 'x', updatedAt: 'x',
+};
+
+describe('plugin bundle signatures', () => {
+  it('signs the bundle when it is installed', async () => {
+    const registry = await import('../plugin-registry');
+    await registry.savePlugin(PLUGIN, 'module.exports = {}');
+
+    const signature = await registry.getPluginSignature('signed-demo', 'module.exports = {}');
+
+    expect(signature).toBeTruthy();
+    expect(await verifies('module.exports = {}', signature!)).toBe(true);
+  });
+
+  it('keeps the install-time signature when the file on disk changes', async () => {
+    // Signing at serve time signed whatever was on disk, so a swapped
+    // bundle still came with a valid signature.
+    const registry = await import('../plugin-registry');
+    await registry.savePlugin(PLUGIN, 'module.exports = {}');
+    await writeFile(path.join(dir, 'plugins', 'signed-demo.js'), 'stealEverything()', 'utf-8');
+
+    const swapped = (await registry.getPluginBundle('signed-demo'))!;
+    const signature = await registry.getPluginSignature('signed-demo', swapped);
+
+    expect(await verifies(swapped, signature!)).toBe(false);
+  });
+});
+
+describe('registry writes at the same time', () => {
+  it('keeps every plugin when several are installed and switched at once', async () => {
+    // Concurrent installs shared one .tmp file and read the same old list:
+    // some answered 500, others were silently dropped from the registry.
+    const registry = await import('../plugin-registry');
+    const ids = Array.from({ length: 8 }, (_, i) => `concurrent-${i}`);
+
+    await Promise.all(ids.flatMap((id) => [
+      registry.savePlugin({ ...PLUGIN, id }, `module.exports = { id: "${id}" }`),
+      registry.updatePluginMeta(id, { forceEnabled: true }),
+    ]));
+
+    const saved = (await registry.getPluginRegistry()).plugins;
+    expect(saved.map((p) => p.id).sort()).toEqual([...ids].sort());
+    expect(saved.every((p) => p.forceEnabled === true)).toBe(true);
+  });
+});
diff --git a/lib/admin/csp-frame-origins.ts b/lib/admin/csp-frame-origins.ts
index 0eb5e2d95..b28c40616 100644
--- a/lib/admin/csp-frame-origins.ts
+++ b/lib/admin/csp-frame-origins.ts
@@ -10,84 +10,15 @@
  */
 
 import { getPluginRegistry } from './plugin-registry';
+import { sanitizeFrameOrigins } from '../extension-origins';
 
-// `https://host`, `https://host:port`, or `https://*.host[:port]`
-//
-// Each label is alphanumeric with optional inner dashes; the final TLD label
-// MUST start with a letter so we reject raw IPv4 literals.
-//
-// Disallowed by the regex (intentionally):
-//   - any scheme other than https
-//   - paths, queries, fragments
-//   - userinfo, IPv4 literals, IPv6 literals (`[::1]`)
-//   - bare wildcards (`https://*`)
-const FRAME_ORIGIN_RE =
-  /^https:\/\/(?:\*\.)?(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)(?:\.(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?))*\.(?:[a-z](?:[a-z0-9-]*[a-z0-9])?)(?::[0-9]{1,5})?$/i;
-
-export function isValidFrameOrigin(origin: unknown): origin is string {
-  if (typeof origin !== 'string') return false;
-  if (origin.length > 200) return false;
-  if (!FRAME_ORIGIN_RE.test(origin)) return false;
-  // Reject control characters / whitespace as a final safeguard against
-  // anything that would let an attacker break out of the directive.
-  if (/[\s'"`;,()]/.test(origin)) return false;
-  return true;
-}
-
-/**
- * Sanitises a list of candidate origins from a manifest. Drops invalid
- * entries silently and dedupes (case-insensitive on the host).
- */
-export function sanitizeFrameOrigins(input: unknown): string[] {
-  if (!Array.isArray(input)) return [];
-  const seen = new Set<string>();
-  const out: string[] = [];
-  for (const value of input) {
-    if (!isValidFrameOrigin(value)) continue;
-    const key = value.toLowerCase();
-    if (seen.has(key)) continue;
-    seen.add(key);
-    out.push(value);
-  }
-  return out;
-}
-
-/**
- * Same syntax + validation as `sanitizeFrameOrigins`, but for the
- * `httpOrigins` manifest field. Kept as a separate exported function so the
- * intent is explicit at every call site (frame embedding vs. HTTP fetch).
- */
-export const sanitizeHttpOrigins = sanitizeFrameOrigins;
-
-// ─── apiPostPaths (manifest field) ────────────────────────────
-
-/**
- * Validates an `/api/...` path entry. Must start with `/api/`, contain only
- * URL-path-safe characters, and have no `..` segment. The trailing slash is
- * meaningful (treated as a prefix at enforcement time).
- */
-export function isValidApiPostPath(path: unknown): path is string {
-  if (typeof path !== 'string') return false;
-  if (path.length === 0 || path.length > 200) return false;
-  if (!path.startsWith('/api/')) return false;
-  if (path.includes('..')) return false;
-  if (/[\s'"`;,()?#]/.test(path)) return false;
-  if (!/^[/A-Za-z0-9._-]+$/.test(path)) return false;
-  return true;
-}
-
-export function sanitizeApiPostPaths(input: unknown): string[] {
-  if (!Array.isArray(input)) return [];
-  const seen = new Set<string>();
-  const out: string[] = [];
-  for (const value of input) {
-    if (!isValidApiPostPath(value)) continue;
-    if (seen.has(value)) continue;
-    seen.add(value);
-    out.push(value);
-  }
-  return out;
-}
+export {
+  isValidFrameOrigin,
+  sanitizeFrameOrigins,
+  sanitizeHttpOrigins,
+  isValidApiPostPath,
+  sanitizeApiPostPaths,
+} from '../extension-origins';
 
 // In-memory cache. The proxy fires on every page navigation; reading the
 // registry JSON every time is fine but cheap to skip when nothing has
@@ -110,9 +41,13 @@ export async function getEnabledPluginFrameOrigins(): Promise<string[]> {
 
   try {
     const registry = await getPluginRegistry();
+    // Dev plugins (PLUGIN_DEV_DIR) are served next to the installed ones and
+    // need their embeds allowed too.
+    const { listDevPlugins } = await import('./plugin-dev');
+    const devPlugins = (await listDevPlugins()).map((e) => e.plugin);
     const seen = new Set<string>();
     const out: string[] = [];
-    for (const plugin of registry.plugins) {
+    for (const plugin of [...registry.plugins, ...devPlugins]) {
       if (!plugin.enabled) continue;
       const origins = sanitizeFrameOrigins(plugin.frameOrigins);
       for (const o of origins) {
diff --git a/lib/admin/extension-cleanup.ts b/lib/admin/extension-cleanup.ts
new file mode 100644
index 000000000..00b70529c
--- /dev/null
+++ b/lib/admin/extension-cleanup.ts
@@ -0,0 +1,26 @@
+import { configManager } from './config-manager';
+import { deletePluginConfig } from './plugin-config';
+
+/**
+ * Drop a deleted plugin or theme from the policy lists that refer to it by
+ * id. Left behind, a later upload that reuses the id would start out forced
+ * on for everyone without the admin asking for it.
+ */
+export async function forgetExtensionInPolicy(kind: 'plugin' | 'theme', id: string): Promise<void> {
+  await configManager.ensureLoaded();
+  const policy = configManager.getPolicy();
+  const key = kind === 'plugin' ? 'forceEnabledPlugins' : 'forceEnabledThemes';
+  const list = policy[key] ?? [];
+  if (!list.includes(id)) return;
+  await configManager.setPolicy({ ...policy, [key]: list.filter((x) => x !== id) });
+}
+
+/**
+ * Everything the server keeps about an admin plugin besides its registry
+ * entry: the forced flag and its config (which can hold secrets). A plugin
+ * installed later under the same id starts clean.
+ */
+export async function cleanUpDeletedPlugin(id: string): Promise<void> {
+  await forgetExtensionInPolicy('plugin', id);
+  await deletePluginConfig(id);
+}
diff --git a/lib/admin/plugin-approvals.ts b/lib/admin/plugin-approvals.ts
index 12fec4879..2654b9298 100644
--- a/lib/admin/plugin-approvals.ts
+++ b/lib/admin/plugin-approvals.ts
@@ -10,7 +10,8 @@
 // admin), 'approved' (admin signed off), 'denied' (admin refused - kept so we
 // don't keep asking).
 
-import { readFile, writeFile, rename } from 'node:fs/promises';
+import { readFile, writeFile, rename, mkdir, unlink } from 'node:fs/promises';
+import nodePath from 'node:path';
 import { existsSync } from 'node:fs';
 import { logger } from '@/lib/logger';
 import { ensureConfigDir, getConfigPath, assertWritable } from './paths';
@@ -43,6 +44,31 @@ interface ApprovalsFile {
 
 const APPROVALS_FILE = 'plugin-approvals.json';
 const MAX_ENTRIES = 500; // hard cap so a misbehaving client can't grow the file unboundedly
+/** Open requests one user may have at a time, so one account can't crowd out the rest. */
+export const MAX_PENDING_PER_USER = 10;
+
+/** The package a user asked to have approved, kept so the admin can read the code. */
+function bundlePath(pluginId: string, bundleHash: string): string {
+  return nodePath.join(getConfigPath('plugin-approvals'), `${pluginId}-${bundleHash}.zip`);
+}
+
+export async function saveApprovalBundle(pluginId: string, bundleHash: string, zip: Uint8Array): Promise<void> {
+  assertWritable('plugin-approvals.saveBundle');
+  await mkdir(getConfigPath('plugin-approvals'), { recursive: true });
+  await writeFile(bundlePath(pluginId, bundleHash), zip);
+}
+
+export async function readApprovalBundle(pluginId: string, bundleHash: string): Promise<Uint8Array | null> {
+  try {
+    return new Uint8Array(await readFile(bundlePath(pluginId, bundleHash)));
+  } catch {
+    return null;
+  }
+}
+
+async function deleteApprovalBundle(pluginId: string, bundleHash: string): Promise<void> {
+  try { await unlink(bundlePath(pluginId, bundleHash)); } catch { /* none */ }
+}
 
 let cached: ApprovalsFile | null = null;
 let loadPromise: Promise<void> | null = null;
@@ -122,12 +148,20 @@ export async function requestApproval(
   const file = cached!;
   const existing = findEntry(file, pluginId, bundleHash);
   if (existing) return existing;
+  const pendingByUser = file.entries.filter(e => e.status === 'pending' && e.requestedBy === requestedBy).length;
+  if (pendingByUser >= MAX_PENDING_PER_USER) {
+    throw new ApprovalLimitError(`You already have ${MAX_PENDING_PER_USER} plugins waiting for approval`);
+  }
   if (file.entries.length >= MAX_ENTRIES) {
     // Drop the oldest pending entry so a new request can land. Approved/denied
     // entries are preserved.
     const oldestPendingIdx = file.entries.findIndex(e => e.status === 'pending');
-    if (oldestPendingIdx >= 0) file.entries.splice(oldestPendingIdx, 1);
-    else throw new Error('plugin-approvals file is full');
+    if (oldestPendingIdx >= 0) {
+      const [dropped] = file.entries.splice(oldestPendingIdx, 1);
+      await deleteApprovalBundle(dropped.pluginId, dropped.bundleHash);
+    } else {
+      throw new ApprovalLimitError('The approval queue is full; ask an administrator to clear old requests');
+    }
   }
   const entry: ApprovalEntry = {
     pluginId,
@@ -166,4 +200,7 @@ export async function revokeApproval(pluginId: string, bundleHash: string): Prom
   if (idx < 0) return;
   file.entries.splice(idx, 1);
   await flushToDisk();
+  await deleteApprovalBundle(pluginId, bundleHash);
 }
+
+export class ApprovalLimitError extends Error {}
diff --git a/lib/admin/plugin-config.ts b/lib/admin/plugin-config.ts
index ca78e1d9d..3af07d254 100644
--- a/lib/admin/plugin-config.ts
+++ b/lib/admin/plugin-config.ts
@@ -51,6 +51,12 @@ export async function setPluginConfig(pluginId: string, key: string, value: unkn
   await rename(tmpPath, filePath);
 }
 
+/** Remove all stored config, secrets included, when a plugin is deleted. */
+export async function deletePluginConfig(pluginId: string): Promise<void> {
+  assertWritable('delete plugin config');
+  try { await unlink(configPath(pluginId)); } catch { /* none stored */ }
+}
+
 /**
  * Delete a single config key for a plugin.
  */
diff --git a/lib/admin/plugin-dev.ts b/lib/admin/plugin-dev.ts
index 84863a5c0..a92e4a93a 100644
--- a/lib/admin/plugin-dev.ts
+++ b/lib/admin/plugin-dev.ts
@@ -4,7 +4,7 @@ import { createHash } from 'node:crypto';
 import path from 'node:path';
 import { logger } from '@/lib/logger';
 import type { ServerPlugin } from './plugin-registry';
-import { sanitizeFrameOrigins, sanitizeHttpOrigins, sanitizeApiPostPaths } from './csp-frame-origins';
+import { checkPluginManifest } from '@/lib/extension-package';
 
 /**
  * Dev-mode plugin loading.
@@ -64,16 +64,23 @@ interface ResolvedBundle {
   needsBundle: boolean;
 }
 
+/** Whether `candidate` lies inside `dir` (after resolving `..`). */
+function isInside(dir: string, candidate: string): boolean {
+  const rel = path.relative(dir, path.resolve(candidate));
+  return rel !== '' && !rel.startsWith('..') && !path.isAbsolute(rel);
+}
+
 function resolveBundlePath(pluginDir: string, entrypoint: string): ResolvedBundle | null {
-  const srcCandidate = path.join(pluginDir, 'src', entrypoint);
-  if (existsSync(srcCandidate)) return { bundlePath: srcCandidate, needsBundle: true };
-
-  const rootCandidate = path.join(pluginDir, entrypoint);
-  if (existsSync(rootCandidate)) return { bundlePath: rootCandidate, needsBundle: false };
-
-  const distCandidate = path.join(pluginDir, 'dist', entrypoint);
-  if (existsSync(distCandidate)) return { bundlePath: distCandidate, needsBundle: false };
-
+  // The bundle route serves this file to anyone, so it must stay inside the
+  // plugin's own folder whatever the manifest says.
+  const candidates: Array<[string, boolean]> = [
+    [path.join(pluginDir, 'src', entrypoint), true],
+    [path.join(pluginDir, entrypoint), false],
+    [path.join(pluginDir, 'dist', entrypoint), false],
+  ];
+  for (const [candidate, needsBundle] of candidates) {
+    if (isInside(pluginDir, candidate) && existsSync(candidate)) return { bundlePath: candidate, needsBundle };
+  }
   return null;
 }
 
@@ -145,8 +152,22 @@ async function loadDevPlugin(pluginDir: string): Promise<DevPluginEntry | null>
     logger.warn(`[plugin-dev] manifest id "${id}" rejected by id regex (${manifestPath})`);
     return null;
   }
+  // Same checks as an upload, with the fields a work-in-progress manifest
+  // may leave out filled in.
+  const check = checkPluginManifest({
+    version: '0.0.0',
+    author: 'dev',
+    type: 'hook',
+    ...manifest,
+    name: asString(manifest.name, id) || id,
+  });
+  if (!check.manifest) {
+    logger.warn(`[plugin-dev] ${id}: ${check.errors.join('; ')}`);
+    return null;
+  }
+  const valid = check.manifest;
 
-  const entrypoint = asString(manifest.entrypoint, 'index.js');
+  const entrypoint = valid.entrypoint;
   const resolved = resolveBundlePath(pluginDir, entrypoint);
   if (!resolved) {
     logger.warn(`[plugin-dev] entrypoint "${entrypoint}" not found at src/, root, or dist/ for ${id}`);
@@ -178,34 +199,25 @@ async function loadDevPlugin(pluginDir: string): Promise<DevPluginEntry | null>
     /* ignore */
   }
 
-  const permissions = Array.isArray(manifest.permissions)
-    ? manifest.permissions.filter((p): p is string => typeof p === 'string')
-    : [];
-
-  const frameOrigins = sanitizeFrameOrigins(manifest.frameOrigins);
-  const httpOrigins = sanitizeHttpOrigins(manifest.httpOrigins);
-  const apiPostPaths = sanitizeApiPostPaths(manifest.apiPostPaths);
-
   const plugin: ServerPlugin = {
     id,
-    name: asString(manifest.name, id),
-    version: asString(manifest.version, '0.0.0-dev'),
-    author: asString(manifest.author),
-    description: asString(manifest.description),
-    type: asString(manifest.type, 'hook'),
-    permissions,
+    name: valid.name,
+    version: valid.version,
+    author: valid.author,
+    description: valid.description,
+    type: valid.type,
+    ...(valid.tier === 'privileged' ? { tier: 'privileged' } : {}),
+    permissions: valid.permissions,
     entrypoint,
     enabled: true,
     forceEnabled: false,
-    ...(manifest.configSchema && typeof manifest.configSchema === 'object'
-      ? { configSchema: manifest.configSchema as ServerPlugin['configSchema'] }
-      : {}),
-    ...(manifest.settingsSchema && typeof manifest.settingsSchema === 'object'
-      ? { settingsSchema: manifest.settingsSchema as ServerPlugin['settingsSchema'] }
-      : {}),
-    ...(frameOrigins.length > 0 ? { frameOrigins } : {}),
-    ...(httpOrigins.length > 0 ? { httpOrigins } : {}),
-    ...(apiPostPaths.length > 0 ? { apiPostPaths } : {}),
+    ...(valid.configSchema ? { configSchema: valid.configSchema } : {}),
+    ...(valid.settingsSchema ? { settingsSchema: valid.settingsSchema } : {}),
+    ...(valid.locales ? { locales: valid.locales } : {}),
+    ...(valid.frameOrigins ? { frameOrigins: valid.frameOrigins } : {}),
+    ...(valid.httpOrigins ? { httpOrigins: valid.httpOrigins } : {}),
+    ...(valid.credentials ? { credentials: valid.credentials } : {}),
+    ...(valid.apiPostPaths ? { apiPostPaths: valid.apiPostPaths } : {}),
     installedAt,
     updatedAt: new Date().toISOString(),
     bundleHash,
diff --git a/lib/admin/plugin-registry.ts b/lib/admin/plugin-registry.ts
index 1ec02385a..8b784654a 100644
--- a/lib/admin/plugin-registry.ts
+++ b/lib/admin/plugin-registry.ts
@@ -1,3 +1,4 @@
+import type { CredentialSpec } from '@/lib/plugin-secrets/credentials';
 import { readFile, writeFile, mkdir, rename, unlink } from 'node:fs/promises';
 import { existsSync } from 'node:fs';
 import { createHash } from 'node:crypto';
@@ -89,6 +90,8 @@ export interface ServerPlugin {
    * `InstalledPlugin.apiPostPaths` in `lib/plugin-types.ts`.
    */
   apiPostPaths?: string[];
+  /** Credentials the plugin uses through the server proxy (no secrets here). */
+  credentials?: Record<string, CredentialSpec>;
 }
 
 export interface ServerTheme {
@@ -102,6 +105,13 @@ export interface ServerTheme {
   forceEnabled?: boolean;
   installedAt: string;
   updatedAt: string;
+  /** True when a Theme API v2 skin.css is stored next to the CSS. */
+  hasSkin?: boolean;
+  /**
+   * SHA-256 of the CSS and skin. Clients use it to notice a re-upload of
+   * the same version and as a cache key on the CSS and skin URLs.
+   */
+  contentHash?: string;
 }
 
 interface PluginRegistry {
@@ -134,11 +144,23 @@ async function readJsonFile<T>(filePath: string, fallback: T): Promise<T> {
 async function writeJsonFile(filePath: string, data: unknown): Promise<void> {
   const dir = path.dirname(filePath);
   await ensureDir(dir);
-  const tmpPath = filePath + '.tmp';
+  // A temp name per write: two writers sharing one ".tmp" overwrote each
+  // other's file and the second rename failed (a 500 on concurrent installs).
+  const tmpPath = `${filePath}.${process.pid}.${Date.now().toString(36)}${Math.random().toString(36).slice(2, 8)}.tmp`;
   await writeFile(tmpPath, JSON.stringify(data, null, 2), 'utf-8');
   await rename(tmpPath, filePath);
 }
 
+// Changes to one registry file run one after another, so two admin actions
+// at once can't read the same old list and drop each other's change.
+const registryQueues = new Map<string, Promise<unknown>>();
+function withRegistryLock<T>(name: 'plugins' | 'themes', task: () => Promise<T>): Promise<T> {
+  const run = (registryQueues.get(name) ?? Promise.resolve()).then(task, task);
+  const tail = run.catch(() => {});
+  registryQueues.set(name, tail);
+  return run;
+}
+
 // ─── Plugin Operations ───────────────────────────────────────
 
 const pluginRegistryPath = () => path.join(getPluginsDir(), 'registry.json');
@@ -184,7 +206,11 @@ export async function getPlugin(id: string): Promise<ServerPlugin | null> {
 
 const SAFE_ID_RE = /^[a-z0-9][a-z0-9-]*[a-z0-9]$/;
 
-export async function savePlugin(
+export function savePlugin(plugin: ServerPlugin, code: string): Promise<void> {
+  return withRegistryLock('plugins', () => savePluginNow(plugin, code));
+}
+
+async function savePluginNow(
   plugin: ServerPlugin,
   code: string,
 ): Promise<void> {
@@ -198,6 +224,10 @@ export async function savePlugin(
   // Save code bundle
   const bundlePath = path.join(dir, `${plugin.id}.js`);
   await writeFile(bundlePath, code, 'utf-8');
+  // Sign now and keep the signature with the bundle. Signing at serve time
+  // would sign whatever is on disk, so a bundle file swapped after install
+  // would still verify.
+  await storePluginSignature(plugin.id, code);
 
   // Stamp content hash + updatedAt so clients can detect re-uploads even
   // when the manifest version hasn't changed. Preserve the original
@@ -222,7 +252,11 @@ export async function savePlugin(
   await writeJsonFile(pluginRegistryPath(), registry);
 }
 
-export async function updatePluginMeta(id: string, updates: Partial<Pick<ServerPlugin, 'enabled' | 'forceEnabled'>>): Promise<ServerPlugin | null> {
+export function updatePluginMeta(id: string, updates: Partial<Pick<ServerPlugin, 'enabled' | 'forceEnabled'>>): Promise<ServerPlugin | null> {
+  return withRegistryLock('plugins', () => updatePluginMetaNow(id, updates));
+}
+
+async function updatePluginMetaNow(id: string, updates: Partial<Pick<ServerPlugin, 'enabled' | 'forceEnabled'>>): Promise<ServerPlugin | null> {
   assertWritable('update plugin metadata');
   const registry = await getPluginRegistry();
   const idx = registry.plugins.findIndex(p => p.id === id);
@@ -233,7 +267,11 @@ export async function updatePluginMeta(id: string, updates: Partial<Pick<ServerP
   return registry.plugins[idx];
 }
 
-export async function deletePlugin(id: string): Promise<boolean> {
+export function deletePlugin(id: string): Promise<boolean> {
+  return withRegistryLock('plugins', () => deletePluginNow(id));
+}
+
+async function deletePluginNow(id: string): Promise<boolean> {
   assertWritable('delete plugin');
   const registry = await getPluginRegistry();
   const idx = registry.plugins.findIndex(p => p.id === id);
@@ -242,13 +280,43 @@ export async function deletePlugin(id: string): Promise<boolean> {
   registry.plugins.splice(idx, 1);
   await writeJsonFile(pluginRegistryPath(), registry);
 
-  // Remove bundle file
-  const bundlePath = path.join(getPluginsDir(), `${id}.js`);
-  try { await unlink(bundlePath); } catch { /* ok if missing */ }
+  // Remove bundle and signature files
+  for (const file of [`${id}.js`, `${id}.sig`]) {
+    try { await unlink(path.join(getPluginsDir(), file)); } catch { /* ok if missing */ }
+  }
 
   return true;
 }
 
+async function storePluginSignature(id: string, code: string): Promise<string | null> {
+  const sigPath = path.join(getPluginsDir(), `${id}.sig`);
+  try {
+    const { signBytes } = await import('./plugin-signing');
+    const signature = await signBytes(code);
+    await writeFile(sigPath, signature, 'utf-8');
+    return signature;
+  } catch (err) {
+    // Without a key the bundle still installs; it just can't run privileged.
+    try { await unlink(sigPath); } catch { /* none */ }
+    logger.warn('[plugin-registry] could not sign plugin bundle', { id, error: err instanceof Error ? err.message : String(err) });
+    return null;
+  }
+}
+
+/**
+ * The signature made when the bundle was installed. Bundles installed before
+ * signatures were stored get one on first request (trust on first use), so
+ * a later change to the file on disk stops verifying from then on.
+ */
+export async function getPluginSignature(id: string, code: string): Promise<string | null> {
+  if (!SAFE_ID_RE.test(id)) return null;
+  try {
+    return (await readFile(path.join(getPluginsDir(), `${id}.sig`), 'utf-8')).trim() || null;
+  } catch {
+    return storePluginSignature(id, code);
+  }
+}
+
 export async function getPluginBundle(id: string): Promise<string | null> {
   const bundlePath = path.join(getPluginsDir(), `${id}.js`);
   try {
@@ -271,9 +339,14 @@ export async function getTheme(id: string): Promise<ServerTheme | null> {
   return registry.themes.find(t => t.id === id) || null;
 }
 
-export async function saveTheme(
+export function saveTheme(theme: ServerTheme, css: string, skin: string | null = null): Promise<void> {
+  return withRegistryLock('themes', () => saveThemeNow(theme, css, skin));
+}
+
+async function saveThemeNow(
   theme: ServerTheme,
   css: string,
+  skin: string | null = null,
 ): Promise<void> {
   assertWritable('install theme');
   if (!SAFE_ID_RE.test(theme.id)) {
@@ -285,6 +358,17 @@ export async function saveTheme(
   // Save CSS file
   const cssPath = path.join(dir, `${theme.id}.css`);
   await writeFile(cssPath, css, 'utf-8');
+  const skinPath = path.join(dir, `${theme.id}.skin.css`);
+  if (skin) {
+    await writeFile(skinPath, skin, 'utf-8');
+  } else {
+    try { await unlink(skinPath); } catch { /* none stored */ }
+  }
+  theme = {
+    ...theme,
+    hasSkin: !!skin,
+    contentHash: createHash('sha256').update(css).update('\0').update(skin ?? '').digest('hex'),
+  };
 
   // Update registry
   const registry = await getThemeRegistry();
@@ -297,7 +381,11 @@ export async function saveTheme(
   await writeJsonFile(themeRegistryPath(), registry);
 }
 
-export async function updateThemeMeta(id: string, updates: Partial<Pick<ServerTheme, 'enabled' | 'forceEnabled'>>): Promise<ServerTheme | null> {
+export function updateThemeMeta(id: string, updates: Partial<Pick<ServerTheme, 'enabled' | 'forceEnabled'>>): Promise<ServerTheme | null> {
+  return withRegistryLock('themes', () => updateThemeMetaNow(id, updates));
+}
+
+async function updateThemeMetaNow(id: string, updates: Partial<Pick<ServerTheme, 'enabled' | 'forceEnabled'>>): Promise<ServerTheme | null> {
   assertWritable('update theme metadata');
   const registry = await getThemeRegistry();
   const idx = registry.themes.findIndex(t => t.id === id);
@@ -308,7 +396,11 @@ export async function updateThemeMeta(id: string, updates: Partial<Pick<ServerTh
   return registry.themes[idx];
 }
 
-export async function deleteTheme(id: string): Promise<boolean> {
+export function deleteTheme(id: string): Promise<boolean> {
+  return withRegistryLock('themes', () => deleteThemeNow(id));
+}
+
+async function deleteThemeNow(id: string): Promise<boolean> {
   assertWritable('delete theme');
   const registry = await getThemeRegistry();
   const idx = registry.themes.findIndex(t => t.id === id);
@@ -317,13 +409,38 @@ export async function deleteTheme(id: string): Promise<boolean> {
   registry.themes.splice(idx, 1);
   await writeJsonFile(themeRegistryPath(), registry);
 
-  // Remove CSS file
-  const cssPath = path.join(getThemesDir(), `${id}.css`);
-  try { await unlink(cssPath); } catch { /* ok if missing */ }
+  // Remove CSS and skin files
+  for (const file of [`${id}.css`, `${id}.skin.css`]) {
+    try { await unlink(path.join(getThemesDir(), file)); } catch { /* ok if missing */ }
+  }
 
   return true;
 }
 
+export async function getThemeSkin(id: string): Promise<string | null> {
+  if (!SAFE_ID_RE.test(id)) return null;
+  try {
+    return await readFile(path.join(getThemesDir(), `${id}.skin.css`), 'utf-8');
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * CSS of every installed theme and every built-in theme, keyed by id, for
+ * resolving a new theme's `extends`.
+ */
+export async function themeCSSResolver(): Promise<(id: string) => string | null> {
+  const { BUILTIN_THEMES } = await import('@/lib/builtin-themes');
+  const map = new Map<string, string>();
+  for (const t of BUILTIN_THEMES) if (t.css) map.set(t.id, t.css);
+  for (const t of (await getThemeRegistry()).themes) {
+    const css = await getThemeCSS(t.id);
+    if (css) map.set(t.id, css);
+  }
+  return (id) => map.get(id) ?? null;
+}
+
 export async function getThemeCSS(id: string): Promise<string | null> {
   const cssPath = path.join(getThemesDir(), `${id}.css`);
   try {
diff --git a/lib/admin/theme-asset.ts b/lib/admin/theme-asset.ts
new file mode 100644
index 000000000..9dc700840
--- /dev/null
+++ b/lib/admin/theme-asset.ts
@@ -0,0 +1,39 @@
+import { NextResponse } from 'next/server';
+import { getThemeCSS, getThemeRegistry, getThemeSkin } from './plugin-registry';
+import { logger } from '@/lib/logger';
+
+/**
+ * Serve an enabled theme's CSS or skin. Clients put the theme's content hash
+ * in the URL, so the response may be revalidated freely but never served
+ * stale after an update (it used to be cached publicly for an hour).
+ */
+export async function serveThemeAsset(id: string, kind: 'css' | 'skin'): Promise<NextResponse> {
+  try {
+    if (!/^[a-z0-9][a-z0-9-]*[a-z0-9]$/.test(id)) {
+      return NextResponse.json({ error: 'Invalid theme ID' }, { status: 400 });
+    }
+    const registry = await getThemeRegistry();
+    const theme = registry.themes.find(t => t.id === id);
+    if (!theme) {
+      return NextResponse.json({ error: 'Theme not found' }, { status: 404 });
+    }
+    if (!theme.enabled) {
+      return NextResponse.json({ error: 'Theme is disabled' }, { status: 403 });
+    }
+    const body = kind === 'css' ? await getThemeCSS(id) : await getThemeSkin(id);
+    if (!body) {
+      return NextResponse.json({ error: kind === 'css' ? 'Theme CSS not found' : 'Theme has no skin' }, { status: 404 });
+    }
+    return new NextResponse(body, {
+      headers: {
+        'Content-Type': 'text/css; charset=utf-8',
+        'Cache-Control': 'private, no-cache',
+        ...(theme.contentHash ? { ETag: `"${theme.contentHash}"` } : {}),
+        'X-Content-Type-Options': 'nosniff',
+      },
+    });
+  } catch (error) {
+    logger.error('Theme asset serve error', { kind, error: error instanceof Error ? error.message : 'Unknown error' });
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+  }
+}
diff --git a/lib/admin/types.ts b/lib/admin/types.ts
index 75e9b5055..43ab13347 100644
--- a/lib/admin/types.ts
+++ b/lib/admin/types.ts
@@ -141,6 +141,10 @@ export interface SettingsPolicy {
   /** Plugin IDs that are force-enabled (users cannot disable) */
   forceEnabledPlugins: string[];
   /** Plugin IDs that have been approved by admin (users can enable) */
+  /**
+   * @deprecated Never had a writer, and approving an id approved any code
+   * under it. Approvals are per package now (lib/admin/plugin-approvals.ts).
+   */
   approvedPlugins: string[];
   /** Theme IDs that are force-enabled (users cannot deactivate) */
   forceEnabledThemes: string[];
diff --git a/lib/app-commands.ts b/lib/app-commands.ts
new file mode 100644
index 000000000..c3bad3e1b
--- /dev/null
+++ b/lib/app-commands.ts
@@ -0,0 +1,66 @@
+"use client";
+
+// Commands the command palette hands to the surface that can run them (the
+// mail page composes and searches). Loosely coupled through a window event,
+// like the in-app mailto: requests, because that state lives deep inside the
+// page component. When no surface takes a command, the palette parks it and
+// navigates to mail, which runs it once it is ready.
+
+import { useEffect, useRef } from 'react';
+
+export type AppCommand = 'compose' | 'search';
+
+export const COMMAND_PALETTE_OPEN_EVENT = 'bulwark:command-palette';
+
+/** Open the command palette from a button or menu (phones have no Ctrl+K). */
+export function openCommandPalette(): void {
+  if (typeof window !== 'undefined') window.dispatchEvent(new Event(COMMAND_PALETTE_OPEN_EVENT));
+}
+
+const EVENT = 'bulwark:app-command';
+let pending: AppCommand | null = null;
+
+/** Run a command on a mounted surface. False when nothing took it. */
+export function requestAppCommand(command: AppCommand): boolean {
+  if (typeof window === 'undefined') return false;
+  const uncancelled = window.dispatchEvent(new CustomEvent<AppCommand>(EVENT, { detail: command, cancelable: true }));
+  return !uncancelled;
+}
+
+/** Keep a command for the next surface that registers a handler for it. */
+export function parkAppCommand(command: AppCommand): void {
+  pending = command;
+}
+
+/** Test helper. */
+export function peekParkedAppCommand(): AppCommand | null {
+  return pending;
+}
+
+/**
+ * Let this surface run palette commands while `enabled`. A command parked
+ * before the surface was ready runs as soon as it is.
+ */
+export function useAppCommands(handlers: Partial<Record<AppCommand, () => void>>, enabled: boolean): void {
+  const ref = useRef(handlers);
+  useEffect(() => {
+    ref.current = handlers;
+  });
+
+  useEffect(() => {
+    if (!enabled) return;
+    const onCommand = (event: Event) => {
+      const handler = ref.current[(event as CustomEvent<AppCommand>).detail];
+      if (!handler) return;
+      event.preventDefault();
+      handler();
+    };
+    window.addEventListener(EVENT, onCommand);
+    if (pending && ref.current[pending]) {
+      const handler = ref.current[pending]!;
+      pending = null;
+      handler();
+    }
+    return () => window.removeEventListener(EVENT, onCommand);
+  }, [enabled]);
+}
diff --git a/lib/auth/crypto.ts b/lib/auth/crypto.ts
index d25c16574..1dfc768ab 100644
--- a/lib/auth/crypto.ts
+++ b/lib/auth/crypto.ts
@@ -102,7 +102,9 @@ export type PayloadPurpose =
   /** WOPI access token, scoped to one file node and a six-hour expiry. */
   | 'wopi-token'
   /** The app password an impersonation handoff minted, kept for revocation. */
-  | 'impersonation-grant';
+  | 'impersonation-grant'
+  /** A user's plugin credentials (lib/plugin-secrets/vault.ts). */
+  | 'plugin-secrets';
 
 /**
  * Whether a blob minted before purposes were bound may be re-admitted for
@@ -122,6 +124,7 @@ const LEGACY_PAYLOAD_MARKERS: Record<PayloadPurpose, (payload: Record<string, un
   'pair-refresh': () => false,
   'wopi-token': (p) => p.t === 'wopi',
   'impersonation-grant': () => false,
+  'plugin-secrets': () => false,
 };
 
 export function encryptPayload(payload: Record<string, unknown>, purpose: PayloadPurpose): string {
diff --git a/lib/email-sanitization.ts b/lib/email-sanitization.ts
index 95eb2c5c4..278cacf16 100644
--- a/lib/email-sanitization.ts
+++ b/lib/email-sanitization.ts
@@ -252,11 +252,24 @@ export function sanitizeSignatureHtmlForDisplay(html: string): string {
  *
  * An untrusted plugin runs in a null-origin iframe, but whatever it returns
  * here lands in the host document and in the message the user then sends, so
- * it gets the same allowlist as a user-authored signature: formatting, links,
+ * it gets the allowlist of a user-authored signature: formatting, links,
  * images and tables, no script, no event handlers, no external URI schemes.
+ * Plus the structure the composer itself can write (lists, quotes, headings,
+ * code), so a plugin's list of links or rewritten paragraph keeps its shape.
  */
+const PLUGIN_BODY_SANITIZE_CONFIG = {
+  ...SIGNATURE_SANITIZE_CONFIG,
+  ALLOWED_TAGS: [...SIGNATURE_SANITIZE_CONFIG.ALLOWED_TAGS, 'ul', 'ol', 'li', 'blockquote', 'h1', 'h2', 'h3', 'pre', 'code', 's', 'hr'],
+};
+
 export function sanitizePluginBodyHtml(html: string): string {
-  return sanitizeSignatureHtml(html);
+  if (!html?.trim()) return '';
+  DOMPurify.addHook('afterSanitizeAttributes', restrictSignatureImages);
+  try {
+    return DOMPurify.sanitize(html, PLUGIN_BODY_SANITIZE_CONFIG);
+  } finally {
+    DOMPurify.removeAllHooks();
+  }
 }
 
 /**
diff --git a/lib/extension-origins.ts b/lib/extension-origins.ts
new file mode 100644
index 000000000..a30299ac5
--- /dev/null
+++ b/lib/extension-origins.ts
@@ -0,0 +1,81 @@
+// Manifest origin and path validation shared by the client install path,
+// the admin and marketplace routes and the CSP builder. No server imports,
+// so the browser can use it too.
+
+// `https://host`, `https://host:port`, or `https://*.host[:port]`
+//
+// Each label is alphanumeric with optional inner dashes; the final TLD label
+// MUST start with a letter so we reject raw IPv4 literals.
+//
+// Disallowed by the regex (intentionally):
+//   - any scheme other than https
+//   - paths, queries, fragments
+//   - userinfo, IPv4 literals, IPv6 literals (`[::1]`)
+//   - bare wildcards (`https://*`)
+const FRAME_ORIGIN_RE =
+  /^https:\/\/(?:\*\.)?(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)(?:\.(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?))*\.(?:[a-z](?:[a-z0-9-]*[a-z0-9])?)(?::[0-9]{1,5})?$/i;
+
+export function isValidFrameOrigin(origin: unknown): origin is string {
+  if (typeof origin !== 'string') return false;
+  if (origin.length > 200) return false;
+  if (!FRAME_ORIGIN_RE.test(origin)) return false;
+  // Reject control characters / whitespace as a final safeguard against
+  // anything that would let an attacker break out of the directive.
+  if (/[\s'"`;,()]/.test(origin)) return false;
+  return true;
+}
+
+/**
+ * Sanitises a list of candidate origins from a manifest. Drops invalid
+ * entries silently and dedupes (case-insensitive on the host).
+ */
+export function sanitizeFrameOrigins(input: unknown): string[] {
+  if (!Array.isArray(input)) return [];
+  const seen = new Set<string>();
+  const out: string[] = [];
+  for (const value of input) {
+    if (!isValidFrameOrigin(value)) continue;
+    const key = value.toLowerCase();
+    if (seen.has(key)) continue;
+    seen.add(key);
+    out.push(value);
+  }
+  return out;
+}
+
+/**
+ * Same syntax + validation as `sanitizeFrameOrigins`, but for the
+ * `httpOrigins` manifest field. Kept as a separate exported function so the
+ * intent is explicit at every call site (frame embedding vs. HTTP fetch).
+ */
+export const sanitizeHttpOrigins = sanitizeFrameOrigins;
+
+// ─── apiPostPaths (manifest field) ────────────────────────────
+
+/**
+ * Validates an `/api/...` path entry. Must start with `/api/`, contain only
+ * URL-path-safe characters, and have no `..` segment. The trailing slash is
+ * meaningful (treated as a prefix at enforcement time).
+ */
+export function isValidApiPostPath(path: unknown): path is string {
+  if (typeof path !== 'string') return false;
+  if (path.length === 0 || path.length > 200) return false;
+  if (!path.startsWith('/api/')) return false;
+  if (path.includes('..')) return false;
+  if (/[\s'"`;,()?#]/.test(path)) return false;
+  if (!/^[/A-Za-z0-9._-]+$/.test(path)) return false;
+  return true;
+}
+
+export function sanitizeApiPostPaths(input: unknown): string[] {
+  if (!Array.isArray(input)) return [];
+  const seen = new Set<string>();
+  const out: string[] = [];
+  for (const value of input) {
+    if (!isValidApiPostPath(value)) continue;
+    if (seen.has(value)) continue;
+    seen.add(value);
+    out.push(value);
+  }
+  return out;
+}
diff --git a/lib/extension-package.ts b/lib/extension-package.ts
new file mode 100644
index 000000000..48221550a
--- /dev/null
+++ b/lib/extension-package.ts
@@ -0,0 +1,699 @@
+// Reading and validating plugin and theme packages (ZIP + manifest.json).
+//
+// One implementation for every install path: the browser upload in Settings,
+// the admin upload, the marketplace install and the marketplace preview. The
+// copies these replace had drifted apart: some checked file types, some the
+// permission list, some the origin lists, and none bounded how much a ZIP may
+// inflate to.
+
+import { checkCredentials } from './plugin-secrets/credentials';
+import JSZip from 'jszip';
+import {
+  ALL_PERMISSIONS,
+  ALLOWED_PLUGIN_FILES,
+  DEPRECATED_PERMISSIONS,
+  MAX_PLUGIN_SIZE,
+  MAX_THEME_SIZE,
+  type PluginManifest,
+  type PluginTier,
+  type PluginType,
+  type SettingFieldSchema,
+  type ThemeManifest,
+  MAX_THEME_SKIN_BYTES,
+} from './plugin-types';
+import { sanitizeSkinCSS, sanitizeThemeCSS } from './theme-loader';
+import { compileAdvancedTheme, isAdvancedManifest } from './theme-compiler';
+import { sanitizeApiPostPaths, sanitizeFrameOrigins, sanitizeHttpOrigins } from './extension-origins';
+
+export const EXTENSION_ID_RE = /^[a-z0-9][a-z0-9-]*[a-z0-9]$/;
+
+/** No real plugin or theme needs more files than this. */
+export const MAX_ZIP_ENTRIES = 200;
+/** Largest single file we inflate. Bundles are capped at 5 MB zipped. */
+export const MAX_ENTRY_BYTES = 20 * 1024 * 1024;
+const MAX_MANIFEST_BYTES = 512 * 1024;
+
+export type ExtensionKind = 'plugin' | 'theme';
+
+export class ExtensionPackageError extends Error {}
+
+export interface OpenedPackage {
+  zip: JSZip;
+  /** Folder prefix when every entry sits inside one top-level directory. */
+  root: string;
+}
+
+function toUint8(data: ArrayBuffer | Uint8Array): Uint8Array {
+  return data instanceof Uint8Array ? data : new Uint8Array(data);
+}
+
+/**
+ * Open a package ZIP. Checks the compressed size and entry count; files are
+ * only inflated when read (see `readEntry`), each under a hard cap.
+ */
+export async function openPackage(data: ArrayBuffer | Uint8Array, kind: ExtensionKind): Promise<OpenedPackage> {
+  const bytes = toUint8(data);
+  const max = kind === 'theme' ? MAX_THEME_SIZE : MAX_PLUGIN_SIZE;
+  if (bytes.byteLength > max) {
+    throw new ExtensionPackageError(`${kind === 'theme' ? 'Theme' : 'Plugin'} ZIP exceeds ${Math.round(max / (1024 * 1024))} MB size limit`);
+  }
+  let zip: JSZip;
+  try {
+    zip = await JSZip.loadAsync(bytes);
+  } catch {
+    throw new ExtensionPackageError('Invalid ZIP file');
+  }
+  const names = Object.keys(zip.files);
+  if (names.length > MAX_ZIP_ENTRIES) {
+    throw new ExtensionPackageError(`ZIP has ${names.length} entries; at most ${MAX_ZIP_ENTRIES} are allowed`);
+  }
+  return { zip, root: findRoot(zip) };
+}
+
+function findRoot(zip: JSZip): string {
+  const entries = Object.keys(zip.files);
+  const topDirs = new Set(entries.map((e) => e.split('/')[0]));
+  if (topDirs.size === 1) {
+    const dir = [...topDirs][0];
+    if (zip.files[dir + '/'] || entries.some((e) => e.startsWith(dir + '/'))) return dir + '/';
+  }
+  return '';
+}
+
+/**
+ * Inflate one entry, stopping as soon as it passes `maxBytes`. The size in
+ * the ZIP header is whatever the author wrote, so it can't be trusted to
+ * stop a ZIP bomb; counting the inflated bytes can.
+ */
+export async function readEntry(pkg: OpenedPackage, name: string, maxBytes = MAX_ENTRY_BYTES): Promise<Uint8Array | null> {
+  const entry = pkg.zip.file(pkg.root + name);
+  if (!entry || entry.dir) return null;
+  return new Promise<Uint8Array>((resolve, reject) => {
+    const chunks: Uint8Array[] = [];
+    let total = 0;
+    let done = false;
+    // internalStream is part of JSZip's API but missing from its typings.
+    const stream = (entry as unknown as { internalStream(type: 'uint8array'): JSZipStream }).internalStream('uint8array');
+    stream
+      .on('data', (chunk: Uint8Array) => {
+        if (done) return;
+        total += chunk.byteLength;
+        if (total > maxBytes) {
+          done = true;
+          stream.pause();
+          reject(new ExtensionPackageError(`${name} is larger than ${Math.round(maxBytes / 1024)} KB once unpacked`));
+          return;
+        }
+        chunks.push(chunk);
+      })
+      .on('error', (err: Error) => {
+        if (done) return;
+        done = true;
+        reject(new ExtensionPackageError(`Could not read ${name}: ${err.message}`));
+      })
+      .on('end', () => {
+        if (done) return;
+        done = true;
+        const out = new Uint8Array(total);
+        let offset = 0;
+        for (const c of chunks) {
+          out.set(c, offset);
+          offset += c.byteLength;
+        }
+        resolve(out);
+      })
+      .resume();
+  });
+}
+
+interface JSZipStream {
+  on(event: 'data', cb: (chunk: Uint8Array) => void): JSZipStream;
+  on(event: 'error', cb: (err: Error) => void): JSZipStream;
+  on(event: 'end', cb: () => void): JSZipStream;
+  pause(): JSZipStream;
+  resume(): JSZipStream;
+}
+
+export async function readText(pkg: OpenedPackage, name: string, maxBytes = MAX_ENTRY_BYTES): Promise<string | null> {
+  const bytes = await readEntry(pkg, name, maxBytes);
+  return bytes === null ? null : new TextDecoder('utf-8').decode(bytes);
+}
+
+export async function readManifest(pkg: OpenedPackage): Promise<Record<string, unknown>> {
+  const raw = await readText(pkg, 'manifest.json', MAX_MANIFEST_BYTES);
+  if (raw === null) throw new ExtensionPackageError('Missing manifest.json');
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    throw new ExtensionPackageError('Invalid manifest.json (not valid JSON)');
+  }
+  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+    throw new ExtensionPackageError('manifest.json must be a JSON object');
+  }
+  return parsed as Record<string, unknown>;
+}
+
+/** Files in a plugin package whose type the host refuses. */
+export function disallowedPluginFiles(pkg: OpenedPackage): string[] {
+  const out: string[] = [];
+  for (const [path, entry] of Object.entries(pkg.zip.files)) {
+    if (entry.dir) continue;
+    const dot = path.lastIndexOf('.');
+    const ext = dot >= 0 ? path.slice(dot).toLowerCase() : '';
+    if (ext && !ALLOWED_PLUGIN_FILES.has(ext)) out.push(path);
+  }
+  return out;
+}
+
+// ─── Manifest validation ─────────────────────────────────────
+
+export interface ManifestCheck<T> {
+  manifest: T | null;
+  errors: string[];
+  warnings: string[];
+}
+
+type InstallablePluginType = Exclude<PluginType, 'theme'>;
+const PLUGIN_TYPES: InstallablePluginType[] = ['ui-extension', 'sidebar-app', 'hook'];
+const KNOWN_PERMISSIONS = new Set<string>(ALL_PERMISSIONS);
+
+function requireString(m: Record<string, unknown>, key: string, errors: string[], max = 200): string {
+  const v = m[key];
+  if (typeof v !== 'string' || v.trim() === '') {
+    errors.push(`Missing or invalid "${key}"`);
+    return '';
+  }
+  if (v.length > max) errors.push(`"${key}" is longer than ${max} characters`);
+  return v;
+}
+
+function optionalString(m: Record<string, unknown>, key: string, errors: string[], max = 2000): string | undefined {
+  const v = m[key];
+  if (v === undefined) return undefined;
+  if (typeof v !== 'string') {
+    errors.push(`"${key}" must be a string`);
+    return undefined;
+  }
+  if (v.length > max) errors.push(`"${key}" is longer than ${max} characters`);
+  return v;
+}
+
+/** `entrypoint` must name a .js file inside the package. */
+function isSafeEntrypoint(value: string): boolean {
+  if (value.startsWith('/') || value.includes('\\')) return false;
+  if (value.split('/').some((seg) => seg === '..' || seg === '.' || seg === '')) return false;
+  return /\.(m?js)$/.test(value) && value.length <= 200;
+}
+
+const VERSION_RE = /^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$/;
+
+/** Compare dotted versions numerically; pre-release tags are ignored. */
+export function compareVersions(a: string, b: string): number {
+  const pa = a.split(/[-+]/)[0].split('.').map((n) => parseInt(n, 10) || 0);
+  const pb = b.split(/[-+]/)[0].split('.').map((n) => parseInt(n, 10) || 0);
+  for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
+    const d = (pa[i] ?? 0) - (pb[i] ?? 0);
+    if (d !== 0) return d < 0 ? -1 : 1;
+  }
+  return 0;
+}
+
+function validateSettingsSchema(raw: unknown, errors: string[]): Record<string, SettingFieldSchema> | undefined {
+  if (raw === undefined) return undefined;
+  if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
+    errors.push('"settingsSchema" must be an object');
+    return undefined;
+  }
+  const out: Record<string, SettingFieldSchema> = {};
+  for (const [key, field] of Object.entries(raw as Record<string, unknown>)) {
+    const where = `settingsSchema.${key}`;
+    if (!/^[A-Za-z][A-Za-z0-9_]{0,63}$/.test(key)) {
+      errors.push(`${where}: key must be letters, digits and _`);
+      continue;
+    }
+    if (!field || typeof field !== 'object' || Array.isArray(field)) {
+      errors.push(`${where} must be an object`);
+      continue;
+    }
+    const f = field as Record<string, unknown>;
+    const type = f.type;
+    if (type !== 'boolean' && type !== 'string' && type !== 'number' && type !== 'select') {
+      errors.push(`${where}.type must be boolean, string, number or select`);
+      continue;
+    }
+    if (typeof f.label !== 'string' || !f.label) {
+      errors.push(`${where}.label is required`);
+      continue;
+    }
+    if (f.description !== undefined && typeof f.description !== 'string') {
+      errors.push(`${where}.description must be a string`);
+      continue;
+    }
+    const entry: SettingFieldSchema = { type, label: f.label, default: f.default };
+    if (typeof f.description === 'string') entry.description = f.description;
+    if (type === 'select') {
+      if (!Array.isArray(f.options) || f.options.length === 0 || f.options.some((o) => typeof o !== 'string')) {
+        errors.push(`${where}.options must be a non-empty list of strings`);
+        continue;
+      }
+      entry.options = f.options as string[];
+      if (!entry.options.includes(f.default as string)) {
+        errors.push(`${where}.default must be one of its options`);
+        continue;
+      }
+    } else if (type === 'boolean') {
+      if (typeof f.default !== 'boolean') {
+        errors.push(`${where}.default must be true or false`);
+        continue;
+      }
+    } else if (type === 'string') {
+      if (typeof f.default !== 'string') {
+        errors.push(`${where}.default must be a string`);
+        continue;
+      }
+    } else if (type === 'number') {
+      for (const bound of ['min', 'max'] as const) {
+        if (f[bound] !== undefined && (typeof f[bound] !== 'number' || !Number.isFinite(f[bound]))) {
+          errors.push(`${where}.${bound} must be a number`);
+        } else if (typeof f[bound] === 'number') {
+          entry[bound] = f[bound] as number;
+        }
+      }
+      if (typeof f.default !== 'number' || !Number.isFinite(f.default)) {
+        errors.push(`${where}.default must be a number`);
+        continue;
+      }
+      if ((entry.min !== undefined && f.default < entry.min) || (entry.max !== undefined && f.default > entry.max)) {
+        errors.push(`${where}.default is outside min/max`);
+        continue;
+      }
+    }
+    out[key] = entry;
+  }
+  return out;
+}
+
+const CONFIG_FIELD_TYPES = new Set(['string', 'secret', 'boolean', 'number', 'select']);
+
+/** Admin-level setting a plugin declares (`configSchema`); mirrors PluginConfigField. */
+export interface ConfigFieldSchema {
+  type: 'string' | 'secret' | 'boolean' | 'number' | 'select';
+  label: string;
+  description?: string;
+  required?: boolean;
+  default?: unknown;
+  placeholder?: string;
+  options?: { label: string; value: string }[];
+}
+
+function validateConfigSchema(raw: unknown, errors: string[]): Record<string, ConfigFieldSchema> | undefined {
+  if (raw === undefined) return undefined;
+  if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
+    errors.push('"configSchema" must be an object');
+    return undefined;
+  }
+  const out: Record<string, ConfigFieldSchema> = {};
+  for (const [key, field] of Object.entries(raw as Record<string, unknown>)) {
+    const where = `configSchema.${key}`;
+    if (!/^[A-Za-z][A-Za-z0-9_]{0,63}$/.test(key)) {
+      errors.push(`${where}: key must be letters, digits and _`);
+      continue;
+    }
+    const f = field as Record<string, unknown> | null;
+    if (!f || typeof f !== 'object' || Array.isArray(f) || !CONFIG_FIELD_TYPES.has(f.type as string) || typeof f.label !== 'string') {
+      errors.push(`${where} needs a type (string, secret, boolean, number, select) and a label`);
+      continue;
+    }
+    if (f.type === 'select' && (!Array.isArray(f.options) || f.options.some((o) => !o || typeof (o as { value?: unknown }).value !== 'string'))) {
+      errors.push(`${where}.options must be a list of { label, value }`);
+      continue;
+    }
+    out[key] = f as unknown as ConfigFieldSchema;
+  }
+  return out;
+}
+
+const MAX_LOCALES = 64;
+const MAX_LOCALE_KEYS = 2000;
+
+function validateLocales(raw: unknown, errors: string[]): Record<string, Record<string, string>> | undefined {
+  if (raw === undefined) return undefined;
+  if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
+    errors.push('"locales" must be an object of locale → { key: text }');
+    return undefined;
+  }
+  const entries = Object.entries(raw as Record<string, unknown>);
+  if (entries.length > MAX_LOCALES) {
+    errors.push(`"locales" has more than ${MAX_LOCALES} languages`);
+    return undefined;
+  }
+  const out: Record<string, Record<string, string>> = {};
+  for (const [locale, table] of entries) {
+    if (!/^[A-Za-z]{2,3}(?:-[A-Za-z0-9]{2,8})*$/.test(locale)) {
+      errors.push(`locales: "${locale}" is not a language tag`);
+      continue;
+    }
+    if (!table || typeof table !== 'object' || Array.isArray(table)) {
+      errors.push(`locales.${locale} must be an object`);
+      continue;
+    }
+    const strings = Object.entries(table as Record<string, unknown>);
+    if (strings.length > MAX_LOCALE_KEYS || strings.some(([, v]) => typeof v !== 'string')) {
+      errors.push(`locales.${locale} must map at most ${MAX_LOCALE_KEYS} keys to strings`);
+      continue;
+    }
+    out[locale] = table as Record<string, string>;
+  }
+  return out;
+}
+
+function originList(
+  m: Record<string, unknown>,
+  key: 'frameOrigins' | 'httpOrigins' | 'apiPostPaths',
+  sanitize: (v: unknown) => string[],
+  errors: string[],
+  warnings: string[],
+): string[] | undefined {
+  const raw = m[key];
+  if (raw === undefined) return undefined;
+  if (!Array.isArray(raw)) {
+    errors.push(`"${key}" must be a list`);
+    return undefined;
+  }
+  const kept = sanitize(raw);
+  const dropped = raw.filter((v) => typeof v !== 'string' || !kept.includes(v));
+  if (dropped.length > 0) warnings.push(`Ignored invalid ${key}: ${dropped.map(String).join(', ')}`);
+  return kept.length > 0 ? kept : undefined;
+}
+
+/** What every install path stores for a plugin, after validation. */
+export type ValidatedPluginManifest = PluginManifest & {
+  frameOrigins?: string[];
+  configSchema?: Record<string, ConfigFieldSchema>;
+};
+
+/**
+ * Validate a plugin manifest. Returns a copy holding only known, checked
+ * fields, so nothing the host didn't validate is ever stored.
+ */
+export function checkPluginManifest(m: Record<string, unknown>, opts: { appVersion?: string } = {}): ManifestCheck<ValidatedPluginManifest> {
+  const errors: string[] = [];
+  const warnings: string[] = [];
+
+  const id = requireString(m, 'id', errors, 64);
+  if (id && !EXTENSION_ID_RE.test(id)) errors.push('ID must be lowercase alphanumeric with hyphens, min 2 chars');
+  const name = requireString(m, 'name', errors, 100);
+  const version = requireString(m, 'version', errors, 64);
+  if (version && !VERSION_RE.test(version)) errors.push('"version" must look like 1.2.3');
+  const author = requireString(m, 'author', errors, 200);
+  const description = optionalString(m, 'description', errors) ?? '';
+
+  const type = m.type as InstallablePluginType;
+  if (!PLUGIN_TYPES.includes(type)) errors.push(`Invalid type "${String(m.type)}". Must be one of: ${PLUGIN_TYPES.join(', ')}`);
+
+  let tier: PluginTier | undefined;
+  if (m.tier !== undefined) {
+    if (m.tier !== 'untrusted' && m.tier !== 'privileged') errors.push('"tier" must be "untrusted" or "privileged"');
+    else tier = m.tier;
+  }
+
+  const entrypoint = typeof m.entrypoint === 'string' && m.entrypoint ? m.entrypoint : 'index.js';
+  if (!isSafeEntrypoint(entrypoint)) errors.push('"entrypoint" must be a .js file inside the package');
+
+  // A string here used to slip past every check and then match by substring
+  // ("crypto:full email:send" granted both).
+  let permissions: string[] = [];
+  if (m.permissions !== undefined) {
+    if (!Array.isArray(m.permissions) || m.permissions.some((p) => typeof p !== 'string')) {
+      errors.push('"permissions" must be a list of strings');
+    } else {
+      permissions = [...new Set(m.permissions as string[])];
+      const deprecated = permissions.filter((p) => DEPRECATED_PERMISSIONS.includes(p));
+      if (deprecated.length > 0) {
+        warnings.push(`Ignored permissions that no longer grant anything: ${deprecated.join(', ')}`);
+        permissions = permissions.filter((p) => !DEPRECATED_PERMISSIONS.includes(p));
+      }
+      const unknown = permissions.filter((p) => !KNOWN_PERMISSIONS.has(p));
+      if (unknown.length > 0) errors.push(`Unknown permissions: ${unknown.join(', ')} (this Bulwark version does not offer them)`);
+    }
+  }
+  if (tier === 'privileged' && !permissions.includes('crypto:full')) {
+    errors.push('A privileged plugin must request the "crypto:full" permission');
+  }
+
+  const minAppVersion = optionalString(m, 'minAppVersion', errors, 32);
+  if (minAppVersion !== undefined && !VERSION_RE.test(minAppVersion)) errors.push('"minAppVersion" must look like 1.2.3');
+  if (minAppVersion && opts.appVersion && VERSION_RE.test(opts.appVersion) && compareVersions(opts.appVersion, minAppVersion) < 0) {
+    errors.push(`Needs Bulwark ${minAppVersion} or later (this is ${opts.appVersion})`);
+  }
+
+  const settingsSchema = validateSettingsSchema(m.settingsSchema, errors);
+  const configSchema = validateConfigSchema(m.configSchema, errors);
+  const locales = validateLocales(m.locales, errors);
+  const frameOrigins = originList(m, 'frameOrigins', sanitizeFrameOrigins, errors, warnings);
+  const httpOrigins = originList(m, 'httpOrigins', sanitizeHttpOrigins, errors, warnings);
+  const apiPostPaths = originList(m, 'apiPostPaths', sanitizeApiPostPaths, errors, warnings);
+  const credentialCheck = checkCredentials(m.credentials, configSchema);
+  errors.push(...credentialCheck.errors);
+
+  if (errors.length > 0) return { manifest: null, errors, warnings };
+
+  const manifest: ValidatedPluginManifest = {
+    id, name, version, author, description, type, permissions, entrypoint,
+    ...(tier ? { tier } : {}),
+    ...(minAppVersion ? { minAppVersion } : {}),
+    ...(settingsSchema && Object.keys(settingsSchema).length ? { settingsSchema } : {}),
+    ...(configSchema && Object.keys(configSchema).length ? { configSchema } : {}),
+    ...(locales && Object.keys(locales).length ? { locales } : {}),
+    ...(frameOrigins ? { frameOrigins } : {}),
+    ...(httpOrigins ? { httpOrigins } : {}),
+    ...(apiPostPaths ? { apiPostPaths } : {}),
+    ...(credentialCheck.credentials && Object.keys(credentialCheck.credentials).length ? { credentials: credentialCheck.credentials } : {}),
+  };
+  return { manifest, errors, warnings };
+}
+
+// ─── Plugin code checks ──────────────────────────────────────
+
+const SUSPICIOUS_JS_PATTERNS = [
+  { pattern: /\beval\s*\(/, label: 'eval()' },
+  { pattern: /\bnew\s+Function\s*\(/, label: 'new Function()' },
+  { pattern: /document\.cookie/, label: 'document.cookie' },
+  { pattern: /document\.write/, label: 'document.write' },
+  { pattern: /innerHTML\s*=/, label: 'innerHTML assignment' },
+];
+
+/** Patterns worth a reviewer's second look. Not a security boundary: the sandbox is. */
+export function suspiciousCode(code: string): string[] {
+  return SUSPICIOUS_JS_PATTERNS.filter(({ pattern }) => pattern.test(code)).map(({ label }) => label);
+}
+
+function canonicalJson(value: unknown): string {
+  if (Array.isArray(value)) return `[${value.map(canonicalJson).join(',')}]`;
+  if (value && typeof value === 'object') {
+    const entries = Object.entries(value as Record<string, unknown>)
+      .filter(([, v]) => v !== undefined)
+      .sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0));
+    return `{${entries.map(([k, v]) => `${JSON.stringify(k)}:${canonicalJson(v)}`).join(',')}}`;
+  }
+  return JSON.stringify(value);
+}
+
+/**
+ * SHA-256 over the validated manifest and the code. An admin approval is
+ * pinned to this, so re-zipping the same code with more permissions or
+ * other origins needs a new approval. Same result in the browser and on
+ * the server.
+ */
+export async function packageHash(manifest: ValidatedPluginManifest, code: string): Promise<string> {
+  const data = new TextEncoder().encode(`${canonicalJson(manifest)}\n${code}`);
+  const digest = await crypto.subtle.digest('SHA-256', data);
+  return Array.from(new Uint8Array(digest), (b) => b.toString(16).padStart(2, '0')).join('');
+}
+
+export interface PluginPackage {
+  manifest: ValidatedPluginManifest;
+  code: string;
+  warnings: string[];
+  /** The opened ZIP, for callers that read more files (preview image). */
+  pkg: OpenedPackage;
+}
+
+/**
+ * Open, validate and read a plugin package. Throws ExtensionPackageError
+ * with every problem found when it is not installable.
+ */
+export async function readPluginPackage(
+  data: ArrayBuffer | Uint8Array,
+  opts: { appVersion?: string; expectedId?: string } = {},
+): Promise<PluginPackage> {
+  const pkg = await openPackage(data, 'plugin');
+  const raw = await readManifest(pkg);
+  const check = checkPluginManifest(raw, opts);
+  const errors = [...check.errors];
+  const bad = disallowedPluginFiles(pkg);
+  if (bad.length > 0) errors.push(`Disallowed file types: ${bad.join(', ')}`);
+  if (check.manifest && opts.expectedId !== undefined && check.manifest.id !== opts.expectedId) {
+    errors.push(`Package id "${check.manifest.id}" does not match "${opts.expectedId}"`);
+  }
+  if (errors.length > 0 || !check.manifest) throw new ExtensionPackageError(errors.join('; '));
+  const code = await readText(pkg, check.manifest.entrypoint);
+  if (code === null) throw new ExtensionPackageError(`Missing entrypoint file: ${check.manifest.entrypoint}`);
+  const warnings = [...check.warnings, ...suspiciousCode(code).map((l) => `Contains ${l} - review for security`)];
+  return { manifest: check.manifest, code, warnings, pkg };
+}
+
+// ─── Themes ──────────────────────────────────────────────────
+
+function validateBaseManifest(manifest: Record<string, unknown>): string[] {
+  const errors: string[] = [];
+
+  if (!manifest.id || typeof manifest.id !== 'string') errors.push('Missing or invalid "id"');
+  if (!manifest.name || typeof manifest.name !== 'string') errors.push('Missing or invalid "name"');
+  if (!manifest.version || typeof manifest.version !== 'string') errors.push('Missing or invalid "version"');
+  if (!manifest.author || typeof manifest.author !== 'string') errors.push('Missing or invalid "author"');
+  if (!manifest.type || typeof manifest.type !== 'string') errors.push('Missing or invalid "type"');
+
+  // Validate ID format (alphanumeric + hyphens)
+  if (manifest.id && typeof manifest.id === 'string' && !/^[a-z0-9][a-z0-9-]*[a-z0-9]$/.test(manifest.id)) {
+    errors.push('ID must be lowercase alphanumeric with hyphens, min 2 chars');
+  }
+
+  return errors;
+}
+
+export function checkThemeManifest(manifest: Record<string, unknown>): { result: ThemeManifest | null; errors: string[] } {
+  const errors = validateBaseManifest(manifest);
+
+  if (manifest.type !== 'theme') {
+    errors.push(`Expected type "theme", got "${manifest.type}"`);
+  }
+
+  if (!manifest.variants || !Array.isArray(manifest.variants) || manifest.variants.length === 0) {
+    errors.push('Missing or empty "variants" array (must be ["light"], ["dark"], or ["light","dark"])');
+  } else {
+    const valid = manifest.variants.every((v: unknown) => v === 'light' || v === 'dark');
+    if (!valid) errors.push('Variants must be "light" or "dark"');
+  }
+
+  // ── Theme API v2 fields (all optional) ──
+  if (manifest.apiVersion !== undefined && manifest.apiVersion !== 1 && manifest.apiVersion !== 2) {
+    errors.push('"apiVersion" must be 1 or 2 if present');
+  }
+  if (manifest.extends !== undefined && typeof manifest.extends !== 'string') {
+    errors.push('"extends" must be a string (the parent theme id)');
+  }
+  if (manifest.tokens !== undefined && (typeof manifest.tokens !== 'object' || manifest.tokens === null)) {
+    errors.push('"tokens" must be an object with optional "common"/"light"/"dark" maps');
+  }
+  if (manifest.density !== undefined && !['compact', 'normal', 'touch'].includes(manifest.density as string)) {
+    errors.push('"density" must be "compact", "normal", or "touch"');
+  }
+  if (manifest.derive !== undefined && typeof manifest.derive !== 'boolean') {
+    errors.push('"derive" must be a boolean');
+  }
+  if (manifest.radii !== undefined && (typeof manifest.radii !== 'object' || manifest.radii === null)) {
+    errors.push('"radii" must be an object');
+  }
+  if (manifest.typography !== undefined && (typeof manifest.typography !== 'object' || manifest.typography === null)) {
+    errors.push('"typography" must be an object');
+  }
+
+  if (errors.length > 0) return { result: null, errors };
+
+  return {
+    result: manifest as unknown as ThemeManifest,
+    errors: [],
+  };
+}
+
+export interface ThemePackageResult {
+  valid: boolean;
+  errors: string[];
+  warnings: string[];
+  manifest: ThemeManifest | null;
+  /** Compiled (Theme API v2) and sanitized CSS. */
+  css: string;
+  /** Sanitized skin.css for v2 themes, else null. */
+  skin: string | null;
+  pkg: OpenedPackage | null;
+}
+
+/**
+ * Open, validate and compile a theme package. v1 themes need theme.css; v2
+ * themes may be tokens only and may ship a skin.css. `resolveExtends` returns
+ * the CSS of an installed theme for `extends`.
+ */
+export async function readThemePackage(
+  data: ArrayBuffer | Uint8Array,
+  opts: { resolveExtends?: (id: string) => string | null } = {},
+): Promise<ThemePackageResult> {
+  const fail = (errors: string[], warnings: string[] = [], manifest: ThemeManifest | null = null, pkg: OpenedPackage | null = null): ThemePackageResult =>
+    ({ valid: false, errors, warnings, manifest, css: '', skin: null, pkg });
+  const errors: string[] = [];
+  const warnings: string[] = [];
+
+  let pkg: OpenedPackage;
+  let manifestData: Record<string, unknown>;
+  try {
+    pkg = await openPackage(data, 'theme');
+    manifestData = await readManifest(pkg);
+  } catch (err) {
+    return fail([err instanceof ExtensionPackageError ? err.message : 'Invalid ZIP file']);
+  }
+
+  const { result: manifest, errors: manifestErrors } = checkThemeManifest(manifestData);
+  if (!manifest) return fail(manifestErrors, warnings, null, pkg);
+
+  // theme.css is required for v1 themes, optional for v2 ones, whose CSS the
+  // compiler can produce from the manifest alone.
+  const isAdvanced = isAdvancedManifest(manifest);
+  let cssText: string | null;
+  let skinText: string | null;
+  try {
+    cssText = await readText(pkg, 'theme.css');
+    skinText = await readText(pkg, 'skin.css', MAX_THEME_SKIN_BYTES * 4);
+  } catch (err) {
+    return fail([err instanceof ExtensionPackageError ? err.message : 'Could not read theme files'], warnings, manifest, pkg);
+  }
+
+  let userCSS = '';
+  if (cssText !== null) {
+    // Sanitize instead of rejecting, and always: the sanitizer is also what
+    // drops rules outside :root and .dark.
+    const sanitized = sanitizeThemeCSS(cssText);
+    userCSS = sanitized.css;
+    warnings.push(...sanitized.warnings);
+  } else if (!isAdvanced) {
+    return fail(['Missing theme.css'], warnings, manifest, pkg);
+  }
+
+  let css = userCSS;
+  if (isAdvanced) {
+    const compiled = compileAdvancedTheme(manifest, { userCSS, resolveExtends: opts.resolveExtends });
+    if (compiled.errors.length > 0) return fail([...errors, ...compiled.errors], warnings, manifest, pkg);
+    warnings.push(...compiled.warnings);
+    // Defence in depth: sanitize the compiled output too.
+    const sanitized = sanitizeThemeCSS(compiled.css);
+    css = sanitized.css;
+    warnings.push(...sanitized.warnings);
+  }
+
+  // Skins target real component selectors and skip the :root/.dark selector
+  // check; they still go through the dangerous-pattern sanitizer.
+  let skin: string | null = null;
+  if (skinText !== null) {
+    if (!isAdvanced) {
+      warnings.push('skin.css ignored - only Theme API v2 manifests can ship a skin');
+    } else if (skinText.length > MAX_THEME_SKIN_BYTES) {
+      warnings.push(`skin.css exceeds ${Math.round(MAX_THEME_SKIN_BYTES / 1024)} KB and was dropped`);
+    } else {
+      const sanitized = sanitizeSkinCSS(skinText);
+      skin = sanitized.css;
+      warnings.push(...sanitized.warnings);
+    }
+  }
+
+  return { valid: true, errors: [], warnings, manifest, css, skin, pkg };
+}
diff --git a/lib/filters/account-filters.ts b/lib/filters/account-filters.ts
index 449bc8d50..705251f42 100644
--- a/lib/filters/account-filters.ts
+++ b/lib/filters/account-filters.ts
@@ -3,6 +3,7 @@ import type { FilterRule, SieveCapabilities, SieveScript } from '@/lib/jmap/siev
 import { parseScript, type ParseResult } from '@/lib/sieve/parser';
 import { generateScript, VACATION_SCRIPT_NAME } from '@/lib/sieve/generator';
 import { filterHooks } from '@/lib/plugin-hooks';
+import type { FilterRuleView } from '@/lib/plugin-types';
 
 /**
  * One account's filters script, read and written against an explicit
@@ -44,6 +45,47 @@ export class FiltersChangedError extends Error {
   }
 }
 
+/** A plugin stopped the save through onBeforeFiltersSave; nothing was written. */
+export class FiltersSaveVetoedError extends Error {
+  constructor() {
+    super('A plugin stopped saving the filters');
+    this.name = 'FiltersSaveVetoedError';
+  }
+}
+
+/**
+ * A filter rule as plugins see it. Only what the rule matches and does: the
+ * raw Sieve block of a rule written elsewhere is left out, since it can hold
+ * anything a hand-edited script holds.
+ */
+export function filterRuleToView(rule: FilterRule): FilterRuleView {
+  return {
+    id: rule.id,
+    name: rule.name,
+    isActive: rule.enabled,
+    conditions: rule.conditions.map((c) => ({
+      field: c.field,
+      comparator: c.comparator,
+      value: Array.isArray(c.value) ? [...c.value] : c.value,
+      ...(c.headerName ? { headerName: c.headerName } : {}),
+    })),
+    actions: rule.actions.map((a) => ({
+      type: a.type,
+      ...(a.value !== undefined ? { value: a.value } : {}),
+      ...(a.mailboxId ? { mailboxId: a.mailboxId } : {}),
+      ...(a.keepCopy !== undefined ? { keepCopy: a.keepCopy } : {}),
+    })),
+  };
+}
+
+/** Asks onBeforeFiltersSave; throws FiltersSaveVetoedError when a plugin says no. */
+export async function assertFiltersSaveAllowed(rules: FilterRule[]): Promise<void> {
+  if (filterHooks.onBeforeFiltersSave.size === 0) return;
+  if (!(await filterHooks.onBeforeFiltersSave.intercept({ rules: rules.map(filterRuleToView) }))) {
+    throw new FiltersSaveVetoedError();
+  }
+}
+
 export function supportsInclude(capabilities: SieveCapabilities | null): boolean {
   return capabilities?.sieveExtensions?.includes('include') ?? false;
 }
@@ -162,6 +204,7 @@ export async function updateAccountFilters(
   if (filters.parsed.isOpaque) throw new OpaqueFiltersError();
   const rules = modify(filters.parsed.rules, filters);
   if (!rules) return null;
+  await assertFiltersSaveAllowed(rules);
   const written = await writeFiltersScript(
     client, accountId, renderFiltersScript(rules, filters), filters.script?.id ?? null,
   );
diff --git a/lib/filters/quick-rule-flow.ts b/lib/filters/quick-rule-flow.ts
index ff73d5adc..79014e450 100644
--- a/lib/filters/quick-rule-flow.ts
+++ b/lib/filters/quick-rule-flow.ts
@@ -14,6 +14,7 @@ import {
   readAccountFilters,
   restoreAccountFilters,
   updateAccountFilters,
+  FiltersSaveVetoedError,
   type FiltersChange,
 } from './account-filters';
 import {
@@ -87,6 +88,8 @@ function refreshFilterStore(target: QuickRuleTarget): void {
 }
 
 function reportWriteError(error: unknown, target: QuickRuleTarget, text: QuickRuleText): void {
+  // The plugin that stopped the save is expected to have told the user.
+  if (error instanceof FiltersSaveVetoedError) return;
   if (error instanceof OpaqueFiltersError) {
     useQuickRuleStore.getState().setStatus(target.key, 'opaque');
     toast.error(text.menu('rules.opaque_hint'));
diff --git a/lib/plugin-after-send.ts b/lib/plugin-after-send.ts
new file mode 100644
index 000000000..d6576f33a
--- /dev/null
+++ b/lib/plugin-after-send.ts
@@ -0,0 +1,89 @@
+// onAfterEmailSend: told once the server accepted a message.
+//
+// - A plain send is reported straight away, scheduledFor null.
+// - A send the user scheduled for later is reported straight away too, with
+//   scheduledFor: the server accepted it, even though it goes out later.
+// - A send held back for undo ("Sending in 10 s") is reported only when the
+//   hold runs out or the user picks "Send now". Undo drops it: that message
+//   never leaves.
+// A failed send never gets here; the callers only report a resolved send.
+
+import type { SendEmailResult } from './jmap/types';
+import { emailHooks } from './plugin-hooks';
+
+export interface SentMessage {
+  to: string[];
+  cc: string[];
+  bcc: string[];
+  subject: string;
+  /** Set when the user scheduled the message; absent for an undo-send hold. */
+  delayedUntil?: string;
+}
+
+interface AfterSendPayload {
+  emailId: string | null;
+  submissionId: string | null;
+  to: string[];
+  cc: string[];
+  bcc: string[];
+  subject: string;
+  scheduledFor: string | null;
+}
+
+const held = new Map<string, { timer: ReturnType<typeof setTimeout>; payload: AfterSendPayload }>();
+
+function emit(payload: AfterSendPayload): void {
+  if (emailHooks.onAfterEmailSend.size === 0) return;
+  void emailHooks.onAfterEmailSend.emit(payload);
+}
+
+/** Report a send the server accepted (see the rules above). */
+export function announceSent(result: SendEmailResult, message: SentMessage): void {
+  const payload: AfterSendPayload = {
+    emailId: result.emailId ?? null,
+    submissionId: result.emailSubmissionId ?? null,
+    to: [...message.to],
+    cc: [...message.cc],
+    bcc: [...message.bcc],
+    subject: message.subject,
+    scheduledFor: null,
+  };
+  if (message.delayedUntil) {
+    emit({ ...payload, scheduledFor: result.sendAt ?? message.delayedUntil });
+    return;
+  }
+  const submissionId = result.emailSubmissionId;
+  if (result.scheduled && submissionId && result.sendAt) {
+    const wait = Math.max(0, Date.parse(result.sendAt) - Date.now());
+    const timer = setTimeout(() => {
+      held.delete(submissionId);
+      emit(payload);
+    }, Number.isFinite(wait) ? wait : 0);
+    held.set(submissionId, { timer, payload });
+    return;
+  }
+  emit(payload);
+}
+
+/** The user undid a held send: it is not reported. */
+export function cancelAnnouncedSend(submissionId: string): void {
+  const entry = held.get(submissionId);
+  if (!entry) return;
+  clearTimeout(entry.timer);
+  held.delete(submissionId);
+}
+
+/** The user chose "Send now" for a held send: report it now. */
+export function releaseAnnouncedSend(submissionId: string): void {
+  const entry = held.get(submissionId);
+  if (!entry) return;
+  clearTimeout(entry.timer);
+  held.delete(submissionId);
+  emit(entry.payload);
+}
+
+/** Drop every held send (tests). */
+export function resetAnnouncedSends(): void {
+  for (const { timer } of held.values()) clearTimeout(timer);
+  held.clear();
+}
diff --git a/lib/plugin-compose-gate.ts b/lib/plugin-compose-gate.ts
new file mode 100644
index 000000000..30b4f16cd
--- /dev/null
+++ b/lib/plugin-compose-gate.ts
@@ -0,0 +1,114 @@
+// onBeforeCompose: asked before the composer opens, from any entry point
+// (new message, keyboard, mailto, reply / forward, re-opened draft). A plugin
+// returns false to stop it, or a ComposeOptions to prefill the fields. Only
+// the fields a plugin actually changed come back as a prefill, so a reply's
+// own recipients and quote stay as the host builds them unless one is touched.
+
+import type { ComposeOptions } from './plugin-types';
+import { emailHooks } from './plugin-hooks';
+import { buildReplyRecipients, type ReplySource } from './reply-recipients';
+import { buildForwardSubject, buildReplySubject } from './subject-prefix';
+import { formatRecipient } from './email-composer-utils';
+
+export type ComposerOpenMode = 'compose' | 'reply' | 'replyAll' | 'forward';
+
+/** Fields a plugin changed in onBeforeCompose. Body is plain text. */
+export interface ComposePrefill {
+  to?: string[];
+  cc?: string[];
+  subject?: string;
+  body?: string;
+}
+
+const MAX_RECIPIENTS = 200;
+const MAX_ADDRESS_LENGTH = 998;
+const MAX_SUBJECT_LENGTH = 998;
+const MAX_BODY_LENGTH = 64 * 1024;
+// eslint-disable-next-line no-control-regex -- removing control characters is the point
+const CONTROL_CHARS = /[\u0000-\u001f\u007f]/g;
+// eslint-disable-next-line no-control-regex -- removing control characters is the point
+const CONTROL_CHARS_EXCEPT_LINE_BREAKS = /[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/g;
+
+function cleanAddresses(value: unknown): string[] | undefined {
+  if (!Array.isArray(value)) return undefined;
+  return value
+    .filter((v): v is string => typeof v === 'string')
+    .map((v) => v.replace(CONTROL_CHARS, '').trim().slice(0, MAX_ADDRESS_LENGTH))
+    .filter(Boolean)
+    .slice(0, MAX_RECIPIENTS);
+}
+
+/** `accept` for onBeforeCompose: take the well-formed fields of a returned ComposeOptions. */
+export function acceptComposeOptions(result: unknown, current: ComposeOptions): ComposeOptions | undefined {
+  if (!result || typeof result !== 'object' || Array.isArray(result)) return undefined;
+  const r = result as Record<string, unknown>;
+  const next: ComposeOptions = { ...current };
+  const to = cleanAddresses(r.to);
+  if (to) next.to = to;
+  const cc = cleanAddresses(r.cc);
+  if (cc) next.cc = cc;
+  if (typeof r.subject === 'string') next.subject = r.subject.replace(CONTROL_CHARS, '').slice(0, MAX_SUBJECT_LENGTH);
+  if (typeof r.body === 'string') {
+    next.body = r.body.replace(/\r\n?/g, '\n').replace(CONTROL_CHARS_EXCEPT_LINE_BREAKS, '').slice(0, MAX_BODY_LENGTH);
+  }
+  return next;
+}
+
+const sameList = (a: string[], b: string[]) => a.length === b.length && a.every((v, i) => v === b[i]);
+
+/**
+ * Run onBeforeCompose. Resolves to null when a plugin stopped the composer,
+ * otherwise to the fields it changed (empty when none).
+ */
+export async function runBeforeCompose(options: ComposeOptions): Promise<ComposePrefill | null> {
+  const outcome = emailHooks.onBeforeCompose.size > 0
+    ? await emailHooks.onBeforeCompose.interceptWithValue(options, acceptComposeOptions)
+    : { allowed: true as const, value: options };
+  if (!outcome.allowed) return null;
+  const changed = outcome.value;
+  const prefill: ComposePrefill = {};
+  if (!sameList(changed.to, options.to)) prefill.to = changed.to;
+  if (!sameList(changed.cc, options.cc)) prefill.cc = changed.cc;
+  if (changed.subject !== options.subject) prefill.subject = changed.subject;
+  if (changed.body !== options.body) prefill.body = changed.body;
+  return prefill;
+}
+
+const PLUGIN_MODE: Record<ComposerOpenMode, ComposeOptions['mode']> = {
+  compose: 'new',
+  reply: 'reply',
+  replyAll: 'reply-all',
+  forward: 'forward',
+};
+
+/**
+ * The ComposeOptions for a composer about to open: what the host will fill in
+ * itself. A reply's recipients and subject are worked out the way the
+ * composer does it.
+ */
+export function composeOptionsFor(
+  mode: ComposerOpenMode,
+  opts: {
+    source?: (ReplySource & { subject?: string }) | null;
+    ownEmails?: string[];
+    to?: string[];
+    cc?: string[];
+    subject?: string;
+    body?: string;
+    replyPrefix?: string;
+    forwardPrefix?: string;
+  } = {},
+): ComposeOptions {
+  let to = opts.to ?? [];
+  let cc = opts.cc ?? [];
+  let subject = opts.subject ?? '';
+  if (opts.source && (mode === 'reply' || mode === 'replyAll')) {
+    const recipients = buildReplyRecipients(opts.source, mode, opts.ownEmails ?? []);
+    if (!opts.to) to = recipients.to.map((r) => formatRecipient(r.name, r.email ?? ''));
+    if (!opts.cc) cc = recipients.cc.map((r) => formatRecipient(r.name, r.email ?? ''));
+    if (opts.subject === undefined && opts.source.subject) subject = buildReplySubject(opts.source.subject, opts.replyPrefix ?? 'Re:');
+  } else if (opts.source && mode === 'forward' && opts.subject === undefined && opts.source.subject) {
+    subject = buildForwardSubject(opts.source.subject, opts.forwardPrefix ?? 'Fwd:');
+  }
+  return { mode: PLUGIN_MODE[mode], to, cc, subject, body: opts.body ?? '' };
+}
diff --git a/lib/plugin-composer-hooks.ts b/lib/plugin-composer-hooks.ts
new file mode 100644
index 000000000..a2cf9d91c
--- /dev/null
+++ b/lib/plugin-composer-hooks.ts
@@ -0,0 +1,68 @@
+// Composer lifecycle hooks: onComposerOpen, onComposerClose, onDraftAutoSave.
+//
+// The composer component is not the composer session: the host remounts it
+// when it moves (Mountain View's pop-out window, a layout switch), which is
+// not the user closing and reopening it. So a session is identified by a key
+// the host keeps for as long as it means the same message, and an unmount
+// only counts as a close when no composer with that key mounts again right
+// after it.
+//
+// Observers never get in the way of the composer: a missing or broken bus is
+// ignored here (composer tests replace the hook module with partial doubles).
+
+import type { ComposerContext } from './plugin-types';
+import { emailHooks } from './plugin-hooks';
+
+const openSessions = new Set<string>();
+const pendingCloses = new Map<string, ReturnType<typeof setTimeout>>();
+
+/** A composer with this session key is on screen. */
+export function composerMounted(sessionKey: string, context: ComposerContext): void {
+  const pending = pendingCloses.get(sessionKey);
+  if (pending !== undefined) {
+    // Remounted in place: the same session goes on.
+    clearTimeout(pending);
+    pendingCloses.delete(sessionKey);
+    return;
+  }
+  if (openSessions.has(sessionKey)) return;
+  openSessions.add(sessionKey);
+  try {
+    if (emailHooks.onComposerOpen.size > 0) void emailHooks.onComposerOpen.emit(context);
+  } catch { /* observers never break the composer */ }
+}
+
+/**
+ * The composer with this key went away. Reported as closed unless it mounts
+ * again before the next task. `info` is read when the close is reported, so a
+ * send that finishes while the host tears the composer down still counts.
+ */
+export function composerUnmounted(sessionKey: string, info: () => { draftId: string | null; sent: boolean }): void {
+  if (!openSessions.has(sessionKey) || pendingCloses.has(sessionKey)) return;
+  pendingCloses.set(sessionKey, setTimeout(() => {
+    pendingCloses.delete(sessionKey);
+    openSessions.delete(sessionKey);
+    try {
+      if (emailHooks.onComposerClose.size > 0) void emailHooks.onComposerClose.emit(info());
+    } catch { /* observers never break the composer */ }
+  }, 0));
+}
+
+/** A draft was saved on the server. */
+export function draftSaved(draftId: string, subject: string): void {
+  try {
+    if (emailHooks.onDraftAutoSave.size > 0) void emailHooks.onDraftAutoSave.emit({ draftId, subject });
+  } catch { /* observers never break the composer */ }
+}
+
+/** Forget every session (tests). */
+export function resetComposerSessions(): void {
+  for (const timer of pendingCloses.values()) clearTimeout(timer);
+  pendingCloses.clear();
+  openSessions.clear();
+}
+
+/** The plugin-facing name of a composer mode. */
+export function composerContextMode(mode: 'compose' | 'reply' | 'replyAll' | 'forward'): ComposerContext['mode'] {
+  return mode === 'compose' ? 'new' : mode === 'replyAll' ? 'reply-all' : mode;
+}
diff --git a/lib/plugin-hook-catalog.ts b/lib/plugin-hook-catalog.ts
new file mode 100644
index 000000000..de80235bf
--- /dev/null
+++ b/lib/plugin-hook-catalog.ts
@@ -0,0 +1,315 @@
+// Every plugin hook the host offers: what kind it is, which permission a
+// plugin needs for it, what it receives, and where the host fires it.
+//
+// This is the single source of truth. The permission table in
+// plugin-sandbox/permissions.ts, the hook reference in the plugin docs and
+// the "every hook is fired" test (lib/__tests__/plugin-hook-catalog.test.ts)
+// all read it, so a hook can't be declared without a call site, a permission
+// and a description.
+//
+// Kinds:
+// - observer: told after something happened; the return value is ignored.
+// - intercept: asked before something happens; return false to stop it.
+// - transform: handed a value and returns a changed one (or undefined to
+//   leave it alone); handlers run in order, each sees the previous result.
+// - takeover: may do the action itself instead of the host (onComposeSend).
+//
+// Payloads cross into a sandboxed iframe, so they are plain data. Changing a
+// payload object in place has no effect on the host; use the return value.
+
+import type { Permission } from './plugin-types';
+
+export type HookKind = 'observer' | 'intercept' | 'transform' | 'takeover';
+
+export type HookGroup =
+  | 'mail-list' | 'mail-read' | 'mail-compose' | 'mail-send' | 'mail-organize' | 'mail-mailboxes'
+  | 'mail-search' | 'mail-attachments' | 'mail-sync'
+  | 'calendar' | 'contacts' | 'tasks' | 'files'
+  | 'settings' | 'identities' | 'filters' | 'vacation' | 'templates'
+  | 'auth' | 'security' | 'navigation' | 'theme' | 'notifications' | 'app' | 'ui' | 'keyboard' | 'tabs';
+
+export interface HookSpec {
+  group: HookGroup;
+  kind: HookKind;
+  permission: Permission;
+  /** What the handler receives (and, for transforms, returns). */
+  payload: string;
+  /** When the host fires it. */
+  when: string;
+}
+
+const H = (group: HookGroup, kind: HookKind, permission: Permission, payload: string, when: string): HookSpec =>
+  ({ group, kind, permission, payload, when });
+
+export const HOOK_CATALOG = {
+  // ─── Mail: message list ────────────────────────────────────
+  onEmailsFetched: H('mail-list', 'transform', 'email:render-takeover', 'Email[] (list rows), { mailboxId }', 'after a page of the message list is loaded, before it is shown'),
+  onEmailListItemRender: H('mail-list', 'transform', 'email:read', 'EmailListBadge[], { email: EmailSummary }', 'for each visible row; returned badges are shown next to the subject'),
+  onEmailSelectionChange: H('mail-list', 'observer', 'email:read', '{ emailIds: string[] }', 'when the set of selected messages changes'),
+  onMailboxChange: H('mail-list', 'observer', 'email:read', '{ mailboxId, role, previousMailboxId }', 'when the user opens another folder'),
+
+  // ─── Mail: reading ─────────────────────────────────────────
+  onEmailOpen: H('mail-read', 'observer', 'email:read', 'EmailReadView', 'when a message is opened'),
+  onEmailClose: H('mail-read', 'observer', 'email:read', '{ emailId }', 'when the open message is closed or replaced'),
+  onRenderEmailBody: H('mail-read', 'transform', 'email:render-takeover', 'RenderableBody, MessageContext', 'before the body of an opened message is rendered'),
+  onEmailContentRender: H('mail-read', 'observer', 'email:read', '{ emailId, hasHtml, hasExternalContent }', 'after the body of an opened message is on screen'),
+  onThreadExpand: H('mail-read', 'observer', 'email:read', '{ threadId, emailIds, expanded }', 'when a conversation is expanded or collapsed'),
+  onBeforeReply: H('mail-read', 'intercept', 'email:read', 'ReplyContext', 'when Reply is chosen, before the composer opens'),
+  onBeforeReplyAll: H('mail-read', 'intercept', 'email:read', 'ReplyContext', 'when Reply all is chosen, before the composer opens'),
+  onBeforeForward: H('mail-read', 'intercept', 'email:read', 'ReplyContext', 'when Forward is chosen, before the composer opens'),
+  onBeforeExternalLink: H('mail-read', 'intercept', 'ui:observe', 'ExternalLinkContext', 'when a link in a message is clicked; return false to stop it or { href } to change it'),
+  onAvatarResolve: H('mail-read', 'transform', 'email:read', 'string | null (avatar URL), { email, name }', 'when a sender avatar is needed'),
+
+  // ─── Mail: composing ───────────────────────────────────────
+  onBeforeCompose: H('mail-compose', 'intercept', 'email:send', 'ComposeOptions', 'before the composer opens; return false to stop it or a ComposeOptions to prefill it'),
+  onComposerOpen: H('mail-compose', 'observer', 'email:read', 'ComposerContext', 'after the composer opened'),
+  onComposerClose: H('mail-compose', 'observer', 'email:read', '{ draftId, sent: boolean }', 'after the composer closed'),
+  onDraftChange: H('mail-compose', 'observer', 'email:read', 'DraftView', 'while the user writes (debounced)'),
+  onBeforeDraftAutoSave: H('mail-compose', 'transform', 'email:send', 'AlmostSavedDraft', 'before a draft is saved; return a changed draft, or false to skip a save while typing (saves on close and before send always run)'),
+  onDraftAutoSave: H('mail-compose', 'observer', 'email:read', '{ draftId, subject }', 'after a draft was saved'),
+  onBeforeEditDraft: H('mail-compose', 'transform', 'email:send', 'Email', 'before a saved draft is opened in the composer'),
+  onBuildQuoteHeader: H('mail-compose', 'transform', 'email:send', 'QuoteHeader, QuoteHeaderContext', 'when a reply or forward is set up'),
+  onRecipientChipsChange: H('mail-compose', 'transform', 'email:send', 'Recipient[]', 'when the recipient fields change'),
+  onBeforeComposeOpenToReply: H('mail-compose', 'transform', 'email:send', 'Email (the original)', 'before a reply is filled in'),
+  onBeforeComposeOpenToReplyAll: H('mail-compose', 'transform', 'email:send', 'Email (the original)', 'before a reply-all is filled in'),
+  onBeforeComposeOpenToForward: H('mail-compose', 'transform', 'email:send', 'Email (the original)', 'before a forward is filled in'),
+  onBeforeComposeOpenToForwardAsAttachment: H('mail-compose', 'transform', 'email:send', 'Email (the original)', 'before a forward-as-attachment is filled in'),
+  onMailtoIntercept: H('mail-compose', 'intercept', 'email:read', 'MailtoContext', 'when a mailto: link is opened; return false to stop the composer'),
+
+  // ─── Mail: sending ─────────────────────────────────────────
+  onBeforeEmailSend: H('mail-send', 'intercept', 'email:send', 'OutgoingEmail', 'when Send is pressed; a handler that fails or times out stops the send'),
+  onTransformOutgoingEmail: H('mail-send', 'transform', 'email:send', 'OutgoingEmail', 'right before the message is submitted'),
+  onComposeSend: H('mail-send', 'takeover', 'email:send', 'ComposeSendRequest', 'at the start of sending; may send the message itself'),
+  onAfterEmailSend: H('mail-send', 'observer', 'email:read', '{ emailId, submissionId, to, cc, bcc, subject, scheduledFor }', 'after the server accepted the message'),
+
+  // ─── Mail: organizing ──────────────────────────────────────
+  onBeforeEmailDelete: H('mail-organize', 'intercept', 'email:write', '{ emailIds, permanent }', 'before messages are deleted or moved to Trash'),
+  onAfterEmailDelete: H('mail-organize', 'observer', 'email:read', '{ emailIds, permanent }', 'after messages were deleted'),
+  onBeforeEmailMove: H('mail-organize', 'intercept', 'email:write', '{ emailIds, fromMailboxId, toMailboxId }', 'before messages are moved'),
+  onAfterEmailMove: H('mail-organize', 'observer', 'email:read', '{ emailIds, fromMailboxId, toMailboxId }', 'after messages were moved'),
+  onBeforeEmailArchive: H('mail-organize', 'intercept', 'email:write', '{ emailIds }', 'before messages are archived'),
+  onEmailArchive: H('mail-organize', 'observer', 'email:read', '{ emailIds }', 'after messages were archived'),
+  onEmailUnarchive: H('mail-organize', 'observer', 'email:read', '{ emailIds, toMailboxId }', 'after messages were moved out of the archive'),
+  onBeforeEmailSpamToggle: H('mail-organize', 'intercept', 'email:write', '{ emailIds, spam }', 'before messages are marked as spam or not spam'),
+  onEmailSpamToggle: H('mail-organize', 'observer', 'email:read', '{ emailIds, spam }', 'after messages were marked as spam or not spam'),
+  onBeforeEmailReadStateChange: H('mail-organize', 'intercept', 'email:write', '{ emailIds, read }', 'before messages are marked read or unread'),
+  onEmailReadStateChange: H('mail-organize', 'observer', 'email:read', '{ emailIds, read }', 'after messages were marked read or unread'),
+  onBeforeEmailStarToggle: H('mail-organize', 'intercept', 'email:write', '{ emailIds, starred }', 'before messages are starred or unstarred'),
+  onEmailStarToggle: H('mail-organize', 'observer', 'email:read', '{ emailIds, starred }', 'after messages were starred or unstarred'),
+  onBeforeEmailKeywordChange: H('mail-organize', 'intercept', 'email:write', '{ emailIds, added: string[], removed: string[] }', 'before tags or other keywords are changed'),
+  onEmailKeywordChange: H('mail-organize', 'observer', 'email:read', '{ emailIds, added: string[], removed: string[] }', 'after tags or other keywords changed'),
+  onBeforeEmailCategorize: H('mail-organize', 'intercept', 'email:read', 'EmailCategorizeContext', 'before messages are moved to another inbox tab'),
+  onEmailCategorize: H('mail-organize', 'observer', 'email:read', 'EmailCategorizeContext', 'after messages were moved to another inbox tab'),
+
+  // ─── Mail: folders ─────────────────────────────────────────
+  onMailboxesRefresh: H('mail-mailboxes', 'observer', 'email:read', 'MailboxView[]', 'after the folder list was loaded or refreshed'),
+  onBeforeMailboxCreate: H('mail-mailboxes', 'intercept', 'email:write', '{ name, parentId }', 'before a folder is created'),
+  onMailboxCreate: H('mail-mailboxes', 'observer', 'email:read', '{ mailboxId, name, parentId }', 'after a folder was created'),
+  onBeforeMailboxRename: H('mail-mailboxes', 'intercept', 'email:write', '{ mailboxId, name }', 'before a folder is renamed'),
+  onMailboxRename: H('mail-mailboxes', 'observer', 'email:read', '{ mailboxId, name, previousName }', 'after a folder was renamed'),
+  onBeforeMailboxDelete: H('mail-mailboxes', 'intercept', 'email:write', '{ mailboxId, name }', 'before a folder is deleted'),
+  onMailboxDelete: H('mail-mailboxes', 'observer', 'email:read', '{ mailboxId, name }', 'after a folder was deleted'),
+  onBeforeMailboxEmpty: H('mail-mailboxes', 'intercept', 'email:write', '{ mailboxId, role }', 'before a folder (usually Trash or Spam) is emptied'),
+  onMailboxEmpty: H('mail-mailboxes', 'observer', 'email:read', '{ mailboxId, role, count }', 'after a folder was emptied'),
+  onQuotaChange: H('mail-mailboxes', 'observer', 'email:read', 'QuotaView', 'when the storage quota was read and changed'),
+
+  // ─── Mail: search ──────────────────────────────────────────
+  onSearch: H('mail-search', 'transform', 'email:read', '{ query, filters: SearchFilters }', 'before a search runs; may change the query and filters'),
+  onSearchResults: H('mail-search', 'transform', 'email:read', 'string[], { query, filters, emailIds }', 'after search results arrived; return ids of further messages to add to them (at most 100)'),
+  onProvideSearchResults: H('mail-search', 'transform', 'email:read', 'ExternalSearchResult[], { query, filters }', 'to add results from elsewhere to a search'),
+
+  // ─── Mail: attachments ─────────────────────────────────────
+  onBeforeAttachmentUpload: H('mail-attachments', 'intercept', 'email:read', 'AttachmentInfo', 'before a file is attached in the composer'),
+  onBeforeBlobUpload: H('mail-attachments', 'transform', 'email:blob-write', '{ file, blobId } | ExternalAttachmentResult', 'before an attachment is uploaded; may offload it'),
+  onAfterAttachmentUpload: H('mail-attachments', 'observer', 'email:read', 'AttachmentInfo', 'after an attachment was uploaded'),
+  onAttachmentDownload: H('mail-attachments', 'observer', 'email:read', 'AttachmentInfo', 'when an attachment of a message is downloaded'),
+  onAttachmentPreview: H('mail-attachments', 'transform', 'email:render-takeover', 'AttachmentPreview, AttachmentInfo', 'when an attachment preview opens'),
+
+  // ─── Mail: new mail and sync ───────────────────────────────
+  onNewEmailReceived: H('mail-sync', 'observer', 'email:read', 'EmailSummary', 'for each new message in the inbox (push or poll)'),
+  onPushConnectionChange: H('mail-sync', 'observer', 'email:read', '{ connected: boolean }', 'when live updates connect or drop'),
+  onSyncStateChange: H('mail-sync', 'observer', 'email:read', '{ state: "syncing" | "idle" | "error", error? }', 'when the app starts or finishes fetching changes from the server'),
+
+  // ─── Calendar ──────────────────────────────────────────────
+  onCalendarEventOpen: H('calendar', 'observer', 'calendar:read', 'CalendarEventView', 'when an event is opened'),
+  onCalendarEventFormOpen: H('calendar', 'observer', 'calendar:read', 'CalendarEventFormView', 'when the event form opens'),
+  onCalendarEventFormSave: H('calendar', 'transform', 'calendar:write', 'CalendarEventFormSavePatch, CalendarEventFormView', 'while the event form is saved'),
+  onCheckEventConflicts: H('calendar', 'transform', 'calendar:read', 'ConflictWarning[], { event }', 'while start or end change in the event form'),
+  onBeforeEventCreate: H('calendar', 'intercept', 'calendar:write', 'CalendarEventView', 'before an event is created'),
+  onAfterEventCreate: H('calendar', 'observer', 'calendar:read', 'CalendarEventView', 'after an event was created'),
+  onBeforeEventUpdate: H('calendar', 'intercept', 'calendar:write', '{ eventId, patch }', 'before an event is changed'),
+  onAfterEventUpdate: H('calendar', 'observer', 'calendar:read', 'CalendarEventView', 'after an event was changed'),
+  onBeforeEventDelete: H('calendar', 'intercept', 'calendar:write', '{ eventId, title }', 'before an event is deleted'),
+  onAfterEventDelete: H('calendar', 'observer', 'calendar:read', '{ eventId, title }', 'after an event was deleted'),
+  onBeforeEventRsvp: H('calendar', 'intercept', 'calendar:write', '{ eventId, status }', 'before an invitation is answered'),
+  onEventRsvp: H('calendar', 'observer', 'calendar:read', '{ eventId, status }', 'after an invitation was answered'),
+  onBeforeEventsImport: H('calendar', 'intercept', 'calendar:write', '{ calendarId, count }', 'before events from a file are imported'),
+  onEventsImport: H('calendar', 'observer', 'calendar:read', '{ calendarId, imported, skipped }', 'after events were imported'),
+  onCalendarDateChange: H('calendar', 'observer', 'calendar:read', '{ date }', 'when the shown date changes'),
+  onCalendarViewChange: H('calendar', 'observer', 'calendar:read', '{ view }', 'when day, week, month or agenda view is chosen'),
+  onCalendarChange: H('calendar', 'observer', 'calendar:read', '{ calendarId, change: "created" | "updated" | "removed" }', 'after a calendar was created, changed or removed'),
+  onCalendarVisibilityToggle: H('calendar', 'observer', 'calendar:read', '{ calendarId, visible }', 'when a calendar is shown or hidden'),
+  onICalSubscriptionChange: H('calendar', 'observer', 'calendar:read', '{ subscriptionId, change: "added" | "updated" | "removed" | "refreshed" }', 'when a calendar subscription changes'),
+  onCalendarAlert: H('calendar', 'observer', 'calendar:read', 'CalendarAlertView', 'when an event reminder fires'),
+  onCalendarAlertAcknowledge: H('calendar', 'observer', 'calendar:read', '{ alertId, eventId }', 'when a reminder is dismissed'),
+
+  // ─── Contacts ──────────────────────────────────────────────
+  onContactOpen: H('contacts', 'observer', 'contacts:read', 'ContactView', 'when a contact is opened'),
+  onBeforeContactCreate: H('contacts', 'intercept', 'contacts:write', 'ContactView', 'before a contact is created'),
+  onAfterContactCreate: H('contacts', 'observer', 'contacts:read', 'ContactView', 'after a contact was created'),
+  onBeforeContactUpdate: H('contacts', 'intercept', 'contacts:write', '{ contactId, patch }', 'before a contact is changed'),
+  onAfterContactUpdate: H('contacts', 'observer', 'contacts:read', 'ContactView', 'after a contact was changed'),
+  onBeforeContactDelete: H('contacts', 'intercept', 'contacts:write', '{ contactIds }', 'before contacts are deleted'),
+  onAfterContactDelete: H('contacts', 'observer', 'contacts:read', '{ contactIds }', 'after contacts were deleted'),
+  onContactsImport: H('contacts', 'observer', 'contacts:read', '{ addressBookId, imported }', 'after contacts were imported'),
+  onContactSelectionChange: H('contacts', 'observer', 'contacts:read', '{ contactIds }', 'when the selected contacts change'),
+  onContactGroupChange: H('contacts', 'observer', 'contacts:read', '{ groupId, change: "created" | "updated" | "deleted" }', 'after a contact group changed'),
+  onContactGroupMemberChange: H('contacts', 'observer', 'contacts:read', '{ groupId, added, removed }', 'after members were added to or removed from a group'),
+  onContactMove: H('contacts', 'observer', 'contacts:read', '{ contactId, toAddressBookId }', 'after a contact moved to another address book'),
+  onProvideRecipientSuggestions: H('contacts', 'transform', 'contacts:read', 'RecipientSuggestion[], { query }', 'to add suggestions to recipient autocomplete'),
+
+  // ─── Tasks ─────────────────────────────────────────────────
+  onTasksLoaded: H('tasks', 'observer', 'tasks:read', 'TaskView[]', 'after the task list was loaded'),
+  onBeforeTaskCreate: H('tasks', 'intercept', 'tasks:write', 'TaskView', 'before a task is created'),
+  onTaskCreate: H('tasks', 'observer', 'tasks:read', 'TaskView', 'after a task was created'),
+  onBeforeTaskUpdate: H('tasks', 'intercept', 'tasks:write', '{ taskId, patch }', 'before a task is changed'),
+  onTaskUpdate: H('tasks', 'observer', 'tasks:read', 'TaskView', 'after a task was changed'),
+  onBeforeTaskDelete: H('tasks', 'intercept', 'tasks:write', '{ taskId, title }', 'before a task is deleted'),
+  onTaskDelete: H('tasks', 'observer', 'tasks:read', '{ taskId, title }', 'after a task was deleted'),
+  onTaskToggleComplete: H('tasks', 'observer', 'tasks:read', '{ taskId, complete }', 'after a task was checked off or reopened'),
+  onTaskFilterChange: H('tasks', 'observer', 'tasks:read', '{ filter, showCompleted }', 'when the task filter changes'),
+
+  // ─── Files ─────────────────────────────────────────────────
+  onFileNavigate: H('files', 'observer', 'files:read', '{ path }', 'when another folder is opened'),
+  onBeforeFileUpload: H('files', 'intercept', 'files:write', '{ name, size, type, path }', 'before a file is uploaded'),
+  onAfterFileUpload: H('files', 'observer', 'files:read', 'FileResourceView', 'after a file was uploaded'),
+  onFileUploadCancel: H('files', 'observer', 'files:read', '{ name, path }', 'when an upload is cancelled'),
+  onFileDownload: H('files', 'observer', 'files:read', 'FileResourceView', 'when a file is downloaded'),
+  onDirectoryCreate: H('files', 'observer', 'files:read', 'FileResourceView', 'after a folder was created'),
+  onBeforeFileDelete: H('files', 'intercept', 'files:write', '{ files: FileResourceView[] }', 'before files are deleted'),
+  onAfterFileDelete: H('files', 'observer', 'files:read', '{ files: FileResourceView[] }', 'after files were deleted'),
+  onBeforeFileRename: H('files', 'intercept', 'files:write', '{ file, newName }', 'before a file is renamed'),
+  onFileRename: H('files', 'observer', 'files:read', '{ file, previousName }', 'after a file was renamed'),
+  onBeforeFileMove: H('files', 'intercept', 'files:write', '{ files, toPath }', 'before files are moved'),
+  onFileMove: H('files', 'observer', 'files:read', '{ files, toPath }', 'after files were moved'),
+  onFileCopy: H('files', 'observer', 'files:read', '{ files, toPath }', 'after files were copied'),
+  onFileDuplicate: H('files', 'observer', 'files:read', 'FileResourceView', 'after a file was duplicated'),
+  onFileFavoriteToggle: H('files', 'observer', 'files:read', '{ file, favorite }', 'when a file is starred or unstarred'),
+  onFileSelectionChange: H('files', 'observer', 'files:read', '{ files: FileResourceView[] }', 'when the selected files change'),
+  onFileUndo: H('files', 'observer', 'files:read', '{ action }', 'after the last file action was undone'),
+
+  // ─── Settings ──────────────────────────────────────────────
+  onBeforeSettingChange: H('settings', 'intercept', 'settings:write', '{ key, value, previous }', 'before a preference is changed'),
+  onSettingChange: H('settings', 'observer', 'settings:read', '{ key, value, previous }', 'after a preference changed'),
+  onSettingsExport: H('settings', 'observer', 'settings:read', '{ keys: string[] }', 'after settings were exported'),
+  onSettingsImport: H('settings', 'observer', 'settings:read', '{ keys: string[] }', 'after settings were imported'),
+  onSettingsReset: H('settings', 'observer', 'settings:read', '{}', 'after settings were reset to defaults'),
+  onSettingsSync: H('settings', 'observer', 'settings:read', '{ direction: "pulled" | "pushed" }', 'after settings were synced with the server'),
+  onKeywordChange: H('settings', 'observer', 'settings:read', '{ keywords: KeywordView[] }', 'after the tag definitions changed'),
+  onTrustedSenderChange: H('settings', 'observer', 'settings:read', '{ email, trusted }', 'after a sender was trusted or untrusted for remote content'),
+
+  // ─── Identities ────────────────────────────────────────────
+  onIdentitiesLoaded: H('identities', 'observer', 'identity:read', 'IdentityView[]', 'after sender identities were loaded'),
+  onBeforeIdentityChange: H('identities', 'intercept', 'identity:write', '{ identityId?, change: "create" | "update" | "delete", identity? }', 'before an identity is created, changed or deleted'),
+  onIdentityCreate: H('identities', 'observer', 'identity:read', 'IdentityView', 'after an identity was created'),
+  onIdentityUpdate: H('identities', 'observer', 'identity:read', 'IdentityView', 'after an identity was changed'),
+  onIdentityDelete: H('identities', 'observer', 'identity:read', '{ identityId }', 'after an identity was deleted'),
+  onIdentitySelect: H('identities', 'observer', 'identity:read', 'IdentityView', 'when another From identity is chosen in the composer'),
+  onSignatureRender: H('identities', 'transform', 'identity:read', '{ html, text }, { identityId }', 'when a signature is inserted into the composer'),
+
+  // ─── Filters ───────────────────────────────────────────────
+  onFiltersLoaded: H('filters', 'observer', 'filters:read', 'FilterRuleView[]', 'after filter rules were loaded'),
+  onFilterRuleChange: H('filters', 'observer', 'filters:read', '{ ruleId, change: "added" | "updated" | "deleted" | "reordered" | "toggled" }', 'after a filter rule changed in the editor'),
+  onBeforeFiltersSave: H('filters', 'intercept', 'filters:write', '{ rules: FilterRuleView[] }', 'before filter rules are saved to the server'),
+  onFiltersSave: H('filters', 'observer', 'filters:read', '{ accountId }', 'after the filter script was saved'),
+  onSieveScriptChange: H('filters', 'observer', 'filters:read', '{ accountId }', 'after the active script changed'),
+  onSieveScriptGenerate: H('filters', 'transform', 'filters:write', 'string (Sieve script), SieveScriptGenerateContext', 'before the generated script is uploaded'),
+
+  // ─── Out of office ─────────────────────────────────────────
+  onVacationLoaded: H('vacation', 'observer', 'vacation:read', 'VacationView', 'after the out-of-office reply was loaded'),
+  onBeforeVacationUpdate: H('vacation', 'intercept', 'vacation:write', 'VacationView', 'before the out-of-office reply is changed'),
+  onVacationUpdate: H('vacation', 'observer', 'vacation:read', 'VacationView', 'after the out-of-office reply was changed'),
+
+  // ─── Templates ─────────────────────────────────────────────
+  onTemplateCreate: H('templates', 'observer', 'templates:read', 'TemplateView', 'after a template was created'),
+  onTemplateUpdate: H('templates', 'observer', 'templates:read', 'TemplateView', 'after a template was changed'),
+  onTemplateDelete: H('templates', 'observer', 'templates:read', '{ templateId }', 'after a template was deleted'),
+  onTemplatesImport: H('templates', 'observer', 'templates:read', '{ count }', 'after templates were imported'),
+  onTemplateApply: H('templates', 'observer', 'templates:read', 'TemplateView', 'after a template was inserted into the composer'),
+  onTemplateRender: H('templates', 'transform', 'templates:read', '{ subject, html, text }, { templateId }', 'before a template is inserted; may change the text'),
+
+  // ─── Sign-in and accounts ──────────────────────────────────
+  onLogin: H('auth', 'observer', 'auth:observe', '{ accountId, username }', 'after a sign-in'),
+  onAuthReady: H('auth', 'observer', 'auth:observe', '{ accountId }', 'when the session is ready after start or sign-in'),
+  onTokenRefresh: H('auth', 'observer', 'auth:observe', '{ accountId }', 'after the access token was renewed'),
+  onAccountAdd: H('auth', 'observer', 'auth:observe', '{ accountId }', 'after another account was added'),
+  onAccountRemove: H('auth', 'observer', 'auth:observe', '{ accountId }', 'after an account was removed'),
+  onAccountSwitch: H('auth', 'observer', 'app:lifecycle', '{ accountId, previousAccountId }', 'after another account was made active'),
+  onBeforeLogout: H('auth', 'observer', 'app:lifecycle', '{ accountId }', 'just before signing out'),
+  onAfterLogout: H('auth', 'observer', 'app:lifecycle', '{ accountId }', 'after signing out'),
+  onOAuthCallback: H('auth', 'observer', 'http:fetch', 'OAuthCallbackPayload', 'when a third-party OAuth flow this plugin started returns'),
+
+  // ─── Account security ──────────────────────────────────────
+  onPasswordChange: H('security', 'observer', 'security:read', '{}', 'after the account password was changed'),
+  onTotpChange: H('security', 'observer', 'security:read', '{ enabled }', 'after two-factor sign-in was turned on or off'),
+  onAppPasswordChange: H('security', 'observer', 'security:read', '{ change: "created" | "removed" }', 'after an app password was created or removed'),
+  onEncryptionChange: H('security', 'observer', 'security:read', '{ enabled }', 'after encryption at rest was changed'),
+  onDisplayNameChange: H('security', 'observer', 'security:read', '{ displayName }', 'after the account display name was changed'),
+
+  // ─── Navigation ────────────────────────────────────────────
+  onNavigate: H('navigation', 'observer', 'ui:observe', 'RouteContext', 'after the app moved to another page'),
+  onRouteEnter: H('navigation', 'observer', 'ui:observe', 'RouteContext', 'when a page is entered'),
+  onRouteLeave: H('navigation', 'observer', 'ui:observe', 'RouteContext', 'when a page is left'),
+
+  // ─── Theme and language ────────────────────────────────────
+  onThemeChange: H('theme', 'observer', 'ui:observe', '{ theme: "light" | "dark" | "system", resolved: "light" | "dark" }', 'after the colour scheme changed'),
+  onCustomThemeChange: H('theme', 'observer', 'ui:observe', '{ themeId }', 'after another theme was activated'),
+  onThemeBeforeApply: H('theme', 'transform', 'ui:observe', 'string (CSS), { themeId, variant }', 'before theme CSS is applied'),
+  onLocaleChange: H('theme', 'observer', 'ui:observe', '{ locale }', 'after the app language changed'),
+
+  // ─── Notifications ─────────────────────────────────────────
+  onToastShow: H('notifications', 'observer', 'ui:observe', '{ id, type, title, message }', 'when the app shows a toast'),
+  onToastDismiss: H('notifications', 'observer', 'ui:observe', '{ id }', 'when a toast is dismissed'),
+  onNotificationClick: H('notifications', 'observer', 'ui:notifications', '{ tag }', 'when a notification the plugin showed, or one from the app, is clicked'),
+
+  // ─── App lifecycle ─────────────────────────────────────────
+  onAppReady: H('app', 'observer', 'app:lifecycle', '{ accountId }', 'once after the app has started and the mail data is loaded'),
+  onVisibilityChange: H('app', 'observer', 'app:lifecycle', '{ visible }', 'when the tab is hidden or shown'),
+  onWindowFocus: H('app', 'observer', 'app:lifecycle', '{}', 'when the window gains focus'),
+  onWindowBlur: H('app', 'observer', 'app:lifecycle', '{}', 'when the window loses focus'),
+  onOnline: H('app', 'observer', 'app:lifecycle', '{}', 'when the network comes back'),
+  onOffline: H('app', 'observer', 'app:lifecycle', '{}', 'when the network goes away'),
+  onBeforeUnload: H('app', 'observer', 'app:lifecycle', '{}', 'when the page is about to close'),
+  onAppError: H('app', 'observer', 'app:lifecycle', '{ message }', 'when an unhandled error occurs in the app'),
+  onInterval: H('app', 'observer', 'app:lifecycle', '{ now }', 'once a minute while the app is open'),
+
+  // ─── Layout ────────────────────────────────────────────────
+  onViewChange: H('ui', 'observer', 'ui:observe', '{ view: "sidebar" | "list" | "viewer" }', 'when the phone layout switches between folders, message list and message'),
+  onSidebarToggle: H('ui', 'observer', 'ui:observe', '{ open }', 'when the sidebar is opened or closed'),
+  onSidebarCollapse: H('ui', 'observer', 'ui:observe', '{ collapsed }', 'when the sidebar is collapsed or expanded'),
+  onDeviceTypeChange: H('ui', 'observer', 'ui:observe', '{ deviceType: "mobile" | "tablet" | "desktop" }', 'when the layout switches between phone, tablet and desktop'),
+  onColumnResize: H('ui', 'observer', 'ui:observe', '{ column: "sidebar" | "email-list" | "email-list-height", width }', 'after a column was resized or reset'),
+  onMobileBack: H('ui', 'observer', 'ui:observe', '{}', 'when Back is used on the phone layout'),
+  onTextSelectionChange: H('ui', 'observer', 'email:read', 'SelectionContext', 'when the user selects text (debounced)'),
+  onDragStart: H('ui', 'observer', 'email:read', '{ kind: "email", ids }', 'when messages start being dragged'),
+  onDragEnd: H('ui', 'observer', 'email:read', '{ kind, ids, dropped }', 'when a drag ends'),
+  onEmailDrop: H('ui', 'observer', 'email:read', '{ emailIds, targetMailboxId }', 'after messages were dropped on a folder'),
+  onTagDrop: H('ui', 'observer', 'email:read', '{ emailIds, keyword }', 'after a tag was dropped on messages'),
+  onSidebarAppOpen: H('ui', 'observer', 'ui:observe', '{ appId }', 'when a sidebar app is opened'),
+  onSidebarAppClose: H('ui', 'observer', 'ui:observe', '{ appId }', 'when a sidebar app is closed'),
+
+  // ─── Keyboard ──────────────────────────────────────────────
+  onBeforeShortcut: H('keyboard', 'intercept', 'ui:keyboard', '{ key, action }', 'before an app shortcut runs; return false to stop it'),
+  onAfterShortcut: H('keyboard', 'observer', 'ui:keyboard', '{ key, action }', 'after an app shortcut ran'),
+
+  // ─── Inbox tabs ────────────────────────────────────────────
+  onTabsChange: H('tabs', 'observer', 'ui:message-list-tabs', 'MessageListTab[]', 'after the set of inbox tabs changed'),
+  onTabActivate: H('tabs', 'observer', 'ui:message-list-tabs', 'TabActivateContext', 'when another inbox tab is chosen'),
+  onTabCountsRefresh: H('tabs', 'observer', 'ui:message-list-tabs', 'Record<tabId, number>', 'after the unread counts per tab were refreshed'),
+} satisfies Record<string, HookSpec>;
+
+export type HookName = keyof typeof HOOK_CATALOG;
+
+export function hookSpec(name: string): HookSpec | null {
+  return Object.prototype.hasOwnProperty.call(HOOK_CATALOG, name) ? HOOK_CATALOG[name as HookName] : null;
+}
diff --git a/lib/plugin-hook-result.ts b/lib/plugin-hook-result.ts
new file mode 100644
index 000000000..b7f1ed017
--- /dev/null
+++ b/lib/plugin-hook-result.ts
@@ -0,0 +1,58 @@
+// "Before" hooks whose handlers may either stop an action (return false) or
+// change what it does (return a value), such as onBeforeExternalLink
+// (`{ href }`) and onBeforeCompose (a ComposeOptions to prefill). A payload
+// changed in place has no effect: plugin handlers run in a sandboxed iframe
+// and receive a copy.
+
+import { uiHooks, type HookBus } from './plugin-hooks';
+import type { ExternalLinkContext } from './plugin-types';
+import { isOpenableLinkHref } from './email-sanitization';
+
+export type InterceptResult<V> = { allowed: false } | { allowed: true; value: V };
+
+/**
+ * Ask every handler of an intercept bus once, in order. `false` stops the
+ * action; any other return value goes through `accept`. See
+ * HookBus.interceptWithValue.
+ */
+export async function interceptWithResult<V>(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  bus: HookBus<any>,
+  value: V,
+  accept: (result: unknown, current: V) => V | undefined,
+): Promise<InterceptResult<V>> {
+  if (!(bus && bus.size > 0)) return { allowed: true, value };
+  return bus.interceptWithValue(value, accept);
+}
+
+/**
+ * `accept` for onBeforeExternalLink: a handler may return `{ href }` to send
+ * the click elsewhere. Only a web address is taken, so a plugin can't turn a
+ * link into javascript:, data: or a path inside the app.
+ */
+export function acceptLinkRewrite<T extends { href: string }>(result: unknown, current: T): T | undefined {
+  if (!result || typeof result !== 'object') return undefined;
+  const href = (result as { href?: unknown }).href;
+  if (typeof href !== 'string') return undefined;
+  const trimmed = href.trim();
+  if (!/^https?:/i.test(trimmed)) return undefined;
+  try {
+    new URL(trimmed);
+  } catch {
+    return undefined;
+  }
+  return { ...current, href: trimmed };
+}
+
+/**
+ * Ask onBeforeExternalLink about a click on a link in a message. Resolves to
+ * the address to open: the original, the one a plugin rewrote it to, or null
+ * when a plugin stopped it.
+ */
+export async function resolveExternalLink(ctx: ExternalLinkContext): Promise<string | null> {
+  const outcome = uiHooks.onBeforeExternalLink.size > 0
+    ? await uiHooks.onBeforeExternalLink.interceptWithValue(ctx, acceptLinkRewrite)
+    : { allowed: true as const, value: ctx };
+  if (!outcome.allowed || !isOpenableLinkHref(outcome.value.href)) return null;
+  return outcome.value.href;
+}
diff --git a/lib/plugin-hooks.ts b/lib/plugin-hooks.ts
index d9206e978..75ffc3fa6 100644
--- a/lib/plugin-hooks.ts
+++ b/lib/plugin-hooks.ts
@@ -63,16 +63,30 @@ const DEFAULT_TIMEOUT_MS = 5000;
 // reply-all, mailto, attachment upload), so they need a much longer budget
 // than observer / transform hooks.
 const INTERCEPT_TIMEOUT_MS = 60_000;
-// onBeforeBlobUpload handlers may push the attachment to an external store
-// before handing back a link (see ExternalAttachmentResult), which is a real
-// upload over the wire - 5s would kill every offload of a file worth
-// offloading, and three of those in a minute would auto-disable the plugin.
-const BLOB_UPLOAD_TIMEOUT_MS = 120_000;
+// onBeforeBlobUpload handlers may ask the user and then push the attachment
+// to an external store before handing back a link (see
+// ExternalAttachmentResult): a real upload of a file too big to mail, which
+// takes minutes on a slow line. Two minutes cut off large offloads and
+// counted them toward auto-disable.
+const BLOB_UPLOAD_TIMEOUT_MS = 15 * 60_000;
+
+class HookTimeoutError extends Error {}
+
+let timeoutListener: ((pluginId: string) => void) | null = null;
+
+/**
+ * Called with the plugin id whenever one of its handlers runs out of time.
+ * The loader uses it to close that plugin's open dialogs: the host has
+ * already moved on, so a dialog left on screen would answer nothing.
+ */
+export function setHookTimeoutListener(listener: ((pluginId: string) => void) | null): void {
+  timeoutListener = listener;
+}
 
 function withTimeout<T>(promise: T | Promise<T>, ms: number = DEFAULT_TIMEOUT_MS): Promise<T> {
   if (!(promise instanceof Promise)) return Promise.resolve(promise);
   return new Promise<T>((resolve, reject) => {
-    const timer = setTimeout(() => reject(new Error(`Hook timed out after ${ms}ms`)), ms);
+    const timer = setTimeout(() => reject(new HookTimeoutError(`Hook timed out after ${ms}ms`)), ms);
     promise.then(
       (val) => { clearTimeout(timer); resolve(val); },
       (err) => { clearTimeout(timer); reject(err); },
@@ -115,8 +129,21 @@ export class HookBus<T extends (...args: any[]) => any> {
    *   Defaults to 5s; a bus whose handlers legitimately do network work sets
    *   its own (see `onBeforeBlobUpload`). `intercept` keeps its own longer
    *   budget because those hooks block on user dialogs.
+   * @param opts.failClosed For intercepts guarding an action that can't be
+   *   taken back (sending mail): a handler that throws or runs out of time
+   *   cancels the action instead of letting it through.
    */
-  constructor(private readonly timeoutMs: number = DEFAULT_TIMEOUT_MS) {}
+  constructor(
+    private readonly timeoutMs: number = DEFAULT_TIMEOUT_MS,
+    private readonly opts: { failClosed?: boolean } = {},
+  ) {}
+
+  private recordFailure(pluginId: string, err: unknown): void {
+    pluginErrorTracker.record(pluginId, err);
+    if (err instanceof HookTimeoutError) {
+      try { timeoutListener?.(pluginId); } catch { /* ignore */ }
+    }
+  }
 
   register(pluginId: string, handler: T, order: number = 100): Disposable {
     const entry: HookEntry<T> = { pluginId, handler, order };
@@ -150,7 +177,7 @@ export class HookBus<T extends (...args: any[]) => any> {
       try {
         await withTimeout(handler(...args), this.timeoutMs);
       } catch (err) {
-        pluginErrorTracker.record(pluginId, err);
+        this.recordFailure(pluginId, err);
       }
     }
   }
@@ -167,18 +194,40 @@ export class HookBus<T extends (...args: any[]) => any> {
     }
   }
 
+  /** Observer emit to one plugin's handlers only. */
+  async emitTo(pluginId: string, ...args: Parameters<T>): Promise<void> {
+    for (const { pluginId: owner, handler } of this.handlers) {
+      if (owner !== pluginId || pluginErrorTracker.isDisabled(owner)) continue;
+      try {
+        await withTimeout(handler(...args), this.timeoutMs);
+      } catch (err) {
+        this.recordFailure(owner, err);
+      }
+    }
+  }
+
   /** Fire handlers as interceptors - any returning false cancels the operation */
   async intercept(...args: Parameters<T>): Promise<boolean> {
+    return (await this.interceptOutcome(...args)) === 'allowed';
+  }
+
+  /**
+   * Like `intercept`, but says why an operation was stopped: `vetoed` when a
+   * handler said no (it is expected to have told the user), `failed` when a
+   * fail-closed bus stopped it because a handler threw or ran out of time.
+   */
+  async interceptOutcome(...args: Parameters<T>): Promise<'allowed' | 'vetoed' | 'failed'> {
     for (const { pluginId, handler } of this.handlers) {
       if (pluginErrorTracker.isDisabled(pluginId)) continue;
       try {
         const result = await withTimeout(handler(...args), Math.max(this.timeoutMs, INTERCEPT_TIMEOUT_MS));
-        if (result === false) return false;
+        if (result === false) return 'vetoed';
       } catch (err) {
-        pluginErrorTracker.record(pluginId, err);
+        this.recordFailure(pluginId, err);
+        if (this.opts.failClosed) return 'failed';
       }
     }
-    return true;
+    return 'allowed';
   }
 
   /**
@@ -194,7 +243,7 @@ export class HookBus<T extends (...args: any[]) => any> {
       try {
         result = await withTimeout(handler(...args), Math.max(this.timeoutMs, INTERCEPT_TIMEOUT_MS));
       } catch (err) {
-        pluginErrorTracker.record(pluginId, err);
+        this.recordFailure(pluginId, err);
         return 'failed';
       }
       if (result === false) return 'handled';
@@ -203,6 +252,38 @@ export class HookBus<T extends (...args: any[]) => any> {
     return 'default';
   }
 
+  /**
+   * For "before" hooks whose handlers may stop an action (return `false`) or
+   * change what it does (return a value). Handlers run once each, in order,
+   * with the intercept budget; `accept` turns a return value into the next
+   * value, or returns undefined to ignore it. A handler that throws or runs
+   * out of time is skipped (fail open), and counts as a failure like any
+   * other hook error.
+   */
+  async interceptWithValue<V>(
+    initial: V,
+    accept: (result: unknown, current: V) => V | undefined,
+    opts: { timeoutMs?: number } = {},
+  ): Promise<{ allowed: false } | { allowed: true; value: V }> {
+    const budget = opts.timeoutMs ?? Math.max(this.timeoutMs, INTERCEPT_TIMEOUT_MS);
+    let value = initial;
+    for (const { pluginId, handler } of this.handlers) {
+      if (pluginErrorTracker.isDisabled(pluginId)) continue;
+      let result: unknown;
+      try {
+        result = await withTimeout((handler as (v: V) => unknown)(value), budget);
+      } catch (err) {
+        this.recordFailure(pluginId, err);
+        continue;
+      }
+      if (result === false) return { allowed: false };
+      if (result === undefined || result === null || result === true) continue;
+      const next = accept(result, value);
+      if (next !== undefined) value = next;
+    }
+    return { allowed: true, value };
+  }
+
   /** Fire handlers as transforms - each receives the output of the previous */
   async transform<V>(initial: V, ...rest: unknown[]): Promise<V> {
     let value = initial;
@@ -214,7 +295,7 @@ export class HookBus<T extends (...args: any[]) => any> {
           value = result as V;
         }
       } catch (err) {
-        pluginErrorTracker.record(pluginId, err);
+        this.recordFailure(pluginId, err);
       }
     }
     return value;
@@ -274,7 +355,10 @@ export const emailHooks = {
   // Return false to cancel opening the composer.
   onBeforeCompose: new HookBus(),
   onComposerOpen: new HookBus(),
-  onBeforeEmailSend: new HookBus(),
+  onComposerClose: new HookBus(),
+  // Fails closed with the long send budget: a guard that asks the user and
+  // gets no answer must not let the mail go out behind its dialog.
+  onBeforeEmailSend: new HookBus(COMPOSE_SEND_TIMEOUT_MS, { failClosed: true }),
   onAfterEmailSend: new HookBus(),
   // Transform hook - fires before the draft is auto-saved to the server.
   // Receive fields passed to client.createDraft and may mutate fields in place.
@@ -288,25 +372,35 @@ export const emailHooks = {
   onAfterEmailDelete: new HookBus(),
   onBeforeEmailMove: new HookBus(),
   onAfterEmailMove: new HookBus(),
+  onBeforeEmailArchive: new HookBus(),
   // Fired after one or more emails are archived to the Archive mailbox
   onEmailArchive: new HookBus(),
   // Fired after one or more emails are moved out of the Archive mailbox
   onEmailUnarchive: new HookBus(),
+  onBeforeEmailReadStateChange: new HookBus(),
   onEmailReadStateChange: new HookBus(),
+  onBeforeEmailStarToggle: new HookBus(),
   onEmailStarToggle: new HookBus(),
+  onBeforeEmailSpamToggle: new HookBus(),
   onEmailSpamToggle: new HookBus(),
+  onBeforeEmailKeywordChange: new HookBus(),
   onEmailKeywordChange: new HookBus(),
   onMailboxChange: new HookBus(),
   onMailboxesRefresh: new HookBus(),
+  onBeforeMailboxCreate: new HookBus(),
   onMailboxCreate: new HookBus(),
+  onBeforeMailboxRename: new HookBus(),
   onMailboxRename: new HookBus(),
+  onBeforeMailboxDelete: new HookBus(),
   onMailboxDelete: new HookBus(),
+  onBeforeMailboxEmpty: new HookBus(),
   onMailboxEmpty: new HookBus(),
   onSearch: new HookBus(),
   onSearchResults: new HookBus(),
   onEmailSelectionChange: new HookBus(),
   onNewEmailReceived: new HookBus(),
   onPushConnectionChange: new HookBus(),
+  onSyncStateChange: new HookBus(),
   onQuotaChange: new HookBus(),
   // Intercept hook - fired when a mailto: link is clicked.
   // Return false to prevent the browser from opening the system mail client.
@@ -397,7 +491,9 @@ export const calendarHooks = {
   onAfterEventUpdate: new HookBus(),
   onBeforeEventDelete: new HookBus(),
   onAfterEventDelete: new HookBus(),
+  onBeforeEventRsvp: new HookBus(),
   onEventRsvp: new HookBus(),
+  onBeforeEventsImport: new HookBus(),
   onEventsImport: new HookBus(),
   onCalendarDateChange: new HookBus(),
   onCalendarViewChange: new HookBus(),
@@ -475,6 +571,7 @@ export const fileHooks = {
   // Return false to cancel the rename.
   onBeforeFileRename: new HookBus(),
   onFileRename: new HookBus(),
+  onBeforeFileMove: new HookBus(),
   onFileMove: new HookBus(),
   onFileCopy: new HookBus(),
   onFileDuplicate: new HookBus(),
@@ -506,6 +603,7 @@ export const authHooks = {
 
 // §7.6 Settings Hooks
 export const settingsHooks = {
+  onBeforeSettingChange: new HookBus(),
   onSettingChange: new HookBus(),
   onSettingsExport: new HookBus(),
   onSettingsImport: new HookBus(),
@@ -518,6 +616,7 @@ export const settingsHooks = {
 // §7.7 Identity Hooks
 export const identityHooks = {
   onIdentitiesLoaded: new HookBus(),
+  onBeforeIdentityChange: new HookBus(),
   onIdentityCreate: new HookBus(),
   onIdentityUpdate: new HookBus(),
   onIdentityDelete: new HookBus(),
@@ -529,6 +628,7 @@ export const identityHooks = {
 export const filterHooks = {
   onFiltersLoaded: new HookBus(),
   onFilterRuleChange: new HookBus(),
+  onBeforeFiltersSave: new HookBus(),
   // Observer fired after the host successfully uploads the account's active
   // Sieve script (visual-builder save or plugin-triggered regenerate).
   onFiltersSave: new HookBus(),
@@ -550,8 +650,11 @@ export const filterHooks = {
 // §7.9 Task Hooks
 export const taskHooks = {
   onTasksLoaded: new HookBus(),
+  onBeforeTaskCreate: new HookBus(),
   onTaskCreate: new HookBus(),
+  onBeforeTaskUpdate: new HookBus(),
   onTaskUpdate: new HookBus(),
+  onBeforeTaskDelete: new HookBus(),
   onTaskDelete: new HookBus(),
   onTaskToggleComplete: new HookBus(),
   onTaskFilterChange: new HookBus(),
@@ -567,17 +670,10 @@ export const templateHooks = {
   onTemplateRender: new HookBus(),
 };
 
-// §7.11 S/MIME Hooks
-export const smimeHooks = {
-  onSmimeKeyImport: new HookBus(),
-  onSmimeCertImport: new HookBus(),
-  onSmimeKeyStateChange: new HookBus(),
-  onSmimeDefaultsChange: new HookBus(),
-};
-
 // §7.12 Vacation Hooks
 export const vacationHooks = {
   onVacationLoaded: new HookBus(),
+  onBeforeVacationUpdate: new HookBus(),
   onVacationUpdate: new HookBus(),
 };
 
@@ -589,7 +685,6 @@ export const uiHooks = {
   onDeviceTypeChange: new HookBus(),
   onColumnResize: new HookBus(),
   onMobileBack: new HookBus(),
-  onMobileViewSwitch: new HookBus(),
   // Intercept hook - fires when the user clicks an external link inside the
   // app (typically inside an email body iframe). Handler receives
   // ExternalLinkContext; return false to cancel the navigation. Mutate
@@ -623,7 +718,6 @@ export const themeHooks = {
 export const toastHooks = {
   onToastShow: new HookBus(),
   onToastDismiss: new HookBus(),
-  onBrowserNotification: new HookBus(),
   // Observer fired when the user clicks an OS-level browser notification
   // dispatched by the host. Handler receives { tag: string, data?: unknown }
   // matching the original notification options.
@@ -640,7 +734,6 @@ export const dragDropHooks = {
 
 // §7.17 Keyboard Hooks
 export const keyboardHooks = {
-  registerShortcut: new HookBus(),
   onBeforeShortcut: new HookBus(),
   onAfterShortcut: new HookBus(),
 };
@@ -675,7 +768,6 @@ export const accountSecurityHooks = {
 export const sidebarAppHooks = {
   onSidebarAppOpen: new HookBus(),
   onSidebarAppClose: new HookBus(),
-  onSidebarAppChange: new HookBus(),
 };
 
 // §7.21 Avatar Hooks
@@ -749,7 +841,7 @@ export const messageListTabHooks = {
 const allHookGroups = [
   emailHooks, calendarHooks, calendarFormHooks, contactHooks, fileHooks,
   authHooks, settingsHooks, identityHooks, filterHooks,
-  taskHooks, templateHooks, smimeHooks, vacationHooks,
+  taskHooks, templateHooks, vacationHooks,
   uiHooks, themeHooks, toastHooks, dragDropHooks,
   keyboardHooks, appLifecycleHooks, accountSecurityHooks, sidebarAppHooks,
   avatarHooks, renderHooks, routerHooks, messageListTabHooks,
diff --git a/lib/plugin-loader.ts b/lib/plugin-loader.ts
index a4b1aa091..747f5f7f3 100644
--- a/lib/plugin-loader.ts
+++ b/lib/plugin-loader.ts
@@ -33,7 +33,10 @@ export function exposePluginExternals(): void {
 
 // ─── Store accessor (status updates) ──────────────────────────
 
-type StoreAccessor = { setPluginStatus: (id: string, status: InstalledPlugin['status'], error?: string) => void };
+type StoreAccessor = {
+  setPluginStatus: (id: string, status: InstalledPlugin['status'], error?: string) => void;
+  markAutoDisabled?: (id: string) => void;
+};
 
 export function setPluginStoreAccessor(accessor: StoreAccessor): void {
   setSandboxStoreAccessor(accessor);
diff --git a/lib/plugin-mail-hooks.ts b/lib/plugin-mail-hooks.ts
new file mode 100644
index 000000000..608b25c8f
--- /dev/null
+++ b/lib/plugin-mail-hooks.ts
@@ -0,0 +1,100 @@
+// Shared pieces for firing the mail plugin hooks (organize, folders, sync)
+// from the email store: the plain views plugins receive, and the rules that
+// decide which hooks a move fires.
+
+import { emailHooks } from './plugin-hooks';
+import type { Mailbox } from './jmap/types';
+import type { MailboxView, QuotaView } from './plugin-types';
+
+export function mailboxToView(mailbox: Mailbox): MailboxView {
+  return {
+    id: mailbox.id,
+    name: mailbox.name,
+    role: mailbox.role ?? null,
+    totalEmails: mailbox.totalEmails ?? 0,
+    unreadEmails: mailbox.unreadEmails ?? 0,
+    parentId: mailbox.parentId ?? null,
+  };
+}
+
+export function quotaToView(quota: { used: number; total: number }): QuotaView {
+  return {
+    used: quota.used,
+    total: quota.total,
+    percentUsed: quota.total > 0 ? Math.round((quota.used / quota.total) * 1000) / 10 : 0,
+  };
+}
+
+/** Bare email ids of a key-based selection (`scope:id` or `id`), each once. */
+export function idsFromSelectionKeys(keys: Iterable<string>): string[] {
+  const ids = new Set<string>();
+  for (const key of keys) ids.add(key.slice(key.lastIndexOf(':') + 1));
+  return [...ids];
+}
+
+/** Keywords a `{ keyword: on/off }` change puts on and takes off. */
+export function keywordChangeLists(changes: Record<string, boolean>): { added: string[]; removed: string[] } {
+  const added: string[] = [];
+  const removed: string[] = [];
+  for (const [keyword, on] of Object.entries(changes)) (on ? added : removed).push(keyword);
+  return { added, removed };
+}
+
+/**
+ * Whether a folder is the Archive folder or one of its sub-folders: a year or
+ * month archive files messages under the Archive folder, and those
+ * sub-folders carry no role of their own.
+ */
+export function isArchiveFolder(mailboxId: string | null | undefined, mailboxes: Mailbox[]): boolean {
+  if (!mailboxId) return false;
+  const find = (id: string) => mailboxes.find((mb) => mb.id === id) ?? mailboxes.find((mb) => mb.originalId === id);
+  const seen = new Set<string>();
+  let current = find(mailboxId);
+  while (current && !seen.has(current.id)) {
+    if (current.role === 'archive') return true;
+    seen.add(current.id);
+    current = current.parentId ? find(current.parentId) : undefined;
+  }
+  return false;
+}
+
+export interface EmailMove {
+  emailIds: string[];
+  fromMailboxId: string | null;
+  toMailboxId: string;
+}
+
+/**
+ * Ask plugins before messages are moved. A move into the archive also asks
+ * onBeforeEmailArchive. Returns false when a plugin stopped it.
+ */
+export async function allowEmailMove(move: EmailMove, mailboxes: Mailbox[]): Promise<boolean> {
+  if (move.emailIds.length === 0) return true;
+  if (emailHooks.onBeforeEmailMove.size > 0
+    && !(await emailHooks.onBeforeEmailMove.intercept({ ...move, emailIds: [...move.emailIds] }))) {
+    return false;
+  }
+  if (emailHooks.onBeforeEmailArchive.size > 0
+    && isArchiveFolder(move.toMailboxId, mailboxes)
+    && !isArchiveFolder(move.fromMailboxId, mailboxes)
+    && !(await emailHooks.onBeforeEmailArchive.intercept({ emailIds: [...move.emailIds] }))) {
+    return false;
+  }
+  return true;
+}
+
+/**
+ * Tell plugins messages were moved; a move into the archive is also an
+ * archive, a move out of it an unarchive.
+ */
+export function emitEmailMove(move: EmailMove, mailboxes: Mailbox[]): void {
+  if (move.emailIds.length === 0) return;
+  void emailHooks.onAfterEmailMove.emit({ ...move, emailIds: [...move.emailIds] });
+  const toArchive = isArchiveFolder(move.toMailboxId, mailboxes);
+  const fromArchive = isArchiveFolder(move.fromMailboxId, mailboxes);
+  if (toArchive && !fromArchive) {
+    void emailHooks.onEmailArchive.emit({ emailIds: [...move.emailIds] });
+  } else if (fromArchive && !toArchive) {
+    void emailHooks.onEmailUnarchive.emit({ emailIds: [...move.emailIds], toMailboxId: move.toMailboxId });
+  }
+}
diff --git a/lib/plugin-oauth.ts b/lib/plugin-oauth.ts
index 16149e104..d5fb09fe1 100644
--- a/lib/plugin-oauth.ts
+++ b/lib/plugin-oauth.ts
@@ -30,3 +30,56 @@ export type OAuthCallbackPayload =
         error_description?: string;
         receivedAt?: number;
     };
+
+// ─── State values bound to the plugin that started the flow ───
+
+const STATES_KEY = "plugin-oauth-states";
+/** A flow that takes longer than this is abandoned. */
+const STATE_TTL_MS = 15 * 60_000;
+
+type StateTable = Record<string, { pluginId: string; created: number }>;
+
+function readStates(): StateTable {
+  try {
+    const raw = localStorage.getItem(STATES_KEY);
+    const parsed = raw ? JSON.parse(raw) as StateTable : {};
+    const now = Date.now();
+    for (const [state, entry] of Object.entries(parsed)) {
+      if (!entry || typeof entry.pluginId !== "string" || now - entry.created > STATE_TTL_MS) delete parsed[state];
+    }
+    return parsed;
+  } catch {
+    return {};
+  }
+}
+
+function writeStates(table: StateTable): void {
+  try { localStorage.setItem(STATES_KEY, JSON.stringify(table)); } catch { /* storage blocked */ }
+}
+
+/**
+ * A fresh `state` for a plugin's OAuth redirect. The callback is delivered
+ * only to the plugin that asked for this value; before, every plugin with
+ * http:fetch received every code. Kept in localStorage so the tab that gets
+ * the callback event finds it even if another tab started the flow.
+ */
+export function createOAuthState(pluginId: string): string {
+  const bytes = new Uint8Array(24);
+  crypto.getRandomValues(bytes);
+  const state = Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
+  const table = readStates();
+  table[state] = { pluginId, created: Date.now() };
+  writeStates(table);
+  return state;
+}
+
+/** The plugin a callback belongs to, consumed so it can't be delivered twice. */
+export function takeOAuthStateOwner(state: string | undefined): string | null {
+  if (!state) return null;
+  const table = readStates();
+  const entry = table[state];
+  if (!entry) return null;
+  delete table[state];
+  writeStates(table);
+  return entry.pluginId;
+}
diff --git a/lib/plugin-projection.ts b/lib/plugin-projection.ts
index 865df43e3..26ac83af0 100644
--- a/lib/plugin-projection.ts
+++ b/lib/plugin-projection.ts
@@ -2,8 +2,14 @@
 // that plugins consume. Keeping this in one place ensures every slot/hook
 // hands plugins the same shape declared in plugin-types.ts.
 
-import type { Email } from '@/lib/jmap/types';
-import type { EmailReadView } from '@/lib/plugin-types';
+import type {
+  CalendarEvent, CalendarTask, ContactCard, Email, FileNode, Identity, VacationResponse,
+} from '@/lib/jmap/types';
+import type {
+  CalendarEventView, ContactView, EmailReadView, EmailSummary, FileResourceView, IdentityView,
+  TaskView, TemplateView, VacationView,
+} from '@/lib/plugin-types';
+import type { EmailTemplate } from '@/lib/template-types';
 import { generateEmailSource } from '@/lib/email-source';
 
 // Resolve a message's plain-text body from its JMAP body parts. Plugins that
@@ -53,6 +59,15 @@ export function emailToReadView(email: Email): EmailReadView {
     isRead: !!email.keywords?.['$seen'],
     isFlagged: !!email.keywords?.['$flagged'],
     hasAttachment: email.hasAttachment,
+    attachments: (email.attachments || [])
+      .filter((part) => !!part.blobId)
+      .map((part) => ({
+        blobId: part.blobId as string,
+        name: part.name || '',
+        type: part.type || 'application/octet-stream',
+        size: part.size || 0,
+        inline: part.disposition === 'inline' || !!part.cid,
+      })),
     preview: email.preview || '',
     text: plainTextFromEmail(email),
     headers: email.headers,
@@ -61,3 +76,143 @@ export function emailToReadView(email: Email): EmailReadView {
     auth: email.authenticationResults,
   };
 }
+
+const trueKeys = (rec?: Record<string, boolean> | null): string[] =>
+  Object.keys(rec || {}).filter((k) => rec?.[k]);
+
+/** Headers and flags of a message, without the body (see EmailSummary). */
+export function emailSummary(email: Email): EmailSummary {
+  return {
+    id: email.id,
+    threadId: email.threadId,
+    mailboxIds: trueKeys(email.mailboxIds),
+    from: (email.from || []).map((a) => ({ name: a.name || '', email: a.email })),
+    to: (email.to || []).map((a) => ({ name: a.name || '', email: a.email })),
+    subject: email.subject || '',
+    receivedAt: email.receivedAt,
+    preview: email.preview || '',
+    keywords: trueKeys(email.keywords),
+    hasAttachment: !!email.hasAttachment,
+    size: email.size || 0,
+  };
+}
+
+export function eventToView(event: CalendarEvent): CalendarEventView {
+  const location = Object.values(event.locations || {})[0]?.name || '';
+  return {
+    id: event.id,
+    uid: event.uid,
+    calendarId: trueKeys(event.calendarIds)[0] || '',
+    title: event.title || '',
+    description: event.description || '',
+    start: event.start,
+    duration: event.duration,
+    timeZone: event.timeZone,
+    utcStart: event.utcStart,
+    utcEnd: event.utcEnd,
+    isAllDay: !!event.showWithoutTime,
+    location,
+    status: event.status,
+    participants: Object.values(event.participants || {}).map((p) => ({
+      name: p.name || '',
+      email: p.email || '',
+      role: trueKeys((p as { roles?: Record<string, boolean> }).roles).join(','),
+      status: (p as { participationStatus?: string }).participationStatus || '',
+    })),
+    isRecurring: !!(event.recurrenceRules && event.recurrenceRules.length > 0),
+    keywords: trueKeys(event.keywords),
+  };
+}
+
+function anniversaryDate(value: unknown): string {
+  if (typeof value === 'string') return value;
+  if (value && typeof value === 'object') {
+    const v = value as { year?: number; month?: number; day?: number; utc?: string };
+    if (typeof v.utc === 'string') return v.utc.slice(0, 10);
+    const mm = String(v.month ?? 0).padStart(2, '0');
+    const dd = String(v.day ?? 0).padStart(2, '0');
+    return v.year ? `${String(v.year).padStart(4, '0')}-${mm}-${dd}` : `--${mm}-${dd}`;
+  }
+  return '';
+}
+
+export function contactToView(contact: ContactCard): ContactView {
+  const components = contact.name?.components || [];
+  const part = (kind: string) => components.filter((c) => c.kind === kind).map((c) => c.value).join(' ');
+  return {
+    id: contact.id,
+    uid: contact.uid || '',
+    addressBookId: trueKeys(contact.addressBookIds)[0] || '',
+    kind: contact.kind || 'individual',
+    fullName: contact.name?.full || [part('given'), part('surname')].filter(Boolean).join(' '),
+    firstName: part('given'),
+    lastName: part('surname'),
+    emails: Object.values(contact.emails || {}).map((e) => e.address).filter(Boolean),
+    phones: Object.values(contact.phones || {}).map((p) => p.number).filter(Boolean),
+    company: Object.values(contact.organizations || {})[0]?.name || '',
+    notes: Object.values(contact.notes || {}).map((n) => (n as { note?: string }).note || '').join('\n'),
+    anniversaries: Object.values(contact.anniversaries || {}).map((a) => ({ kind: a.kind, date: anniversaryDate(a.date) })),
+  };
+}
+
+export function taskToView(task: CalendarTask): TaskView {
+  return {
+    id: task.id,
+    uid: task.uid,
+    title: task.title || '',
+    description: task.description || '',
+    isComplete: task.progress === 'completed',
+    progress: task.progress,
+    dueDate: task.due,
+    priority: task.priority ?? 0,
+    calendarId: trueKeys(task.calendarIds)[0] || '',
+    keywords: trueKeys(task.keywords),
+  };
+}
+
+export function fileToView(node: FileNode, path = ''): FileResourceView {
+  const isDir = node.type === 'd' || node.blobId === null;
+  return {
+    id: node.id,
+    name: node.name,
+    type: isDir ? 'directory' : 'file',
+    size: node.size || 0,
+    mimeType: isDir ? '' : node.type,
+    path,
+    modified: node.modified,
+  };
+}
+
+export function identityToView(identity: Identity): IdentityView {
+  return {
+    id: identity.id,
+    name: identity.name || '',
+    email: identity.email,
+    replyTo: identity.replyTo?.map((a) => a.email).join(', ') || null,
+    bcc: identity.bcc?.map((a) => a.email).join(', ') || null,
+    htmlSignature: identity.htmlSignature || '',
+    textSignature: identity.textSignature || '',
+  };
+}
+
+export function templateToView(template: EmailTemplate): TemplateView {
+  return {
+    id: template.id,
+    name: template.name,
+    category: template.category,
+    subject: template.subject || '',
+    body: template.body || '',
+    isHTML: !!template.isHTML,
+  };
+}
+
+export function vacationToView(vacation: VacationResponse): VacationView {
+  return {
+    isEnabled: vacation.isEnabled,
+    subject: vacation.subject || '',
+    htmlBody: vacation.htmlBody || '',
+    textBody: vacation.textBody || '',
+    fromDate: vacation.fromDate,
+    toDate: vacation.toDate,
+  };
+}
diff --git a/lib/plugin-sandbox/actions.ts b/lib/plugin-sandbox/actions.ts
new file mode 100644
index 000000000..e69da38da
--- /dev/null
+++ b/lib/plugin-sandbox/actions.ts
@@ -0,0 +1,186 @@
+// Buttons and menu entries plugins declare as data (`api.ui.setActions`).
+// The host draws them in its own style on the surface named in the slot
+// catalogue (kind: 'action'); a click goes back to the plugin with the
+// surface's context, filtered by the plugin's permissions.
+
+import { slotSpec } from '../plugin-slot-catalog';
+import { isAllowedPluginCombo } from './shortcuts';
+
+export interface PluginAction {
+  id: string;
+  label: string;
+  /** Name of a host icon (see components/icons); unknown names show none. */
+  icon?: string;
+  /** Lower comes first; default 100. */
+  order?: number;
+  /** Show only for these folder roles (message surfaces), e.g. ["inbox"]. */
+  mailboxRoles?: string[];
+  /** Show only for attachments or files of these MIME types (prefix match, "image/"). */
+  mimeTypes?: string[];
+  /** A danger action is drawn in red. */
+  danger?: boolean;
+  /**
+   * A key combination for the action ("Ctrl+Shift+A"), on surfaces that bind
+   * one (composer-toolbar-actions: while the composer has focus). Needs Alt,
+   * Ctrl/Cmd+Shift or Ctrl/Cmd+Alt, like plugin shortcuts.
+   */
+  shortcut?: string;
+  /**
+   * On menu surfaces (the composer's Options and Send menus): draw the entry
+   * as a check item, ticked or not. The plugin updates it with setActions.
+   */
+  checked?: boolean;
+  /** A second line under the label, on menu surfaces. Up to 120 characters. */
+  description?: string;
+}
+
+export interface RegisteredAction extends PluginAction {
+  pluginId: string;
+  pluginName: string;
+}
+
+export const MAX_ACTIONS_PER_SURFACE = 8;
+const ID_RE = /^[a-z0-9][a-z0-9-_.]{0,39}$/i;
+const ICON_RE = /^[A-Za-z0-9-]{1,40}$/;
+const ROLE_RE = /^[a-z]{1,20}$/;
+const MIME_RE = /^[a-z0-9.+-]+\/[a-z0-9.+*-]*$/i;
+
+/** Surfaces that take actions, from the slot catalogue. */
+export function isActionSurface(surface: string): boolean {
+  return slotSpec(surface)?.kind === 'action';
+}
+
+/** Check and copy what a plugin sent; throws with a message the plugin sees. */
+export function checkActions(value: unknown): PluginAction[] {
+  if (!Array.isArray(value)) throw new Error('actions must be a list');
+  if (value.length > MAX_ACTIONS_PER_SURFACE) throw new Error(`At most ${MAX_ACTIONS_PER_SURFACE} actions per surface`);
+  const seen = new Set<string>();
+  return value.map((raw, i) => {
+    if (!raw || typeof raw !== 'object') throw new Error(`actions[${i}] must be an object`);
+    const a = raw as Record<string, unknown>;
+    if (typeof a.id !== 'string' || !ID_RE.test(a.id)) throw new Error(`actions[${i}].id is invalid`);
+    if (seen.has(a.id)) throw new Error(`actions[${i}].id is used twice`);
+    seen.add(a.id);
+    if (typeof a.label !== 'string' || !a.label.trim() || a.label.length > 60) throw new Error(`actions[${i}].label is required (max 60 characters)`);
+    const out: PluginAction = { id: a.id, label: a.label.trim() };
+    if (a.icon !== undefined) {
+      if (typeof a.icon !== 'string' || !ICON_RE.test(a.icon)) throw new Error(`actions[${i}].icon is invalid`);
+      out.icon = a.icon;
+    }
+    if (a.order !== undefined) {
+      if (typeof a.order !== 'number' || !Number.isFinite(a.order)) throw new Error(`actions[${i}].order must be a number`);
+      out.order = a.order;
+    }
+    if (a.mailboxRoles !== undefined) {
+      if (!Array.isArray(a.mailboxRoles) || a.mailboxRoles.length > 10 || !a.mailboxRoles.every((r) => typeof r === 'string' && ROLE_RE.test(r))) {
+        throw new Error(`actions[${i}].mailboxRoles must be a list of folder roles`);
+      }
+      out.mailboxRoles = [...a.mailboxRoles] as string[];
+    }
+    if (a.mimeTypes !== undefined) {
+      if (!Array.isArray(a.mimeTypes) || a.mimeTypes.length > 20 || !a.mimeTypes.every((m) => typeof m === 'string' && MIME_RE.test(m))) {
+        throw new Error(`actions[${i}].mimeTypes must be a list of MIME types`);
+      }
+      out.mimeTypes = (a.mimeTypes as string[]).map((m) => m.toLowerCase());
+    }
+    if (a.danger !== undefined) out.danger = a.danger === true;
+    if (a.checked !== undefined) {
+      if (typeof a.checked !== 'boolean') throw new Error(`actions[${i}].checked must be true or false`);
+      out.checked = a.checked;
+    }
+    if (a.description !== undefined) {
+      if (typeof a.description !== 'string' || a.description.length > 120) throw new Error(`actions[${i}].description must be a string of up to 120 characters`);
+      if (a.description.trim()) out.description = a.description.trim();
+    }
+    if (a.shortcut !== undefined) {
+      if (typeof a.shortcut !== 'string' || a.shortcut.length > 30 || !isAllowedPluginCombo(a.shortcut)) {
+        throw new Error(`actions[${i}].shortcut must use Alt, Ctrl+Shift or Ctrl+Alt`);
+      }
+      out.shortcut = a.shortcut;
+    }
+    return out;
+  });
+}
+
+// pluginId → surface → actions
+const registry = new Map<string, Map<string, RegisteredAction[]>>();
+const listeners = new Set<() => void>();
+const snapshots = new Map<string, RegisteredAction[]>();
+
+function changed(): void {
+  snapshots.clear();
+  for (const l of listeners) {
+    try { l(); } catch { /* ignore */ }
+  }
+}
+
+export function subscribeActions(listener: () => void): () => void {
+  listeners.add(listener);
+  return () => { listeners.delete(listener); };
+}
+
+export function setPluginActions(pluginId: string, pluginName: string, surface: string, actions: PluginAction[]): void {
+  let surfaces = registry.get(pluginId);
+  if (!surfaces) {
+    surfaces = new Map();
+    registry.set(pluginId, surfaces);
+  }
+  if (actions.length === 0) surfaces.delete(surface);
+  else surfaces.set(surface, actions.map((a) => ({ ...a, pluginId, pluginName })));
+  changed();
+}
+
+/** Drop everything a plugin declared (it was turned off or removed). */
+export function clearPluginActions(pluginId: string): void {
+  if (registry.delete(pluginId)) changed();
+}
+
+/**
+ * The actions on a surface, in order. The same array is returned until
+ * something changes, so it can feed useSyncExternalStore.
+ */
+export function actionsFor(surface: string): RegisteredAction[] {
+  const cached = snapshots.get(surface);
+  if (cached) return cached;
+  const out: RegisteredAction[] = [];
+  for (const surfaces of registry.values()) out.push(...(surfaces.get(surface) ?? []));
+  out.sort((a, b) => (a.order ?? 100) - (b.order ?? 100) || a.label.localeCompare(b.label));
+  snapshots.set(surface, out);
+  return out;
+}
+
+/** Whether an action applies to a folder role and/or a MIME type. */
+export function actionApplies(action: PluginAction, ctx: { mailboxRole?: string | null; mimeType?: string | null }): boolean {
+  if (action.mailboxRoles && ctx.mailboxRole !== undefined && !action.mailboxRoles.includes(ctx.mailboxRole ?? '')) return false;
+  if (action.mimeTypes && ctx.mimeType !== undefined) {
+    const type = (ctx.mimeType ?? '').toLowerCase();
+    if (!action.mimeTypes.some((m) => (m.endsWith('/') || m.endsWith('/*') ? type.startsWith(m.replace(/\*$/, '')) : type === m))) return false;
+  }
+  return true;
+}
+
+/** Test helper. */
+export function resetActions(): void {
+  registry.clear();
+  changed();
+}
+
+// ─── Clicks ───────────────────────────────────────────────────
+
+/**
+ * Delivers a click to the plugin. Set by the loader, which owns the running
+ * plugins; it filters `context` by the surface's props and the plugin's
+ * permissions before anything crosses into the sandbox.
+ */
+export type ActionDispatcher = (pluginId: string, surface: string, actionId: string, context: Record<string, unknown>) => Promise<void>;
+
+let dispatcher: ActionDispatcher | null = null;
+
+export function setActionDispatcher(next: ActionDispatcher | null): void {
+  dispatcher = next;
+}
+
+export async function runAction(action: RegisteredAction, surface: string, context: Record<string, unknown>): Promise<void> {
+  if (!dispatcher) return;
+  await dispatcher(action.pluginId, surface, action.id, context);
+}
diff --git a/lib/plugin-sandbox/bundle-fetch.ts b/lib/plugin-sandbox/bundle-fetch.ts
index 031fe2cc8..fb9b90619 100644
--- a/lib/plugin-sandbox/bundle-fetch.ts
+++ b/lib/plugin-sandbox/bundle-fetch.ts
@@ -28,7 +28,11 @@ export function bundleUrl(pluginId: string, bundleHash?: string | null): string
  * load-time error shows up on the plugin card instead of the plugin silently
  * vanishing from the list.
  */
-export async function downloadManagedBundle(pluginId: string, bundleHash?: string | null): Promise<string> {
+export async function downloadManagedBundle(
+  pluginId: string,
+  bundleHash?: string | null,
+  opts: { requireSignature?: boolean } = {},
+): Promise<string> {
   let res: Response;
   try {
     res = await apiFetch(bundleUrl(pluginId, bundleHash));
@@ -55,6 +59,10 @@ export async function downloadManagedBundle(pluginId: string, bundleHash?: strin
     if (!ok) {
       throw new Error(`Refusing the bundle for plugin "${pluginId}": signature verification failed`);
     }
+  } else if (opts.requireSignature) {
+    // A privileged plugin runs with full access to the app; it only loads
+    // with a signature made when the admin installed it.
+    throw new Error(`Refusing the bundle for plugin "${pluginId}": it is not signed`);
   } else {
     console.warn(`[plugin-bundle] Bundle for "${pluginId}" has no Ed25519 signature; loading without it`);
   }
diff --git a/lib/plugin-sandbox/composer-edit.ts b/lib/plugin-sandbox/composer-edit.ts
new file mode 100644
index 000000000..595129d42
--- /dev/null
+++ b/lib/plugin-sandbox/composer-edit.ts
@@ -0,0 +1,265 @@
+// Edits a plugin makes to the message being written (api.composer.*).
+//
+// The rich editor: every change is one ProseMirror transaction on the live
+// editor, so it lands in the editor's history as one step and Ctrl+Z takes
+// it back whole. Not through the composer's body state: that rebuilds the
+// whole document from HTML a render later, and in the plain-text composer
+// setting the textarea's value wipes its undo history.
+//
+// "The message" a plugin reads or replaces as a whole is the user's own
+// text: everything above the signature and the quoted original. Those, and
+// inline images, are never removed by an edit:
+// - the signature (SignatureBlock atom, or the paragraphs bracketed by
+//   data-signature-block markers) and the quote (QuotedHtml atom, a
+//   blockquote, or the forwarded-message header) end the user's text;
+// - in a reply the line just above the quote is its header ("On ... wrote:")
+//   and goes with it;
+// - images inside a replaced range are put back right after the new text.
+//
+// The plain-text composer (a textarea) uses the same rules on the string,
+// and edits through the browser's own editing command, so the textarea's
+// undo still works.
+
+import type { Editor } from '@tiptap/core';
+import { DOMParser as PMDOMParser, DOMSerializer, Fragment, type Node as PMNode } from '@tiptap/pm/model';
+import { TextSelection, type Transaction } from '@tiptap/pm/state';
+import { closeHistory } from '@tiptap/pm/history';
+
+const ATOM_BOUNDARIES = new Set(['signatureBlock', 'quotedHtml']);
+
+// The editor's history merges changes made within half a second of each
+// other into one undo step. A plugin's edit always starts a step of its own,
+// so Ctrl+Z never takes back what the user typed just before with it.
+const ownStep = (tr: Transaction) => closeHistory(tr);
+const QUOTE_NODES = new Set(['quotedHtml', 'blockquote']);
+const SIGNATURE_MARKER_ATTR = 'data-signature-block';
+
+export interface OwnTextOptions {
+  /** Reply or forward: the line above the quote is the quote's header. */
+  replyLike?: boolean;
+  /** The localised "---------- Forwarded message ----------" line. */
+  forwardedSeparator?: string;
+}
+
+export interface OwnRange {
+  /** Start and end of the user's own text in the document. */
+  from: number;
+  to: number;
+  /** Whether a signature or quote follows. */
+  bounded: boolean;
+}
+
+function isEmptyBlock(node: PMNode): boolean {
+  if (node.textContent.trim()) return false;
+  let hasLeaf = false;
+  node.descendants((child) => {
+    if (child.type.name === 'image' || child.type.name === 'table') hasLeaf = true;
+    return !hasLeaf;
+  });
+  return !hasLeaf;
+}
+
+function isBoundary(node: PMNode, opts: OwnTextOptions): boolean {
+  if (ATOM_BOUNDARIES.has(node.type.name) || node.type.name === 'blockquote') return true;
+  const marker = node.attrs?.[SIGNATURE_MARKER_ATTR];
+  if (marker === 'separator' || marker === 'start') return true;
+  if (opts.forwardedSeparator && node.textContent.trim().startsWith(opts.forwardedSeparator.trim())) return true;
+  return false;
+}
+
+/** Where the user's own text is in a document. */
+export function ownRange(doc: PMNode, opts: OwnTextOptions = {}): OwnRange {
+  const children: { node: PMNode; pos: number }[] = [];
+  doc.forEach((node, offset) => { children.push({ node, pos: offset }); });
+  let boundary = children.findIndex((c) => isBoundary(c.node, opts));
+  const bounded = boundary !== -1;
+  if (!bounded) boundary = children.length;
+  // A reply's quote header sits right above the quote.
+  if (bounded && opts.replyLike && QUOTE_NODES.has(children[boundary].node.type.name)
+    && boundary > 0 && !isEmptyBlock(children[boundary - 1].node)) {
+    boundary -= 1;
+  }
+  // Blank lines between the text and what follows stay where they are.
+  let last = boundary - 1;
+  while (last >= 0 && isEmptyBlock(children[last].node)) last--;
+  if (last < 0) {
+    // Nothing written yet: the first empty paragraph, if there is one, is
+    // where the text goes.
+    if (boundary > 0) {
+      const first = children[0];
+      return { from: first.pos, to: first.pos + first.node.nodeSize, bounded };
+    }
+    const at = children[boundary]?.pos ?? 0;
+    return { from: at, to: at, bounded };
+  }
+  const end = children[last];
+  return { from: 0, to: end.pos + end.node.nodeSize, bounded };
+}
+
+function fragmentHtml(editor: Editor, fragment: Fragment): string {
+  const serializer = DOMSerializer.fromSchema(editor.schema);
+  const container = document.createElement('div');
+  container.appendChild(serializer.serializeFragment(fragment));
+  return container.innerHTML;
+}
+
+function textOf(doc: PMNode, from: number, to: number): string {
+  return doc.textBetween(from, to, '\n', (leaf) => (leaf.type.name === 'hardBreak' ? '\n' : ''));
+}
+
+/** The user's own text, as HTML and as plain text. */
+export function readOwnContent(editor: Editor, opts: OwnTextOptions = {}): { html: string; text: string } {
+  const { doc } = editor.state;
+  const { from, to } = ownRange(doc, opts);
+  return { html: fragmentHtml(editor, doc.slice(from, to).content), text: textOf(doc, from, to).trim() };
+}
+
+/** The selected text, as HTML and plain text, and whether it is empty. */
+export function readSelection(editor: Editor): { html: string; text: string; empty: boolean } {
+  const { doc, selection } = editor.state;
+  if (selection.empty) return { html: '', text: '', empty: true };
+  return {
+    html: fragmentHtml(editor, doc.slice(selection.from, selection.to).content),
+    text: textOf(doc, selection.from, selection.to),
+    empty: false,
+  };
+}
+
+/** Plain text a plugin sent, as editor HTML: one paragraph per line. */
+export function textToEditorHtml(text: string): string {
+  const escape = (s: string) => s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+  return text.replace(/\r\n?/g, '\n').split('\n').map((line) => `<p>${escape(line)}</p>`).join('');
+}
+
+function imagesIn(doc: PMNode, from: number, to: number): PMNode[] {
+  const out: PMNode[] = [];
+  doc.nodesBetween(from, to, (node) => {
+    if (node.type.name === 'image') out.push(node);
+  });
+  return out;
+}
+
+function containsAtom(doc: PMNode, from: number, to: number): boolean {
+  let found = false;
+  doc.nodesBetween(from, to, (node) => {
+    if (ATOM_BOUNDARIES.has(node.type.name) || (node.attrs?.[SIGNATURE_MARKER_ATTR] && node.isBlock)) found = true;
+    return !found;
+  });
+  return found;
+}
+
+function parseBlocks(editor: Editor, html: string): Fragment {
+  const dom = document.createElement('div');
+  dom.innerHTML = html;
+  return PMDOMParser.fromSchema(editor.schema).parse(dom).content;
+}
+
+/**
+ * Replace the user's own text with `html` (already sanitised), in one
+ * transaction. Inline images that were in it follow the new text. Returns
+ * false when the editor is gone.
+ */
+export function replaceOwnContent(editor: Editor, html: string, opts: OwnTextOptions = {}): boolean {
+  if (editor.isDestroyed) return false;
+  return editor.chain().focus().command(({ tr, state }) => {
+    ownStep(tr);
+    const { from, to } = ownRange(state.doc, opts);
+    const images = imagesIn(state.doc, from, to);
+    let content = parseBlocks(editor, html);
+    if (images.length) {
+      const paragraph = state.schema.nodes.paragraph;
+      content = content.addToEnd(paragraph.create(null, images.map((img) => img.copy(img.content))));
+    }
+    tr.replaceWith(from, to, content);
+    tr.setSelection(TextSelection.near(tr.doc.resolve(Math.min(from + content.size, tr.doc.content.size)), -1));
+    tr.scrollIntoView();
+    return true;
+  }).run();
+}
+
+/**
+ * Replace the selection with `html` (or insert it at the caret), in one
+ * transaction. Refused (false) when the selection holds the signature or a
+ * quoted original as a whole: replacing it would delete them.
+ */
+export function replaceSelection(editor: Editor, html: string, { below = false }: { below?: boolean } = {}): boolean {
+  if (editor.isDestroyed) return false;
+  const { doc, selection } = editor.state;
+  if (!below && containsAtom(doc, selection.from, selection.to)) return false;
+  const images = below ? [] : imagesIn(doc, selection.from, selection.to);
+  return editor.chain().focus().command(({ tr, commands }) => {
+    ownStep(tr);
+    if (below) {
+      // After the block the selection ends in.
+      const $to = tr.doc.resolve(selection.to);
+      const after = $to.depth > 0 ? $to.after(1) : selection.to;
+      tr.insert(after, parseBlocks(editor, html));
+      return true;
+    }
+    return commands.insertContentAt({ from: selection.from, to: selection.to }, html, { updateSelection: true });
+  }).command(({ tr }) => {
+    if (!images.length) return true;
+    const at = tr.selection.to;
+    const $at = tr.doc.resolve(at);
+    if ($at.parent.inlineContent) tr.insert(at, Fragment.from(images.map((img) => img.copy(img.content))));
+    else tr.insert(at, editor.schema.nodes.paragraph.create(null, images.map((img) => img.copy(img.content))));
+    return true;
+  }).run();
+}
+
+// ─── Plain text (the textarea composer) ───────────────────────
+
+export interface PlainOwnOptions extends OwnTextOptions {
+  /** The identity's signature as plain text. */
+  signature?: string;
+}
+
+/** Where the user's own text is in a plain-text body. */
+export function plainOwnRange(body: string, opts: PlainOwnOptions = {}): { from: number; to: number } {
+  const cut: number[] = [body.length];
+  const sepMatch = /(^|\n)-- ?\n/.exec(body);
+  if (sepMatch) cut.push(sepMatch.index + (sepMatch[1] ? 1 : 0));
+  if (opts.signature?.trim()) {
+    const at = body.indexOf(opts.signature.trim());
+    if (at !== -1) cut.push(at);
+  }
+  if (opts.forwardedSeparator) {
+    const at = body.indexOf(opts.forwardedSeparator.trim());
+    if (at !== -1) cut.push(at);
+  }
+  const quote = /(^|\n)>/.exec(body);
+  if (quote) {
+    let at = quote.index + (quote[1] ? 1 : 0);
+    if (opts.replyLike) {
+      // The non-empty line above the quote is its header.
+      const before = body.slice(0, Math.max(0, at - 1));
+      const lineStart = before.lastIndexOf('\n') + 1;
+      if (before.slice(lineStart).trim()) at = lineStart;
+    }
+    cut.push(at);
+  }
+  const boundary = Math.min(...cut);
+  const own = body.slice(0, boundary).replace(/\s+$/, '');
+  return { from: 0, to: own.length };
+}
+
+/**
+ * Replace a range of a textarea through the browser's editing command, so
+ * it lands in the textarea's undo history and fires `input` like typing
+ * does. Falls back to setRangeText (no undo) where the command is missing.
+ */
+export function replaceTextareaRange(textarea: HTMLTextAreaElement, from: number, to: number, text: string): boolean {
+  textarea.focus();
+  textarea.setSelectionRange(from, to);
+  let done = false;
+  try {
+    done = typeof document.execCommand === 'function' && document.execCommand('insertText', false, text);
+  } catch {
+    done = false;
+  }
+  if (!done) {
+    textarea.setRangeText(text, from, to, 'end');
+    textarea.dispatchEvent(new Event('input', { bubbles: true }));
+  }
+  return true;
+}
diff --git a/lib/plugin-sandbox/composer-registry.ts b/lib/plugin-sandbox/composer-registry.ts
new file mode 100644
index 000000000..16062e5c2
--- /dev/null
+++ b/lib/plugin-sandbox/composer-registry.ts
@@ -0,0 +1,51 @@
+// Open composers that plugins may work on (api.composer.*).
+//
+// Each composer registers a handle under a random id while it is open. A
+// plugin learns the id only from the composer itself: the click context of
+// a composer action (Attach menu, toolbar, Options, Send menu) or the props
+// of a composer slot. So a plugin edits the message the user pointed it
+// at, never one it found by itself.
+
+import { generateUUID } from '@/lib/utils';
+
+export interface ComposerContent {
+  html: string;
+  text: string;
+}
+
+export interface ComposerAttachment {
+  blobId: string;
+  name: string;
+  type: string;
+  size: number;
+}
+
+export interface ComposerHandle {
+  /** The user's own text, without the signature and the quote. */
+  readBody(): ComposerContent;
+  readSelection(): ComposerContent & { empty: boolean };
+  /** Replace the user's own text. */
+  replaceBody(html: string, text: string): boolean;
+  /** Replace the selection (or insert at the caret), or with `below` add after it. */
+  replaceSelection(html: string, text: string, opts: { below: boolean }): boolean;
+  /** Attach a blob the plugin uploaded, through the composer's usual checks. */
+  attach(file: ComposerAttachment): Promise<boolean>;
+}
+
+const handles = new Map<string, ComposerHandle>();
+
+/** Register an open composer. Returns its id and a function that unregisters it. */
+export function registerComposer(handle: ComposerHandle): { id: string; unregister: () => void } {
+  const id = generateUUID();
+  handles.set(id, handle);
+  return { id, unregister: () => { handles.delete(id); } };
+}
+
+export function composerHandle(id: unknown): ComposerHandle | null {
+  return typeof id === 'string' ? handles.get(id) ?? null : null;
+}
+
+/** Test helper. */
+export function resetComposers(): void {
+  handles.clear();
+}
diff --git a/lib/plugin-sandbox/connect-dialog.ts b/lib/plugin-sandbox/connect-dialog.ts
new file mode 100644
index 000000000..3b259e14c
--- /dev/null
+++ b/lib/plugin-sandbox/connect-dialog.ts
@@ -0,0 +1,164 @@
+// Host-side "Connect account" requests. A plugin asks to connect one of the
+// user-scope credentials its manifest declares (api.proxy.connect); the host
+// shows its own dialog naming the plugin and the server, the user types the
+// password there, and it goes straight to /api/plugin-secrets. The plugin
+// only learns whether the account is connected.
+
+import type { UserCredentialSpec } from '@/lib/plugin-secrets/credentials';
+import { apiFetch } from '../browser-navigation';
+
+export interface ConnectRequest {
+  id: string;
+  pluginId: string;
+  pluginName: string;
+  credentialId: string;
+  spec: UserCredentialSpec;
+  /**
+   * `password`: the user types a password or key here.
+   * `signin`: only the server is approved here; the plugin then runs a
+   * sign-in flow whose answer the proxy captures (Nextcloud Login Flow v2).
+   */
+  mode: 'password' | 'signin';
+  /** Server address to suggest when the manifest leaves it to the user. */
+  suggestedOrigin?: string;
+  suggestedUsername?: string;
+  resolve: (result: ConnectResult) => void;
+}
+
+export type ConnectResult = { connected: boolean; origin?: string };
+
+let current: ConnectRequest | null = null;
+const listeners = new Set<() => void>();
+
+function notify(): void {
+  for (const l of listeners) {
+    try { l(); } catch { /* ignore */ }
+  }
+}
+
+export function subscribeConnect(listener: () => void): () => void {
+  listeners.add(listener);
+  return () => { listeners.delete(listener); };
+}
+
+export function currentConnect(): ConnectRequest | null {
+  return current;
+}
+
+export class ConnectBusyError extends Error {
+  constructor() {
+    super('Another account connection is already open');
+  }
+}
+
+/** Ask the user to connect an account. One request at a time, app-wide. */
+export function requestConnect(input: Omit<ConnectRequest, 'id' | 'resolve'>): Promise<ConnectResult> {
+  if (current) return Promise.reject(new ConnectBusyError());
+  return new Promise<ConnectResult>((resolve) => {
+    current = {
+      ...input,
+      id: Math.random().toString(36).slice(2),
+      resolve: (result) => {
+        current = null;
+        notify();
+        resolve(result);
+      },
+    };
+    notify();
+  });
+}
+
+/** Close an open request of this plugin (it was turned off or removed). */
+export function cancelConnectFor(pluginId: string): void {
+  if (current?.pluginId === pluginId) current.resolve({ connected: false });
+}
+
+export interface SaveCredentialInput {
+  pluginId: string;
+  credentialId: string;
+  label: string;
+  origin: string;
+  inject: UserCredentialSpec['inject'];
+  username?: string;
+  secret?: string;
+}
+
+/** POST to /api/plugin-secrets. Returns an error message, or null. */
+export async function saveCredential(input: SaveCredentialInput): Promise<string | null> {
+  const res = await apiFetch('/api/plugin-secrets', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(input),
+  });
+  if (res.ok) return null;
+  try {
+    const body = await res.json() as { error?: string };
+    return body.error || `HTTP ${res.status}`;
+  } catch {
+    return `HTTP ${res.status}`;
+  }
+}
+
+/** Remove a plugin's stored credentials (all of them without credentialId). */
+export async function forgetCredentials(pluginId: string, credentialId?: string): Promise<boolean> {
+  const query = new URLSearchParams({ plugin: pluginId, ...(credentialId ? { credential: credentialId } : {}) });
+  try {
+    const res = await apiFetch(`/api/plugin-secrets?${query}`, { method: 'DELETE' });
+    return res.ok;
+  } catch {
+    return false;
+  }
+}
+
+export interface ConnectedAccount {
+  pluginId: string;
+  credentialId: string;
+  label: string;
+  origin: string;
+  username?: string;
+  connected: boolean;
+  updatedAt: string;
+}
+
+export async function listConnectedAccounts(pluginId?: string): Promise<ConnectedAccount[]> {
+  return (await credentialOverview(pluginId)).credentials;
+}
+
+export interface CredentialOverview {
+  credentials: ConnectedAccount[];
+  admin: { credentialId: string; configured: boolean }[];
+  /** Servers of the admin credentials that are set up. For the host page only. */
+  adminOrigins: string[];
+}
+
+/** The user's connected accounts, and (for one plugin) which admin credentials are set up. */
+export async function credentialOverview(pluginId?: string): Promise<CredentialOverview> {
+  const query = pluginId ? `?plugin=${encodeURIComponent(pluginId)}` : '';
+  try {
+    const res = await apiFetch(`/api/plugin-secrets${query}`);
+    if (!res.ok) return { credentials: [], admin: [], adminOrigins: [] };
+    const body = await res.json() as Partial<CredentialOverview>;
+    return {
+      credentials: Array.isArray(body.credentials) ? body.credentials : [],
+      admin: Array.isArray(body.admin) ? body.admin : [],
+      adminOrigins: Array.isArray(body.adminOrigins) ? body.adminOrigins.filter((o): o is string => typeof o === 'string') : [],
+    };
+  } catch {
+    return { credentials: [], admin: [], adminOrigins: [] };
+  }
+}
+
+/** Normalise what the user typed into an origin, adding https:// if missing. */
+export function originFromInput(value: string): string | null {
+  const trimmed = value.trim();
+  if (!trimmed) return null;
+  const withScheme = /^[a-z][a-z0-9+.-]*:\/\//i.test(trimmed) ? trimmed : `https://${trimmed}`;
+  try {
+    const url = new URL(withScheme);
+    if (url.protocol !== 'https:' && url.protocol !== 'http:') return null;
+    if (url.username || url.password) return null;
+    return url.origin;
+  } catch {
+    return null;
+  }
+}
diff --git a/lib/plugin-sandbox/consent.ts b/lib/plugin-sandbox/consent.ts
index 69d77b455..b84dc8b33 100644
--- a/lib/plugin-sandbox/consent.ts
+++ b/lib/plugin-sandbox/consent.ts
@@ -12,6 +12,9 @@ export interface ConsentRequest {
   pluginId: string;
   pluginName: string;
   permissions: Permission[];
+  /** Where the plugin may send data, shown under http:fetch / http:post. */
+  httpOrigins?: string[];
+  apiPostPaths?: string[];
   resolve: (granted: boolean) => void;
 }
 
@@ -28,9 +31,14 @@ function uid(): string {
   return Math.random().toString(36).slice(2) + Date.now().toString(36);
 }
 
-export function requestConsent(pluginId: string, pluginName: string, permissions: Permission[]): Promise<boolean> {
+export function requestConsent(
+  pluginId: string,
+  pluginName: string,
+  permissions: Permission[],
+  targets: { httpOrigins?: string[]; apiPostPaths?: string[] } = {},
+): Promise<boolean> {
   return new Promise<boolean>((resolve) => {
-    queue.push({ id: uid(), pluginId, pluginName, permissions, resolve });
+    queue.push({ id: uid(), pluginId, pluginName, permissions, ...targets, resolve });
     notify();
   });
 }
@@ -50,47 +58,3 @@ export function subscribe(listener: () => void): () => void {
   listeners.add(listener);
   return () => { listeners.delete(listener); };
 }
-
-// ─── Friendly labels for permission strings ───────────────────
-
-const PERMISSION_LABELS: Record<string, { title: string; body: string }> = {
-  'email:read':       { title: 'Read your email',                body: 'Access subjects, senders, recipients, body previews, and message bodies of your messages.' },
-  'email:write':      { title: 'Modify your email',              body: 'Move, delete, flag, archive, or change keywords on your messages.' },
-  'email:send':       { title: 'Send mail and transform drafts', body: 'Compose and send messages, and modify content right before delivery.' },
-  'crypto:full':      { title: 'Full cryptographic access (high risk)', body: 'Runs with full cryptographic access in a privileged, same-origin context. It can read your message bodies and private keys, store key material, and sign/encrypt on your behalf. Only enable plugins you fully trust — this is comparable to a full-access browser extension.' },
-  'email:raw-send':   { title: 'Send raw messages',                body: 'Submit fully-formed (e.g. signed or encrypted) messages on your behalf.' },
-  'email:blob-read':  { title: 'Read raw message content',        body: 'Fetch the raw bytes of your messages and attachments (needed to decrypt and verify them). This also lets the plugin read the full contents of every file you attach to a message, before it is sent.' },
-  'email:blob-write':  { title: 'Replace raw message content',        body: 'Replace the contents of a file you attached, after you attached it and before it is sent to the server (needed to encrypt attachments).' },
-  'email:render-takeover': { title: 'Replace rendered email content', body: 'Replace the displayed content of an opened message (e.g. to show decrypted text and a signature-verification badge).' },
-  'calendar:read':    { title: 'Read your calendar',             body: 'Access events, calendars, RSVPs, and reminders.' },
-  'calendar:write':   { title: 'Modify your calendar',           body: 'Create, edit, or delete events.' },
-  'contacts:read':    { title: 'Read your contacts',             body: 'Access your address book entries.' },
-  'contacts:write':   { title: 'Modify your contacts',           body: 'Create, edit, or delete contact entries.' },
-  'files:read':       { title: 'Read your files',                body: 'Browse files stored in your WebDAV folders.' },
-  'files:write':      { title: 'Modify your files',              body: 'Create, edit, rename, move, or delete files.' },
-  'identity:read':    { title: 'Read your identities',           body: 'Access the From addresses and signatures you send mail from.' },
-  'identity:write':   { title: 'Modify your identities',         body: 'Create, edit, or delete identities.' },
-  'filters:read':     { title: 'Read your filters',              body: 'Access your Sieve mail-filter rules.' },
-  'filters:write':    { title: 'Modify your filters',            body: 'Create, edit, or delete Sieve filter rules.' },
-  'tasks:read':       { title: 'Read your tasks',                body: 'Access your task list.' },
-  'tasks:write':      { title: 'Modify your tasks',              body: 'Create, edit, or delete tasks.' },
-  'templates:read':   { title: 'Read your templates',            body: 'Access stored mail templates.' },
-  'templates:write':  { title: 'Modify your templates',          body: 'Create, edit, or delete mail templates.' },
-  'smime:read':       { title: 'Read your S/MIME state',         body: 'Access information about installed S/MIME keys and certificates.' },
-  'vacation:read':    { title: 'Read your vacation auto-reply',  body: 'See the configured vacation auto-reply state.' },
-  'vacation:write':   { title: 'Modify your vacation auto-reply',body: 'Create, change, or remove the vacation auto-reply.' },
-  'settings:read':    { title: 'Read your settings',             body: 'Access non-secret user preferences.' },
-  'settings:write':   { title: 'Modify your settings',           body: 'Change non-secret user preferences.' },
-  'security:read':    { title: 'Read account security state',    body: 'See whether TOTP / encryption are enabled (no secrets exposed).' },
-  'auth:observe':     { title: 'Observe login events',           body: 'See when you log in, log out, or switch accounts.' },
-  'auth:emit':        { title: 'Emit login events',              body: 'Emit auth events such as logout.' },
-  'http:post':        { title: 'Call same-origin APIs',          body: 'Make authenticated requests to the webmail backend on your behalf.' },
-  'http:fetch':       { title: 'Talk to external services',      body: 'Make uncredentialled requests to the third-party origins listed in the manifest.' },
-  'admin:config':     { title: 'Read/write admin config',        body: 'Access this plugin\'s admin-supplied configuration values.' },
-  'ui:download-file': { title: 'Download files',                 body: 'Download custom files generated by the plugin.' },
-  'account:read':      { title: 'Read your accounts',              body: 'Access the list of accounts you have configured in the app.' },
-};
-
-export function describePermission(perm: string): { title: string; body: string } {
-  return PERMISSION_LABELS[perm] ?? { title: perm, body: 'No description available.' };
-}
diff --git a/lib/plugin-sandbox/day-labels.ts b/lib/plugin-sandbox/day-labels.ts
new file mode 100644
index 000000000..761d8dac4
--- /dev/null
+++ b/lib/plugin-sandbox/day-labels.ts
@@ -0,0 +1,91 @@
+// Short labels and dots plugins put on calendar days (`api.ui.setDayLabels`):
+// a holiday name under the day header, a dot in the small month calendar.
+// Data only; the host draws them.
+
+export interface DayLabel {
+  /** YYYY-MM-DD */
+  date: string;
+  /** Shown under the day's name in the day and week views (max 24 characters). */
+  text?: string;
+  /** Tooltip (max 120 characters). */
+  title?: string;
+  /** A dot on the day in the small month calendar. */
+  dot?: boolean;
+}
+
+export interface RegisteredDayLabel extends DayLabel {
+  pluginId: string;
+  pluginName: string;
+}
+
+export const MAX_DAY_LABELS = 400;
+const DATE_RE = /^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01])$/;
+
+export function checkDayLabels(value: unknown): DayLabel[] {
+  if (!Array.isArray(value)) throw new Error('labels must be a list');
+  if (value.length > MAX_DAY_LABELS) throw new Error(`At most ${MAX_DAY_LABELS} day labels`);
+  return value.map((raw, i) => {
+    if (!raw || typeof raw !== 'object') throw new Error(`labels[${i}] must be an object`);
+    const l = raw as Record<string, unknown>;
+    if (typeof l.date !== 'string' || !DATE_RE.test(l.date)) throw new Error(`labels[${i}].date must be YYYY-MM-DD`);
+    const out: DayLabel = { date: l.date };
+    if (l.text !== undefined) {
+      if (typeof l.text !== 'string' || l.text.length > 24) throw new Error(`labels[${i}].text must be at most 24 characters`);
+      if (l.text.trim()) out.text = l.text.trim();
+    }
+    if (l.title !== undefined) {
+      if (typeof l.title !== 'string' || l.title.length > 120) throw new Error(`labels[${i}].title must be at most 120 characters`);
+      if (l.title.trim()) out.title = l.title.trim();
+    }
+    if (l.dot !== undefined) out.dot = l.dot === true;
+    if (!out.text && !out.dot) throw new Error(`labels[${i}] needs text or dot`);
+    return out;
+  });
+}
+
+const byPlugin = new Map<string, RegisteredDayLabel[]>();
+const listeners = new Set<() => void>();
+let snapshot: Map<string, RegisteredDayLabel[]> | null = null;
+
+function changed(): void {
+  snapshot = null;
+  for (const l of listeners) {
+    try { l(); } catch { /* ignore */ }
+  }
+}
+
+export function subscribeDayLabels(listener: () => void): () => void {
+  listeners.add(listener);
+  return () => { listeners.delete(listener); };
+}
+
+export function setDayLabels(pluginId: string, pluginName: string, labels: DayLabel[]): void {
+  if (labels.length === 0) byPlugin.delete(pluginId);
+  else byPlugin.set(pluginId, labels.map((l) => ({ ...l, pluginId, pluginName })));
+  changed();
+}
+
+export function clearDayLabels(pluginId: string): void {
+  if (byPlugin.delete(pluginId)) changed();
+}
+
+/** Labels by date. Stable between changes (for useSyncExternalStore). */
+export function dayLabelsByDate(): Map<string, RegisteredDayLabel[]> {
+  if (snapshot) return snapshot;
+  const out = new Map<string, RegisteredDayLabel[]>();
+  for (const labels of byPlugin.values()) {
+    for (const l of labels) {
+      const list = out.get(l.date);
+      if (list) list.push(l);
+      else out.set(l.date, [l]);
+    }
+  }
+  snapshot = out;
+  return out;
+}
+
+/** Test helper. */
+export function resetDayLabels(): void {
+  byPlugin.clear();
+  changed();
+}
diff --git a/lib/plugin-sandbox/host-api-calendar.ts b/lib/plugin-sandbox/host-api-calendar.ts
new file mode 100644
index 000000000..4c6a36be2
--- /dev/null
+++ b/lib/plugin-sandbox/host-api-calendar.ts
@@ -0,0 +1,592 @@
+// Host side of api.calendar and api.tasks. Plugins read through the JMAP
+// client (a read must not move the calendar the user is looking at) and
+// write through the calendar and task stores, so the plugin hooks wired into
+// those actions run and the open calendar shows the change.
+//
+// Plugins describe events in a small shape of their own (CalendarEventInput
+// in plugin-types.ts); arbitrary JSCalendar objects are not accepted.
+
+import { createRecurrenceRule } from '@/lib/recurrence-rule';
+import type {
+  CalendarEventInput, CalendarEventView, CalendarView, TaskInput, TaskView,
+} from '../plugin-types';
+import type { Calendar, CalendarEvent, CalendarParticipant, CalendarRecurrenceRule, CalendarTask } from '../jmap/types';
+import type { IJMAPClient } from '../jmap/client-interface';
+import { useCalendarStore } from '@/stores/calendar-store';
+import { useTaskStore } from '@/stores/task-store';
+import { useIdentityStore } from '@/stores/identity-store';
+import { eventToView, taskToView } from '../plugin-projection';
+import { expandRecurringEvents } from '../recurrence-expansion';
+import { buildParticipantMap } from '../calendar-participants';
+import { parseDurationSeconds } from '../calendar-event-normalization';
+import { getEffectiveTimeZone } from '../timezone';
+import { generateUUID } from '../utils';
+import {
+  readBoolean, readId, readInteger, readObject, readString, sessionClient,
+} from './host-api-input';
+
+/** Longest range calendar.getEvents covers in one call. */
+export const MAX_PLUGIN_EVENT_RANGE_DAYS = 366;
+/** Most events calendar.getEvents returns; the earliest ones win. */
+export const MAX_PLUGIN_EVENTS = 1000;
+/** Most tasks tasks.list returns. */
+export const MAX_PLUGIN_TASKS = 1000;
+const MAX_TITLE = 500;
+const MAX_DESCRIPTION = 10_000;
+const MAX_LOCATION = 500;
+const MAX_PARTICIPANTS = 50;
+const DAY_MS = 86_400_000;
+
+// ─── Dates and times ──────────────────────────────────────────
+
+interface WhenParts {
+  /** YYYY-MM-DD */
+  date: string;
+  /** HH:MM:SS, or null for a date without a time. */
+  time: string | null;
+  /** True when the value ended in Z. */
+  utc: boolean;
+}
+
+const WHEN_RE = /^(\d{4})-(\d{2})-(\d{2})(?:T(\d{2}):(\d{2})(?::(\d{2}))?(Z)?)?$/;
+
+/**
+ * `YYYY-MM-DD`, `YYYY-MM-DDTHH:MM[:SS]` (a wall-clock time) or the same
+ * followed by `Z` (UTC). Offsets like `+02:00` are refused: pass a timeZone.
+ */
+function readWhen(value: unknown, method: string, field: string): WhenParts {
+  if (typeof value !== 'string') throw new Error(`${method}: ${field} must be a date string`);
+  const m = WHEN_RE.exec(value);
+  if (!m) {
+    throw new Error(`${method}: ${field} must look like 2026-05-01, 2026-05-01T09:30 or 2026-05-01T07:30:00Z`);
+  }
+  const [, y, mo, d, h, mi, s, z] = m;
+  const check = new Date(Date.UTC(+y, +mo - 1, +d, h ? +h : 0, mi ? +mi : 0, s ? +s : 0));
+  if (
+    check.getUTCFullYear() !== +y || check.getUTCMonth() !== +mo - 1 || check.getUTCDate() !== +d ||
+    (h !== undefined && (check.getUTCHours() !== +h || check.getUTCMinutes() !== +mi || check.getUTCSeconds() !== +(s ?? 0)))
+  ) {
+    throw new Error(`${method}: ${field} is not a real date or time`);
+  }
+  return {
+    date: `${y}-${mo}-${d}`,
+    time: h === undefined ? null : `${h}:${mi}:${s ?? '00'}`,
+    utc: z === 'Z',
+  };
+}
+
+/** Wall-clock milliseconds, for differences only (time zones don't matter). */
+function wallMs(when: WhenParts): number {
+  return Date.parse(`${when.date}T${when.time ?? '00:00:00'}Z`);
+}
+
+function readTimeZone(value: unknown, method: string): string {
+  const zone = readString(value, method, 'timeZone', 64, { min: 1 });
+  try {
+    new Intl.DateTimeFormat('en-US', { timeZone: zone });
+  } catch {
+    throw new Error(`${method}: timeZone "${zone}" is not a known time zone`);
+  }
+  return zone;
+}
+
+function readDurationSeconds(value: unknown, method: string): number {
+  if (typeof value !== 'string') throw new Error(`${method}: duration must be an ISO 8601 duration such as PT1H`);
+  const seconds = parseDurationSeconds(value);
+  if (seconds === null || seconds <= 0) {
+    throw new Error(`${method}: duration must be an ISO 8601 duration such as PT1H or P1D`);
+  }
+  return seconds;
+}
+
+function formatDuration(seconds: number): string {
+  const days = Math.floor(seconds / 86_400);
+  let rest = seconds % 86_400;
+  const hours = Math.floor(rest / 3600);
+  rest %= 3600;
+  const minutes = Math.floor(rest / 60);
+  const secs = rest % 60;
+  const time = `${hours ? `${hours}H` : ''}${minutes ? `${minutes}M` : ''}${secs ? `${secs}S` : ''}`;
+  return `P${days ? `${days}D` : ''}${time ? `T${time}` : ''}`;
+}
+
+interface Timing {
+  start: string;
+  duration: string;
+  timeZone: string | null;
+  showWithoutTime: boolean;
+}
+
+/** Turn the plugin's start/end/duration/timeZone/isAllDay into JSCalendar fields. */
+function buildTiming(
+  method: string,
+  input: { start: unknown; end?: unknown; duration?: unknown; timeZone?: unknown; isAllDay?: unknown },
+): Timing {
+  const start = readWhen(input.start, method, 'start');
+  const isAllDay = input.isAllDay === undefined ? start.time === null : readBoolean(input.isAllDay, method, 'isAllDay');
+  if (input.end !== undefined && input.duration !== undefined) {
+    throw new Error(`${method}: pass end or duration, not both`);
+  }
+  const maxSeconds = MAX_PLUGIN_EVENT_RANGE_DAYS * 86_400;
+
+  if (isAllDay) {
+    if (input.timeZone !== undefined && input.timeZone !== null) {
+      throw new Error(`${method}: an all-day event has no timeZone`);
+    }
+    let days = 1;
+    if (input.end !== undefined) {
+      const end = readWhen(input.end, method, 'end');
+      days = Math.round((Date.parse(`${end.date}T00:00:00Z`) - Date.parse(`${start.date}T00:00:00Z`)) / DAY_MS);
+      if (days < 1) throw new Error(`${method}: end must be at least one day after start (end is exclusive)`);
+    } else if (input.duration !== undefined) {
+      const seconds = readDurationSeconds(input.duration, method);
+      if (seconds % 86_400 !== 0) throw new Error(`${method}: an all-day event lasts whole days (P1D, P2D, ...)`);
+      days = seconds / 86_400;
+    }
+    if (days * 86_400 > maxSeconds) throw new Error(`${method}: an event may last at most ${MAX_PLUGIN_EVENT_RANGE_DAYS} days`);
+    return { start: `${start.date}T00:00:00`, duration: `P${days}D`, timeZone: null, showWithoutTime: true };
+  }
+
+  if (start.time === null) throw new Error(`${method}: start needs a time unless isAllDay is true`);
+  let timeZone: string;
+  if (start.utc) {
+    if (input.timeZone !== undefined && input.timeZone !== null && input.timeZone !== 'Etc/UTC' && input.timeZone !== 'UTC') {
+      throw new Error(`${method}: start is in UTC (ends in Z), so timeZone must be left out`);
+    }
+    timeZone = 'Etc/UTC';
+  } else {
+    timeZone = input.timeZone === undefined || input.timeZone === null
+      ? getEffectiveTimeZone()
+      : readTimeZone(input.timeZone, method);
+  }
+
+  let seconds = 3600;
+  if (input.end !== undefined) {
+    const end = readWhen(input.end, method, 'end');
+    if (end.time === null || end.utc !== start.utc) {
+      throw new Error(`${method}: end must be written like start (with a time${start.utc ? ', in UTC' : ''})`);
+    }
+    seconds = (wallMs(end) - wallMs(start)) / 1000;
+    if (seconds <= 0) throw new Error(`${method}: end must be after start`);
+  } else if (input.duration !== undefined) {
+    seconds = readDurationSeconds(input.duration, method);
+  }
+  if (seconds > maxSeconds) throw new Error(`${method}: an event may last at most ${MAX_PLUGIN_EVENT_RANGE_DAYS} days`);
+  return { start: `${start.date}T${start.time}`, duration: formatDuration(seconds), timeZone, showWithoutTime: false };
+}
+
+// ─── Calendars ────────────────────────────────────────────────
+
+/** The store's calendars, loaded first when the calendar was never opened. */
+async function ensureCalendars(client: IJMAPClient): Promise<Calendar[]> {
+  if (useCalendarStore.getState().calendars.length === 0) {
+    await useCalendarStore.getState().fetchCalendars(client);
+  }
+  return useCalendarStore.getState().calendars;
+}
+
+function calendarToView(calendar: Calendar): CalendarView {
+  return {
+    id: calendar.id,
+    name: calendar.name,
+    color: calendar.color || '',
+    isVisible: calendar.isVisible !== false,
+    isDefault: !!calendar.isDefault,
+    isTasksOnly: !!calendar.isTasksOnly,
+  };
+}
+
+async function pickCalendar(
+  client: IJMAPClient,
+  method: string,
+  requested: unknown,
+  forTasks: boolean,
+): Promise<string> {
+  const calendars = await ensureCalendars(client);
+  if (requested !== undefined) {
+    const id = readId(requested, method, 'calendarId');
+    if (!calendars.some((c) => c.id === id)) throw new Error(`${method}: no calendar with id "${id}"`);
+    return id;
+  }
+  const choice = forTasks
+    ? calendars.find((c) => c.isTasksOnly) ?? calendars.find((c) => c.isDefault) ?? calendars[0]
+    : calendars.find((c) => c.isDefault && !c.isTasksOnly) ?? calendars.find((c) => !c.isTasksOnly);
+  if (!choice) throw new Error(`${method}: there is no calendar to put it in`);
+  return choice.id;
+}
+
+export async function doCalendarListCalendars(): Promise<CalendarView[]> {
+  const client = sessionClient('calendar.listCalendars');
+  return (await ensureCalendars(client)).map(calendarToView);
+}
+
+// ─── Reading events ───────────────────────────────────────────
+
+/** Bounds of an event query: wall clock without a zone, or UTC with Z. */
+function rangeBound(when: WhenParts): string {
+  return `${when.date}T${when.time ?? '00:00:00'}${when.utc ? 'Z' : ''}`;
+}
+
+export async function doCalendarGetEvents(options: unknown): Promise<CalendarEventView[]> {
+  const method = 'calendar.getEvents';
+  const opts = readObject(options, method, 'options', ['from', 'to', 'calendarIds']);
+  const from = readWhen(opts.from, method, 'from');
+  const to = readWhen(opts.to, method, 'to');
+  if (from.utc !== to.utc) throw new Error(`${method}: from and to must both be in UTC or both without a zone`);
+  const span = wallMs(to) - wallMs(from);
+  if (span <= 0) throw new Error(`${method}: to must be after from`);
+  if (span > MAX_PLUGIN_EVENT_RANGE_DAYS * DAY_MS) {
+    throw new Error(`${method}: the range may cover at most ${MAX_PLUGIN_EVENT_RANGE_DAYS} days`);
+  }
+  let calendarIds: Set<string> | null = null;
+  if (opts.calendarIds !== undefined) {
+    if (!Array.isArray(opts.calendarIds) || opts.calendarIds.length > 100) {
+      throw new Error(`${method}: calendarIds must be an array of at most 100 ids`);
+    }
+    calendarIds = new Set(opts.calendarIds.map((id, i) => readId(id, method, `calendarIds[${i}]`)));
+  }
+
+  const client = sessionClient(method);
+  const start = rangeBound(from);
+  const end = rangeBound(to);
+  const raw = await client.queryAllCalendarEvents({ after: start, before: end });
+  // Same clean-up as the calendar's own range fetch (calendar-store.ts).
+  const valid = raw.filter((e) => typeof e.start === 'string' && e.start && !Number.isNaN(Date.parse(e.start)));
+  const events = expandRecurringEvents(valid, start, end)
+    .filter((e) => !calendarIds || Object.keys(e.calendarIds || {}).some((id) => e.calendarIds[id] && calendarIds.has(id)));
+  const sortKey = (e: CalendarEvent) => e.utcStart ?? e.start;
+  events.sort((a, b) => (sortKey(a) < sortKey(b) ? -1 : sortKey(a) > sortKey(b) ? 1 : 0));
+  return events.slice(0, MAX_PLUGIN_EVENTS).map(eventToView);
+}
+
+/**
+ * The event as the store addresses it. Events of shared calendars carry
+ * `<accountId>:<id>` ids (see queryAllCalendarEvents), which is resolved
+ * here the same way.
+ */
+async function loadEvent(client: IJMAPClient, id: string): Promise<CalendarEvent | null> {
+  const inStore = useCalendarStore.getState().events.find((e) => e.id === id);
+  if (inStore) return inStore;
+  const own = await client.getCalendarEvent(id);
+  if (own) return own;
+  const colon = id.indexOf(':');
+  if (colon <= 0) return null;
+  const accountId = id.slice(0, colon);
+  const rawId = id.slice(colon + 1);
+  const shared = await client.getCalendarEvent(rawId, accountId);
+  if (!shared) return null;
+  return {
+    ...shared,
+    id,
+    originalId: rawId,
+    originalCalendarIds: shared.calendarIds,
+    calendarIds: Object.fromEntries(
+      Object.entries(shared.calendarIds || {}).map(([calId, v]) => [`${accountId}:${calId}`, v]),
+    ),
+    accountId,
+    isShared: true,
+  };
+}
+
+export async function doCalendarGetEvent(id: unknown): Promise<CalendarEventView | null> {
+  const method = 'calendar.getEvent';
+  const eventId = readId(id, method);
+  const event = await loadEvent(sessionClient(method), eventId);
+  return event ? eventToView(event) : null;
+}
+
+/**
+ * Store mutations look the event up in the store's list to route it (shared
+ * calendars, occurrences) and to tell hooks its title. An event outside the
+ * range the calendar has loaded is added to that list first.
+ */
+async function eventForMutation(client: IJMAPClient, method: string, id: string): Promise<CalendarEvent> {
+  const event = await loadEvent(client, id);
+  if (!event) throw new Error(`${method}: no event with id "${id}"`);
+  if (!useCalendarStore.getState().events.some((e) => e.id === id)) {
+    useCalendarStore.setState((state) => ({ events: [...state.events, event] }));
+  }
+  return event;
+}
+
+// ─── Writing events ───────────────────────────────────────────
+
+const EVENT_FIELDS = [
+  'title', 'description', 'start', 'end', 'duration', 'timeZone', 'isAllDay', 'location', 'calendarId', 'participants', 'repeat',
+] as const;
+const CREATE_FIELDS = [...EVENT_FIELDS, 'uid'] as const;
+
+const UID_RE = /^[A-Za-z0-9._:-]{1,128}$/;
+const DATE_RE = /^\d{4}-\d{2}-\d{2}$/;
+const FREQUENCIES = ['daily', 'weekly', 'monthly', 'yearly'] as const;
+
+/**
+ * The uid an event a plugin created is stored under: the plugin's own uid in
+ * its own namespace, so it can't collide with events from other apps and the
+ * plugin finds its events again by uid (CalendarEventView.uid).
+ */
+export function pluginEventUid(pluginId: string, uid: string): string {
+  return `${uid}@${pluginId}.plugin.bulwark`;
+}
+
+/** `repeat: { frequency, interval?, count?, until? }` → JSCalendar rules; null removes them. */
+function recurrenceOf(value: unknown, method: string): CalendarEvent['recurrenceRules'] {
+  if (value === null) return null;
+  const r = readObject(value, method, 'repeat', ['frequency', 'interval', 'count', 'until']);
+  if (!FREQUENCIES.includes(r.frequency as never)) throw new Error(`${method}: repeat.frequency must be one of ${FREQUENCIES.join(', ')}`);
+  const overrides: Partial<CalendarRecurrenceRule> = {};
+  if (r.interval !== undefined) {
+    if (!Number.isInteger(r.interval) || (r.interval as number) < 1 || (r.interval as number) > 99) throw new Error(`${method}: repeat.interval must be 1-99`);
+    overrides.interval = r.interval as number;
+  }
+  if (r.count !== undefined && r.until !== undefined) throw new Error(`${method}: give repeat.count or repeat.until, not both`);
+  if (r.count !== undefined) {
+    if (!Number.isInteger(r.count) || (r.count as number) < 1 || (r.count as number) > 1000) throw new Error(`${method}: repeat.count must be 1-1000`);
+    overrides.count = r.count as number;
+  }
+  if (r.until !== undefined) {
+    if (typeof r.until !== 'string' || !DATE_RE.test(r.until)) throw new Error(`${method}: repeat.until must be YYYY-MM-DD`);
+    overrides.until = `${r.until}T23:59:59`;
+  }
+  return [createRecurrenceRule(r.frequency as CalendarRecurrenceRule['frequency'], overrides)];
+}
+
+function locationsOf(location: string): CalendarEvent['locations'] {
+  if (!location) return null;
+  return {
+    loc1: {
+      '@type': 'Location', name: location, description: null, locationTypes: null,
+      coordinates: null, timeZone: null, links: null, relativeTo: null,
+    },
+  } as CalendarEvent['locations'];
+}
+
+/** Attendees as stored on the event, with the user as organizer. No invitations are sent. */
+function participantsOf(value: unknown, method: string): Pick<CalendarEvent, 'participants' | 'organizerCalendarAddress'> {
+  if (!Array.isArray(value)) throw new Error(`${method}: participants must be an array`);
+  if (value.length > MAX_PARTICIPANTS) throw new Error(`${method}: at most ${MAX_PARTICIPANTS} participants are allowed`);
+  const attendees = value.map((entry, i) => {
+    const p = readObject(entry, method, `participants[${i}]`, ['email', 'name']);
+    const email = readString(p.email, method, `participants[${i}].email`, 254, { min: 3, trim: true });
+    if (!/^[^\s@<>]+@[^\s@<>]+$/.test(email)) throw new Error(`${method}: participants[${i}].email is not an address`);
+    const name = p.name === undefined ? '' : readString(p.name, method, `participants[${i}].name`, 200, { trim: true });
+    return { email, name };
+  });
+  if (attendees.length === 0) return { participants: null, organizerCalendarAddress: null };
+  const { identities, preferredPrimaryId } = useIdentityStore.getState();
+  const organizer = identities.find((i) => i.id === preferredPrimaryId) ?? identities[0];
+  if (!organizer) throw new Error(`${method}: the account has no sender address to organise the event from`);
+  return {
+    participants: buildParticipantMap(
+      { name: organizer.name || '', email: organizer.email },
+      attendees,
+    ) as Record<string, CalendarParticipant>,
+    organizerCalendarAddress: `mailto:${organizer.email}`,
+  };
+}
+
+/**
+ * Create an event. Resolves to the new event, or null when it was not
+ * created (another plugin's onBeforeEventCreate stopped it, or the server
+ * refused it). Never sends invitations.
+ */
+export async function doCalendarCreateEvent(input: unknown, pluginId = 'unknown'): Promise<CalendarEventView | null> {
+  const method = 'calendar.createEvent';
+  const data = readObject(input, method, 'event', CREATE_FIELDS) as CalendarEventInput & Record<string, unknown>;
+  const title = readString(data.title, method, 'title', MAX_TITLE, { min: 1, trim: true });
+  const timing = buildTiming(method, data);
+  const client = sessionClient(method);
+  const calendarId = await pickCalendar(client, method, data.calendarId, false);
+
+  let uid = generateUUID();
+  if (data.uid !== undefined) {
+    if (typeof data.uid !== 'string' || !UID_RE.test(data.uid)) throw new Error(`${method}: uid must be 1-128 letters, digits or . _ : -`);
+    uid = pluginEventUid(pluginId, data.uid);
+  }
+  const event: Partial<CalendarEvent> = {
+    uid,
+    title,
+    ...timing,
+    calendarIds: { [calendarId]: true },
+    status: 'confirmed',
+    freeBusyStatus: 'busy',
+    privacy: 'public',
+  };
+  if (data.description !== undefined) {
+    const description = readString(data.description, method, 'description', MAX_DESCRIPTION, { trim: true });
+    if (description) event.description = description;
+  }
+  if (data.location !== undefined) {
+    const location = readString(data.location, method, 'location', MAX_LOCATION, { trim: true });
+    if (location) event.locations = locationsOf(location);
+  }
+  if (data.participants !== undefined) {
+    const p = participantsOf(data.participants, method);
+    if (p.participants) Object.assign(event, p);
+  }
+  if (data.repeat !== undefined) event.recurrenceRules = recurrenceOf(data.repeat, method);
+
+  const created = await useCalendarStore.getState().createEvent(client, event, false);
+  return created ? eventToView(created) : null;
+}
+
+/**
+ * Change an event. Only the fields in `patch` change; `start`, `end`,
+ * `duration`, `timeZone` and `isAllDay` are worked out together against the
+ * event's current times. Never sends updates to participants.
+ */
+export async function doCalendarUpdateEvent(id: unknown, patch: unknown): Promise<void> {
+  const method = 'calendar.updateEvent';
+  const eventId = readId(id, method);
+  const data = readObject(patch, method, 'patch', EVENT_FIELDS);
+  if (Object.keys(data).length === 0) throw new Error(`${method}: patch is empty`);
+  const updates: Partial<CalendarEvent> = {};
+
+  if (data.title !== undefined) updates.title = readString(data.title, method, 'title', MAX_TITLE, { min: 1, trim: true });
+  if (data.description !== undefined) {
+    updates.description = readString(data.description, method, 'description', MAX_DESCRIPTION, { trim: true });
+  }
+  if (data.location !== undefined) {
+    updates.locations = locationsOf(readString(data.location, method, 'location', MAX_LOCATION, { trim: true }));
+  }
+  if (data.participants !== undefined) Object.assign(updates, participantsOf(data.participants, method));
+  if (data.repeat !== undefined) updates.recurrenceRules = recurrenceOf(data.repeat, method);
+
+  const client = sessionClient(method);
+  if (data.calendarId !== undefined) {
+    updates.calendarIds = { [await pickCalendar(client, method, data.calendarId, false)]: true };
+  }
+  const existing = await eventForMutation(client, method, eventId);
+
+  const timeKeys = ['start', 'end', 'duration', 'timeZone', 'isAllDay'] as const;
+  if (timeKeys.some((k) => data[k] !== undefined)) {
+    const wasAllDay = !!existing.showWithoutTime;
+    const isAllDay = data.isAllDay === undefined ? wasAllDay : data.isAllDay;
+    const keepLength = data.end === undefined && data.duration === undefined && isAllDay === wasAllDay;
+    Object.assign(updates, buildTiming(method, {
+      start: data.start ?? (wasAllDay ? existing.start.slice(0, 10) : existing.start.slice(0, 19)),
+      end: data.end,
+      duration: keepLength ? existing.duration : data.duration,
+      timeZone: data.timeZone !== undefined ? data.timeZone : (isAllDay ? undefined : existing.timeZone ?? undefined),
+      isAllDay,
+    }));
+  }
+
+  await useCalendarStore.getState().updateEvent(client, eventId, updates, false);
+}
+
+/** Delete an event (one occurrence when the id is an occurrence's). Never sends cancellations. */
+export async function doCalendarDeleteEvent(id: unknown): Promise<void> {
+  const method = 'calendar.deleteEvent';
+  const eventId = readId(id, method);
+  const client = sessionClient(method);
+  await eventForMutation(client, method, eventId);
+  await useCalendarStore.getState().deleteEvent(client, eventId, false);
+}
+
+// ─── Tasks ────────────────────────────────────────────────────
+
+const TASK_FIELDS = ['title', 'description', 'due', 'priority', 'calendarId'] as const;
+
+function isDone(task: CalendarTask): boolean {
+  return task.progress === 'completed' || task.progress === 'cancelled';
+}
+
+export async function doTasksList(options: unknown): Promise<TaskView[]> {
+  const method = 'tasks.list';
+  const opts = readObject(options, method, 'options', ['includeCompleted'], true);
+  const includeCompleted = opts.includeCompleted === undefined
+    ? false
+    : readBoolean(opts.includeCompleted, method, 'includeCompleted');
+  const tasks = await sessionClient(method).getCalendarTasks();
+  return tasks
+    .filter((t) => includeCompleted || !isDone(t))
+    .slice(0, MAX_PLUGIN_TASKS)
+    .map(taskToView);
+}
+
+async function loadTask(client: IJMAPClient, id: string): Promise<CalendarTask | null> {
+  const inStore = useTaskStore.getState().tasks.find((t) => t.id === id);
+  if (inStore) return inStore;
+  return (await client.getCalendarTasks()).find((t) => t.id === id) ?? null;
+}
+
+async function requireTask(client: IJMAPClient, method: string, id: string): Promise<CalendarTask> {
+  const task = await loadTask(client, id);
+  if (!task) throw new Error(`${method}: no task with id "${id}"`);
+  return task;
+}
+
+export async function doTasksGet(id: unknown): Promise<TaskView | null> {
+  const method = 'tasks.get';
+  const task = await loadTask(sessionClient(method), readId(id, method));
+  return task ? taskToView(task) : null;
+}
+
+/** `due` as a task stores it: a date (no time) or a wall-clock time. */
+function dueOf(value: unknown, method: string): Pick<CalendarTask, 'due' | 'showWithoutTime'> {
+  if (value === null) return { due: null, showWithoutTime: true };
+  const when = readWhen(value, method, 'due');
+  if (when.utc) throw new Error(`${method}: due is a local date or time, without Z`);
+  return when.time === null
+    ? { due: when.date, showWithoutTime: true }
+    : { due: `${when.date}T${when.time}`, showWithoutTime: false };
+}
+
+/** Resolves to the new task, or null when another plugin's onBeforeTaskCreate stopped it. */
+export async function doTasksCreate(input: unknown): Promise<TaskView | null> {
+  const method = 'tasks.create';
+  const data = readObject(input, method, 'task', TASK_FIELDS) as TaskInput & Record<string, unknown>;
+  const client = sessionClient(method);
+  const task: Partial<CalendarTask> = {
+    '@type': 'Task',
+    title: readString(data.title, method, 'title', MAX_TITLE, { min: 1, trim: true }),
+    description: data.description === undefined
+      ? ''
+      : readString(data.description, method, 'description', MAX_DESCRIPTION, { trim: true }),
+    ...(data.due === undefined ? { due: null, showWithoutTime: true } : dueOf(data.due, method)),
+    priority: data.priority === undefined ? 0 : readInteger(data.priority, method, 'priority', 0, 9),
+    progress: 'needs-action',
+    calendarIds: { [await pickCalendar(client, method, data.calendarId, true)]: true },
+  };
+  const created = await useTaskStore.getState().createTask(client, task);
+  return created ? taskToView(created) : null;
+}
+
+export async function doTasksUpdate(id: unknown, patch: unknown): Promise<void> {
+  const method = 'tasks.update';
+  const taskId = readId(id, method);
+  const data = readObject(patch, method, 'patch', TASK_FIELDS);
+  if (Object.keys(data).length === 0) throw new Error(`${method}: patch is empty`);
+  const updates: Partial<CalendarTask> = {};
+  if (data.title !== undefined) updates.title = readString(data.title, method, 'title', MAX_TITLE, { min: 1, trim: true });
+  if (data.description !== undefined) {
+    updates.description = readString(data.description, method, 'description', MAX_DESCRIPTION, { trim: true });
+  }
+  if (data.due !== undefined) Object.assign(updates, dueOf(data.due, method));
+  if (data.priority !== undefined) updates.priority = readInteger(data.priority, method, 'priority', 0, 9);
+  const client = sessionClient(method);
+  if (data.calendarId !== undefined) {
+    updates.calendarIds = { [await pickCalendar(client, method, data.calendarId, true)]: true };
+  }
+  await requireTask(client, method, taskId);
+  await useTaskStore.getState().updateTask(client, taskId, updates);
+}
+
+export async function doTasksSetComplete(id: unknown, complete: unknown): Promise<void> {
+  const method = 'tasks.setComplete';
+  const taskId = readId(id, method);
+  const done = readBoolean(complete, method, 'complete');
+  const client = sessionClient(method);
+  const task = await requireTask(client, method, taskId);
+  if ((task.progress === 'completed') === done) return;
+  await useTaskStore.getState().toggleTaskComplete(client, task);
+}
+
+export async function doTasksDelete(id: unknown): Promise<void> {
+  const method = 'tasks.delete';
+  const taskId = readId(id, method);
+  const client = sessionClient(method);
+  await requireTask(client, method, taskId);
+  await useTaskStore.getState().deleteTask(client, taskId);
+}
diff --git a/lib/plugin-sandbox/host-api-compose.ts b/lib/plugin-sandbox/host-api-compose.ts
new file mode 100644
index 000000000..25a50a190
--- /dev/null
+++ b/lib/plugin-sandbox/host-api-compose.ts
@@ -0,0 +1,166 @@
+// Host side of api.compose.open and api.drafts.create. compose.open fills
+// the composer the way an in-app mailto: link does, and the user still has
+// to press Send; drafts.create saves a draft to the Drafts folder without
+// opening anything. Neither sends mail.
+
+import type { ComposeInput, DraftInput, InstalledPlugin } from '../plugin-types';
+import type { ParsedMailto } from '../protocol-handlers/mailto';
+import { requestInternalCompose } from '../protocol-handlers/mailto';
+import { notifyPendingMailto, savePendingMailto } from '../protocol-handlers/session';
+import { getPathPrefix } from '../browser-navigation';
+import { locales } from '@/i18n/routing';
+import { useIdentityStore } from '@/stores/identity-store';
+import { sanitizePluginBodyHtml } from '../email-sanitization';
+import { htmlToPlainText } from '../html-to-text';
+import {
+  readAddressList, readBlobRefs, readBoolean, readId, readObject, readString, sessionClient, withinRate,
+  type PluginBlobRef,
+} from './host-api-input';
+
+/** Most recipients (to, cc and bcc together) one call may set. */
+export const MAX_PLUGIN_RECIPIENTS = 100;
+/** Most attachments one call may add. */
+export const MAX_PLUGIN_ATTACHMENTS = 20;
+const MAX_SUBJECT = 998;
+const MAX_BODY = 512 * 1024;
+// A blob a plugin uploaded can be as big as the server lets it be; this
+// only keeps the number sane.
+const MAX_ATTACHMENT_SIZE = 2 ** 31;
+
+interface MessageFields {
+  to: string[];
+  cc: string[];
+  bcc: string[];
+  subject: string;
+  text: string;
+  html: string | undefined;
+  attachments: PluginBlobRef[];
+}
+
+function readMessage(method: string, data: Record<string, unknown>): MessageFields {
+  const to = readAddressList(data.to, method, 'to', MAX_PLUGIN_RECIPIENTS);
+  const cc = readAddressList(data.cc, method, 'cc', MAX_PLUGIN_RECIPIENTS);
+  const bcc = readAddressList(data.bcc, method, 'bcc', MAX_PLUGIN_RECIPIENTS);
+  if (to.length + cc.length + bcc.length > MAX_PLUGIN_RECIPIENTS) {
+    throw new Error(`${method}: at most ${MAX_PLUGIN_RECIPIENTS} recipients in all`);
+  }
+  const subject = data.subject === undefined ? '' : readString(data.subject, method, 'subject', MAX_SUBJECT);
+  // eslint-disable-next-line no-control-regex -- a subject is one header line
+  if (/[\u0000-\u001f\u007f]/.test(subject)) throw new Error(`${method}: subject must be one line`);
+  const body = data.body === undefined ? '' : readString(data.body, method, 'body', MAX_BODY);
+  const isHtml = data.isHtml === undefined ? false : readBoolean(data.isHtml, method, 'isHtml');
+  const html = isHtml ? sanitizePluginBodyHtml(body) : undefined;
+  return {
+    to, cc, bcc, subject,
+    text: html !== undefined ? htmlToPlainText(html) : body,
+    html,
+    attachments: readBlobRefs(data.attachments, method, MAX_PLUGIN_ATTACHMENTS, MAX_ATTACHMENT_SIZE),
+  };
+}
+
+// ─── compose.open ─────────────────────────────────────────────
+
+const COMPOSE_PER_MINUTE = 5;
+
+/** The mail page in the current mount and locale. */
+function mailPageHref(): string {
+  const segments = window.location.pathname.split('/').filter(Boolean);
+  const localeIndex = segments.findIndex((s) => (locales as readonly string[]).includes(s));
+  if (localeIndex >= 0) return '/' + segments.slice(0, localeIndex + 1).join('/') + '/';
+  return getPathPrefix() + '/';
+}
+
+/**
+ * Open the composer filled in. On the mail page it opens in place (asking
+ * first when a draft is already open); elsewhere the app goes to the mail
+ * page, which opens it. Resolves to 'opened' or 'navigating'.
+ */
+export function doComposeOpen(plugin: InstalledPlugin, input: unknown): 'opened' | 'navigating' {
+  const method = 'compose.open';
+  const data = readObject(input, method, 'message', ['to', 'cc', 'bcc', 'subject', 'body', 'isHtml', 'attachments'], true) as ComposeInput & Record<string, unknown>;
+  const message = readMessage(method, data);
+  if (!withinRate('compose', plugin.id, COMPOSE_PER_MINUTE)) {
+    throw new Error(`${method}: at most ${COMPOSE_PER_MINUTE} times a minute`);
+  }
+  const draft: ParsedMailto = {
+    to: message.to,
+    cc: message.cc,
+    bcc: message.bcc,
+    subject: message.subject,
+    body: message.text,
+    ...(message.html !== undefined ? { htmlBody: message.html } : {}),
+    ...(message.attachments.length ? { attachments: message.attachments } : {}),
+  };
+  if (requestInternalCompose(draft)) return 'opened';
+  // No mail page on screen: park the draft where the mail page looks for an
+  // incoming mailto: request when it mounts, and go there.
+  savePendingMailto(draft);
+  notifyPendingMailto();
+  window.location.assign(mailPageHref());
+  return 'navigating';
+}
+
+// ─── compose.reply ────────────────────────────────────────────
+
+/** Asks the mail page to reply to the open message (components/mail/mail-app.tsx). */
+export const PLUGIN_REPLY_EVENT = 'bulwark:plugin-reply';
+
+export interface PluginReplyRequest {
+  emailId: string;
+  text: string;
+  all: boolean;
+}
+
+/**
+ * Reply (or reply to all) to the message open in the reader, with `text` as
+ * the start of the reply, the way the reader's own quick reply does. Only
+ * the open message: a plugin can't start replies to mail the user isn't
+ * looking at. Resolves to true when the composer opened.
+ */
+export function doComposeReply(plugin: InstalledPlugin, emailId: unknown, input: unknown): boolean {
+  const method = 'compose.reply';
+  const id = readId(emailId, method, 'emailId');
+  const data = readObject(input, method, 'reply', ['text', 'all'], true);
+  const text = data.text === undefined ? '' : readString(data.text, method, 'text', MAX_BODY);
+  const all = data.all === undefined ? false : readBoolean(data.all, method, 'all');
+  if (!withinRate('compose', plugin.id, COMPOSE_PER_MINUTE)) {
+    throw new Error(`${method}: at most ${COMPOSE_PER_MINUTE} times a minute`);
+  }
+  const uncancelled = window.dispatchEvent(new CustomEvent<PluginReplyRequest>(PLUGIN_REPLY_EVENT, {
+    detail: { emailId: id, text, all },
+    cancelable: true,
+  }));
+  if (uncancelled) throw new Error(`${method}: the message is not open in the reader`);
+  return true;
+}
+
+// ─── drafts.create ────────────────────────────────────────────
+
+const DRAFTS_PER_MINUTE = 10;
+
+/** Save a draft in the Drafts folder, from the user's default identity. Resolves to its id. */
+export async function doDraftsCreate(plugin: InstalledPlugin, input: unknown): Promise<string> {
+  const method = 'drafts.create';
+  const data = readObject(input, method, 'draft', ['to', 'cc', 'bcc', 'subject', 'body', 'isHtml', 'attachments'], true) as DraftInput & Record<string, unknown>;
+  const message = readMessage(method, data);
+  const client = sessionClient(method);
+  const { identities, preferredPrimaryId } = useIdentityStore.getState();
+  const identity = identities.find((i) => i.id === preferredPrimaryId) ?? identities[0];
+  if (!identity) throw new Error(`${method}: the account has no sender address to save the draft from`);
+  if (!withinRate('drafts', plugin.id, DRAFTS_PER_MINUTE)) {
+    throw new Error(`${method}: at most ${DRAFTS_PER_MINUTE} drafts a minute`);
+  }
+  return client.createDraft(
+    message.to,
+    message.subject,
+    message.text,
+    message.cc,
+    message.bcc,
+    identity.id,
+    identity.email,
+    undefined,
+    message.attachments.map((a) => ({ ...a, disposition: 'attachment' as const })),
+    identity.name || undefined,
+    message.html,
+  );
+}
diff --git a/lib/plugin-sandbox/host-api-composer.ts b/lib/plugin-sandbox/host-api-composer.ts
new file mode 100644
index 000000000..42e4fb847
--- /dev/null
+++ b/lib/plugin-sandbox/host-api-composer.ts
@@ -0,0 +1,87 @@
+// Host side of api.composer: read and change the message being written, and
+// attach files to it. The composer id comes from the composer itself (an
+// action's click context or a composer slot's props; see
+// composer-registry.ts).
+//
+//   composer.getBody(id)                        compose:read
+//   composer.getSelection(id)                   compose:read
+//   composer.replaceSelection(id, content, opts) compose:write
+//   composer.replaceBody(id, content)           compose:write
+//   composer.attach(id, file)                   email:blob-write
+//
+// `content` is { text } or { html }. HTML goes through the same sanitiser as
+// compose.open bodies. Edits are single editor transactions (one Ctrl+Z) and
+// leave the signature, the quote and inline images in place.
+
+import type { InstalledPlugin } from '../plugin-types';
+import { sanitizePluginBodyHtml } from '../email-sanitization';
+import { htmlToPlainText } from '../html-to-text';
+import { composerHandle, type ComposerHandle } from './composer-registry';
+import { textToEditorHtml } from './composer-edit';
+import { readBoolean, readId, readObject, readString, withinRate } from './host-api-input';
+
+const MAX_CONTENT = 512 * 1024;
+const EDITS_PER_MINUTE = 60;
+
+function handleFor(method: string, id: unknown): ComposerHandle {
+  const handle = composerHandle(readId(id, method, 'composerId'));
+  if (!handle) throw new Error(`${method}: that composer is not open any more`);
+  return handle;
+}
+
+function readContent(method: string, value: unknown): { html: string; text: string } {
+  const data = readObject(value, method, 'content', ['text', 'html']);
+  if ((data.text === undefined) === (data.html === undefined)) throw new Error(`${method}: content needs either text or html`);
+  if (data.html !== undefined) {
+    const html = sanitizePluginBodyHtml(readString(data.html, method, 'content.html', MAX_CONTENT));
+    return { html, text: htmlToPlainText(html) };
+  }
+  const text = readString(data.text, method, 'content.text', MAX_CONTENT);
+  return { html: textToEditorHtml(text), text };
+}
+
+function rateLimited(method: string, plugin: InstalledPlugin): void {
+  if (!withinRate('composer-edit', plugin.id, EDITS_PER_MINUTE)) {
+    throw new Error(`${method}: at most ${EDITS_PER_MINUTE} edits a minute`);
+  }
+}
+
+export function doComposerGetBody(_plugin: InstalledPlugin, id: unknown): { html: string; text: string } {
+  return handleFor('composer.getBody', id).readBody();
+}
+
+export function doComposerGetSelection(_plugin: InstalledPlugin, id: unknown): { html: string; text: string; empty: boolean } {
+  return handleFor('composer.getSelection', id).readSelection();
+}
+
+export function doComposerReplaceSelection(plugin: InstalledPlugin, id: unknown, content: unknown, opts: unknown): boolean {
+  const method = 'composer.replaceSelection';
+  const handle = handleFor(method, id);
+  const { html, text } = readContent(method, content);
+  const o = readObject(opts, method, 'options', ['below'], true);
+  const below = o.below === undefined ? false : readBoolean(o.below, method, 'options.below');
+  rateLimited(method, plugin);
+  return handle.replaceSelection(html, text, { below });
+}
+
+export function doComposerReplaceBody(plugin: InstalledPlugin, id: unknown, content: unknown): boolean {
+  const method = 'composer.replaceBody';
+  const handle = handleFor(method, id);
+  const { html, text } = readContent(method, content);
+  rateLimited(method, plugin);
+  return handle.replaceBody(html, text);
+}
+
+export async function doComposerAttach(plugin: InstalledPlugin, id: unknown, file: unknown): Promise<boolean> {
+  const method = 'composer.attach';
+  const handle = handleFor(method, id);
+  const data = readObject(file, method, 'file', ['blobId', 'name', 'type', 'size']);
+  const blobId = readId(data.blobId, method, 'file.blobId');
+  const name = readString(data.name, method, 'file.name', 255, { min: 1 });
+  const type = data.type === undefined ? 'application/octet-stream' : readString(data.type, method, 'file.type', 255, { min: 1 });
+  if (typeof data.size !== 'number' || !Number.isSafeInteger(data.size) || data.size < 0) {
+    throw new Error(`${method}: file.size must be a whole number of bytes`);
+  }
+  rateLimited(method, plugin);
+  return handle.attach({ blobId, name, type, size: data.size });
+}
diff --git a/lib/plugin-sandbox/host-api-input.ts b/lib/plugin-sandbox/host-api-input.ts
new file mode 100644
index 000000000..eb94c7c35
--- /dev/null
+++ b/lib/plugin-sandbox/host-api-input.ts
@@ -0,0 +1,199 @@
+// Input checks shared by the plugin host API. Everything a plugin sends
+// arrives through postMessage and is untrusted: these helpers turn it into
+// the exact types the host works with, or throw an error that names the
+// method and the field, which the plugin sees as the rejection message.
+
+import { useAuthStore } from '@/stores/auth-store';
+import type { IJMAPClient } from '../jmap/client-interface';
+import { isValidEmail } from '../validation';
+
+/**
+ * Largest body the host hands a plugin in one answer: an http.fetch
+ * response, an attachment or a message source. It is copied across
+ * postMessage, so an unbounded one could take the tab down. Bigger transfers
+ * go through the server proxy.
+ */
+export const MAX_PLUGIN_FETCH_BYTES = 25 * 1024 * 1024;
+
+/** Longest id (event, task, template, email, blob, ...) a plugin may pass. */
+export const MAX_PLUGIN_ID_LENGTH = 256;
+
+export function isPlainRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+/** The session's JMAP client, or an error naming the method. */
+export function sessionClient(method: string): IJMAPClient {
+  const { client } = useAuthStore.getState();
+  if (!client) throw new Error(`${method}: no active session`);
+  return client;
+}
+
+/**
+ * A plain object with only the listed keys. Unknown keys are refused rather
+ * than ignored, so a misspelt field fails loudly instead of doing nothing.
+ */
+export function readObject(
+  value: unknown,
+  method: string,
+  field: string,
+  allowed: readonly string[],
+  optional = false,
+): Record<string, unknown> {
+  if (value === undefined && optional) return {};
+  if (!isPlainRecord(value)) throw new Error(`${method}: ${field} must be an object`);
+  for (const key of Object.keys(value)) {
+    if (!allowed.includes(key)) throw new Error(`${method}: ${field} has an unknown property "${key}"`);
+  }
+  return value;
+}
+
+export function readId(value: unknown, method: string, field = 'id'): string {
+  if (typeof value !== 'string' || value.length === 0 || value.length > MAX_PLUGIN_ID_LENGTH) {
+    throw new Error(`${method}: ${field} must be a string of 1-${MAX_PLUGIN_ID_LENGTH} characters`);
+  }
+  return value;
+}
+
+export function readString(
+  value: unknown,
+  method: string,
+  field: string,
+  max: number,
+  { min = 0, trim = false }: { min?: number; trim?: boolean } = {},
+): string {
+  if (typeof value !== 'string') throw new Error(`${method}: ${field} must be a string`);
+  const text = trim ? value.trim() : value;
+  if (text.length < min || text.length > max) {
+    throw new Error(min > 0
+      ? `${method}: ${field} must be ${min}-${max} characters`
+      : `${method}: ${field} must be at most ${max} characters`);
+  }
+  return text;
+}
+
+export function readOptionalString(
+  value: unknown,
+  method: string,
+  field: string,
+  max: number,
+): string | undefined {
+  return value === undefined ? undefined : readString(value, method, field, max);
+}
+
+export function readBoolean(value: unknown, method: string, field: string): boolean {
+  if (typeof value !== 'boolean') throw new Error(`${method}: ${field} must be true or false`);
+  return value;
+}
+
+export function readInteger(value: unknown, method: string, field: string, min: number, max: number): number {
+  if (typeof value !== 'number' || !Number.isInteger(value) || value < min || value > max) {
+    throw new Error(`${method}: ${field} must be a whole number from ${min} to ${max}`);
+  }
+  return value;
+}
+
+/**
+ * Recipient addresses: `alice@example.com` or `Alice <alice@example.com>`.
+ * Returned trimmed, in the form given. Refuses anything with line breaks.
+ */
+export function readAddressList(value: unknown, method: string, field: string, max: number): string[] {
+  if (value === undefined) return [];
+  if (!Array.isArray(value)) throw new Error(`${method}: ${field} must be an array of addresses`);
+  if (value.length > max) throw new Error(`${method}: ${field} may hold at most ${max} addresses`);
+  return value.map((entry, index) => {
+    if (typeof entry !== 'string' || entry.length > 320) {
+      throw new Error(`${method}: ${field}[${index}] must be an address`);
+    }
+    const trimmed = entry.trim();
+    const match = /^(?:"?([^"<>\r\n]*)"?\s*)?<([^<>\s]+)>$/.exec(trimmed);
+    const address = match ? match[2] : trimmed;
+    if (!isValidEmail(address)) throw new Error(`${method}: ${field}[${index}] is not a valid address`);
+    return trimmed;
+  });
+}
+
+/** Just the address part of `Name <addr>` (or the address itself). */
+export function addressOf(entry: string): string {
+  const match = /<([^<>\s]+)>$/.exec(entry);
+  return match ? match[1] : entry;
+}
+
+/** The display name of `Name <addr>`, or ''. */
+export function nameOf(entry: string): string {
+  const match = /^"?([^"<>]*)"?\s*<[^<>]+>$/.exec(entry);
+  return match ? match[1].trim() : '';
+}
+
+const MIME_TYPE_RE = /^[a-z0-9][a-z0-9!#$&^_.+-]{0,126}\/[a-z0-9][a-z0-9!#$&^_.+-]{0,126}$/i;
+
+/** A media type such as `application/pdf`, without parameters. */
+export function readMediaType(value: unknown, method: string, field: string): string {
+  const type = readString(value, method, field, 255);
+  if (!MIME_TYPE_RE.test(type)) throw new Error(`${method}: ${field} is not a media type`);
+  return type;
+}
+
+/** A file name of 1-255 characters, control characters removed. */
+export function readFileName(value: unknown, method: string, field: string): string {
+  // eslint-disable-next-line no-control-regex -- control characters in a file name are refused
+  const name = readString(value, method, field, 255, { min: 1 }).replace(/[\u0000-\u001f\u007f]/g, '');
+  if (!name.trim()) throw new Error(`${method}: ${field} must be 1-255 characters`);
+  return name;
+}
+
+export interface PluginBlobRef {
+  blobId: string;
+  name: string;
+  type: string;
+  size: number;
+}
+
+/**
+ * Attachments a plugin uploaded itself (`jmap.uploadBlob`) and wants on a
+ * message: blob id, file name, media type and size.
+ */
+export function readBlobRefs(
+  value: unknown,
+  method: string,
+  maxCount: number,
+  maxSize: number,
+): PluginBlobRef[] {
+  if (value === undefined) return [];
+  if (!Array.isArray(value)) throw new Error(`${method}: attachments must be an array`);
+  if (value.length > maxCount) throw new Error(`${method}: at most ${maxCount} attachments are allowed`);
+  return value.map((entry, index) => {
+    const field = `attachments[${index}]`;
+    const ref = readObject(entry, method, field, ['blobId', 'name', 'type', 'size']);
+    const type = readMediaType(ref.type, method, `${field}.type`);
+    return {
+      blobId: readId(ref.blobId, method, `${field}.blobId`),
+      name: readFileName(ref.name, method, `${field}.name`),
+      type,
+      size: readInteger(ref.size, method, `${field}.size`, 0, maxSize),
+    };
+  });
+}
+
+// ─── Rate limits ──────────────────────────────────────────────
+
+const recentCalls = new Map<string, number[]>();
+
+/** True when `pluginId` made fewer than `max` `kind` calls in the last minute; records this one. */
+export function withinRate(kind: string, pluginId: string, max: number, windowMs = 60_000): boolean {
+  const key = `${kind}\u0000${pluginId}`;
+  const now = Date.now();
+  const recent = (recentCalls.get(key) ?? []).filter((t) => now - t < windowMs);
+  if (recent.length >= max) {
+    recentCalls.set(key, recent);
+    return false;
+  }
+  recent.push(now);
+  recentCalls.set(key, recent);
+  return true;
+}
+
+/** Forget the rate-limit history (tests). */
+export function resetPluginRateLimits(): void {
+  recentCalls.clear();
+}
diff --git a/lib/plugin-sandbox/host-api-mail.ts b/lib/plugin-sandbox/host-api-mail.ts
new file mode 100644
index 000000000..4c2fb4ee8
--- /dev/null
+++ b/lib/plugin-sandbox/host-api-mail.ts
@@ -0,0 +1,176 @@
+// Host side of reading mail for plugins: api.email.get / list,
+// api.mailboxes.list, and the bytes of an attachment or a whole message
+// (api.email.getAttachment / getRaw). Reads go to the server through the
+// JMAP client and never change what the user has open.
+//
+// Messages are read from the signed-in account itself; mail in folders shared
+// from other accounts is not reached by id here.
+
+import type { EmailReadView, EmailSummary, MailboxView } from '../plugin-types';
+import type { Email, Mailbox } from '../jmap/types';
+import type { IJMAPClient } from '../jmap/client-interface';
+import { useEmailStore } from '@/stores/email-store';
+import { emailSummary, emailToReadView } from '../plugin-projection';
+import {
+  MAX_PLUGIN_FETCH_BYTES, readId, readInteger, readObject, sessionClient, withinRate,
+} from './host-api-input';
+
+/** Most messages one api.email.list call returns. */
+export const MAX_PLUGIN_EMAIL_PAGE = 100;
+
+/** The open message when it is this one and its body is loaded, else the server's copy. */
+async function loadEmail(client: IJMAPClient, emailId: string): Promise<Email | null> {
+  const { selectedEmail } = useEmailStore.getState();
+  if (selectedEmail?.id === emailId && selectedEmail.bodyValues && !selectedEmail.accountId) {
+    return selectedEmail;
+  }
+  return client.getEmail(emailId);
+}
+
+export async function doEmailGet(id: unknown): Promise<EmailReadView | null> {
+  const method = 'email.get';
+  const emailId = readId(id, method, 'emailId');
+  const email = await loadEmail(sessionClient(method), emailId);
+  return email ? emailToReadView(email) : null;
+}
+
+function mailboxToView(mailbox: Mailbox): MailboxView {
+  return {
+    id: mailbox.id,
+    name: mailbox.name,
+    role: mailbox.role ?? null,
+    parentId: mailbox.parentId ?? null,
+    totalEmails: mailbox.totalEmails ?? 0,
+    unreadEmails: mailbox.unreadEmails ?? 0,
+  };
+}
+
+async function knownMailboxes(client: IJMAPClient): Promise<Mailbox[]> {
+  const { mailboxes } = useEmailStore.getState();
+  return mailboxes.length > 0 ? mailboxes : client.getMailboxes();
+}
+
+export async function doMailboxesList(): Promise<MailboxView[]> {
+  return (await knownMailboxes(sessionClient('mailboxes.list'))).map(mailboxToView);
+}
+
+/**
+ * One page of a folder, newest first in the user's list order, as message
+ * summaries (no body). Without mailboxId it pages through all mail.
+ */
+export async function doEmailList(options: unknown): Promise<EmailSummary[]> {
+  const method = 'email.list';
+  const opts = readObject(options, method, 'options', ['mailboxId', 'limit', 'position'], true);
+  const limit = opts.limit === undefined ? 50 : readInteger(opts.limit, method, 'limit', 1, MAX_PLUGIN_EMAIL_PAGE);
+  const position = opts.position === undefined ? 0 : readInteger(opts.position, method, 'position', 0, 1_000_000);
+  const client = sessionClient(method);
+  let jmapMailboxId: string | undefined;
+  let accountId: string | undefined;
+  if (opts.mailboxId !== undefined) {
+    const id = readId(opts.mailboxId, method, 'mailboxId');
+    const mailbox = (await knownMailboxes(client)).find((m) => m.id === id);
+    if (!mailbox) throw new Error(`${method}: no mailbox with id "${id}"`);
+    // Shared folders carry a namespaced id in the app; the server knows the original.
+    jmapMailboxId = mailbox.originalId || mailbox.id;
+    accountId = mailbox.isShared ? mailbox.accountId : undefined;
+  }
+  const { emails } = await client.getEmails(jmapMailboxId, accountId, limit, position);
+  return emails.map(emailSummary);
+}
+
+// ─── Bytes ────────────────────────────────────────────────────
+
+/** Every attachment part of a message, nested ones included. */
+function attachmentParts(email: Email): NonNullable<Email['attachments']> {
+  return email.attachments ?? [];
+}
+
+function tooBig(method: string): Error {
+  return new Error(`${method}: it is larger than ${MAX_PLUGIN_FETCH_BYTES} bytes`);
+}
+
+export interface PluginAttachmentData {
+  name: string;
+  type: string;
+  size: number;
+  data: ArrayBuffer;
+}
+
+/**
+ * The bytes of one attachment of one message. The blob has to be an
+ * attachment of that message: a plugin can't use this to read arbitrary
+ * blobs (that stays jmap.fetchBlob, privileged tier only).
+ */
+export async function doEmailGetAttachment(emailIdArg: unknown, blobIdArg: unknown): Promise<PluginAttachmentData> {
+  const method = 'email.getAttachment';
+  const emailId = readId(emailIdArg, method, 'emailId');
+  const blobId = readId(blobIdArg, method, 'blobId');
+  const client = sessionClient(method);
+  const email = await loadEmail(client, emailId);
+  if (!email) throw new Error(`${method}: no message with id "${emailId}"`);
+  const part = attachmentParts(email).find((a) => a.blobId === blobId);
+  if (!part) throw new Error(`${method}: that blob is not an attachment of this message`);
+  if (part.size > MAX_PLUGIN_FETCH_BYTES) throw tooBig(method);
+  const data = await client.fetchBlobArrayBuffer(blobId, part.name || undefined, part.type || undefined);
+  if (data.byteLength > MAX_PLUGIN_FETCH_BYTES) throw tooBig(method);
+  return {
+    name: part.name || 'attachment',
+    type: part.type || 'application/octet-stream',
+    size: data.byteLength,
+    data,
+  };
+}
+
+/** The message as the server stores it (RFC 5322), e.g. to save it as a .eml file. */
+export async function doEmailGetRaw(emailIdArg: unknown): Promise<ArrayBuffer> {
+  const method = 'email.getRaw';
+  const emailId = readId(emailIdArg, method, 'emailId');
+  const client = sessionClient(method);
+  const email = await loadEmail(client, emailId);
+  if (!email) throw new Error(`${method}: no message with id "${emailId}"`);
+  if (!email.blobId) throw new Error(`${method}: the server did not say where the message source is`);
+  if (email.size > MAX_PLUGIN_FETCH_BYTES) throw tooBig(method);
+  const data = await client.fetchBlobArrayBuffer(email.blobId, 'message.eml', 'message/rfc822');
+  if (data.byteLength > MAX_PLUGIN_FETCH_BYTES) throw tooBig(method);
+  return data;
+}
+
+// ─── Moving ───────────────────────────────────────────────────
+
+/** Most messages one api.email.move / archive call moves. */
+export const MAX_PLUGIN_MOVE = 100;
+/** Moves a plugin may make per minute. */
+export const MAX_PLUGIN_MOVES_PER_MINUTE = 20;
+
+function readIdList(value: unknown, method: string): string[] {
+  if (!Array.isArray(value) || value.length === 0) throw new Error(`${method}: emailIds must be a non-empty array`);
+  if (value.length > MAX_PLUGIN_MOVE) throw new Error(`${method}: at most ${MAX_PLUGIN_MOVE} messages at once`);
+  return [...new Set(value.map((id, i) => readId(id, method, `emailIds[${i}]`)))];
+}
+
+/**
+ * Move messages of the signed-in account into one of its folders, through
+ * the store, so the list updates and onBeforeEmailMove / onEmailMove (and the
+ * archive hooks for the archive folder) run like for a move the user made.
+ */
+export async function doEmailMove(pluginId: string, emailIdsArg: unknown, mailboxIdArg: unknown): Promise<void> {
+  const method = 'email.move';
+  const emailIds = readIdList(emailIdsArg, method);
+  const mailboxId = readId(mailboxIdArg, method, 'mailboxId');
+  const store = useEmailStore.getState();
+  if (!store.mailboxes.some((m) => m.id === mailboxId && !m.isShared)) {
+    throw new Error(`${method}: no folder with id "${mailboxId}" in this account`);
+  }
+  if (!withinRate('email.move', pluginId, MAX_PLUGIN_MOVES_PER_MINUTE)) throw new Error(`${method}: too many moves, try again in a minute`);
+  await store.moveEmailsToMailbox(sessionClient(method), emailIds, mailboxId);
+}
+
+/** Move messages into the account's Archive folder. */
+export async function doEmailArchive(pluginId: string, emailIdsArg: unknown): Promise<void> {
+  const method = 'email.archive';
+  const emailIds = readIdList(emailIdsArg, method);
+  const archive = useEmailStore.getState().mailboxes.find((m) => m.role === 'archive' && !m.isShared);
+  if (!archive) throw new Error(`${method}: this account has no Archive folder`);
+  if (!withinRate('email.move', pluginId, MAX_PLUGIN_MOVES_PER_MINUTE)) throw new Error(`${method}: too many moves, try again in a minute`);
+  await useEmailStore.getState().moveEmailsToMailbox(sessionClient(method), emailIds, archive.id);
+}
diff --git a/lib/plugin-sandbox/host-api-notify.ts b/lib/plugin-sandbox/host-api-notify.ts
new file mode 100644
index 000000000..847e50a6b
--- /dev/null
+++ b/lib/plugin-sandbox/host-api-notify.ts
@@ -0,0 +1,120 @@
+// Host side of api.notifications.show: a system notification when the user
+// has allowed them for the webmail, otherwise a toast. Every one names the
+// plugin that sent it, and a plugin may send only a few a minute.
+//
+// A notification may carry one link ("Open in Paperless"). The host draws
+// it, so it looks like the app's own: it may only point at a server the
+// plugin already talks to (its httpOrigins or the server of one of its proxy
+// credentials). Otherwise any plugin with ui:notifications could put an
+// app-styled button to any site in front of the user.
+
+import type { InstalledPlugin, NotificationInput } from '../plugin-types';
+import { toast as appToast } from '@/stores/toast-store';
+import { toastHooks } from '../plugin-hooks';
+import { readObject, readString, withinRate } from './host-api-input';
+import { recordNotification } from '@/stores/notification-center-store';
+import { credentialOverview } from './connect-dialog';
+
+export const MAX_NOTIFICATION_TITLE = 120;
+export const MAX_NOTIFICATION_BODY = 300;
+export const NOTIFICATIONS_PER_MINUTE = 5;
+export const MAX_NOTIFICATION_ACTION_LABEL = 40;
+const MAX_ACTION_URL = 2048;
+const TAG_RE = /^[A-Za-z0-9._:-]{1,64}$/;
+
+// eslint-disable-next-line no-control-regex -- line breaks and other control characters become spaces
+const oneLine = (text: string) => text.replace(/[\u0000-\u001f\u007f]+/g, ' ').trim();
+
+/**
+ * Show a notification from a plugin. Resolves to 'system' when the browser
+ * showed it, 'toast' when the app did. Clicking a system notification
+ * brings the webmail to the front and fires onNotificationClick for this
+ * plugin only, with the tag it passed.
+ */
+export async function doNotificationsShow(plugin: InstalledPlugin, input: unknown): Promise<'system' | 'toast'> {
+  const method = 'notifications.show';
+  const data = readObject(input, method, 'notification', ['title', 'body', 'tag', 'action']) as NotificationInput & Record<string, unknown>;
+  const title = oneLine(readString(data.title, method, 'title', MAX_NOTIFICATION_TITLE, { min: 1 }));
+  if (!title) throw new Error(`${method}: title must not be empty`);
+  const body = data.body === undefined ? '' : oneLine(readString(data.body, method, 'body', MAX_NOTIFICATION_BODY));
+  let tag: string | undefined;
+  if (data.tag !== undefined) {
+    if (typeof data.tag !== 'string' || !TAG_RE.test(data.tag)) {
+      throw new Error(`${method}: tag must be 1-64 letters, digits or . _ : -`);
+    }
+    tag = data.tag;
+  }
+  const action = data.action === undefined ? undefined : readAction(method, data.action);
+  if (!withinRate('notifications', plugin.id, NOTIFICATIONS_PER_MINUTE)) {
+    throw new Error(`${method}: at most ${NOTIFICATIONS_PER_MINUTE} notifications a minute`);
+  }
+  if (action && !(await pluginOrigins(plugin)).has(new URL(action.url).origin)) {
+    throw new Error(`${method}: action.url must be on a server the plugin talks to (its httpOrigins or a proxy credential's server)`);
+  }
+
+  const source = plugin.name || plugin.id;
+  // Also listed in the app's notification panel (the bell), where a click
+  // reaches the plugin the same way as a click on the system notification.
+  recordNotification({ level: 'info', title, body, pluginId: plugin.id, pluginName: source, ...(tag ? { tag } : {}), ...(action ? { action } : {}) });
+  if (typeof Notification !== 'undefined' && Notification.permission === 'granted') {
+    try {
+      const notification = new Notification(title, {
+        body: body ? `${body}\n${source}` : source,
+        // Scoped to the plugin, so one plugin's tag can't replace another's notification.
+        ...(tag ? { tag: `plugin:${plugin.id}:${tag}` } : {}),
+      });
+      notification.onclick = () => {
+        try { window.focus(); } catch { /* ignore */ }
+        notification.close();
+        void toastHooks.onNotificationClick.emitTo(plugin.id, { tag: tag ?? '' });
+      };
+      return 'system';
+    } catch {
+      // Some browsers (Chrome on Android) only allow notifications from a
+      // service worker; the toast below still tells the user.
+    }
+  }
+  appToast.info(title, {
+    message: body ? `${body} (${source})` : source,
+    ...(action ? { action: { label: action.label, onClick: () => openNotificationLink(action.url) } } : {}),
+  });
+  return 'toast';
+}
+
+function readAction(method: string, value: unknown): { label: string; url: string } {
+  const data = readObject(value, method, 'action', ['label', 'url']);
+  const label = oneLine(readString(data.label, method, 'action.label', MAX_NOTIFICATION_ACTION_LABEL, { min: 1 }));
+  if (!label) throw new Error(`${method}: action.label must not be empty`);
+  const raw = readString(data.url, method, 'action.url', MAX_ACTION_URL, { min: 1 });
+  let url: URL;
+  try {
+    url = new URL(raw);
+  } catch {
+    throw new Error(`${method}: action.url must be an absolute URL`);
+  }
+  if (url.protocol !== 'https:' && url.protocol !== 'http:') throw new Error(`${method}: action.url must be http or https`);
+  if (url.username || url.password) throw new Error(`${method}: action.url must not carry a user name or password`);
+  return { label, url: url.href };
+}
+
+/** Origins the plugin reaches: its manifest's httpOrigins and its credentials' servers. */
+async function pluginOrigins(plugin: InstalledPlugin): Promise<Set<string>> {
+  const origins = new Set<string>();
+  for (const o of plugin.httpOrigins ?? []) {
+    try { origins.add(new URL(o).origin); } catch { /* invalid entries never matched anything */ }
+  }
+  if (plugin.permissions.includes('http:proxy')) {
+    const { credentials, adminOrigins } = await credentialOverview(plugin.id);
+    for (const c of credentials) if (c.pluginId === plugin.id && c.origin) origins.add(c.origin);
+    for (const o of adminOrigins) origins.add(o);
+  }
+  return origins;
+}
+
+/** Open a notification's link in a new tab, without giving that tab a handle on the webmail. */
+export function openNotificationLink(url: string): void {
+  let parsed: URL;
+  try { parsed = new URL(url); } catch { return; }
+  if (parsed.protocol !== 'https:' && parsed.protocol !== 'http:') return;
+  window.open(parsed.href, '_blank', 'noopener,noreferrer');
+}
diff --git a/lib/plugin-sandbox/host-api-settings.ts b/lib/plugin-sandbox/host-api-settings.ts
new file mode 100644
index 000000000..8aafffec1
--- /dev/null
+++ b/lib/plugin-sandbox/host-api-settings.ts
@@ -0,0 +1,227 @@
+// Host side of api.templates, api.identities and api.vacation: the message
+// templates (kept in the browser and synced with the settings), the sender
+// identities and the out-of-office reply. Changes go through the same stores
+// and the same HTML sanitising as Settings, so what a plugin saves is held to
+// the rules a user's own edit is.
+
+import type {
+  IdentityView, TemplateInput, VacationInput, VacationView, TemplateView,
+} from '../plugin-types';
+import type { EmailAddress, Identity } from '../jmap/types';
+import { useTemplateStore } from '@/stores/template-store';
+import { updateIdentityWithHooks, useIdentityStore } from '@/stores/identity-store';
+import { useVacationStore } from '@/stores/vacation-store';
+import { identityToView, templateToView, vacationToView } from '../plugin-projection';
+import { sanitizeEmailHtml, sanitizePluginBodyHtml, sanitizeSignatureHtml } from '../email-sanitization';
+import { htmlToPlainText } from '../html-to-text';
+import { isPeriodBoundary } from '../sieve/period';
+import {
+  addressOf, nameOf, readAddressList, readBoolean, readId, readObject, readString, sessionClient,
+} from './host-api-input';
+
+// ─── Templates ────────────────────────────────────────────────
+
+/** Templates a plugin may leave in the store; they all sync to the server. */
+export const MAX_PLUGIN_TEMPLATES = 500;
+const MAX_TEMPLATE_NAME = 200;
+const MAX_TEMPLATE_CATEGORY = 100;
+const MAX_TEMPLATE_SUBJECT = 998;
+const MAX_TEMPLATE_BODY = 100_000;
+const TEMPLATE_FIELDS = ['name', 'subject', 'body', 'isHTML', 'category'] as const;
+
+export function doTemplatesList(): TemplateView[] {
+  return useTemplateStore.getState().templates.map(templateToView);
+}
+
+export function doTemplatesGet(id: unknown): TemplateView | null {
+  const templateId = readId(id, 'templates.get');
+  const template = useTemplateStore.getState().templates.find((t) => t.id === templateId);
+  return template ? templateToView(template) : null;
+}
+
+/** Template fields from a plugin; an HTML body is sanitised like a plugin-supplied body anywhere else. */
+function templateFields(method: string, data: Record<string, unknown>, isHTML: boolean) {
+  const out: { name?: string; subject?: string; body?: string; isHTML?: boolean; category?: string } = {};
+  if (data.name !== undefined) out.name = readString(data.name, method, 'name', MAX_TEMPLATE_NAME, { min: 1, trim: true });
+  if (data.subject !== undefined) out.subject = readString(data.subject, method, 'subject', MAX_TEMPLATE_SUBJECT);
+  if (data.category !== undefined) {
+    out.category = readString(data.category, method, 'category', MAX_TEMPLATE_CATEGORY, { trim: true });
+  }
+  if (data.isHTML !== undefined) out.isHTML = readBoolean(data.isHTML, method, 'isHTML');
+  if (data.body !== undefined) {
+    const body = readString(data.body, method, 'body', MAX_TEMPLATE_BODY);
+    out.body = isHTML ? sanitizePluginBodyHtml(body) : body;
+  }
+  return out;
+}
+
+export function doTemplatesCreate(input: unknown): TemplateView {
+  const method = 'templates.create';
+  const data = readObject(input, method, 'template', TEMPLATE_FIELDS) as TemplateInput & Record<string, unknown>;
+  if (data.name === undefined) throw new Error(`${method}: name is required`);
+  const store = useTemplateStore.getState();
+  if (store.templates.length >= MAX_PLUGIN_TEMPLATES) {
+    throw new Error(`${method}: there are already ${MAX_PLUGIN_TEMPLATES} templates`);
+  }
+  const isHTML = data.isHTML === undefined ? false : readBoolean(data.isHTML, method, 'isHTML');
+  const fields = templateFields(method, data, isHTML);
+  const created = store.addTemplate({
+    name: fields.name!,
+    subject: fields.subject ?? '',
+    body: fields.body ?? '',
+    isHTML,
+    category: fields.category ?? '',
+    isFavorite: false,
+  });
+  return templateToView(created);
+}
+
+export function doTemplatesUpdate(id: unknown, patch: unknown): TemplateView {
+  const method = 'templates.update';
+  const templateId = readId(id, method);
+  const data = readObject(patch, method, 'patch', TEMPLATE_FIELDS);
+  if (Object.keys(data).length === 0) throw new Error(`${method}: patch is empty`);
+  const existing = useTemplateStore.getState().templates.find((t) => t.id === templateId);
+  if (!existing) throw new Error(`${method}: no template with id "${templateId}"`);
+  const isHTML = data.isHTML === undefined ? !!existing.isHTML : readBoolean(data.isHTML, method, 'isHTML');
+  const fields = templateFields(method, data, isHTML);
+  // Turning an existing body into HTML must not let unsanitised text through.
+  if (isHTML && !existing.isHTML && fields.body === undefined) fields.body = sanitizePluginBodyHtml(existing.body || '');
+  useTemplateStore.getState().updateTemplate(templateId, fields);
+  return templateToView(useTemplateStore.getState().templates.find((t) => t.id === templateId)!);
+}
+
+export function doTemplatesDelete(id: unknown): void {
+  const method = 'templates.delete';
+  const templateId = readId(id, method);
+  if (!useTemplateStore.getState().templates.some((t) => t.id === templateId)) {
+    throw new Error(`${method}: no template with id "${templateId}"`);
+  }
+  useTemplateStore.getState().deleteTemplate(templateId);
+}
+
+// ─── Identities ───────────────────────────────────────────────
+
+const MAX_IDENTITY_NAME = 256;
+const MAX_REPLY_TO = 10;
+const MAX_TEXT_SIGNATURE = 20_000;
+const MAX_HTML_SIGNATURE = 100_000;
+
+/**
+ * Change one sender identity's name, reply-to addresses or signatures. The
+ * address itself can't be changed; an HTML signature is sanitised exactly
+ * like one typed into Settings > Identities.
+ */
+export async function doIdentitiesUpdate(id: unknown, patch: unknown): Promise<IdentityView | null> {
+  const method = 'identities.update';
+  const identityId = readId(id, method);
+  if (patch && typeof patch === 'object' && 'email' in patch) {
+    throw new Error(`${method}: the address of an identity can't be changed`);
+  }
+  const data = readObject(patch, method, 'patch', ['name', 'replyTo', 'textSignature', 'htmlSignature']);
+  if (Object.keys(data).length === 0) throw new Error(`${method}: patch is empty`);
+  const identity = useIdentityStore.getState().identities.find((i) => i.id === identityId);
+  if (!identity) throw new Error(`${method}: no identity with id "${identityId}"`);
+
+  const updates: { name?: string; replyTo?: EmailAddress[] | null; textSignature?: string | null; htmlSignature?: string | null } = {};
+  if (data.name !== undefined) updates.name = readString(data.name, method, 'name', MAX_IDENTITY_NAME, { trim: true });
+  if (data.replyTo !== undefined) {
+    const list = data.replyTo === null ? [] : readAddressList(data.replyTo, method, 'replyTo', MAX_REPLY_TO);
+    updates.replyTo = list.length === 0
+      ? null
+      : list.map((entry) => ({ ...(nameOf(entry) ? { name: nameOf(entry) } : {}), email: addressOf(entry) }));
+  }
+  if (data.textSignature !== undefined) {
+    const text = data.textSignature === null ? '' : readString(data.textSignature, method, 'textSignature', MAX_TEXT_SIGNATURE);
+    // JMAP clears a field with null; an empty string would be stored as such.
+    updates.textSignature = text.trim() ? text : null;
+  }
+  if (data.htmlSignature !== undefined) {
+    const html = data.htmlSignature === null ? '' : readString(data.htmlSignature, method, 'htmlSignature', MAX_HTML_SIGNATURE);
+    updates.htmlSignature = html.trim() ? sanitizeSignatureHtml(html) : null;
+  }
+
+  // Through the store's hooked update, so onBeforeIdentityChange can stop a
+  // plugin's change like it stops one made in Settings.
+  const done = await updateIdentityWithHooks(sessionClient(method), identity as Identity, updates as Parameters<typeof updateIdentityWithHooks>[2]);
+  if (!done) return null;
+  useIdentityStore.getState().updateIdentityLocal(identityId, updates as Partial<Identity>);
+  return identityToView({ ...identity, ...updates } as Identity);
+}
+
+// ─── Vacation ─────────────────────────────────────────────────
+
+const MAX_VACATION_SUBJECT = 500;
+const MAX_VACATION_BODY = 64_000;
+
+function vacationClient(method: string) {
+  const client = sessionClient(method);
+  if (!client.supportsVacationResponse()) throw new Error(`${method}: the mail server has no out-of-office reply`);
+  return client;
+}
+
+function vacationViewFromStore(): VacationView {
+  const s = useVacationStore.getState();
+  return vacationToView({
+    id: 'singleton',
+    isEnabled: s.isEnabled,
+    fromDate: s.fromDate,
+    toDate: s.toDate,
+    subject: s.subject,
+    textBody: s.textBody,
+    htmlBody: s.htmlBody,
+  });
+}
+
+export async function doVacationGet(): Promise<VacationView> {
+  const method = 'vacation.get';
+  const client = vacationClient(method);
+  await useVacationStore.getState().fetchVacationResponse(client);
+  const { error } = useVacationStore.getState();
+  if (error) throw new Error(`${method}: ${error}`);
+  return vacationViewFromStore();
+}
+
+function readMoment(value: unknown, method: string, field: string): string | null {
+  if (value === null) return null;
+  if (!isPeriodBoundary(value)) {
+    throw new Error(`${method}: ${field} must be a date and time with a zone, such as 2026-05-01T00:00:00Z, or null`);
+  }
+  return new Date(value).toISOString();
+}
+
+/**
+ * Turn the out-of-office reply on or off and set its text and dates. The
+ * HTML body is sanitised like the one typed into Settings; without a text
+ * body the text is derived from it. Resolves to the reply as saved, or null
+ * when another plugin stopped the change.
+ */
+export async function doVacationSet(input: unknown): Promise<VacationView | null> {
+  const method = 'vacation.set';
+  const data = readObject(input, method, 'vacation', ['isEnabled', 'subject', 'textBody', 'htmlBody', 'fromDate', 'toDate']) as VacationInput & Record<string, unknown>;
+  const updates: {
+    isEnabled: boolean; subject?: string; textBody?: string; htmlBody?: string | null;
+    fromDate?: string | null; toDate?: string | null;
+  } = { isEnabled: readBoolean(data.isEnabled, method, 'isEnabled') };
+  if (data.subject !== undefined) updates.subject = readString(data.subject, method, 'subject', MAX_VACATION_SUBJECT);
+  if (data.textBody !== undefined) updates.textBody = readString(data.textBody, method, 'textBody', MAX_VACATION_BODY);
+  if (data.htmlBody !== undefined) {
+    const html = data.htmlBody === null ? '' : readString(data.htmlBody, method, 'htmlBody', MAX_VACATION_BODY);
+    updates.htmlBody = html && htmlToPlainText(html).trim() ? sanitizeEmailHtml(html) : null;
+    if (updates.htmlBody && updates.textBody === undefined) {
+      updates.textBody = htmlToPlainText(updates.htmlBody, { paragraphSpacing: true });
+    }
+  }
+  if (data.fromDate !== undefined) updates.fromDate = readMoment(data.fromDate, method, 'fromDate');
+  if (data.toDate !== undefined) updates.toDate = readMoment(data.toDate, method, 'toDate');
+  if (updates.fromDate && updates.toDate && updates.toDate <= updates.fromDate) {
+    throw new Error(`${method}: toDate must be after fromDate`);
+  }
+
+  const client = vacationClient(method);
+  // Returns false once the onBeforeVacationUpdate hook is wired into the
+  // store and a plugin said no; nothing (undefined) before that.
+  const outcome: unknown = await useVacationStore.getState().updateVacationResponse(client, updates);
+  if (outcome === false) return null;
+  return vacationViewFromStore();
+}
diff --git a/lib/plugin-sandbox/host-api.ts b/lib/plugin-sandbox/host-api.ts
index cec33a952..12f7127ab 100644
--- a/lib/plugin-sandbox/host-api.ts
+++ b/lib/plugin-sandbox/host-api.ts
@@ -3,7 +3,12 @@
 // structured-cloneable data back to the iframe.
 
 import type { InstalledPlugin, Permission } from '../plugin-types';
-import { pluginHasPermission } from './permissions';
+import { mayOfferSlot, pluginHasPermission } from './permissions';
+import { proxyAccounts, proxyCancel, proxyConnect, proxyDisconnect, proxyFetch, type StreamSink } from './proxy-client';
+import { checkActions, isActionSurface, setPluginActions } from './actions';
+import { checkDayLabels, setDayLabels } from './day-labels';
+import { refreshRowBadges } from './row-badges';
+import { checkPages, setPluginPages } from './pages';
 import { toast as appToast } from '@/stores/toast-store';
 import { useAuthStore } from '@/stores/auth-store';
 import { useAccountStore } from '@/stores/account-store';
@@ -19,7 +24,8 @@ import {
   type KeywordVisibility,
 } from '@/stores/settings-store';
 import type { MessageListTabsConfig } from '../plugin-types';
-import { apiFetch, getPathPrefix } from '../browser-navigation';
+import { apiFetch, getPathPrefix, withBasePath } from '../browser-navigation';
+import { createOAuthState } from '../plugin-oauth';
 import { reportUploadProgress } from '../upload-progress';
 import { DEFAULT_KEYWORD_SCAN_LIMIT } from '../jmap/client';
 import { suggestKeywordColor } from '../keyword-discovery';
@@ -31,7 +37,23 @@ import { fileStorage } from '../plugin-storage';
 import { generateUUID } from '../utils';
 import { AddressBook, ContactCard, Identity } from '../jmap/types';
 import { EncryptionAtRestConfig, PublicKeyInfo, PublicKeyInput, useAccountSecurityStore } from '@/stores/account-security-store';
-import { createHash } from 'crypto';
+import {
+  doCalendarCreateEvent, doCalendarDeleteEvent, doCalendarGetEvent, doCalendarGetEvents,
+  doCalendarListCalendars, doCalendarUpdateEvent, doTasksCreate, doTasksDelete, doTasksGet,
+  doTasksList, doTasksSetComplete, doTasksUpdate,
+} from './host-api-calendar';
+import {
+  doIdentitiesUpdate, doTemplatesCreate, doTemplatesDelete, doTemplatesGet, doTemplatesList,
+  doTemplatesUpdate, doVacationGet, doVacationSet,
+} from './host-api-settings';
+import {
+  doEmailArchive, doEmailGet, doEmailGetAttachment, doEmailGetRaw, doEmailList, doEmailMove, doMailboxesList,
+} from './host-api-mail';
+import { MAX_PLUGIN_FETCH_BYTES, readFileName, readMediaType, sessionClient } from './host-api-input';
+import { doComposeOpen, doComposeReply, doDraftsCreate } from './host-api-compose';
+import { doNotificationsShow } from './host-api-notify';
+import { setSectionTitle } from './section-titles';
+import { doComposerAttach, doComposerGetBody, doComposerGetSelection, doComposerReplaceBody, doComposerReplaceSelection } from './host-api-composer';
 
 /**
  * Methods only callable from the privileged (same-origin) tier. These expose
@@ -41,7 +63,9 @@ import { createHash } from 'crypto';
  */
 const PRIVILEGED_ONLY_METHODS = new Set<string>([
   'jmap.fetchBlob',
-  'jmap.uploadBlob',
+  // NOTE: jmap.uploadBlob is deliberately NOT here. The composer's
+  // `composer-attachment-source` slot is built for untrusted plugins that
+  // upload a file (from cloud storage, say) and hand the blob id to onAttach.
   'jmap.sendRaw',
   'jmap.submitRaw',
   'jmap.importRaw',
@@ -67,7 +91,7 @@ const PRIVILEGED_ONLY_METHODS = new Set<string>([
   'upfiles.save',
 ]);
 
-const PERM_PER_METHOD: Record<string, Permission | null> = {
+export const PERM_PER_METHOD: Readonly<Record<string, Permission | null>> = {
   // storage is unscoped by the manifest - implicit.
   'storage.get': null,
   'storage.set': null,
@@ -123,12 +147,17 @@ const PERM_PER_METHOD: Record<string, Permission | null> = {
   // user
   'user.getAccounts': 'account:read',
   'user.getIdentities': 'identity:read',
+  // The IANA zone the app shows times in (Settings or the browser's).
+  'user.getTimeZone': null,
   'user.logout': 'auth:emit',
   // admin
   'admin.getConfig': 'admin:config',
   'admin.getAllConfig': 'admin:config',
   'admin.setConfig': 'admin:config',
   'admin.deleteConfig': 'admin:config',
+  // The admin's non-secret settings for the calling plugin (a server
+  // address, a switch). Secrets stay on the server.
+  'plugin.getConfig': null,
   // ui - any plugin can ask the host to render a modal or open a URL.
   'ui.confirm': null,
   'ui.alert': null,
@@ -163,11 +192,82 @@ const PERM_PER_METHOD: Record<string, Permission | null> = {
   // message-list search: the plugin never sees the results, but it decides
   // which messages the list shows.
   'search.run': 'email:read',
+  // OAuth with a third party: a state value bound to this plugin, and the
+  // redirect URI the provider sends the user back to.
+  'oauth.createState': 'http:fetch',
+  'oauth.getRedirectUri': 'http:fetch',
+  // Requests with a credential, through the server (lib/plugin-secrets).
+  'proxy.fetch': 'http:proxy',
+  'proxy.cancel': 'http:proxy',
+  'proxy.connect': 'http:proxy',
+  'proxy.accounts': 'http:proxy',
+  'proxy.disconnect': 'http:proxy',
+  // Buttons and menu entries drawn by the host; the surface's own
+  // permission is checked per call (see the slot catalogue).
+  'ui.setActions': null,
+  // Ask the rows again for onEmailListItemRender badges (rate limited).
+  'ui.refreshRowBadges': null,
+  'ui.setDayLabels': 'ui:calendar-action',
+  'ui.setPages': 'ui:app-page',
+  'ui.setSectionTitle': 'ui:sidebar-widget',
   // sieve (delivery-time classification)
   'sieve.isSupported': 'filters:read',
   'sieve.getActiveScript': 'filters:read',
   'sieve.validateScript': 'filters:write',
   'sieve.regenerate': 'filters:write',
+  // calendar events. Reads go to the server; writes go through the calendar
+  // store so its plugin hooks run. None of them sends invitations.
+  'calendar.listCalendars': 'calendar:read',
+  'calendar.getEvents': 'calendar:read',
+  'calendar.getEvent': 'calendar:read',
+  'calendar.createEvent': 'calendar:write',
+  'calendar.updateEvent': 'calendar:write',
+  'calendar.deleteEvent': 'calendar:write',
+  // tasks
+  'tasks.list': 'tasks:read',
+  'tasks.get': 'tasks:read',
+  'tasks.create': 'tasks:write',
+  'tasks.update': 'tasks:write',
+  'tasks.setComplete': 'tasks:write',
+  'tasks.delete': 'tasks:write',
+  // message templates
+  'templates.list': 'templates:read',
+  'templates.get': 'templates:read',
+  'templates.create': 'templates:write',
+  'templates.update': 'templates:write',
+  'templates.delete': 'templates:write',
+  // sender identities: name, reply-to and signatures, never the address
+  'identities.update': 'identity:write',
+  // out-of-office reply
+  'vacation.get': 'vacation:read',
+  'vacation.set': 'vacation:write',
+  // reading mail: one message with its text, a page of a folder, the folders
+  'email.get': 'email:read',
+  'email.list': 'email:read',
+  'mailboxes.list': 'email:read',
+  // The bytes of one attachment of a given message, or of the message
+  // itself. Unlike jmap.fetchBlob these only reach blobs of a message the
+  // plugin names, so the untrusted tier may call them.
+  'email.getAttachment': 'email:blob-read',
+  'email.getRaw': 'email:blob-read',
+  // Moving messages between the account's folders, archive included.
+  'email.move': 'email:write',
+  'email.archive': 'email:write',
+  // Open the composer filled in; the user still decides whether to send.
+  'compose.open': 'compose:open',
+  // Reply to the message open in the reader, with text to start from.
+  'compose.reply': 'compose:open',
+  // Save a draft without opening the composer. Nothing is sent.
+  'drafts.create': 'email:write',
+  // A system notification (or a toast), naming the plugin, 5 a minute.
+  'notifications.show': 'ui:notifications',
+  // The message being written, in a composer that handed the plugin its id.
+  'composer.getBody': 'compose:read',
+  'composer.getSelection': 'compose:read',
+  'composer.replaceSelection': 'compose:write',
+  'composer.replaceBody': 'compose:write',
+  // Attach a file the plugin uploaded (jmap.uploadBlob).
+  'composer.attach': 'email:blob-write',
 };
 
 // ─── Cross-origin allow-list (mirrors lib/plugin-api.ts) ──────
@@ -211,9 +311,32 @@ function storageGet(pluginId: string, key: string): unknown {
   if (raw === null) return null;
   try { return JSON.parse(raw); } catch { return null; }
 }
+/**
+ * What one plugin may keep per account in localStorage. The host's own
+ * stores (sign-in, settings) live in the same 5-10 MB browser quota, so a
+ * plugin that filled it would break them.
+ */
+export const PLUGIN_STORAGE_QUOTA_BYTES = 1024 * 1024;
+
 function storageSet(pluginId: string, key: string, value: unknown): void {
   if (typeof window === 'undefined') return;
-  window.localStorage.setItem(storagePrefix(pluginId) + key, JSON.stringify(value));
+  if (typeof key !== 'string' || key.length === 0 || key.length > 256) {
+    throw new Error('storage.set: key must be a string of 1-256 characters');
+  }
+  const prefix = storagePrefix(pluginId);
+  const serialized = JSON.stringify(value);
+  if (serialized === undefined) throw new Error('storage.set: value is not JSON-serialisable');
+  let used = 0;
+  for (let i = 0; i < window.localStorage.length; i++) {
+    const k = window.localStorage.key(i);
+    if (!k?.startsWith(prefix) || k === prefix + key) continue;
+    used += k.length + (window.localStorage.getItem(k)?.length ?? 0);
+  }
+  // UTF-16 code units, which is what browsers count against the quota.
+  if (used + prefix.length + key.length + serialized.length > PLUGIN_STORAGE_QUOTA_BYTES) {
+    throw new Error(`Plugin storage is full (${Math.round(PLUGIN_STORAGE_QUOTA_BYTES / 1024)} KB per account)`);
+  }
+  window.localStorage.setItem(prefix + key, serialized);
 }
 function storageRemove(pluginId: string, key: string): void {
   if (typeof window === 'undefined') return;
@@ -481,6 +604,40 @@ interface PluginFetchInit {
   body?: string | ArrayBuffer | ArrayBufferView | null;
 }
 
+// The http.fetch body is copied across postMessage twice (text and bytes);
+// MAX_PLUGIN_FETCH_BYTES (host-api-input.ts) caps it like every other body
+// the host hands a plugin.
+export { MAX_PLUGIN_FETCH_BYTES };
+
+async function readCapped(res: Response, limit: number): Promise<ArrayBuffer> {
+  const declared = Number(res.headers.get('content-length'));
+  if (Number.isFinite(declared) && declared > limit) {
+    void res.body?.cancel().catch(() => {});
+    throw new Error(`Response is larger than ${limit} bytes`);
+  }
+  if (!res.body) return res.arrayBuffer();
+  const reader = res.body.getReader();
+  const chunks: Uint8Array[] = [];
+  let total = 0;
+  for (;;) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    total += value.byteLength;
+    if (total > limit) {
+      void reader.cancel().catch(() => {});
+      throw new Error(`Response is larger than ${limit} bytes`);
+    }
+    chunks.push(value);
+  }
+  const out = new Uint8Array(total);
+  let offset = 0;
+  for (const chunk of chunks) {
+    out.set(chunk, offset);
+    offset += chunk.byteLength;
+  }
+  return out.buffer;
+}
+
 async function doHttpFetch(plugin: InstalledPlugin, rawUrl: string, init?: PluginFetchInit) {
   if (typeof rawUrl !== 'string') throw new Error('url must be a string');
   let url: URL;
@@ -508,11 +665,23 @@ async function doHttpFetch(plugin: InstalledPlugin, rawUrl: string, init?: Plugi
     mode: 'cors',
     redirect: 'follow',
   });
+  // fetch() can't stop at a cross-origin redirect and still tell us where it
+  // was going, so it follows, and the plugin only gets the answer if the
+  // last hop is still allowlisted. The request carries the webmail origin,
+  // so a host that trusts that origin in CORS would otherwise answer it.
+  if (res.url) {
+    let finalUrl: URL | null = null;
+    try { finalUrl = new URL(res.url); } catch { /* opaque */ }
+    if (!finalUrl || !originMatchesAllowlist(finalUrl, allowlist)) {
+      void res.body?.cancel().catch(() => {});
+      throw new Error(`Request was redirected to ${finalUrl?.origin ?? 'an unknown origin'}, which is not in plugin httpOrigins allowlist`);
+    }
+  }
   // Sandboxed plugin can't hold a Response object across the boundary, so
   // we read the body once and return it as text + arrayBuffer (base64).
   const headers: Record<string, string> = {};
   res.headers.forEach((val, key) => { headers[key.toLowerCase()] = val; });
-  const buf = await res.arrayBuffer();
+  const buf = await readCapped(res, MAX_PLUGIN_FETCH_BYTES);
   let text: string | null = null;
   try { text = new TextDecoder('utf-8', { fatal: false }).decode(buf); } catch { text = null; }
   return {
@@ -542,10 +711,30 @@ async function doJmapFetchBlob(blobId: string, opts?: { name?: string; type?: st
   return new Uint8Array(buf);
 }
 
-async function doJmapUploadBlob(content: Uint8Array, name: string, type: string): Promise<{ blobId: string; size: number; type: string; }> {
-  const { client } = useAuthStore.getState();
-  if (!client) throw new Error('jmap.uploadBlob: no active session');
-  const file = new File([content as BlobPart], name, { type });
+/** Largest blob a plugin may upload when the server names no limit of its own. */
+export const MAX_PLUGIN_UPLOAD_BYTES = 50 * 1024 * 1024;
+
+/**
+ * jmap.uploadBlob: bytes from the plugin, checked like the attachment refs a
+ * plugin hands the composer (readBlobRefs): a real file name, a media type,
+ * and no more than the server accepts (its maxSizeUpload, or 50 MB when it
+ * names none).
+ */
+async function doJmapUploadBlob(content: unknown, name: unknown, type: unknown): Promise<{ blobId: string; size: number; type: string; }> {
+  const method = 'jmap.uploadBlob';
+  const bytes = content instanceof Uint8Array ? content
+    : content instanceof ArrayBuffer ? new Uint8Array(content)
+    : null;
+  if (!bytes) throw new Error(`${method}: content must be a Uint8Array or ArrayBuffer`);
+  const fileName = readFileName(name, method, 'name');
+  const mediaType = readMediaType(type, method, 'type');
+  const client = sessionClient(method);
+  const serverLimit = client.getMaxSizeUpload();
+  const limit = serverLimit > 0 ? serverLimit : MAX_PLUGIN_UPLOAD_BYTES;
+  if (bytes.byteLength > limit) {
+    throw new Error(`${method}: content is ${bytes.byteLength} bytes, more than the ${limit} bytes allowed`);
+  }
+  const file = new File([bytes as BlobPart], fileName, { type: mediaType });
   return await client.uploadBlob(file);
 }
 
@@ -903,15 +1092,16 @@ function zBase32Encode(buffer: Uint8Array): string {
  * Generates the WKD hash (SHA-1 in z-base-32) from the local-part.
  * RFC 9292: Lowercase in UTF-8 before hashing.
  */
-function getWkdHash(localPart: string): string {
+export async function getWkdHash(localPart: string): Promise<string> {
   // NFC normalization + lowercasing
   const normalizedLocal = localPart.normalize('NFC').toLowerCase();
-  
-  // Explicit TextEncoder usage to guarantee UTF-8 bytes
+
+  // Explicit TextEncoder usage to guarantee UTF-8 bytes. WebCrypto, not
+  // Node's crypto: importing that pulled a ~330 KB polyfill into the client.
   const utf8Bytes = new TextEncoder().encode(normalizedLocal);
-  const sha1Buffer = createHash('sha1').update(utf8Bytes).digest();
-  
-  return zBase32Encode(sha1Buffer);
+  const sha1 = await crypto.subtle.digest('SHA-1', utf8Bytes);
+
+  return zBase32Encode(new Uint8Array(sha1));
 }
 
 /**
@@ -953,7 +1143,12 @@ export async function doGetPublicKeyFromWKD(email: string): Promise<WkdResult> {
 
   const localPart = cleanEmail.slice(0, atIndex);
   const domain = cleanEmail.slice(atIndex + 1).toLowerCase();
-  const hash = getWkdHash(localPart);
+  // The domain goes into a URL; anything but a host name would change where
+  // the request goes (a@evil.example/x?).
+  if (!/^[a-z0-9-]+(\.[a-z0-9-]+)+$/.test(domain)) {
+    return { status: 'ERROR', error: 'Invalid email address' };
+  }
+  const hash = await getWkdHash(localPart);
 
   const urls = [
     `https://openpgpkey.${domain}/.well-known/openpgpkey/hu/${hash}?l=${encodeURIComponent(localPart)}`,
@@ -1013,21 +1208,47 @@ async function saveFile(formerFileID:string, file: File): Promise<string> {
 }
 
 // ─── Download files generated by the plugin. This is not user's files or attachments ──────────────────────────
-async function downloadFile(args: { content: string; filename: string; contentType?: string }): Promise<void> {
-    const { content, filename, contentType = 'application/json' } = args;
+// File types a plugin may not hand the user: programs, scripts, and
+// documents a browser opens as an active page.
+const BLOCKED_DOWNLOAD_EXTENSIONS = new Set([
+  'exe', 'msi', 'bat', 'cmd', 'com', 'scr', 'ps1', 'vbs', 'vbe', 'js', 'jse', 'wsf', 'hta', 'jar',
+  'lnk', 'app', 'dmg', 'pkg', 'sh', 'command', 'html', 'htm', 'xhtml', 'shtml', 'svg', 'mhtml', 'xml',
+]);
+const BLOCKED_DOWNLOAD_TYPES = /^(text\/html|application\/xhtml|image\/svg|application\/(x-)?javascript|text\/javascript|application\/x-msdownload|application\/xml|text\/xml)/i;
 
-    try {
-      const url = URL.createObjectURL(new Blob([content], { type: contentType }));
-      const a = document.createElement('a');
-      a.href = url;
-      a.download = filename;
-      document.body.appendChild(a); 
-      a.click();
-      document.body.removeChild(a);
-      URL.revokeObjectURL(url);
-    } catch (error) {
-     throw new Error(`Failed to download file: ${error}`);
-    }
+/** A file name that can't carry a path, control characters or a hidden extension. */
+export function safeDownloadName(name: unknown): string {
+  const raw = typeof name === 'string' ? name : '';
+  const cleaned = raw
+    // eslint-disable-next-line no-control-regex -- removing control characters is the point
+    .replace(/[\u0000-\u001f\u007f\u200e\u200f\u202a-\u202e\u2066-\u2069]/g, '')
+    .replace(/[\\/:*?"<>|]/g, '_')
+    .replace(/^[.\s]+|[.\s]+$/g, '')
+    .slice(0, 120);
+  return cleaned || 'download';
+}
+
+async function downloadFile(args: { content: string | ArrayBuffer | Uint8Array; filename: string; contentType?: string }): Promise<void> {
+  const { content } = args;
+  const filename = safeDownloadName(args.filename);
+  const contentType = typeof args.contentType === 'string' && args.contentType ? args.contentType : 'application/octet-stream';
+  const ext = filename.includes('.') ? filename.slice(filename.lastIndexOf('.') + 1).toLowerCase() : '';
+  if (BLOCKED_DOWNLOAD_EXTENSIONS.has(ext) || BLOCKED_DOWNLOAD_TYPES.test(contentType)) {
+    throw new Error(`ui.downloadFile: ${ext ? `.${ext} files` : contentType} can't be downloaded from a plugin`);
+  }
+  if (typeof content !== 'string' && !(content instanceof ArrayBuffer) && !(content instanceof Uint8Array)) {
+    throw new Error('ui.downloadFile: content must be a string or bytes');
+  }
+  const url = URL.createObjectURL(new Blob([content as BlobPart], { type: contentType }));
+  const a = document.createElement('a');
+  a.href = url;
+  a.download = filename;
+  a.rel = 'noopener';
+  document.body.appendChild(a);
+  a.click();
+  document.body.removeChild(a);
+  // Revoking at once can cancel the download in some browsers.
+  setTimeout(() => URL.revokeObjectURL(url), 60_000);
 }
 
 // ─── Email keyword mutations ──────────────────────────────────
@@ -1407,23 +1628,70 @@ async function adminGetAll(pluginId: string): Promise<Record<string, unknown>> {
   if (!res.ok) return {};
   return res.json();
 }
+/** The zone the app shows times in: the user's choice, else the browser's. */
+function userTimeZone(): string {
+  const setting = useSettingsStore.getState().timeZone;
+  if (typeof setting === 'string' && setting && setting !== 'auto') return setting;
+  return Intl.DateTimeFormat().resolvedOptions().timeZone || 'UTC';
+}
+
+/** The admin's settings for this plugin that aren't secrets (any user may read them). */
+async function publicConfig(pluginId: string): Promise<Record<string, unknown>> {
+  const res = await apiFetch(`/api/admin/plugins/${encodeURIComponent(pluginId)}/config?public=1`);
+  if (!res.ok) return {};
+  return res.json();
+}
 async function adminGet(pluginId: string, key: string): Promise<unknown> {
   const all = await adminGetAll(pluginId);
   return all[key] ?? null;
 }
 async function adminSet(pluginId: string, key: string, value: unknown): Promise<void> {
-  await apiFetch(`/api/admin/plugins/${encodeURIComponent(pluginId)}/config`, {
+  await expectOk('admin.setConfig', apiFetch(`/api/admin/plugins/${encodeURIComponent(pluginId)}/config`, {
     method: 'PUT',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({ key, value }),
-  });
+  }));
+}
+
+/** A failed admin config write used to look like success to the plugin. */
+async function expectOk(method: string, request: Promise<Response>): Promise<void> {
+  const res = await request;
+  if (!res.ok) {
+    throw new Error(res.status === 401 || res.status === 403
+      ? `${method}: only an administrator can change this plugin's admin settings`
+      : `${method} failed (HTTP ${res.status})`);
+  }
 }
 async function adminDelete(pluginId: string, key: string): Promise<void> {
-  await apiFetch(`/api/admin/plugins/${encodeURIComponent(pluginId)}/config`, {
+  await expectOk('admin.deleteConfig', apiFetch(`/api/admin/plugins/${encodeURIComponent(pluginId)}/config`, {
     method: 'DELETE',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({ key }),
-  });
+  }));
+}
+
+// ─── Toasts ──────────────────────────────────────────────────
+
+const MAX_TOAST_LENGTH = 300;
+const TOASTS_PER_TEN_SECONDS = 5;
+const recentToasts = new Map<string, number[]>();
+
+function toastText(value: unknown): string {
+  const text = String(value ?? '');
+  return text.length > MAX_TOAST_LENGTH ? text.slice(0, MAX_TOAST_LENGTH - 1) + '…' : text;
+}
+
+/** A plugin may show a few toasts; past that they are dropped, not queued. */
+function mayToast(pluginId: string): boolean {
+  const now = Date.now();
+  const recent = (recentToasts.get(pluginId) ?? []).filter((t) => now - t < 10_000);
+  if (recent.length >= TOASTS_PER_TEN_SECONDS) {
+    recentToasts.set(pluginId, recent);
+    return false;
+  }
+  recent.push(now);
+  recentToasts.set(pluginId, recent);
+  return true;
 }
 
 // ─── Dispatcher ──────────────────────────────────────────────
@@ -1433,7 +1701,7 @@ export async function dispatchApiCall(
   plugin: InstalledPlugin,
   method: string,
   args: unknown[],
-  opts?: { privileged?: boolean },
+  opts?: { privileged?: boolean; sink?: StreamSink },
 ): Promise<unknown> {
   // Tier gate: privileged-only methods are refused for untrusted (null-origin)
   // instances even if the permission is somehow present. Defence-in-depth on
@@ -1453,21 +1721,39 @@ export async function dispatchApiCall(
   }
 
   switch (method) {
+    case 'proxy.fetch': return proxyFetch(plugin, args, opts?.sink ?? null);
+    case 'proxy.cancel': proxyCancel(plugin, args[0]); return undefined;
+    case 'proxy.connect': return proxyConnect(plugin, args);
+    case 'proxy.accounts': return proxyAccounts(plugin);
+    case 'proxy.disconnect': return proxyDisconnect(plugin, args);
+
+    case 'ui.setActions': {
+      const surface = args[0];
+      if (typeof surface !== 'string' || !isActionSurface(surface)) throw new Error(`"${String(surface)}" is not a surface that takes actions`);
+      if (!mayOfferSlot(plugin, surface)) throw new Error(`Plugin "${plugin.id}" may not add actions to "${surface}"`);
+      setPluginActions(plugin.id, plugin.name, surface, checkActions(args[1]));
+      return undefined;
+    }
+    case 'ui.refreshRowBadges': refreshRowBadges(); return undefined;
+    case 'ui.setDayLabels': setDayLabels(plugin.id, plugin.name, checkDayLabels(args[0])); return undefined;
+    case 'ui.setPages': setPluginPages(plugin.id, plugin.name, checkPages(args[0])); return undefined;
+    case 'ui.setSectionTitle': setSectionTitle(plugin.id, args[0]); return undefined;
+
     case 'storage.get': return storageGet(plugin.id, args[0] as string);
     case 'storage.set': storageSet(plugin.id, args[0] as string, args[1]); return undefined;
     case 'storage.remove': storageRemove(plugin.id, args[0] as string); return undefined;
     case 'storage.keys': return storageKeys(plugin.id);
 
-    case 'toast.success': appToast.success(String(args[0] ?? '')); return undefined;
-    case 'toast.error':   appToast.error(String(args[0] ?? '')); return undefined;
-    case 'toast.info':    appToast.info(String(args[0] ?? '')); return undefined;
-    case 'toast.warning': appToast.warning(String(args[0] ?? '')); return undefined;
+    case 'toast.success': if (mayToast(plugin.id)) appToast.success(toastText(args[0])); return undefined;
+    case 'toast.error':   if (mayToast(plugin.id)) appToast.error(toastText(args[0])); return undefined;
+    case 'toast.info':    if (mayToast(plugin.id)) appToast.info(toastText(args[0])); return undefined;
+    case 'toast.warning': if (mayToast(plugin.id)) appToast.warning(toastText(args[0])); return undefined;
 
     case 'http.post':  return doHttpPost(plugin, args[0] as string, args[1], args[2] as PluginHttpPostOptions | undefined);
     case 'http.fetch': return doHttpFetch(plugin, args[0] as string, args[1] as PluginFetchInit | undefined);
 
     case 'jmap.fetchBlob': return doJmapFetchBlob(args[0] as string, args[1] as { name?: string; type?: string, rangeHeader?: number } | undefined);
-    case 'jmap.uploadBlob': return doJmapUploadBlob(args[0] as Uint8Array, args[1] as string, args[2] as string);
+    case 'jmap.uploadBlob': return doJmapUploadBlob(args[0], args[1], args[2]);
     case 'jmap.sendRaw':   return doJmapSendRaw(
       args[0] as ArrayBuffer | ArrayBufferView,
       args[1] as string,
@@ -1508,8 +1794,10 @@ export async function dispatchApiCall(
     case 'upfiles.get' : return getFile(args[0] as string);
     case 'upfiles.save' : return saveFile(args[0] as string, args[1] as File);
 
-    case 'crypto.createWebAuthn': return doCreatePRF(args[0] as string, args[1] as string, args[2] as string);
-    case 'crypto.getWebAuthn': return doGetPRF(args[0] as number[], args[1] as string);
+    // The PRF salt is derived from the calling plugin's id, never from an
+    // argument: otherwise one plugin could ask for another plugin's secret.
+    case 'crypto.createWebAuthn': return doCreatePRF(plugin.id, args[1] as string, args[2] as string);
+    case 'crypto.getWebAuthn': return doGetPRF(args[0] as number[], plugin.id);
     case 'crypto.getPublicKeys': return getPublicKeys();
     case 'crypto.createPublicKey': return doCreatePublicKey(args[0] as PublicKeyInput);
     case 'crypto.removePublicKey': return doRemovePublicKey(args[0] as string);
@@ -1530,10 +1818,12 @@ export async function dispatchApiCall(
 
     case 'user.getAccounts':   return doUserGetAccounts();
     case 'user.getIdentities': return doUserGetIdentities();
+    case 'user.getTimeZone': return userTimeZone();
     case 'user.logout' : return doUserLogout();
 
     case 'admin.getConfig':    return adminGet(plugin.id, args[0] as string);
     case 'admin.getAllConfig': return adminGetAll(plugin.id);
+    case 'plugin.getConfig':   return publicConfig(plugin.id);
     case 'admin.setConfig':    await adminSet(plugin.id, args[0] as string, args[1]); return undefined;
     case 'admin.deleteConfig': await adminDelete(plugin.id, args[0] as string); return undefined;
 
@@ -1629,18 +1919,22 @@ export async function dispatchApiCall(
       return undefined;
     }
     case 'ui.downloadFile': {
-      const opts = args[0] as { content: string; filename: string; contentType?: string };
-      return downloadFile(opts);
+      const opts = args[0] as { content: string | ArrayBuffer | Uint8Array; filename: string; contentType?: string };
+      return downloadFile(opts ?? { content: '', filename: '' });
     }
 
     case 'email.setKeyword': {
+      const emailId = assertEmailId(args[0], 'email.setKeyword');
       const keyword = assertPluginKeyword(args[1]);
-      await requireClient().setKeyword(String(args[0]), keyword, args[2] as string | undefined);
+      const accountId = assertOptionalAccountId(args[2], 'email.setKeyword');
+      await requireClient().setKeyword(emailId, keyword, accountId);
       return undefined;
     }
     case 'email.removeKeyword': {
+      const emailId = assertEmailId(args[0], 'email.removeKeyword');
       const keyword = assertPluginKeyword(args[1]);
-      await requireClient().removeKeyword(String(args[0]), keyword, args[2] as string | undefined);
+      const accountId = assertOptionalAccountId(args[2], 'email.removeKeyword');
+      await requireClient().removeKeyword(emailId, keyword, accountId);
       return undefined;
     }
 
@@ -1670,6 +1964,12 @@ export async function dispatchApiCall(
 
     case 'search.run': return doSearchRun(plugin, args[0], args[1]);
 
+    case 'oauth.createState': return createOAuthState(plugin.id);
+    case 'oauth.getRedirectUri': {
+      const locale = (globalThis as unknown as { __APP_LOCALE__?: string }).__APP_LOCALE__ || 'en';
+      return `${window.location.origin}${withBasePath(`/${encodeURIComponent(locale)}/plugins/oauth/callback`)}`;
+    }
+
     case 'sieve.isSupported': {
       const { client } = useAuthStore.getState();
       return !!client?.supportsSieve();
@@ -1684,6 +1984,51 @@ export async function dispatchApiCall(
       return undefined;
     }
 
+    case 'calendar.listCalendars': return doCalendarListCalendars();
+    case 'calendar.getEvents': return doCalendarGetEvents(args[0]);
+    case 'calendar.getEvent': return doCalendarGetEvent(args[0]);
+    case 'calendar.createEvent': return doCalendarCreateEvent(args[0], plugin.id);
+    case 'calendar.updateEvent': return doCalendarUpdateEvent(args[0], args[1]);
+    case 'calendar.deleteEvent': return doCalendarDeleteEvent(args[0]);
+
+    case 'tasks.list': return doTasksList(args[0]);
+    case 'tasks.get': return doTasksGet(args[0]);
+    case 'tasks.create': return doTasksCreate(args[0]);
+    case 'tasks.update': return doTasksUpdate(args[0], args[1]);
+    case 'tasks.setComplete': return doTasksSetComplete(args[0], args[1]);
+    case 'tasks.delete': return doTasksDelete(args[0]);
+
+    case 'templates.list': return doTemplatesList();
+    case 'templates.get': return doTemplatesGet(args[0]);
+    case 'templates.create': return doTemplatesCreate(args[0]);
+    case 'templates.update': return doTemplatesUpdate(args[0], args[1]);
+    case 'templates.delete': doTemplatesDelete(args[0]); return undefined;
+
+    case 'identities.update': return doIdentitiesUpdate(args[0], args[1]);
+
+    case 'vacation.get': return doVacationGet();
+    case 'vacation.set': return doVacationSet(args[0]);
+
+    case 'email.get': return doEmailGet(args[0]);
+    case 'email.list': return doEmailList(args[0]);
+    case 'mailboxes.list': return doMailboxesList();
+    case 'email.getAttachment': return doEmailGetAttachment(args[0], args[1]);
+    case 'email.getRaw': return doEmailGetRaw(args[0]);
+    case 'email.move': return doEmailMove(plugin.id, args[0], args[1]);
+    case 'email.archive': return doEmailArchive(plugin.id, args[0]);
+
+    case 'compose.open': return doComposeOpen(plugin, args[0]);
+    case 'compose.reply': return doComposeReply(plugin, args[0], args[1]);
+    case 'drafts.create': return doDraftsCreate(plugin, args[0]);
+
+    case 'notifications.show': return doNotificationsShow(plugin, args[0]);
+
+    case 'composer.getBody': return doComposerGetBody(plugin, args[0]);
+    case 'composer.getSelection': return doComposerGetSelection(plugin, args[0]);
+    case 'composer.replaceSelection': return doComposerReplaceSelection(plugin, args[0], args[1], args[2]);
+    case 'composer.replaceBody': return doComposerReplaceBody(plugin, args[0], args[1]);
+    case 'composer.attach': return doComposerAttach(plugin, args[0], args[1]);
+
     default:
       throw new Error(`Unhandled method "${method}"`);
   }
diff --git a/lib/plugin-sandbox/host-bridge.ts b/lib/plugin-sandbox/host-bridge.ts
index cd0cf51b7..84c0da1ef 100644
--- a/lib/plugin-sandbox/host-bridge.ts
+++ b/lib/plugin-sandbox/host-bridge.ts
@@ -12,8 +12,10 @@ import { dispatchApiCall } from './host-api';
 import { SANDBOX_PATH, SANDBOX_PRIVILEGED_PATH } from './protocol';
 import { withBasePath } from '../browser-navigation';
 import { snapshotHostTheme, type ThemeSnapshot } from './host-theme';
+import { effectiveSettings } from '../plugin-settings';
+import { clampSlotHeight, clampSlotWidth, isInlineSlot, MAX_INLINE_SLOT_WIDTH } from './slot-layout';
 import type {
-  SandboxToHost, HostToSandbox, InitMsg, InitPayload,
+  SandboxToHost, HostToSandbox, InitMsg, InitPayload, StreamChunkMsg, StreamEndMsg, StreamProgressMsg,
 } from './protocol';
 
 // ─── Callback marshalling ────────────────────────────────────
@@ -71,8 +73,8 @@ export interface SlotOptions {
   extraProps: Record<string, unknown>;
   /** Container element the visible slot iframe is mounted into. */
   hostContainer: HTMLElement;
-  /** Called whenever the sandbox reports a new content height. */
-  onResize: (height: number) => void;
+  /** Called whenever the sandbox reports a new content size (width only for inline slots). */
+  onResize: (height: number, width?: number) => void;
 }
 
 export interface InitDoneInfo {
@@ -81,6 +83,54 @@ export interface InitDoneInfo {
   shortcuts: Array<{ id: string; keys: string; label: string; category?: string }>;
 }
 
+// ─── Live instances ──────────────────────────────────────────
+
+/**
+ * Every iframe currently running, background and slot alike, so a change
+ * that concerns a plugin (its settings, the app locale) reaches all of them.
+ */
+const liveInstances = new Set<SandboxInstance>();
+
+export function forEachInstance(pluginId: string | null, fn: (instance: SandboxInstance) => void): void {
+  for (const instance of liveInstances) {
+    if (pluginId !== null && instance.pluginId !== pluginId) continue;
+    try { fn(instance); } catch { /* one broken iframe must not stop the rest */ }
+  }
+}
+
+// ─── Theme watcher ───────────────────────────────────────────
+
+// Plugin frames follow the theme the page actually shows, whichever code
+// path changed it: the theme store, settings synced from the server after
+// load, a custom theme's injected stylesheet. Watching the page itself
+// (the root's class and style, the stylesheets in <head>) catches all of
+// them; changes are batched to one update per frame.
+let themeWatcher: MutationObserver | null = null;
+let lastThemeKey = '';
+
+function pushThemeToFrames(): void {
+  const theme = snapshotHostTheme();
+  const key = JSON.stringify(theme);
+  if (key === lastThemeKey) return;
+  lastThemeKey = key;
+  for (const instance of liveInstances) {
+    if (instance.mode !== 'slot') continue;
+    try { instance.setTheme(theme); } catch { /* one broken iframe must not stop the rest */ }
+  }
+}
+
+function ensureThemeWatcher(): void {
+  if (themeWatcher || typeof MutationObserver === 'undefined' || typeof document === 'undefined') return;
+  let scheduled = false;
+  themeWatcher = new MutationObserver(() => {
+    if (scheduled) return;
+    scheduled = true;
+    requestAnimationFrame(() => { scheduled = false; pushThemeToFrames(); });
+  });
+  themeWatcher.observe(document.documentElement, { attributes: true, attributeFilter: ['class', 'style', 'data-theme'] });
+  themeWatcher.observe(document.head, { childList: true, subtree: true, characterData: true });
+}
+
 // ─── Sandbox instance ────────────────────────────────────────
 
 export class SandboxInstance {
@@ -89,6 +139,8 @@ export class SandboxInstance {
   readonly mode: 'background' | 'slot';
   /** True for the same-origin privileged tier; gates the origin assertion. */
   readonly privileged: boolean;
+  /** An inline slot (toolbar row) sized to its content's width. */
+  readonly inline: boolean;
 
   readyPromise: Promise<void>;
   initPromise: Promise<InitDoneInfo>;
@@ -103,21 +155,26 @@ export class SandboxInstance {
   private pendingShouldShow = new Map<string, (show: boolean) => void>();
   /** Host-side function references the sandbox can call back via 'callback-invoke'. */
   private callbackTable = new Map<string, (...args: unknown[]) => unknown>();
+  /** Ids in callbackTable that came from the current props. */
+  private propCallbackIds = new Set<string>();
 
   constructor(
     private plugin: InstalledPlugin,
     initPayload: InitPayload,
     hostContainer: HTMLElement,
-    private slotResizeCb: ((height: number) => void) | null,
+    private slotResizeCb: ((height: number, width?: number) => void) | null,
   ) {
     this.pluginId = plugin.id;
     this.mode = initPayload.mode;
     this.privileged = initPayload.tier === 'privileged';
+    this.inline = initPayload.mode === 'slot' && isInlineSlot(initPayload.slot);
 
     // Slot iframes get `extraProps`; encode any function values now so the
     // structured-clone send doesn't drop them.
     if (initPayload.mode === 'slot') {
+      const before = new Set(this.callbackTable.keys());
       initPayload.extraProps = encodeCallbacks(initPayload.extraProps, this.callbackTable) as Record<string, unknown>;
+      this.propCallbackIds = new Set([...this.callbackTable.keys()].filter((k) => !before.has(k)));
     }
 
     this.readyPromise = new Promise<void>((res) => { this.resolveReady = res; });
@@ -137,11 +194,22 @@ export class SandboxInstance {
     // `sandbox-ready` would never post).
     const sandboxFlags = this.privileged || process.env.NODE_ENV === 'development'
       ? 'allow-scripts allow-same-origin'
-      : 'allow-scripts';
+      // allow-forms: plugin UIs can use <form> and get its submit event. The
+      // sandbox CSP sets form-action 'none', so a form can't post anywhere.
+      : 'allow-scripts allow-forms';
+    if (!this.privileged && process.env.NODE_ENV === 'development') warnDevSandboxOnce();
     this.iframe.setAttribute('sandbox', sandboxFlags);
     this.iframe.setAttribute('referrerpolicy', 'no-referrer');
+    // "Copy" buttons in plugin UIs. Writing only; reading the clipboard
+    // stays off.
+    this.iframe.setAttribute('allow', 'clipboard-write');
     this.iframe.title = `plugin-${plugin.id}-${initPayload.mode}`;
     this.iframe.style.border = 'none';
+    // The frame's document declares the theme's color-scheme (themeSnapshotToCSS).
+    // When the iframe element's own color-scheme differs, the browser paints
+    // an opaque canvas behind the frame (white in a dark theme), so the two
+    // are always set together.
+    if (initPayload.mode === 'slot') this.iframe.style.colorScheme = initPayload.theme.dark ? 'dark' : 'light';
     this.iframe.style.display = 'block';
     if (initPayload.mode === 'background') {
       this.iframe.style.position = 'absolute';
@@ -151,6 +219,10 @@ export class SandboxInstance {
       this.iframe.style.pointerEvents = 'none';
       this.iframe.style.left = '-9999px';
       this.iframe.setAttribute('aria-hidden', 'true');
+    } else if (this.inline) {
+      // Starts at the widest it may get; the first resize shrinks it.
+      this.iframe.style.width = `${MAX_INLINE_SLOT_WIDTH}px`;
+      this.iframe.style.height = '0px';
     } else {
       this.iframe.style.width = '100%';
       this.iframe.style.height = '0px';
@@ -165,6 +237,8 @@ export class SandboxInstance {
     this.listener = (ev) => this.onMessage(ev);
     window.addEventListener('message', this.listener);
     hostContainer.appendChild(this.iframe);
+    liveInstances.add(this);
+    if (this.mode === 'slot') ensureThemeWatcher();
 
     // Send init after the iframe runtime signals it's ready.
     this.readyPromise.then(() => {
@@ -191,6 +265,14 @@ export class SandboxInstance {
     // are null-origin (event.origin === "null") in prod and can't be pinned
     // this way, so the contentWindow check above is the sole gate for them.
     if (this.privileged && ev.origin !== window.location.origin) return;
+    // Untrusted iframes are opaque-origin, so their messages say "null". A
+    // sandboxed frame can still navigate itself; the page it lands on runs
+    // outside the sandbox CSP and must not inherit the RPC channel. Dev mode
+    // adds allow-same-origin (see the sandbox flags), so it posts as us.
+    if (!this.privileged) {
+      const expected = process.env.NODE_ENV === 'development' ? window.location.origin : 'null';
+      if (ev.origin !== expected) return;
+    }
     const msg = ev.data as SandboxToHost;
     if (!msg || typeof (msg as { type?: unknown }).type !== 'string') return;
 
@@ -211,7 +293,7 @@ export class SandboxInstance {
         const { id, method, args } = msg;
         void (async () => {
           try {
-            const result = await dispatchApiCall(this.plugin, method, args ?? [], { privileged: this.privileged });
+            const result = await dispatchApiCall(this.plugin, method, args ?? [], { privileged: this.privileged, sink: this });
             this.send({ type: 'api-response', id, ok: true, result });
           } catch (err) {
             this.send({ type: 'api-response', id, ok: false, error: (err as Error).message ?? String(err) });
@@ -257,13 +339,20 @@ export class SandboxInstance {
         return;
       }
 
-      case 'slot-resize':
+      case 'slot-resize': {
         // The iframe has no intrinsic height - sync it to the content height
         // the sandbox reported, otherwise the wrapper reserves space but the
-        // iframe stays at 0px and the slot appears blank.
-        this.iframe.style.height = `${msg.height}px`;
-        this.slotResizeCb?.(msg.height);
+        // iframe stays at 0px and the slot appears blank. The plugin reports
+        // the numbers, so they are clamped: a slot whose content is 100vh
+        // tall would otherwise grow with every resize.
+        const height = clampSlotHeight(msg.height);
+        if (height === null) return;
+        const width = this.inline ? clampSlotWidth(msg.width) : null;
+        this.iframe.style.height = `${height}px`;
+        if (width !== null) this.iframe.style.width = `${width}px`;
+        this.slotResizeCb?.(height, width ?? undefined);
         return;
+      }
     }
   }
 
@@ -274,9 +363,23 @@ export class SandboxInstance {
     if (this.destroyed) return Promise.reject(new Error('sandbox destroyed'));
     const id = uid();
     const p = new Promise<unknown>((resolve, reject) => {
-      this.pendingHookInvokes.set(id, { resolve, reject });
+      // The bus gives up on a slow handler, but the entry used to stay here
+      // until the iframe answered, which a hung plugin never does.
+      const timer = setTimeout(() => {
+        if (this.pendingHookInvokes.delete(id)) reject(new Error(`hook ${hookName} got no answer`));
+      }, HOOK_INVOKE_TTL_MS);
+      this.pendingHookInvokes.set(id, {
+        resolve: (v) => { clearTimeout(timer); resolve(v); },
+        reject: (e) => { clearTimeout(timer); reject(e); },
+      });
     });
-    this.send({ type: 'hook-invoke', id, hookName, args });
+    try {
+      this.send({ type: 'hook-invoke', id, hookName, args });
+    } catch (err) {
+      // Arguments that can't be cloned: fail this call, don't leak it.
+      this.pendingHookInvokes.get(id)?.reject(err as Error);
+      this.pendingHookInvokes.delete(id);
+    }
     return p;
   }
 
@@ -287,10 +390,24 @@ export class SandboxInstance {
     const p = new Promise<boolean>((resolve) => {
       this.pendingShouldShow.set(id, resolve);
     });
-    this.send({ type: 'slot-should-show', id, slot, context });
+    // shouldShow only decides; it gets the data, not the host callbacks.
+    // Functions can't be posted at all - sending them threw and took the
+    // composer or event form down with it.
+    this.send({ type: 'slot-should-show', id, slot, context: withoutFunctions(context) });
     return p;
   }
 
+  /** Streamed proxy responses and upload progress (see proxy-client.ts). */
+  sendStream(msg: StreamChunkMsg | StreamEndMsg | StreamProgressMsg): void {
+    if (this.destroyed) return;
+    if (msg.type === 'stream-chunk') {
+      // Hand the buffer over instead of copying it.
+      this.iframe.contentWindow?.postMessage(msg, '*', [msg.chunk]);
+      return;
+    }
+    this.send(msg);
+  }
+
   setLocale(locale: string): void {
     if (this.destroyed) return;
     this.send({ type: 'locale-change', locale });
@@ -299,21 +416,32 @@ export class SandboxInstance {
   /** Push a new resolved theme so the slot iframe re-injects its theme CSS. */
   setTheme(theme: ThemeSnapshot): void {
     if (this.destroyed) return;
+    this.iframe.style.colorScheme = theme.dark ? 'dark' : 'light';
     this.send({ type: 'theme-change', theme });
   }
 
+  /** Push the plugin's current settings (see effectiveSettings). */
+  setSettings(settings: Record<string, unknown>): void {
+    if (this.destroyed) return;
+    this.send({ type: 'settings-change', settings });
+  }
+
   updateProps(props: Record<string, unknown>): void {
     if (this.destroyed) return;
-    // Stale references would leak if we kept growing the table without
-    // bound; for now we let it grow until destroy(). A future refinement
-    // could diff old vs new props and drop entries no longer referenced.
-    const encoded = encodeCallbacks(props, this.callbackTable) as Record<string, unknown>;
+    // Callbacks from the props being replaced are dropped, so the table
+    // holds only what the slot can currently reach.
+    const fresh = new Map<string, (...args: unknown[]) => unknown>();
+    const encoded = encodeCallbacks(props, fresh) as Record<string, unknown>;
+    for (const id of this.propCallbackIds) this.callbackTable.delete(id);
+    this.propCallbackIds = new Set(fresh.keys());
+    for (const [id, fn] of fresh) this.callbackTable.set(id, fn);
     this.send({ type: 'props-update', props: encoded });
   }
 
   destroy(): void {
     if (this.destroyed) return;
     this.destroyed = true;
+    liveInstances.delete(this);
     window.removeEventListener('message', this.listener);
     this.iframe.remove();
     for (const { reject } of this.pendingHookInvokes.values()) {
@@ -325,6 +453,30 @@ export class SandboxInstance {
   }
 }
 
+/** Copy of a props object with every function left out. */
+export function withoutFunctions(value: unknown, depth = 0): unknown {
+  if (depth > 6 || typeof value === 'function') return undefined;
+  if (value === null || typeof value !== 'object') return value;
+  if (Array.isArray(value)) return value.map((v) => withoutFunctions(v, depth + 1));
+  const out: Record<string, unknown> = {};
+  for (const [k, v] of Object.entries(value as Record<string, unknown>)) {
+    if (typeof v === 'function') continue;
+    out[k] = withoutFunctions(v, depth + 1);
+  }
+  return out;
+}
+
+let devSandboxWarned = false;
+function warnDevSandboxOnce(): void {
+  if (devSandboxWarned) return;
+  devSandboxWarned = true;
+  console.warn('[plugin-sandbox] next dev runs untrusted plugins same-origin (Next needs it for HMR). '
+    + 'They can reach the whole app here; test isolation against a production build.');
+}
+
+/** How long the host waits for a hook answer; longer than any bus budget. */
+const HOOK_INVOKE_TTL_MS = 11 * 60_000;
+
 function uid(): string {
   return Math.random().toString(36).slice(2) + Date.now().toString(36);
 }
@@ -340,7 +492,7 @@ export function createBackgroundInstance(opts: BackgroundOptions): SandboxInstan
       id: opts.plugin.id,
       version: opts.plugin.version,
       permissions: opts.plugin.permissions,
-      settings: { ...opts.plugin.settings },
+      settings: effectiveSettings(opts.plugin),
       locales: opts.plugin.locales,
       httpOrigins: opts.plugin.httpOrigins,
     },
@@ -366,7 +518,7 @@ export function createSlotInstance(opts: SlotOptions): SandboxInstance {
       id: opts.plugin.id,
       version: opts.plugin.version,
       permissions: opts.plugin.permissions,
-      settings: { ...opts.plugin.settings },
+      settings: effectiveSettings(opts.plugin),
       locales: opts.plugin.locales,
       httpOrigins: opts.plugin.httpOrigins,
     },
diff --git a/lib/plugin-sandbox/host-dialog.ts b/lib/plugin-sandbox/host-dialog.ts
index 68159cefa..e3bd09caa 100644
--- a/lib/plugin-sandbox/host-dialog.ts
+++ b/lib/plugin-sandbox/host-dialog.ts
@@ -67,7 +67,32 @@ function uid(): string {
   return Math.random().toString(36).slice(2) + Date.now().toString(36);
 }
 
+/** How many dialogs one plugin may open per minute. */
+export const MAX_DIALOGS_PER_MINUTE = 20;
+const recentByPlugin = new Map<string, number[]>();
+
+export class DialogLimitError extends Error {}
+
+/**
+ * Queue a dialog. A plugin gets one dialog at a time and a limited number
+ * per minute: with neither limit, a plugin that opens dialogs in a loop
+ * covers the whole app and the user can't reach Settings to turn it off.
+ */
 export function enqueueDialog(req: Omit<DialogRequest, 'id'>): { id: string } {
+  // One dialog per plugin, except that a plugin's own large dialog (custom)
+  // may ask one confirm/alert/prompt on top of itself ("Discard changes?").
+  const open = queue.filter((d) => d.pluginId === req.pluginId);
+  const overCustom = open.length === 1 && open[0].kind === 'custom' && req.kind !== 'custom';
+  if (open.length > 0 && !overCustom) {
+    throw new DialogLimitError('This plugin already has a dialog open');
+  }
+  const now = Date.now();
+  const recent = (recentByPlugin.get(req.pluginId) ?? []).filter((t) => now - t < 60_000);
+  if (recent.length >= MAX_DIALOGS_PER_MINUTE) {
+    throw new DialogLimitError('This plugin opened too many dialogs; try again in a minute');
+  }
+  recent.push(now);
+  recentByPlugin.set(req.pluginId, recent);
   const entry: DialogRequest = { ...req, id: uid() };
   queue.push(entry);
   notify();
@@ -78,6 +103,17 @@ export function head(): DialogRequest | null {
   return queue[0] ?? null;
 }
 
+/**
+ * A confirm/alert/prompt a plugin opened on top of its own custom dialog,
+ * when that custom dialog is the one showing. Drawn above it; the custom
+ * dialog stays open (and its iframe keeps its state) underneath.
+ */
+export function overlay(): DialogRequest | null {
+  const base = queue[0];
+  if (!base || base.kind !== 'custom') return null;
+  return queue.find((d, i) => i > 0 && d.pluginId === base.pluginId && d.kind !== 'custom') ?? null;
+}
+
 export function resolveHead(result: unknown): void {
   const entry = queue.shift();
   if (!entry) return;
@@ -85,6 +121,23 @@ export function resolveHead(result: unknown): void {
   notify();
 }
 
+/**
+ * Resolve one specific dialog. A custom dialog's onResult uses this, so a
+ * second call after it closed can't answer whatever dialog came next.
+ */
+export function resolveDialog(id: string, result: unknown): void {
+  const idx = queue.findIndex((d) => d.id === id);
+  if (idx < 0) return;
+  const [entry] = queue.splice(idx, 1);
+  try { entry.resolve(result); } catch { /* ignore */ }
+  notify();
+}
+
+/** Forget rate-limit history (tests). */
+export function resetDialogLimits(): void {
+  recentByPlugin.clear();
+}
+
 /** The "cancelled" result for a given dialog kind (null for prompt/custom, else false). */
 function cancelledResult(kind: DialogKind): unknown {
   return kind === 'prompt' || kind === 'custom' ? null : false;
@@ -118,6 +171,8 @@ export function awaitDialog(req: Omit<DialogRequest, 'id' | 'resolve'>): Promise
     enqueueDialog({ ...req, resolve: (r) => resolve(r === true) });
   });
 }
+// (enqueueDialog throws synchronously inside the executor, which rejects
+// the promise, so the plugin's await sees the limit error.)
 
 /**
  * Prompt variant of `awaitDialog`: resolves to the collected name→value map on
diff --git a/lib/plugin-sandbox/host-theme.ts b/lib/plugin-sandbox/host-theme.ts
index 7b1b0423a..a97a8d491 100644
--- a/lib/plugin-sandbox/host-theme.ts
+++ b/lib/plugin-sandbox/host-theme.ts
@@ -121,6 +121,8 @@ export function themeSnapshotToCSS(snapshot: ThemeSnapshot): string {
     ':root {',
     declarations,
     `  color-scheme: ${colorScheme};`,
+    // The user's font size setting, so rem units in a slot match the app.
+    ...(snapshot.vars['--font-size-base'] ? ['  font-size: var(--font-size-base);'] : []),
     '}',
     'html, body {',
     `  font-family: ${snapshot.fontFamily};`,
diff --git a/lib/plugin-sandbox/loader.ts b/lib/plugin-sandbox/loader.ts
index e5f8b4706..80111fa5b 100644
--- a/lib/plugin-sandbox/loader.ts
+++ b/lib/plugin-sandbox/loader.ts
@@ -6,22 +6,29 @@ import { pluginStorage } from '../plugin-storage';
 import {
   emailHooks, calendarHooks, calendarFormHooks, contactHooks, fileHooks,
   authHooks, settingsHooks, identityHooks, filterHooks,
-  taskHooks, templateHooks, smimeHooks, vacationHooks,
+  taskHooks, templateHooks, vacationHooks,
   uiHooks, themeHooks, toastHooks, dragDropHooks,
   keyboardHooks, appLifecycleHooks, accountSecurityHooks,
   sidebarAppHooks, avatarHooks, renderHooks, routerHooks,
   messageListTabHooks,
-  removeAllPluginHooks, pluginErrorTracker,
+  removeAllPluginHooks, pluginErrorTracker, setHookTimeoutListener,
 } from '../plugin-hooks';
 import { useMessageListTabsStore } from '@/stores/message-list-tabs-store';
 import { verifyBundle } from './bundle-integrity';
 import { downloadManagedBundle } from './bundle-fetch';
-import { createBackgroundInstance } from './host-bridge';
+import { createBackgroundInstance, forEachInstance } from './host-bridge';
 import { resolvePluginTier } from './tier';
-import { register as registerActive, deregister as deregisterActive, all as allActiveEntries } from './registry';
+import { register as registerActive, deregister as deregisterActive, all as allActiveEntries, get as getActive } from './registry';
 import { cancelPluginDialogs } from './host-api';
 import { registerShortcuts } from './shortcuts';
-import { mayOfferSlot, mayRegisterHook } from './permissions';
+import { mayOfferSlot, mayRegisterHook, pluginHasPermission, slotPropsFor } from './permissions';
+import { clearPluginActions, setActionDispatcher } from './actions';
+import { clearDayLabels } from './day-labels';
+import { clearPluginPages } from './pages';
+import { clearSectionTitle } from './section-titles';
+import { cancelPluginProxyRequests } from './proxy-client';
+import { cancelConnectFor } from './connect-dialog';
+import type { SlotName } from '../plugin-types';
 
 // ─── Hook-bus lookup (one flat map for name → bus) ────────────
 
@@ -30,7 +37,7 @@ type AnyBus = { register: (pluginId: string, handler: (...args: unknown[]) => un
 const HOOK_BUSES: Record<string, AnyBus> = Object.assign({},
   emailHooks, calendarHooks, calendarFormHooks, contactHooks, fileHooks,
   authHooks, settingsHooks, identityHooks, filterHooks,
-  taskHooks, templateHooks, smimeHooks, vacationHooks,
+  taskHooks, templateHooks, vacationHooks,
   uiHooks, themeHooks, toastHooks, dragDropHooks,
   keyboardHooks, appLifecycleHooks, accountSecurityHooks,
   sidebarAppHooks, avatarHooks, renderHooks, routerHooks,
@@ -39,7 +46,11 @@ const HOOK_BUSES: Record<string, AnyBus> = Object.assign({},
 
 // ─── Store accessor (status updates flow through the existing store) ──
 
-type StoreAccessor = { setPluginStatus: (id: string, status: InstalledPlugin['status'], error?: string) => void };
+type StoreAccessor = {
+  setPluginStatus: (id: string, status: InstalledPlugin['status'], error?: string) => void;
+  /** Turn a failing plugin off for good (until the user turns it on again). */
+  markAutoDisabled?: (id: string) => void;
+};
 let storeAccessor: StoreAccessor | null = null;
 export function setSandboxStoreAccessor(a: StoreAccessor): void { storeAccessor = a; }
 
@@ -51,12 +62,17 @@ export function setSandboxLocale(locale: string): void {
   // good locale back to '' - the initial 'en' default stands until the real
   // locale arrives via the store subscription.
   if (!locale) return;
+  const changed = locale !== currentLocale;
   currentLocale = locale;
   // Background instances read `currentLocale` at load time; the slot-iframe
   // component reads this global at spawn time (plugin-iframe-slot.tsx). Keep
-  // both in step from one place. Already-running instances are not re-pushed,
-  // so a locale switch only affects plugins/slots loaded afterwards.
+  // both in step from one place.
   (globalThis as unknown as { __APP_LOCALE__?: string }).__APP_LOCALE__ = locale;
+  if (!changed) return;
+  // Running plugins switch too: their slots re-render in the new language
+  // and their onLocaleChange handlers run.
+  forEachInstance(null, (instance) => instance.setLocale(locale));
+  void themeHooks.onLocaleChange.emit({ locale });
 }
 
 // ─── Bundle fetch ─────────────────────────────────────────────
@@ -100,7 +116,9 @@ async function getBundleCode(plugin: InstalledPlugin): Promise<string> {
     throw new Error(`No bundle in storage for plugin "${plugin.id}". Reinstall to populate.`);
   }
 
-  const code = await downloadManagedBundle(plugin.id, plugin.bundleHash);
+  const code = await downloadManagedBundle(plugin.id, plugin.bundleHash, {
+    requireSignature: plugin.tier === 'privileged',
+  });
   await verifyBundle(code, plugin.bundleHash);
   try {
     await pluginStorage.saveCode(plugin.id, code);
@@ -131,8 +149,24 @@ function withTimeout<T>(promise: Promise<T>, ms: number, label: string): Promise
   });
 }
 
-export async function loadSandboxedPlugin(plugin: InstalledPlugin): Promise<void> {
-  if (typeof window === 'undefined') return;
+const loading = new Map<string, Promise<void>>();
+
+/**
+ * Start a plugin. Calling it again for a plugin that is running or still
+ * starting does nothing: start-up and a force-enable sync used to both load
+ * a plugin, leaving two background iframes whose hooks all fired twice.
+ */
+export function loadSandboxedPlugin(plugin: InstalledPlugin): Promise<void> {
+  if (typeof window === 'undefined') return Promise.resolve();
+  if (getActive(plugin.id)) return Promise.resolve();
+  const pending = loading.get(plugin.id);
+  if (pending) return pending;
+  const run = startSandboxedPlugin(plugin).finally(() => loading.delete(plugin.id));
+  loading.set(plugin.id, run);
+  return run;
+}
+
+async function startSandboxedPlugin(plugin: InstalledPlugin): Promise<void> {
 
   let background: ReturnType<typeof createBackgroundInstance> | null = null;
   try {
@@ -171,6 +205,9 @@ export async function loadSandboxedPlugin(plugin: InstalledPlugin): Promise<void
     const hookDisposables: Disposable[] = [];
     for (const hookName of info.hooks) {
       if (hookName.startsWith('shortcut:')) continue;
+      // Not a bus: the host calls it directly for clicks on this plugin's own
+      // actions (see setActionDispatcher below).
+      if (hookName === 'onAction') continue;
       const bus = HOOK_BUSES[hookName];
       if (!bus) {
         console.warn(`[plugin-sandbox] Plugin "${plugin.id}" registered unknown hook "${hookName}"`);
@@ -180,20 +217,22 @@ export async function loadSandboxedPlugin(plugin: InstalledPlugin): Promise<void
         console.warn(`[plugin-sandbox] Plugin "${plugin.id}" lacks the permission for hook "${hookName}"; not registered`);
         continue;
       }
-      const proxy = async (...args: unknown[]) => {
-        try {
-          return await bg.invokeHook(hookName, args);
-        } catch (err) {
-          pluginErrorTracker.record(plugin.id, err);
-          throw err;
-        }
-      };
+      // The bus records a failure once; recording it here too made the
+      // three-strikes breaker trip on the second error.
+      const proxy = (...args: unknown[]) => bg.invokeHook(hookName, args);
       hookDisposables.push(bus.register(plugin.id, proxy as (...a: unknown[]) => unknown));
     }
 
-    // Install plugin-declared keyboard shortcuts.
-    const shortcutDispose = registerShortcuts(bg, info.shortcuts ?? []);
-    hookDisposables.push({ dispose: shortcutDispose });
+    // Install plugin-declared keyboard shortcuts. A shortcut sees every
+    // key press outside text fields, so it needs ui:keyboard like the hooks.
+    if ((info.shortcuts ?? []).length > 0) {
+      if (pluginHasPermission(plugin, 'ui:keyboard')) {
+        const shortcutDispose = registerShortcuts(bg, info.shortcuts ?? []);
+        hookDisposables.push({ dispose: shortcutDispose });
+      } else {
+        console.warn(`[plugin-sandbox] Plugin "${plugin.id}" declares shortcuts without the ui:keyboard permission; not registered`);
+      }
+    }
 
     const slotOffers = info.slots.filter((offer) => {
       if (mayOfferSlot(plugin, offer.name)) return true;
@@ -224,6 +263,22 @@ export async function loadSandboxedPlugin(plugin: InstalledPlugin): Promise<void
   }
 }
 
+// ─── Action clicks ────────────────────────────────────────────
+
+// A click on a button a plugin declared (api.ui.setActions) goes to that
+// plugin's background instance as its `onAction` hook, with the surface's
+// context cut down to what the plugin may see.
+setActionDispatcher(async (pluginId, surface, actionId, context) => {
+  const entry = allActiveEntries().find((e) => e.plugin.id === pluginId);
+  if (!entry) return;
+  const visible = slotPropsFor(entry.plugin, surface as SlotName, context);
+  try {
+    await entry.background.invokeHook('onAction', [{ surface, actionId, context: visible }]);
+  } catch (err) {
+    pluginErrorTracker.record(pluginId, err);
+  }
+});
+
 // ─── Unload ───────────────────────────────────────────────────
 
 export function unloadSandboxedPlugin(pluginId: string): void {
@@ -236,6 +291,14 @@ export function unloadSandboxedPlugin(pluginId: string): void {
   // Drop any message-list category tabs the plugin registered so the strip
   // disappears (and the inbox unfilters) the moment the plugin is disabled.
   try { useMessageListTabsStore.getState().clearTabs(pluginId); } catch { /* ignore */ }
+  // Same for the buttons, day labels and pages it declared, and anything
+  // still running through the proxy for it.
+  clearPluginActions(pluginId);
+  clearDayLabels(pluginId);
+  clearPluginPages(pluginId);
+  clearSectionTitle(pluginId);
+  cancelPluginProxyRequests(pluginId);
+  cancelConnectFor(pluginId);
   try { entry.background.destroy(); } catch { /* ignore */ }
   cancelPluginDialogs(pluginId);
   pluginErrorTracker.reset(pluginId);
@@ -260,9 +323,15 @@ export function deactivateAllSandboxed(): void {
 // ─── Auto-disable ─────────────────────────────────────────────
 
 export function setupSandboxAutoDisable(): void {
+  setHookTimeoutListener((pluginId) => cancelPluginDialogs(pluginId));
   pluginErrorTracker.setAutoDisableCallback((pluginId) => {
     unloadSandboxedPlugin(pluginId);
-    storeAccessor?.setPluginStatus(pluginId, 'error', 'Auto-disabled due to repeated errors');
+    if (storeAccessor?.markAutoDisabled) storeAccessor.markAutoDisabled(pluginId);
+    else storeAccessor?.setPluginStatus(pluginId, 'error', 'auto-disabled');
+    // PluginDialogHost turns this into a toast in the user's language.
+    if (typeof window !== 'undefined') {
+      window.dispatchEvent(new CustomEvent('plugin:auto-disabled', { detail: { pluginId } }));
+    }
   });
 }
 
diff --git a/lib/plugin-sandbox/pages.ts b/lib/plugin-sandbox/pages.ts
new file mode 100644
index 000000000..fc375661c
--- /dev/null
+++ b/lib/plugin-sandbox/pages.ts
@@ -0,0 +1,82 @@
+// Full pages plugins add to the app (`api.ui.setPages`): each gets an entry
+// in the navigation rail and its own route, /apps/<pluginId>/<pageId>, where
+// the plugin's `app-page` slot fills the content area.
+
+export interface PluginPage {
+  id: string;
+  title: string;
+  /** Name of a host icon (see components/icons). */
+  icon?: string;
+}
+
+export interface RegisteredPage extends PluginPage {
+  pluginId: string;
+  pluginName: string;
+}
+
+export const MAX_PAGES_PER_PLUGIN = 3;
+const ID_RE = /^[a-z0-9][a-z0-9-]{0,31}$/;
+const ICON_RE = /^[A-Za-z0-9-]{1,40}$/;
+
+export function checkPages(value: unknown): PluginPage[] {
+  if (!Array.isArray(value)) throw new Error('pages must be a list');
+  if (value.length > MAX_PAGES_PER_PLUGIN) throw new Error(`At most ${MAX_PAGES_PER_PLUGIN} pages`);
+  const seen = new Set<string>();
+  return value.map((raw, i) => {
+    if (!raw || typeof raw !== 'object') throw new Error(`pages[${i}] must be an object`);
+    const p = raw as Record<string, unknown>;
+    if (typeof p.id !== 'string' || !ID_RE.test(p.id)) throw new Error(`pages[${i}].id must be lowercase letters, digits and hyphens`);
+    if (seen.has(p.id)) throw new Error(`pages[${i}].id is used twice`);
+    seen.add(p.id);
+    if (typeof p.title !== 'string' || !p.title.trim() || p.title.length > 40) throw new Error(`pages[${i}].title is required (max 40 characters)`);
+    const out: PluginPage = { id: p.id, title: p.title.trim() };
+    if (p.icon !== undefined) {
+      if (typeof p.icon !== 'string' || !ICON_RE.test(p.icon)) throw new Error(`pages[${i}].icon is invalid`);
+      out.icon = p.icon;
+    }
+    return out;
+  });
+}
+
+const byPlugin = new Map<string, RegisteredPage[]>();
+const listeners = new Set<() => void>();
+let snapshot: RegisteredPage[] | null = null;
+
+function changed(): void {
+  snapshot = null;
+  for (const l of listeners) {
+    try { l(); } catch { /* ignore */ }
+  }
+}
+
+export function subscribePages(listener: () => void): () => void {
+  listeners.add(listener);
+  return () => { listeners.delete(listener); };
+}
+
+export function setPluginPages(pluginId: string, pluginName: string, pages: PluginPage[]): void {
+  if (pages.length === 0) byPlugin.delete(pluginId);
+  else byPlugin.set(pluginId, pages.map((p) => ({ ...p, pluginId, pluginName })));
+  changed();
+}
+
+export function clearPluginPages(pluginId: string): void {
+  if (byPlugin.delete(pluginId)) changed();
+}
+
+/** Every page, plugins in install order. Stable between changes. */
+export function allPages(): RegisteredPage[] {
+  if (snapshot) return snapshot;
+  snapshot = [...byPlugin.values()].flat();
+  return snapshot;
+}
+
+export function findPage(pluginId: string, pageId: string): RegisteredPage | null {
+  return byPlugin.get(pluginId)?.find((p) => p.id === pageId) ?? null;
+}
+
+/** Test helper. */
+export function resetPages(): void {
+  byPlugin.clear();
+  changed();
+}
diff --git a/lib/plugin-sandbox/permission-text.ts b/lib/plugin-sandbox/permission-text.ts
new file mode 100644
index 000000000..c5c7fe0cd
--- /dev/null
+++ b/lib/plugin-sandbox/permission-text.ts
@@ -0,0 +1,45 @@
+// How permissions are shown to people: the consent dialog and the plugin list
+// in Settings. The text itself lives in the locale files under
+// `plugins.permissions.<key>.{title,body}`.
+
+import { ALL_PERMISSIONS, IMPLICIT_PERMISSIONS } from '../plugin-types';
+
+/**
+ * Permissions that let a plugin read or send mail content, change what is
+ * sent or shown, run with full access, or move data off the device. The
+ * consent dialog lists them first and marks them.
+ */
+export const HIGH_RISK_PERMISSIONS: ReadonlySet<string> = new Set([
+  'crypto:full',
+  // email.get reads any message in the account, not only the open one.
+  'email:read',
+  'email:send',
+  'email:raw-send',
+  'email:blob-read',
+  'email:blob-write',
+  'email:render-takeover',
+  'http:fetch',
+  'http:post',
+  'filters:write',
+  'http:proxy',
+  // A plugin can point the reply-to of a sender address elsewhere, so
+  // answers to the user's mail go to someone else.
+  'identity:write',
+  // The out-of-office reply goes out to everyone who writes, in the user's
+  // name, with whatever text the plugin set.
+  'vacation:write',
+]);
+
+/** Locale key segment for a permission: `email:read` → `email_read`. */
+export function permissionKey(perm: string): string {
+  return perm.replace(/[:-]/g, '_');
+}
+
+/** Permissions worth showing: known, not implicit, high-risk first. */
+export function visiblePermissions(perms: readonly string[]): string[] {
+  const known = new Set<string>(ALL_PERMISSIONS);
+  const implicit = new Set<string>(IMPLICIT_PERMISSIONS);
+  return [...new Set(perms)]
+    .filter((p) => known.has(p) && !implicit.has(p))
+    .sort((a, b) => Number(HIGH_RISK_PERMISSIONS.has(b)) - Number(HIGH_RISK_PERMISSIONS.has(a)));
+}
diff --git a/lib/plugin-sandbox/permissions.ts b/lib/plugin-sandbox/permissions.ts
index 1f298b51e..79a6c7620 100644
--- a/lib/plugin-sandbox/permissions.ts
+++ b/lib/plugin-sandbox/permissions.ts
@@ -1,5 +1,7 @@
 import type { InstalledPlugin, Permission, SlotName } from '../plugin-types';
 import { IMPLICIT_PERMISSIONS } from '../plugin-types';
+import { hookSpec } from '../plugin-hook-catalog';
+import { slotSpec } from '../plugin-slot-catalog';
 
 /**
  * Whether `plugin` may use `perm`: the manifest must declare it, and an
@@ -18,239 +20,14 @@ export function pluginHasPermission(plugin: InstalledPlugin, perm: Permission):
 
 // ─── Hooks ────────────────────────────────────────────────────
 
-/**
- * The permission each hook needs. A hook hands the plugin data (an opened
- * message, the outgoing mail) or lets it change what the host does with it,
- * so registering one is as much an API call as `email.get` and is gated the
- * same way. A hook missing from this table is refused.
- */
-const HOOK_PERMISSIONS: Record<string, Permission> = {
-  // Email: reading
-  onEmailOpen: 'email:read',
-  onEmailClose: 'email:read',
-  onEmailContentRender: 'email:read',
-  onThreadExpand: 'email:read',
-  onComposerOpen: 'email:read',
-  onAfterEmailSend: 'email:read',
-  onDraftAutoSave: 'email:read',
-  onAfterEmailDelete: 'email:read',
-  onAfterEmailMove: 'email:read',
-  onEmailArchive: 'email:read',
-  onEmailUnarchive: 'email:read',
-  onEmailReadStateChange: 'email:read',
-  onEmailStarToggle: 'email:read',
-  onEmailSpamToggle: 'email:read',
-  onEmailKeywordChange: 'email:read',
-  onMailboxChange: 'email:read',
-  onMailboxesRefresh: 'email:read',
-  onMailboxCreate: 'email:read',
-  onMailboxRename: 'email:read',
-  onMailboxDelete: 'email:read',
-  onMailboxEmpty: 'email:read',
-  onSearch: 'email:read',
-  onSearchResults: 'email:read',
-  onEmailSelectionChange: 'email:read',
-  onNewEmailReceived: 'email:read',
-  onPushConnectionChange: 'email:read',
-  onQuotaChange: 'email:read',
-  onMailtoIntercept: 'email:read',
-  onBeforeReply: 'email:read',
-  onBeforeReplyAll: 'email:read',
-  onBeforeForward: 'email:read',
-  onBeforeAttachmentUpload: 'email:read',
-  onAfterAttachmentUpload: 'email:read',
-  onAttachmentDownload: 'email:read',
-  onProvideSearchResults: 'email:read',
-  onDraftChange: 'email:read',
-  // Email: changing mail in the mailbox
-  onBeforeEmailDelete: 'email:write',
-  onBeforeEmailMove: 'email:write',
-  // Email: changing what is sent (recipients, body, drafts, the submission)
-  onBeforeCompose: 'email:send',
-  onBeforeEmailSend: 'email:send',
-  onTransformOutgoingEmail: 'email:send',
-  onComposeSend: 'email:send',
-  onBeforeDraftAutoSave: 'email:send',
-  onBeforeEditDraft: 'email:send',
-  onBuildQuoteHeader: 'email:send',
-  onRecipientChipsChange: 'email:send',
-  onBeforeComposeOpenToForwardAsAttachment: 'email:send',
-  onBeforeComposeOpenToReply: 'email:send',
-  onBeforeComposeOpenToReplyAll: 'email:send',
-  onBeforeComposeOpenToForward: 'email:send',
-  onBeforeBlobUpload: 'email:blob-write',
-  // Email: changing what is displayed
-  onEmailsFetched: 'email:render-takeover',
-  onAttachmentPreview: 'email:render-takeover',
-  onEmailListItemRender: 'email:render-takeover',
-  onRenderEmailBody: 'email:render-takeover',
-  // Email data reached through other surfaces
-  onAvatarResolve: 'email:read',
-  onDragStart: 'email:read',
-  onDragEnd: 'email:read',
-  onEmailDrop: 'email:read',
-  onTagDrop: 'email:read',
-  onBrowserNotification: 'email:read',
-  onNotificationClick: 'email:read',
-  onTextSelectionChange: 'email:read',
-  onBeforeEmailCategorize: 'email:read',
-  onEmailCategorize: 'email:read',
-
-  // Calendar
-  onCalendarEventOpen: 'calendar:read',
-  onAfterEventCreate: 'calendar:read',
-  onAfterEventUpdate: 'calendar:read',
-  onAfterEventDelete: 'calendar:read',
-  onEventRsvp: 'calendar:read',
-  onEventsImport: 'calendar:read',
-  onCalendarDateChange: 'calendar:read',
-  onCalendarViewChange: 'calendar:read',
-  onCalendarChange: 'calendar:read',
-  onCalendarVisibilityToggle: 'calendar:read',
-  onICalSubscriptionChange: 'calendar:read',
-  onCalendarAlert: 'calendar:read',
-  onCalendarAlertAcknowledge: 'calendar:read',
-  onCheckEventConflicts: 'calendar:read',
-  onCalendarEventFormOpen: 'calendar:read',
-  onBeforeEventCreate: 'calendar:write',
-  onBeforeEventUpdate: 'calendar:write',
-  onBeforeEventDelete: 'calendar:write',
-  onCalendarEventFormSave: 'calendar:write',
-
-  // Contacts
-  onContactOpen: 'contacts:read',
-  onAfterContactCreate: 'contacts:read',
-  onAfterContactUpdate: 'contacts:read',
-  onAfterContactDelete: 'contacts:read',
-  onContactsImport: 'contacts:read',
-  onContactSelectionChange: 'contacts:read',
-  onContactGroupChange: 'contacts:read',
-  onContactGroupMemberChange: 'contacts:read',
-  onContactMove: 'contacts:read',
-  onProvideRecipientSuggestions: 'contacts:read',
-  onBeforeContactCreate: 'contacts:write',
-  onBeforeContactUpdate: 'contacts:write',
-  onBeforeContactDelete: 'contacts:write',
-
-  // Files
-  onFileNavigate: 'files:read',
-  onAfterFileUpload: 'files:read',
-  onFileDownload: 'files:read',
-  onFileUploadCancel: 'files:read',
-  onDirectoryCreate: 'files:read',
-  onAfterFileDelete: 'files:read',
-  onFileRename: 'files:read',
-  onFileMove: 'files:read',
-  onFileCopy: 'files:read',
-  onFileDuplicate: 'files:read',
-  onFileFavoriteToggle: 'files:read',
-  onFileSelectionChange: 'files:read',
-  onFileUndo: 'files:read',
-  onBeforeFileUpload: 'files:write',
-  onBeforeFileDelete: 'files:write',
-  onBeforeFileRename: 'files:write',
-
-  // Sign-in state. Logout and account switches are lifecycle events every
-  // plugin needs to drop per-account state, so they stay implicit.
-  onLogin: 'auth:observe',
-  onAccountAdd: 'auth:observe',
-  onAccountRemove: 'auth:observe',
-  onTokenRefresh: 'auth:observe',
-  onAuthReady: 'auth:observe',
-  onBeforeLogout: 'app:lifecycle',
-  onAfterLogout: 'app:lifecycle',
-  onAccountSwitch: 'app:lifecycle',
-  // Carries the code of a plugin's own OAuth flow with a third party.
-  onOAuthCallback: 'http:fetch',
-
-  // Settings
-  onSettingChange: 'settings:read',
-  onSettingsExport: 'settings:read',
-  onSettingsReset: 'settings:read',
-  onSettingsSync: 'settings:read',
-  onKeywordChange: 'settings:read',
-  onTrustedSenderChange: 'settings:read',
-  onSettingsImport: 'settings:write',
-
-  // Identities
-  onIdentitiesLoaded: 'identity:read',
-  onIdentityCreate: 'identity:read',
-  onIdentityUpdate: 'identity:read',
-  onIdentityDelete: 'identity:read',
-  onIdentitySelect: 'identity:read',
-  onSignatureRender: 'identity:read',
-
-  // Filters
-  onFiltersLoaded: 'filters:read',
-  onFilterRuleChange: 'filters:read',
-  onFiltersSave: 'filters:read',
-  onSieveScriptChange: 'filters:read',
-  onSieveScriptGenerate: 'filters:write',
-
-  // Tasks, templates, S/MIME, vacation, account security
-  onTasksLoaded: 'tasks:read',
-  onTaskCreate: 'tasks:read',
-  onTaskUpdate: 'tasks:read',
-  onTaskDelete: 'tasks:read',
-  onTaskToggleComplete: 'tasks:read',
-  onTaskFilterChange: 'tasks:read',
-  onTemplateCreate: 'templates:read',
-  onTemplateUpdate: 'templates:read',
-  onTemplateDelete: 'templates:read',
-  onTemplateApply: 'templates:read',
-  onTemplatesImport: 'templates:read',
-  onTemplateRender: 'templates:read',
-  onSmimeKeyImport: 'smime:read',
-  onSmimeCertImport: 'smime:read',
-  onSmimeKeyStateChange: 'smime:read',
-  onSmimeDefaultsChange: 'smime:read',
-  onVacationLoaded: 'vacation:read',
-  onVacationUpdate: 'vacation:read',
-  onPasswordChange: 'security:read',
-  onTotpChange: 'security:read',
-  onAppPasswordChange: 'security:read',
-  onEncryptionChange: 'security:read',
-  onDisplayNameChange: 'security:read',
-
-  // UI and app state
-  onViewChange: 'ui:observe',
-  onSidebarToggle: 'ui:observe',
-  onSidebarCollapse: 'ui:observe',
-  onDeviceTypeChange: 'ui:observe',
-  onColumnResize: 'ui:observe',
-  onMobileBack: 'ui:observe',
-  onMobileViewSwitch: 'ui:observe',
-  onBeforeExternalLink: 'ui:observe',
-  onThemeChange: 'ui:observe',
-  onCustomThemeChange: 'ui:observe',
-  onLocaleChange: 'ui:observe',
-  onThemeBeforeApply: 'ui:observe',
-  onToastShow: 'ui:observe',
-  onToastDismiss: 'ui:observe',
-  onSidebarAppOpen: 'ui:observe',
-  onSidebarAppClose: 'ui:observe',
-  onSidebarAppChange: 'ui:observe',
-  onNavigate: 'ui:observe',
-  onRouteEnter: 'ui:observe',
-  onRouteLeave: 'ui:observe',
-  onTabsChange: 'ui:message-list-tabs',
-  onTabActivate: 'ui:message-list-tabs',
-  onTabCountsRefresh: 'ui:message-list-tabs',
-  onBeforeShortcut: 'ui:keyboard',
-  onAfterShortcut: 'ui:keyboard',
-  onAppReady: 'app:lifecycle',
-  onVisibilityChange: 'app:lifecycle',
-  onBeforeUnload: 'app:lifecycle',
-  onAppError: 'app:lifecycle',
-  onInterval: 'app:lifecycle',
-  onWindowFocus: 'app:lifecycle',
-  onWindowBlur: 'app:lifecycle',
-  onOnline: 'app:lifecycle',
-  onOffline: 'app:lifecycle',
-};
+// The permission each hook needs comes from the hook catalogue
+// (lib/plugin-hook-catalog.ts). A hook hands the plugin data (an opened
+// message, the outgoing mail) or lets it change what the host does with it,
+// so registering one is as much an API call as `email.get` and is gated the
+// same way. A hook missing from the catalogue is refused.
 
 export function hookPermission(hookName: string): Permission | null {
-  return Object.prototype.hasOwnProperty.call(HOOK_PERMISSIONS, hookName) ? HOOK_PERMISSIONS[hookName] : null;
+  return hookSpec(hookName)?.permission ?? null;
 }
 
 export function mayRegisterHook(plugin: InstalledPlugin, hookName: string): boolean {
@@ -260,37 +37,32 @@ export function mayRegisterHook(plugin: InstalledPlugin, hookName: string): bool
 
 // ─── Slots ────────────────────────────────────────────────────
 
-/**
- * Permissions that allow rendering into each slot (any one suffices). Slot
- * components receive the data of the surface they sit on (the open message,
- * the draft), so they are gated like hooks.
- */
-const SLOT_PERMISSIONS: Record<SlotName, readonly Permission[]> = {
-  'toolbar-actions': ['ui:toolbar'],
-  'app-top-banner': ['ui:app-top-banner'],
-  'email-banner': ['ui:email-banner'],
-  'email-footer': ['ui:email-footer'],
-  'composer-toolbar': ['ui:composer-toolbar'],
-  'composer-sidebar': ['ui:composer-sidebar'],
-  'composer-sidebar-right': ['ui:composer-sidebar'],
-  'composer-attachment-source': ['ui:composer-toolbar', 'ui:composer-sidebar'],
-  'sidebar-widget': ['ui:sidebar-widget'],
-  'email-detail-sidebar': ['ui:email-details'],
-  'email-details-section': ['ui:email-details'],
-  'settings-section': ['ui:settings-section'],
-  'context-menu-email': ['ui:context-menu'],
-  'navigation-rail-bottom': ['ui:navigation-rail'],
-  'calendar-event-actions': ['ui:calendar-action'],
-  'admin-plugin-page': ['ui:admin-page', 'admin:config'],
-  'contact-cryptokeys': ['ui:contact-cryptokeys'],
-  'attachment-actions': ['email:read'],
-  // Only shown inside a dialog the plugin opened through the host API.
-  'plugin-dialog': ['ui:observe'],
-};
+// Which permissions let a plugin use each slot, and which props (or click
+// context) it may see, come from the slot catalogue. A ui:* permission only
+// lets a plugin draw somewhere; the message, event, contact or account the
+// slot sits on is data, and stays behind the matching read permission. Props
+// not listed in the catalogue are dropped, so a new prop at a call site is
+// withheld until the catalogue names it.
+
+export function slotPropsFor(
+  plugin: InstalledPlugin,
+  slot: SlotName,
+  props: Record<string, unknown>,
+): Record<string, unknown> {
+  const allowed = slotSpec(slot)?.props;
+  if (allowed === '*') return props;
+  if (!allowed) return {};
+  const out: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(props)) {
+    if (!Object.prototype.hasOwnProperty.call(allowed, key)) continue;
+    const perm = allowed[key];
+    if (perm && !pluginHasPermission(plugin, perm)) continue;
+    out[key] = value;
+  }
+  return out;
+}
 
 export function mayOfferSlot(plugin: InstalledPlugin, slot: string): boolean {
-  const perms = Object.prototype.hasOwnProperty.call(SLOT_PERMISSIONS, slot)
-    ? SLOT_PERMISSIONS[slot as SlotName]
-    : null;
+  const perms = slotSpec(slot)?.permissions ?? null;
   return !!perms && perms.some((perm) => pluginHasPermission(plugin, perm));
 }
diff --git a/lib/plugin-sandbox/plugin-i18n.ts b/lib/plugin-sandbox/plugin-i18n.ts
new file mode 100644
index 000000000..b3d64d138
--- /dev/null
+++ b/lib/plugin-sandbox/plugin-i18n.ts
@@ -0,0 +1,47 @@
+// Translation lookup for plugin strings (api.i18n.t). Pure, so the runtime
+// inside the sandbox and the tests share it.
+
+import { getLocaleDirection } from '@/i18n/direction';
+
+export type LocaleTables = Record<string, Record<string, string>>;
+
+/** Text direction for a locale tag, `ar-EG` included. */
+export function textDirection(locale: string): 'ltr' | 'rtl' {
+  return getLocaleDirection((locale || 'en').split('-')[0].toLowerCase());
+}
+
+/**
+ * Locales to try for `locale`, most specific first: `de-CH` → `de-CH`, `de`,
+ * then `en`. Matching ignores case (`zh-tw` finds `zh-TW`).
+ */
+export function localeChain(locale: string): string[] {
+  const chain: string[] = [];
+  const parts = (locale || 'en').split('-');
+  for (let i = parts.length; i > 0; i--) chain.push(parts.slice(0, i).join('-'));
+  if (!chain.includes('en')) chain.push('en');
+  return chain;
+}
+
+function findTable(tables: LocaleTables, locale: string): Record<string, string> | undefined {
+  if (tables[locale]) return tables[locale];
+  const lower = locale.toLowerCase();
+  const key = Object.keys(tables).find((k) => k.toLowerCase() === lower);
+  return key ? tables[key] : undefined;
+}
+
+/** The text for `key`, or undefined when no table has it. */
+export function lookup(tables: LocaleTables, locale: string, key: string): string | undefined {
+  for (const loc of localeChain(locale)) {
+    const value = findTable(tables, loc)?.[key];
+    if (typeof value === 'string') return value;
+  }
+  return undefined;
+}
+
+/** Replace `{name}` placeholders. */
+export function interpolate(text: string, vars?: Record<string, string | number>): string {
+  if (!vars) return text;
+  let out = text;
+  for (const [k, v] of Object.entries(vars)) out = out.split('{' + k + '}').join(String(v));
+  return out;
+}
diff --git a/lib/plugin-sandbox/protocol.ts b/lib/plugin-sandbox/protocol.ts
index f24f7d5ac..fce78e31c 100644
--- a/lib/plugin-sandbox/protocol.ts
+++ b/lib/plugin-sandbox/protocol.ts
@@ -135,6 +135,8 @@ export interface HookResultMsg {
 export interface SlotResizeMsg {
   type: 'slot-resize';
   height: number;
+  /** Natural content width, sent by inline slots (see slot-layout.ts). */
+  width?: number;
 }
 
 export interface SlotShouldShowResultMsg {
@@ -177,6 +179,9 @@ export interface LocaleChangeMsg { type: 'locale-change'; locale: string; }
 /** Host → sandbox: the resolved theme changed; re-inject the slot's theme CSS. */
 export interface ThemeChangeMsg { type: 'theme-change'; theme: ThemeSnapshot; }
 
+/** Host → sandbox: the user changed this plugin's settings. */
+export interface SettingsChangeMsg { type: 'settings-change'; settings: Record<string, unknown>; }
+
 export interface PropsUpdateMsg { type: 'props-update'; props: Record<string, unknown>; }
 
 export interface SlotShouldShowMsg {
@@ -186,13 +191,24 @@ export interface SlotShouldShowMsg {
   context: unknown;
 }
 
+/** Host → sandbox: a piece of a streamed api.proxy.fetch response. */
+export interface StreamChunkMsg { type: 'stream-chunk'; streamId: string; chunk: ArrayBuffer; }
+/** Host → sandbox: a streamed response ended (error set when it broke off). */
+export interface StreamEndMsg { type: 'stream-end'; streamId: string; error?: string; }
+/** Host → sandbox: upload progress of an api.proxy.fetch request. */
+export interface StreamProgressMsg { type: 'stream-progress'; streamId: string; loaded: number; total: number; }
+
 export type HostToSandbox =
   | InitMsg
+  | StreamChunkMsg
+  | StreamEndMsg
+  | StreamProgressMsg
   | ApiResponseMsg
   | CallbackResponseMsg
   | HookInvokeMsg
   | LocaleChangeMsg
   | ThemeChangeMsg
+  | SettingsChangeMsg
   | PropsUpdateMsg
   | SlotShouldShowMsg;
 
diff --git a/lib/plugin-sandbox/proxy-client.ts b/lib/plugin-sandbox/proxy-client.ts
new file mode 100644
index 000000000..2afc4740a
--- /dev/null
+++ b/lib/plugin-sandbox/proxy-client.ts
@@ -0,0 +1,301 @@
+// Host side of `api.proxy`: a plugin's requests that need one of its
+// credentials go to /api/plugin-proxy, which adds the secret on the server.
+// Responses come back whole (text, JSON, bytes) or as a stream of chunks for
+// large downloads and AI answers; uploads report progress.
+
+import type { InstalledPlugin } from '../plugin-types';
+import { apiFetch, withBasePath } from '../browser-navigation';
+import { requestConnect, forgetCredentials, credentialOverview } from './connect-dialog';
+
+/** Where streamed chunks and upload progress go: the iframe that asked. */
+export interface StreamSink {
+  sendStream(msg:
+    | { type: 'stream-chunk'; streamId: string; chunk: ArrayBuffer }
+    | { type: 'stream-end'; streamId: string; error?: string }
+    | { type: 'stream-progress'; streamId: string; loaded: number; total: number }): void;
+}
+
+/** Largest response returned in one piece; bigger ones need responseType "stream". */
+export const MAX_PROXY_BUFFERED_BYTES = 25 * 1024 * 1024;
+/** Largest request body; matches MAX_PROXY_REQUEST_BYTES on the server. */
+export const MAX_PROXY_UPLOAD_BYTES = 100 * 1024 * 1024;
+export const MAX_STREAMS_PER_PLUGIN = 8;
+
+type ResponseType = 'text' | 'json' | 'arraybuffer' | 'stream';
+
+export interface ProxyInit {
+  method?: string;
+  headers?: Record<string, string>;
+  body?: string | ArrayBuffer | Uint8Array | Blob | null;
+  responseType?: ResponseType;
+  /** Set by the runtime: ties chunks and progress to this request. */
+  streamId?: string;
+  /** Store these JSON fields of the response as the credential (see the proxy route). */
+  capture?: { secret: string; username?: string };
+}
+
+export interface ProxyResult {
+  status: number;
+  ok: boolean;
+  headers: Record<string, string>;
+  body?: unknown;
+  /** Set when the proxy itself refused, e.g. "rate_limited", "wrong_origin". */
+  proxyError?: string;
+}
+
+const HEADER_NAME_RE = /^[A-Za-z0-9!#$%&'*+.^_`|~-]{1,64}$/;
+const STREAM_ID_RE = /^[a-z0-9]{6,40}$/;
+const running = new Map<string, Map<string, AbortController>>();
+
+function credentialSpec(plugin: InstalledPlugin, credentialId: unknown) {
+  if (typeof credentialId !== 'string') throw new Error('credentialId must be a string');
+  const spec = plugin.credentials?.[credentialId];
+  if (!spec) throw new Error(`The manifest declares no credential "${credentialId}"`);
+  return { id: credentialId, spec };
+}
+
+function checkInit(raw: unknown): ProxyInit {
+  if (raw === undefined || raw === null) return {};
+  if (typeof raw !== 'object') throw new Error('init must be an object');
+  const init = raw as Record<string, unknown>;
+  const out: ProxyInit = {};
+  if (init.method !== undefined) {
+    if (typeof init.method !== 'string' || !/^[A-Z]{3,10}$/i.test(init.method)) throw new Error('Invalid method');
+    out.method = init.method.toUpperCase();
+  }
+  if (init.headers !== undefined) {
+    if (!init.headers || typeof init.headers !== 'object') throw new Error('headers must be an object');
+    const entries = Object.entries(init.headers as Record<string, unknown>);
+    if (entries.length > 50) throw new Error('Too many headers');
+    out.headers = {};
+    for (const [name, value] of entries) {
+      if (!HEADER_NAME_RE.test(name) || typeof value !== 'string' || value.length > 8192 || /[\r\n]/.test(value)) {
+        throw new Error(`Invalid header "${name}"`);
+      }
+      out.headers[name] = value;
+    }
+  }
+  if (init.body !== undefined && init.body !== null) {
+    const b = init.body;
+    const size = typeof b === 'string' ? b.length : b instanceof Blob ? b.size : (b instanceof ArrayBuffer || ArrayBuffer.isView(b)) ? (b as ArrayBuffer).byteLength : -1;
+    if (size < 0) throw new Error('body must be a string, ArrayBuffer, Uint8Array or Blob');
+    if (size > MAX_PROXY_UPLOAD_BYTES) throw new Error(`body is larger than ${MAX_PROXY_UPLOAD_BYTES} bytes; upload it in chunks`);
+    out.body = b as ProxyInit['body'];
+  }
+  if (init.responseType !== undefined) {
+    if (!['text', 'json', 'arraybuffer', 'stream'].includes(init.responseType as string)) throw new Error('Invalid responseType');
+    out.responseType = init.responseType as ResponseType;
+  }
+  if (init.streamId !== undefined) {
+    if (typeof init.streamId !== 'string' || !STREAM_ID_RE.test(init.streamId)) throw new Error('Invalid streamId');
+    out.streamId = init.streamId;
+  }
+  if (init.capture !== undefined) {
+    const c = init.capture as Record<string, unknown>;
+    if (!c || typeof c.secret !== 'string' || (c.username !== undefined && typeof c.username !== 'string')) throw new Error('Invalid capture');
+    out.capture = { secret: c.secret, ...(typeof c.username === 'string' ? { username: c.username } : {}) };
+  }
+  return out;
+}
+
+function headersOf(res: { headers: Headers }): Record<string, string> {
+  const out: Record<string, string> = {};
+  res.headers.forEach((value, name) => { out[name] = value; });
+  return out;
+}
+
+async function readCapped(res: Response, limit: number): Promise<ArrayBuffer> {
+  const length = Number(res.headers.get('content-length') ?? '0');
+  if (length > limit) {
+    await res.body?.cancel().catch(() => {});
+    throw new Error(`Response is larger than ${limit} bytes; use responseType "stream"`);
+  }
+  if (!res.body) return new ArrayBuffer(0);
+  const reader = res.body.getReader();
+  const chunks: Uint8Array[] = [];
+  let total = 0;
+  for (;;) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    total += value.byteLength;
+    if (total > limit) {
+      await reader.cancel().catch(() => {});
+      throw new Error(`Response is larger than ${limit} bytes; use responseType "stream"`);
+    }
+    chunks.push(value);
+  }
+  const out = new Uint8Array(total);
+  let offset = 0;
+  for (const c of chunks) { out.set(c, offset); offset += c.byteLength; }
+  return out.buffer;
+}
+
+function track(pluginId: string, streamId: string, controller: AbortController): () => void {
+  let streams = running.get(pluginId);
+  if (!streams) {
+    streams = new Map();
+    running.set(pluginId, streams);
+  }
+  if (streams.size >= MAX_STREAMS_PER_PLUGIN) throw new Error(`At most ${MAX_STREAMS_PER_PLUGIN} proxy requests at once`);
+  streams.set(streamId, controller);
+  return () => {
+    streams!.delete(streamId);
+    if (streams!.size === 0) running.delete(pluginId);
+  };
+}
+
+/** Upload with progress reports; resolves with a fetch-like Response. */
+function sendWithProgress(url: string, method: string, headers: Record<string, string>, body: XMLHttpRequestBodyInit, signal: AbortSignal, onProgress: (loaded: number, total: number) => void): Promise<Response> {
+  return new Promise((resolve, reject) => {
+    const xhr = new XMLHttpRequest();
+    xhr.open('POST', url);
+    xhr.responseType = 'arraybuffer';
+    for (const [name, value] of Object.entries(headers)) xhr.setRequestHeader(name, value);
+    xhr.setRequestHeader('x-bulwark-method', method);
+    xhr.upload.onprogress = (e) => onProgress(e.loaded, e.lengthComputable ? e.total : 0);
+    xhr.onload = () => {
+      const h = new Headers();
+      for (const line of xhr.getAllResponseHeaders().trim().split(/[\r\n]+/)) {
+        const i = line.indexOf(':');
+        if (i > 0) h.append(line.slice(0, i).trim(), line.slice(i + 1).trim());
+      }
+      resolve(new Response(xhr.status === 204 || xhr.status === 304 ? null : xhr.response as ArrayBuffer, { status: xhr.status, headers: h }));
+    };
+    xhr.onerror = () => reject(new Error('Network error'));
+    xhr.onabort = () => reject(new DOMException('Aborted', 'AbortError'));
+    signal.addEventListener('abort', () => xhr.abort(), { once: true });
+    xhr.send(body);
+  });
+}
+
+/** `api.proxy.fetch(credentialId, url, init)`. */
+export async function proxyFetch(plugin: InstalledPlugin, args: unknown[], sink: StreamSink | null): Promise<ProxyResult> {
+  const { id: credentialId } = credentialSpec(plugin, args[0]);
+  if (typeof args[1] !== 'string' || args[1].length > 8192) throw new Error('url must be a string');
+  const target = args[1];
+  const init = checkInit(args[2]);
+  const method = init.method ?? (init.body ? 'POST' : 'GET');
+  const responseType = init.responseType ?? 'text';
+  const streamId = init.streamId ?? Math.random().toString(36).slice(2, 12);
+  if (init.capture && plugin.credentials?.[credentialId]?.scope !== 'user') throw new Error('capture needs a user credential');
+
+  const query = new URLSearchParams({ plugin: plugin.id, credential: credentialId, url: target });
+  const url = withBasePath(`/api/plugin-proxy?${query}`);
+  const headers: Record<string, string> = { ...(init.headers ?? {}) };
+  if (init.capture) headers['x-bulwark-capture'] = JSON.stringify(init.capture);
+
+  const controller = new AbortController();
+  const untrack = track(plugin.id, streamId, controller);
+  let streaming = false;
+  try {
+    let res: Response;
+    // XHR reports upload progress but can't stream the answer, so a request
+    // that wants a streamed answer (an AI reply) goes through fetch.
+    if (init.body && sink && responseType !== 'stream' && typeof XMLHttpRequest !== 'undefined') {
+      res = await sendWithProgress(url, method, headers, init.body as XMLHttpRequestBodyInit, controller.signal,
+        (loaded, total) => sink.sendStream({ type: 'stream-progress', streamId, loaded, total }));
+    } else {
+      res = await apiFetch(`/api/plugin-proxy?${query}`, {
+        method: 'POST',
+        headers: { ...headers, 'x-bulwark-method': method },
+        body: (init.body ?? undefined) as BodyInit | undefined,
+        signal: controller.signal,
+      });
+    }
+
+    const result: ProxyResult = { status: res.status, ok: res.ok, headers: headersOf(res) };
+    const proxyRefused = !!res.headers.get('x-bulwark-proxy-error');
+
+    if (responseType === 'stream' && sink && res.body && res.ok) {
+      streaming = true;
+      const reader = res.body.getReader();
+      void (async () => {
+        try {
+          for (;;) {
+            const { done, value } = await reader.read();
+            if (done) break;
+            const copy = value.slice().buffer;
+            sink.sendStream({ type: 'stream-chunk', streamId, chunk: copy });
+          }
+          sink.sendStream({ type: 'stream-end', streamId });
+        } catch (err) {
+          sink.sendStream({ type: 'stream-end', streamId, error: controller.signal.aborted ? 'cancelled' : (err as Error).message });
+        } finally {
+          untrack();
+        }
+      })();
+      return result;
+    }
+
+    const bytes = await readCapped(res, MAX_PROXY_BUFFERED_BYTES);
+    if (proxyRefused) {
+      result.proxyError = res.headers.get('x-bulwark-proxy-error') ?? 'refused';
+      try {
+        result.body = (JSON.parse(new TextDecoder().decode(bytes)) as { error?: string }).error ?? '';
+      } catch {
+        result.body = '';
+      }
+      return result;
+    }
+    if (responseType === 'arraybuffer') result.body = bytes;
+    else {
+      const text = new TextDecoder().decode(bytes);
+      if (responseType === 'json') {
+        try { result.body = text ? JSON.parse(text) : null; } catch { throw new Error(`Response is not JSON (HTTP ${res.status})`); }
+      } else {
+        result.body = text;
+      }
+    }
+    return result;
+  } finally {
+    if (!streaming) untrack();
+  }
+}
+
+/** `api.proxy.cancel(streamId)`: stop a running request or stream. */
+export function proxyCancel(plugin: InstalledPlugin, streamId: unknown): void {
+  if (typeof streamId !== 'string') return;
+  running.get(plugin.id)?.get(streamId)?.abort();
+}
+
+/** Stop everything a plugin has running (it was turned off). */
+export function cancelPluginProxyRequests(pluginId: string): void {
+  for (const controller of running.get(pluginId)?.values() ?? []) controller.abort();
+  running.delete(pluginId);
+}
+
+/** `api.proxy.connect(credentialId, { mode, server, username })`. */
+export async function proxyConnect(plugin: InstalledPlugin, args: unknown[]): Promise<{ connected: boolean; origin?: string }> {
+  const { id, spec } = credentialSpec(plugin, args[0]);
+  if (spec.scope !== 'user') throw new Error(`"${id}" is set up by the administrator`);
+  const opts = (args[1] && typeof args[1] === 'object' ? args[1] : {}) as Record<string, unknown>;
+  const mode = opts.mode === 'signin' ? 'signin' : 'password';
+  return requestConnect({
+    pluginId: plugin.id,
+    pluginName: plugin.name,
+    credentialId: id,
+    spec,
+    mode,
+    ...(typeof opts.server === 'string' && opts.server.length < 2048 ? { suggestedOrigin: opts.server } : {}),
+    ...(typeof opts.username === 'string' && opts.username.length < 256 ? { suggestedUsername: opts.username } : {}),
+  });
+}
+
+/**
+ * `api.proxy.accounts()`: the user's connected accounts (with server and
+ * user name) and, with `scope: 'admin'`, whether each admin credential is
+ * set up. No secrets, and no server address for admin credentials.
+ */
+export async function proxyAccounts(plugin: InstalledPlugin): Promise<{ credentialId: string; scope: 'user' | 'admin'; origin?: string; username?: string; connected: boolean }[]> {
+  const { credentials, admin } = await credentialOverview(plugin.id);
+  return [
+    ...credentials.map(({ credentialId, origin, username, connected }) => ({ credentialId, scope: 'user' as const, origin, ...(username ? { username } : {}), connected })),
+    ...admin.map(({ credentialId, configured }) => ({ credentialId, scope: 'admin' as const, connected: configured })),
+  ];
+}
+
+/** `api.proxy.disconnect(credentialId)`. */
+export async function proxyDisconnect(plugin: InstalledPlugin, args: unknown[]): Promise<boolean> {
+  const { id } = credentialSpec(plugin, args[0]);
+  return forgetCredentials(plugin.id, id);
+}
diff --git a/lib/plugin-sandbox/row-badges.ts b/lib/plugin-sandbox/row-badges.ts
new file mode 100644
index 000000000..af35949f5
--- /dev/null
+++ b/lib/plugin-sandbox/row-badges.ts
@@ -0,0 +1,36 @@
+// Plugins' row badges (onEmailListItemRender) are cached per message and
+// keyword state. A plugin whose answer changed for another reason (a task
+// was created elsewhere) asks for a refresh with api.ui.refreshRowBadges().
+
+let generation = 0;
+let lastRefresh = 0;
+const listeners = new Set<() => void>();
+
+/** How often a refresh may happen. */
+export const ROW_BADGE_REFRESH_INTERVAL_MS = 1000;
+
+export function rowBadgeGeneration(): number {
+  return generation;
+}
+
+export function subscribeRowBadges(listener: () => void): () => void {
+  listeners.add(listener);
+  return () => { listeners.delete(listener); };
+}
+
+/** Ask every visible row again. At most once a second; extra calls are dropped. */
+export function refreshRowBadges(now = Date.now()): boolean {
+  if (now - lastRefresh < ROW_BADGE_REFRESH_INTERVAL_MS) return false;
+  lastRefresh = now;
+  generation += 1;
+  for (const l of listeners) {
+    try { l(); } catch { /* ignore */ }
+  }
+  return true;
+}
+
+/** Test helper. */
+export function resetRowBadgeRefresh(): void {
+  generation = 0;
+  lastRefresh = 0;
+}
diff --git a/lib/plugin-sandbox/runtime.tsx b/lib/plugin-sandbox/runtime.tsx
index cd377451e..80d1641d6 100644
--- a/lib/plugin-sandbox/runtime.tsx
+++ b/lib/plugin-sandbox/runtime.tsx
@@ -28,7 +28,14 @@ import type {
   SlotInit,
 } from './protocol';
 import { themeSnapshotToCSS, type ThemeSnapshot } from './host-theme';
-import type { SlotName } from '../plugin-types';
+import { pluginUiKit, SlotPropsContext } from './ui-kit';
+import { interpolate, lookup, textDirection, type LocaleTables } from './plugin-i18n';
+import { isInlineSlot, MAX_INLINE_SLOT_WIDTH } from './slot-layout';
+import type {
+  CalendarEventInput, CalendarEventView, CalendarView, ComposeInput, DraftInput, EmailReadView,
+  EmailSummary, IdentityPatch, IdentityView, MailboxView, NotificationInput, SlotName, TaskInput,
+  TaskView, TemplateInput, TemplateView, VacationInput, VacationView,
+} from '../plugin-types';
 import { AddressBook, ContactCard } from '../jmap/types';
 import { EncryptionAtRestConfig, PublicKeyInput } from '@/stores/account-security-store';
 
@@ -62,6 +69,35 @@ let bootDone = false;
 let readyPosted = false;
 
 const pendingApi = new Map<string, { resolve: (v: unknown) => void; reject: (err: Error) => void }>();
+
+// The plugin's settings. One object for the iframe's lifetime, updated in
+// place on 'settings-change', so code that kept a reference sees new values.
+const settingsState: Record<string, unknown> = {};
+
+// The app language, pushed by the host on init and on every change.
+const localeListeners = new Set<(locale: string) => void>();
+function currentLocale(): string {
+  return (globalThis as unknown as { __PLUGIN_LOCALE__?: string }).__PLUGIN_LOCALE__ || 'en';
+}
+function applyLocale(locale: string): void {
+  (globalThis as unknown as { __PLUGIN_LOCALE__?: string }).__PLUGIN_LOCALE__ = locale;
+  document.documentElement.lang = locale;
+  // Slots sit inside an RTL page in Arabic, Hebrew and Persian; their own
+  // document has to flip too.
+  document.documentElement.dir = textDirection(locale);
+  for (const listener of localeListeners) {
+    try { listener(locale); } catch (err) { console.error('[plugin] locale listener failed', err); }
+  }
+}
+const settingsListeners = new Set<(settings: Record<string, unknown>) => void>();
+
+function applySettings(next: Record<string, unknown>): void {
+  for (const key of Object.keys(settingsState)) delete settingsState[key];
+  Object.assign(settingsState, next);
+  for (const listener of settingsListeners) {
+    try { listener(settingsState); } catch (err) { console.error('[plugin] settings listener failed', err); }
+  }
+}
 const pendingCallbacks = new Map<string, { resolve: (v: unknown) => void; reject: (err: Error) => void }>();
 const hookHandlers: Record<string, (...args: unknown[]) => unknown> = {};
 
@@ -159,6 +195,61 @@ function callApi(method: string, args: unknown[], timeoutMs: number = DEFAULT_AP
   });
 }
 
+// ─── api.proxy streams ───────────────────────────────────────
+
+interface ProxyStream {
+  controller?: ReadableStreamDefaultController<Uint8Array>;
+  onProgress?: (loaded: number, total: number) => void;
+}
+const proxyStreams = new Map<string, ProxyStream>();
+
+interface ProxyFetchInit {
+  method?: string;
+  headers?: Record<string, string>;
+  body?: string | ArrayBuffer | Uint8Array | Blob | null;
+  /** "text" (default), "json", "arraybuffer", or "stream" for a ReadableStream body. */
+  responseType?: 'text' | 'json' | 'arraybuffer' | 'stream';
+  /** Upload progress, in bytes. */
+  onProgress?: (loaded: number, total: number) => void;
+  /** Store these JSON fields of the response as the credential instead of returning them. */
+  capture?: { secret: string; username?: string };
+  /** Stops the request (and a streamed body). */
+  signal?: AbortSignal;
+}
+
+async function proxyFetch(credentialId: string, url: string, init: ProxyFetchInit = {}): Promise<unknown> {
+  const streamId = uid().replace(/[^a-z0-9]/g, '').slice(0, 24);
+  const entry: ProxyStream = { onProgress: init.onProgress };
+  proxyStreams.set(streamId, entry);
+  const stream = init.responseType === 'stream'
+    ? new ReadableStream<Uint8Array>({
+        start(controller) { entry.controller = controller; },
+        cancel() {
+          proxyStreams.delete(streamId);
+          void callApi('proxy.cancel', [streamId]).catch(() => {});
+        },
+      })
+    : null;
+  const abort = () => {
+    void callApi('proxy.cancel', [streamId]).catch(() => {});
+    try { entry.controller?.error(new Error('cancelled')); } catch { /* closed */ }
+    proxyStreams.delete(streamId);
+  };
+  init.signal?.addEventListener('abort', abort, { once: true });
+  const { onProgress: _p, signal: _s, ...plain } = init;
+  void _p; void _s;
+  try {
+    // No overall timeout: a big upload or a long AI answer takes as long as
+    // it takes, and api.proxy.cancel / the signal stop it.
+    const res = await callApi('proxy.fetch', [credentialId, url, { ...plain, streamId }], 0) as Record<string, unknown>;
+    if (!stream || !res.ok) proxyStreams.delete(streamId);
+    return stream && res.ok ? { ...res, body: stream } : res;
+  } catch (err) {
+    proxyStreams.delete(streamId);
+    throw err;
+  }
+}
+
 function invokeHostCallback(callbackId: string, args: unknown[]): Promise<unknown> {
   const id = uid();
   return new Promise((resolve, reject) => {
@@ -215,11 +306,19 @@ interface PluginKeywordCounts {
 }
 
 function buildPluginApi(manifest: PluginManifest) {
+  applySettings({ ...manifest.settings });
+  const localeTables: LocaleTables = JSON.parse(JSON.stringify(manifest.locales ?? {}));
   return {
     plugin: {
       id: manifest.id,
       version: manifest.version,
-      settings: { ...manifest.settings },
+      /** Current settings, defaults filled in. Updated in place when the user changes them. */
+      settings: settingsState,
+      /** Called with the new settings whenever the user changes them. Returns an unsubscribe function. */
+      onSettingsChange: (listener: (settings: Record<string, unknown>) => void) => {
+        settingsListeners.add(listener);
+        return () => { settingsListeners.delete(listener); };
+      },
     },
     crypto: {
       getPublicKeys: () => callApi('crypto.getPublicKeys', []),
@@ -240,6 +339,8 @@ function buildPluginApi(manifest: PluginManifest) {
     user: {
       getAccounts: () => callApi('user.getAccounts', []),
       getIdentities: () => callApi('user.getIdentities', []),
+      /** The IANA time zone the app shows times in (the user's setting, else the browser's). */
+      getTimeZone: () => callApi('user.getTimeZone', []) as Promise<string>,
       logout: () => callApi('user.logout', []),
     },
     http: {
@@ -290,6 +391,7 @@ function buildPluginApi(manifest: PluginManifest) {
       /** Fetch a blob's raw bytes by id. Resolves to a Uint8Array. */
       fetchBlob: (blobId: string, opts?: { name?: string; type?: string, rangeHeader?: number }) =>
         callApi('jmap.fetchBlob', [blobId, opts]) as Promise<Uint8Array>,
+      /** Upload bytes to the mail server (email:blob-write); pass the blob id to a composer's onAttach. */
       uploadBlob: (content: Uint8Array, name: string, type: string) =>
         callApi('jmap.uploadBlob', [content, name, type]) as Promise<{ blobId: string; size: number; type: string; }>,
       /** Submit a fully-formed raw RFC822 message (already signed/encrypted). */
@@ -336,6 +438,41 @@ function buildPluginApi(manifest: PluginManifest) {
       get: (fileId:string) =>
         callApi('upfiles.get', [fileId]) as Promise<File>,
     },
+    // Notifications (permission: ui:notifications).
+    notifications: {
+      /**
+       * A system notification when the user allowed them for the webmail,
+       * otherwise a toast; either way it names this plugin. At most 5 a
+       * minute. Clicking a system notification brings the webmail to the
+       * front and fires this plugin's onNotificationClick hook with the tag.
+       * Resolves to 'system' or 'toast'.
+       */
+      show: (notification: NotificationInput) =>
+        callApi('notifications.show', [notification]) as Promise<'system' | 'toast'>,
+    },
+    // The message being written. `composerId` comes from the composer: the
+    // context of a click on a composer action, or a composer slot's props.
+    composer: {
+      /** The user's own text (no signature, no quote) as { html, text }. Needs compose:read. */
+      getBody: (composerId: string) =>
+        callApi('composer.getBody', [composerId]) as Promise<{ html: string; text: string }>,
+      /** The selection as { html, text, empty }. Needs compose:read. */
+      getSelection: (composerId: string) =>
+        callApi('composer.getSelection', [composerId]) as Promise<{ html: string; text: string; empty: boolean }>,
+      /**
+       * Replace the selection, or insert at the caret when nothing is
+       * selected; `{ below: true }` adds after the selection instead. One
+       * Ctrl+Z undoes it. Needs compose:write.
+       */
+      replaceSelection: (composerId: string, content: { text: string } | { html: string }, options?: { below?: boolean }) =>
+        callApi('composer.replaceSelection', [composerId, content, options]) as Promise<boolean>,
+      /** Replace the user's own text; the signature and the quote stay. Needs compose:write. */
+      replaceBody: (composerId: string, content: { text: string } | { html: string }) =>
+        callApi('composer.replaceBody', [composerId, content]) as Promise<boolean>,
+      /** Attach a blob from jmap.uploadBlob. Needs email:blob-write. */
+      attach: (composerId: string, file: { blobId: string; name: string; type?: string; size: number }) =>
+        callApi('composer.attach', [composerId, file]) as Promise<boolean>,
+    },
     toast: {
       success: (m: string) => { void callApi('toast.success', [m]); },
       error: (m: string) => { void callApi('toast.error', [m]); },
@@ -379,17 +516,123 @@ function buildPluginApi(manifest: PluginManifest) {
       openExternalUrl: (url: string, target?: string) =>
         callApi('ui.openExternalUrl', [url, target]) as Promise<void>,
       /** Downloads a file generated by the plugin. Not a user's file or attachment. */
-      downloadFile: (opts: { content: string; filename: string; contentType?: string }) =>
+      /** `content` is text, or the file's bytes (ArrayBuffer / Uint8Array). */
+      downloadFile: (opts: { content: string | ArrayBuffer | Uint8Array; filename: string; contentType?: string }) =>
         callApi('ui.downloadFile', [opts]) as Promise<void>,
+      /**
+       * Buttons or menu entries on an action surface (see the slot catalogue:
+       * message rows, the selection toolbar, attachment menus, the command
+       * palette, ...). Replaces what this plugin set there before; [] removes
+       * them. Clicks arrive in the `onAction({ surface, actionId, context })` hook.
+       */
+      setActions: (surface: string, actions: Array<{ id: string; label: string; icon?: string; order?: number; mailboxRoles?: string[]; mimeTypes?: string[]; danger?: boolean }>) =>
+        callApi('ui.setActions', [surface, actions]) as Promise<void>,
+      /**
+       * Ask every visible message row for its onEmailListItemRender badges
+       * again, e.g. after a task was created elsewhere. At most once a second.
+       */
+      refreshRowBadges: () => callApi('ui.refreshRowBadges', []) as Promise<void>,
+      /** Short labels and dots on calendar days. Replaces this plugin's earlier labels. */
+      setDayLabels: (labels: Array<{ date: string; text?: string; title?: string; dot?: boolean }>) =>
+        callApi('ui.setDayLabels', [labels]) as Promise<void>,
+      /** Full pages with a button in the navigation bar; the `app-page` slot renders them. */
+      setPages: (pages: Array<{ id: string; title: string; icon?: string }>) =>
+        callApi('ui.setPages', [pages]) as Promise<void>,
+      /**
+       * The header of this plugin's sidebar section (the host draws it like
+       * Folders and Tags), e.g. a translated "Upcoming birthdays". null goes
+       * back to the plugin's name. At most 40 characters.
+       */
+      setSectionTitle: (title: string | null) => callApi('ui.setSectionTitle', [title]) as Promise<void>,
     },
-    // Email keyword mutations (permission: email:write). Keywords follow JMAP
-    // syntax, e.g. '$category-promotions' or '$label:<tagId>'.
+    // Requests with an account or key the manifest declares under
+    // `credentials`; the server adds the secret (permission http:proxy).
+    proxy: {
+      fetch: proxyFetch,
+      /** Show the host's dialog to connect a user credential. */
+      connect: (credentialId: string, opts?: { mode?: 'password' | 'signin'; server?: string; username?: string }) =>
+        callApi('proxy.connect', [credentialId, opts ?? {}], 0) as Promise<{ connected: boolean; origin?: string }>,
+      /**
+       * Which credentials are ready: accounts the user connected (scope
+       * 'user', with server and user name) and the admin's (scope 'admin',
+       * connected = set up). No secrets.
+       */
+      accounts: () => callApi('proxy.accounts', []) as Promise<Array<{ credentialId: string; scope: 'user' | 'admin'; origin?: string; username?: string; connected: boolean }>>,
+      disconnect: (credentialId: string) => callApi('proxy.disconnect', [credentialId]) as Promise<boolean>,
+    },
+    // Reading mail (permission: email:read) and keyword mutations
+    // (permission: email:write). Keywords follow JMAP syntax, e.g.
+    // '$category-promotions' or '$label:<tagId>'.
     email: {
+      /**
+       * One message with its plain text, headers and source, or null when
+       * there is none with that id. Any message of the account, not only the
+       * open one.
+       */
+      get: (emailId: string) => callApi('email.get', [emailId]) as Promise<EmailReadView | null>,
+      /**
+       * Move messages (at most 100) into a folder of the account, like the
+       * user would; the move hooks run. 20 moves a minute. Needs email:write.
+       */
+      move: (emailIds: string[], mailboxId: string) => callApi('email.move', [emailIds, mailboxId]) as Promise<void>,
+      /** Move messages into the account's Archive folder. Needs email:write. */
+      archive: (emailIds: string[]) => callApi('email.archive', [emailIds]) as Promise<void>,
+      /**
+       * A page of a folder (or of all mail without mailboxId), in the user's
+       * list order: summaries without the body. limit 1-100 (default 50).
+       */
+      list: (options?: { mailboxId?: string; limit?: number; position?: number }) =>
+        callApi('email.list', [options]) as Promise<EmailSummary[]>,
+      /**
+       * The bytes of one attachment of a message (email:blob-read, at most
+       * 25 MB). `blobId` must be one of that message's attachments, e.g.
+       * from an `attachment-actions` slot or onAttachmentDownload.
+       */
+      getAttachment: (emailId: string, blobId: string) =>
+        callApi('email.getAttachment', [emailId, blobId], NETWORK_API_TIMEOUT_MS) as Promise<{
+          name: string; type: string; size: number; data: ArrayBuffer;
+        }>,
+      /** The full RFC 5322 source of a message, to save as .eml (email:blob-read, at most 25 MB). */
+      getRaw: (emailId: string) =>
+        callApi('email.getRaw', [emailId], NETWORK_API_TIMEOUT_MS) as Promise<ArrayBuffer>,
       setKeyword: (emailId: string, keyword: string, accountId?: string) =>
         callApi('email.setKeyword', [emailId, keyword, accountId]) as Promise<void>,
       removeKeyword: (emailId: string, keyword: string, accountId?: string) =>
         callApi('email.removeKeyword', [emailId, keyword, accountId]) as Promise<void>,
     },
+    // The composer (permission: compose:open). Opens it filled in; the user
+    // reviews the message and decides whether to send it.
+    compose: {
+      /**
+       * Open the composer with these fields. On the mail page it opens in
+       * place; anywhere else the app first goes to the mail page (the
+       * plugin is reloaded with it). Resolves to 'opened' or 'navigating'.
+       * At most 5 times a minute.
+       */
+      open: (message: ComposeInput) => callApi('compose.open', [message]) as Promise<'opened' | 'navigating'>,
+      /**
+       * Reply to the message open in the reader (`all` for reply to all),
+       * starting the reply with `text`. Only the open message; resolves to
+       * true when the composer opened. Shares compose.open's 5 a minute.
+       */
+      reply: (emailId: string, reply?: { text?: string; all?: boolean }) =>
+        callApi('compose.reply', [emailId, reply]) as Promise<boolean>,
+    },
+    // Drafts (permission: email:write).
+    drafts: {
+      /**
+       * Save a draft in the Drafts folder, from the user's default sender
+       * address, without opening the composer. Attachments are blobs the
+       * plugin uploaded with api.jmap.uploadBlob. Resolves to the draft's
+       * email id. At most 10 a minute.
+       */
+      create: (draft: DraftInput) => callApi('drafts.create', [draft]) as Promise<string>,
+    },
+    // Folders (permission: email:read).
+    mailboxes: {
+      /** Every folder with its role, parent and message counts. */
+      list: () => callApi('mailboxes.list', []) as Promise<MailboxView[]>,
+    },
     // Native sidebar tag definitions. Definition reads/writes use the existing
     // settings permissions; server discovery and message counts use email:read.
     // add() is intentionally append-only. reorder() requires a complete
@@ -448,6 +691,83 @@ function buildPluginApi(manifest: PluginManifest) {
       run: (query: unknown, options?: { label?: string }) =>
         callApi('search.run', [query, options]) as Promise<void>,
     },
+    // Calendar events (permissions: calendar:read / calendar:write). Writes
+    // go through the calendar the way the user's own edits do, so other
+    // plugins' hooks run and may stop them. Nothing here sends invitations,
+    // updates or cancellations to participants.
+    calendar: {
+      /** The user's calendars. */
+      listCalendars: () => callApi('calendar.listCalendars', []) as Promise<CalendarView[]>,
+      /**
+       * Events from `from` to `to` (at most 366 days; `2026-05-01`,
+       * `2026-05-01T09:00` or `...Z`), recurring events expanded into their
+       * occurrences, earliest first, at most 1000.
+       */
+      getEvents: (range: { from: string; to: string; calendarIds?: string[] }) =>
+        callApi('calendar.getEvents', [range]) as Promise<CalendarEventView[]>,
+      /** One event, or null when there is none with that id. */
+      getEvent: (id: string) => callApi('calendar.getEvent', [id]) as Promise<CalendarEventView | null>,
+      /** Resolves to the new event, or null when it was not created (a plugin stopped it or the server refused). */
+      createEvent: (event: CalendarEventInput) =>
+        callApi('calendar.createEvent', [event]) as Promise<CalendarEventView | null>,
+      /** Change the given fields; times are worked out against the event's current ones. */
+      updateEvent: (id: string, patch: Partial<CalendarEventInput>) =>
+        callApi('calendar.updateEvent', [id, patch]) as Promise<void>,
+      /** Delete an event, or one occurrence when given an occurrence's id. */
+      deleteEvent: (id: string) => callApi('calendar.deleteEvent', [id]) as Promise<void>,
+    },
+    // Tasks (permissions: tasks:read / tasks:write), through the task list
+    // the way the user's own edits go.
+    tasks: {
+      /** Open tasks, or every task with includeCompleted. At most 1000. */
+      list: (options?: { includeCompleted?: boolean }) => callApi('tasks.list', [options]) as Promise<TaskView[]>,
+      /** One task, or null. */
+      get: (id: string) => callApi('tasks.get', [id]) as Promise<TaskView | null>,
+      /** Resolves to the new task, or null when another plugin stopped it. */
+      create: (task: TaskInput) => callApi('tasks.create', [task]) as Promise<TaskView | null>,
+      /** Change the given fields. */
+      update: (id: string, patch: Partial<TaskInput>) => callApi('tasks.update', [id, patch]) as Promise<void>,
+      /** Mark a task done or not done. */
+      setComplete: (id: string, complete: boolean) => callApi('tasks.setComplete', [id, complete]) as Promise<void>,
+      delete: (id: string) => callApi('tasks.delete', [id]) as Promise<void>,
+    },
+    // Message templates (permissions: templates:read / templates:write).
+    // They live with the user's settings and sync across devices.
+    templates: {
+      list: () => callApi('templates.list', []) as Promise<TemplateView[]>,
+      /** One template, or null. */
+      get: (id: string) => callApi('templates.get', [id]) as Promise<TemplateView | null>,
+      /** At most 500 templates in all. An HTML body is sanitised. */
+      create: (template: TemplateInput) => callApi('templates.create', [template]) as Promise<TemplateView>,
+      update: (id: string, patch: Partial<TemplateInput>) =>
+        callApi('templates.update', [id, patch]) as Promise<TemplateView>,
+      delete: (id: string) => callApi('templates.delete', [id]) as Promise<void>,
+    },
+    // Sender identities. Read them with api.user.getIdentities()
+    // (identity:read); change one with identity:write.
+    identities: {
+      /**
+       * Change the name, reply-to addresses or signatures of one identity.
+       * The address can't be changed. An HTML signature is sanitised like
+       * one typed into Settings. Resolves to the identity as changed, or null
+       * when an onBeforeIdentityChange handler stopped it.
+       */
+      update: (id: string, patch: IdentityPatch) =>
+        callApi('identities.update', [id, patch]) as Promise<IdentityView | null>,
+    },
+    // Out-of-office reply (permissions: vacation:read / vacation:write).
+    vacation: {
+      get: () => callApi('vacation.get', []) as Promise<VacationView>,
+      /** Resolves to the reply as saved, or null when another plugin stopped the change. */
+      set: (vacation: VacationInput) => callApi('vacation.set', [vacation]) as Promise<VacationView | null>,
+    },
+    // OAuth with a third party (permission: http:fetch). Put createState()'s
+    // value in the authorize URL; the code comes back through the
+    // onOAuthCallback hook, to this plugin only.
+    oauth: {
+      createState: () => callApi('oauth.createState', []) as Promise<string>,
+      getRedirectUri: () => callApi('oauth.getRedirectUri', []) as Promise<string>,
+    },
     // Sieve integration for delivery-time classification (permissions:
     // filters:read / filters:write). Plugins never write scripts directly -
     // they register an onSieveScriptGenerate transform hook and call
@@ -461,6 +781,14 @@ function buildPluginApi(manifest: PluginManifest) {
       /** Rebuild + re-upload the active script, running onSieveScriptGenerate. */
       regenerate: () => callApi('sieve.regenerate', []) as Promise<void>,
     },
+    /**
+     * The admin's settings for this plugin (configSchema) that aren't secrets,
+     * e.g. a server address. No permission needed; `type: "secret"` fields
+     * are never included. Use credentials for secrets.
+     */
+    config: {
+      get: () => callApi('plugin.getConfig', []) as Promise<Record<string, unknown>>,
+    },
     admin: {
       getConfig: (key: string) => callApi('admin.getConfig', [key]),
       getAllConfig: () => callApi('admin.getAllConfig', []),
@@ -475,22 +803,27 @@ function buildPluginApi(manifest: PluginManifest) {
     },
     // Localization for plugins. The host pushes the active locale (init +
     // 'locale-change'); `t` resolves a key against the plugin's declared
-    // `locales` map (manifest.locales), falling back to English then the key
-    // itself, with optional {placeholder} interpolation.
+    // `locales` map (manifest.locales) plus anything added at runtime,
+    // trying `de-CH`, then `de`, then English, then the key itself, with
+    // optional {placeholder} interpolation.
     i18n: {
       get locale(): string {
-        return (globalThis as unknown as { __PLUGIN_LOCALE__?: string }).__PLUGIN_LOCALE__ || 'en';
+        return currentLocale();
       },
+      getLocale: () => currentLocale(),
       t(key: string, vars?: Record<string, string | number>): string {
-        const loc = (globalThis as unknown as { __PLUGIN_LOCALE__?: string }).__PLUGIN_LOCALE__ || 'en';
-        const tables = manifest.locales || {};
-        let out = tables[loc]?.[key] ?? tables['en']?.[key] ?? key;
-        if (vars) {
-          for (const [k, v] of Object.entries(vars)) {
-            out = out.split('{' + k + '}').join(String(v));
-          }
-        }
-        return out;
+        return interpolate(lookup(localeTables, currentLocale(), key) ?? key, vars);
+      },
+      /** Whether any table has `key`, for `has(k) ? t(k) : fallback`. */
+      has: (key: string) => lookup(localeTables, currentLocale(), key) !== undefined,
+      /** Add or override strings for one locale. */
+      addTranslations(locale: string, strings: Record<string, string>): void {
+        localeTables[locale] = { ...(localeTables[locale] ?? {}), ...strings };
+      },
+      /** Called with the new locale when the user switches language. Returns an unsubscribe function. */
+      onLocaleChange: (listener: (locale: string) => void) => {
+        localeListeners.add(listener);
+        return () => { localeListeners.delete(listener); };
       },
     },
   };
@@ -507,7 +840,7 @@ function buildPluginApi(manifest: PluginManifest) {
  * The host injects the per-plugin API as `@plugin-host`, so plugin code can
  * `const api = require('@plugin-host')` in both background and slot modes.
  */
-function makePluginRequire(api: ReturnType<typeof buildPluginApi> | null): (name: string) => unknown {
+export function makePluginRequire(api: ReturnType<typeof buildPluginApi> | null): (name: string) => unknown {
   const known: Record<string, unknown> = {
     'react': React,
     'react-dom': ReactDOM,
@@ -516,6 +849,9 @@ function makePluginRequire(api: ReturnType<typeof buildPluginApi> | null): (name
     'react/jsx-dev-runtime': ReactJSXRuntime,
   };
   if (api) known['@plugin-host'] = api;
+  // The app's controls (lib/plugin-sandbox/ui-kit), so plugins draw the same
+  // buttons, fields and lists as the app without bundling their own.
+  known['@plugin-host/ui'] = pluginUiKit;
   return (name: string) => {
     if (Object.prototype.hasOwnProperty.call(known, name)) return known[name];
     throw new Error(`Plugin sandbox: module "${name}" is not available. Externalise it in your bundler or ship it bundled.`);
@@ -620,6 +956,7 @@ function bootSlot(payload: SlotInit): void {
 
   let currentProps = decodeCallbacks(payload.extraProps) as Record<string, unknown>;
   const Component = slotDef.component;
+  const inline = isInlineSlot(payload.slot);
 
   // A trivial pub/sub so host-pushed `props-update` messages re-render the
   // slot tree without tearing down the iframe.
@@ -634,26 +971,48 @@ function bootSlot(payload: SlotInit): void {
   const SlotShell = () => {
     const wrapRef = React.useRef<HTMLDivElement>(null);
     const [props, setProps] = React.useState(currentProps);
+    const [, setSettingsVersion] = React.useState(0);
     React.useEffect(() => {
       propsListeners.add(setProps);
       return () => { propsListeners.delete(setProps); };
     }, []);
+    // Re-render the slot when its settings change, so a component that reads
+    // api.plugin.settings while rendering shows the new values.
+    React.useEffect(() => {
+      const bump = () => setSettingsVersion((v) => v + 1);
+      settingsListeners.add(bump);
+      localeListeners.add(bump);
+      return () => {
+        settingsListeners.delete(bump);
+        localeListeners.delete(bump);
+      };
+    }, []);
     React.useEffect(() => {
       if (!wrapRef.current) return;
+      const el = wrapRef.current;
       let lastHeight = -1;
-      const ro = new ResizeObserver((entries) => {
-        for (const entry of entries) {
-          const h = Math.ceil(entry.contentRect.height);
-          if (h !== lastHeight) {
-            lastHeight = h;
-            sendToHost({ type: 'slot-resize', height: h });
-          }
+      let lastWidth = -1;
+      const ro = new ResizeObserver(() => {
+        const rect = el.getBoundingClientRect();
+        const h = Math.ceil(rect.height);
+        const w = inline ? Math.ceil(rect.width) : undefined;
+        if (h !== lastHeight || (w !== undefined && w !== lastWidth)) {
+          lastHeight = h;
+          if (w !== undefined) lastWidth = w;
+          sendToHost({ type: 'slot-resize', height: h, ...(w !== undefined ? { width: w } : {}) });
         }
       });
-      ro.observe(wrapRef.current);
+      ro.observe(el);
       return () => ro.disconnect();
     }, []);
-    return React.createElement('div', { ref: wrapRef }, React.createElement(Component, props));
+    // An inline slot is measured at its natural width (max-content), not the
+    // iframe's: in a toolbar row the iframe starts out narrow, and content
+    // that wraps to fit it reports a narrow width back, so it never grew.
+    const style = inline
+      ? { display: 'inline-block', width: 'max-content', maxWidth: MAX_INLINE_SLOT_WIDTH }
+      : undefined;
+    return React.createElement('div', { ref: wrapRef, style },
+      React.createElement(SlotPropsContext.Provider, { value: props }, React.createElement(Component, props)));
   };
 
   const reactRoot = ReactDOM.createRoot(rootEl);
@@ -670,7 +1029,7 @@ async function handleInit(payload: InitPayload): Promise<void> {
   mode = payload.mode;
   // Make the active locale available to plugin code (api.i18n) right away -
   // not only after the first 'locale-change' push.
-  (globalThis as unknown as { __PLUGIN_LOCALE__?: string }).__PLUGIN_LOCALE__ = payload.locale;
+  applyLocale(payload.locale);
   try {
     if (payload.mode === 'background') {
       await bootBackground(payload);
@@ -752,16 +1111,40 @@ function handleHostMessage(ev: MessageEvent): void {
     }
 
     case 'locale-change':
-      (globalThis as unknown as { __PLUGIN_LOCALE__?: string }).__PLUGIN_LOCALE__ = msg.locale;
+      applyLocale(msg.locale);
       break;
 
     case 'theme-change':
       applyHostTheme(msg.theme);
       break;
 
+    case 'settings-change':
+      applySettings(msg.settings ?? {});
+      break;
+
     case 'props-update':
       slotPropsUpdater?.(msg.props ?? {});
       break;
+
+    case 'stream-chunk': {
+      const entry = proxyStreams.get(msg.streamId);
+      try { entry?.controller?.enqueue(new Uint8Array(msg.chunk)); } catch { /* cancelled */ }
+      break;
+    }
+
+    case 'stream-end': {
+      const entry = proxyStreams.get(msg.streamId);
+      proxyStreams.delete(msg.streamId);
+      try {
+        if (msg.error) entry?.controller?.error(new Error(msg.error));
+        else entry?.controller?.close();
+      } catch { /* already closed */ }
+      break;
+    }
+
+    case 'stream-progress':
+      try { proxyStreams.get(msg.streamId)?.onProgress?.(msg.loaded, msg.total); } catch { /* plugin's own error */ }
+      break;
   }
 }
 
diff --git a/lib/plugin-sandbox/section-titles.ts b/lib/plugin-sandbox/section-titles.ts
new file mode 100644
index 000000000..35f210c3b
--- /dev/null
+++ b/lib/plugin-sandbox/section-titles.ts
@@ -0,0 +1,38 @@
+// Titles plugins give their sidebar section (api.ui.setSectionTitle). The
+// host draws the header itself, like Folders and Tags; without a title it
+// shows the plugin's name.
+
+export const MAX_SECTION_TITLE = 40;
+
+const titles = new Map<string, string>();
+const listeners = new Set<() => void>();
+
+function changed(): void {
+  for (const l of listeners) {
+    try { l(); } catch { /* ignore */ }
+  }
+}
+
+/** Check and store a title; throws with a message the plugin sees. */
+export function setSectionTitle(pluginId: string, value: unknown): void {
+  if (value !== null && typeof value !== 'string') throw new Error('ui.setSectionTitle: title must be a string or null');
+  // eslint-disable-next-line no-control-regex -- one line of text
+  const title = typeof value === 'string' ? value.replace(/[\u0000-\u001f\u007f]+/g, ' ').trim() : '';
+  if (title.length > MAX_SECTION_TITLE) throw new Error(`ui.setSectionTitle: at most ${MAX_SECTION_TITLE} characters`);
+  if (title) titles.set(pluginId, title);
+  else titles.delete(pluginId);
+  changed();
+}
+
+export function sectionTitle(pluginId: string): string | undefined {
+  return titles.get(pluginId);
+}
+
+export function clearSectionTitle(pluginId: string): void {
+  if (titles.delete(pluginId)) changed();
+}
+
+export function subscribeSectionTitles(listener: () => void): () => void {
+  listeners.add(listener);
+  return () => { listeners.delete(listener); };
+}
diff --git a/lib/plugin-sandbox/shortcuts.ts b/lib/plugin-sandbox/shortcuts.ts
index 1b1408270..a75d48dc0 100644
--- a/lib/plugin-sandbox/shortcuts.ts
+++ b/lib/plugin-sandbox/shortcuts.ts
@@ -49,6 +49,31 @@ function normaliseCombo(combo: string): NormalisedCombo | null {
   return { ctrl, shift, alt, meta, key };
 }
 
+// Keys a plugin may never bind: the app and the browser need them.
+const RESERVED_KEYS = new Set(['escape', 'tab', 'enter', 'f1', 'f5', 'f11', 'f12', 'delete', 'backspace']);
+// Ctrl/Cmd+Shift chords browsers use (reopen tab, new private window,
+// devtools, …).
+const BROWSER_SHIFT_CHORDS = new Set(['t', 'n', 'w', 'q', 'i', 'j', 'c', 'r', 'p', 'b', 'o', 'delete', 'tab', 'enter', 'k']);
+
+/**
+ * Whether a plugin may bind this combo. The app uses bare keys (j, k, c, /,
+ * Shift+G…) and Escape, and browsers own plain Ctrl/Cmd chords, so a plugin
+ * needs Alt, Ctrl/Cmd+Shift or Ctrl/Cmd+Alt.
+ */
+export function isAllowedPluginCombo(keys: string): boolean {
+  const combo = normaliseCombo(keys);
+  if (!combo) return false;
+  if (RESERVED_KEYS.has(combo.key)) return false;
+  const primary = combo.ctrl || combo.meta;
+  if (combo.alt) return true;
+  if (primary && combo.shift) return !BROWSER_SHIFT_CHORDS.has(combo.key);
+  return false;
+}
+
+function comboId(combo: NormalisedCombo): string {
+  return `${combo.ctrl || combo.meta ? 'C' : ''}${combo.shift ? 'S' : ''}${combo.alt ? 'A' : ''}+${combo.key}`;
+}
+
 function eventMatches(ev: KeyboardEvent, combo: NormalisedCombo): boolean {
   if (combo.ctrl !== (ev.ctrlKey || ev.metaKey ? ev.ctrlKey : false)) {
     // Treat Ctrl and Cmd as equivalent: a binding declaring Ctrl matches a
@@ -60,7 +85,18 @@ function eventMatches(ev: KeyboardEvent, combo: NormalisedCombo): boolean {
   if (combo.shift !== ev.shiftKey) return false;
   if (combo.alt !== ev.altKey) return false;
   if (!combo.ctrl && combo.meta !== ev.metaKey) return false;
-  return ev.key.toLowerCase() === combo.key;
+  if (ev.key.toLowerCase() === combo.key) return true;
+  // With Alt held, macOS types another character (Alt+A is "å"): match the
+  // physical key for letters and digits.
+  if (/^[a-z]$/.test(combo.key)) return ev.code === `Key${combo.key.toUpperCase()}`;
+  if (/^[0-9]$/.test(combo.key)) return ev.code === `Digit${combo.key}`;
+  return false;
+}
+
+/** Whether a key event is the combo ("Ctrl+Shift+A"); Ctrl and Cmd count the same. */
+export function matchesCombo(keys: string, ev: Pick<KeyboardEvent, 'key' | 'code' | 'ctrlKey' | 'metaKey' | 'shiftKey' | 'altKey'>): boolean {
+  const combo = normaliseCombo(keys);
+  return !!combo && eventMatches(ev as KeyboardEvent, combo);
 }
 
 function onKeyDown(ev: KeyboardEvent): void {
@@ -70,8 +106,8 @@ function onKeyDown(ev: KeyboardEvent): void {
     const combo = normaliseCombo(binding.keys);
     if (!combo) continue;
     if (eventMatches(ev, combo)) {
+      // Not stopPropagation: the app's own listeners still see the key.
       ev.preventDefault();
-      ev.stopPropagation();
       void binding.invoke();
       return;
     }
@@ -90,8 +126,22 @@ export function registerShortcuts(
 ): () => void {
   ensureListener();
   const keys: string[] = [];
+  const taken = new Set([...bindings.values()].map((b) => {
+    const c = normaliseCombo(b.keys);
+    return c ? comboId(c) : '';
+  }));
   for (const sc of shortcuts) {
     const key = `${instance.pluginId}:${sc.id}`;
+    const combo = normaliseCombo(sc.keys);
+    if (!combo || !isAllowedPluginCombo(sc.keys)) {
+      console.warn(`[plugin-shortcuts] "${instance.pluginId}" may not bind ${sc.keys}; use Alt, Ctrl+Shift or Ctrl+Alt`);
+      continue;
+    }
+    if (taken.has(comboId(combo))) {
+      console.warn(`[plugin-shortcuts] ${sc.keys} is already used by another plugin; "${instance.pluginId}" does not get it`);
+      continue;
+    }
+    taken.add(comboId(combo));
     bindings.set(key, {
       pluginId: instance.pluginId,
       shortcutId: sc.id,
diff --git a/lib/plugin-sandbox/slot-layout.ts b/lib/plugin-sandbox/slot-layout.ts
new file mode 100644
index 000000000..1a33df38e
--- /dev/null
+++ b/lib/plugin-sandbox/slot-layout.ts
@@ -0,0 +1,39 @@
+// How slot iframes are sized. Shared by the host (which sizes the iframe)
+// and the sandbox runtime (which measures the plugin's content).
+
+import { SLOT_CATALOG, type SlotSpec } from '../plugin-slot-catalog';
+import type { SlotName } from '../plugin-types';
+
+/**
+ * Slots that sit in a row next to host controls (toolbars, attachment chips,
+ * the event form's action row). Their iframe takes the plugin content's own
+ * width; everything else fills the width of its container.
+ */
+export const INLINE_SLOTS: ReadonlySet<SlotName> = new Set<SlotName>(
+  (Object.entries(SLOT_CATALOG) as [SlotName, SlotSpec][])
+    .filter(([, spec]) => spec.kind === 'frame' && spec.inline)
+    .map(([name]) => name),
+);
+
+export function isInlineSlot(slot: SlotName | string | null | undefined): boolean {
+  return !!slot && INLINE_SLOTS.has(slot as SlotName);
+}
+
+/** Tallest a slot iframe gets; content past this scrolls inside it. */
+export const MAX_SLOT_HEIGHT = 2000;
+/** Widest an inline slot gets, so one plugin can't push the host's buttons off screen. */
+export const MAX_INLINE_SLOT_WIDTH = 480;
+
+function clamp(value: unknown, max: number): number | null {
+  if (typeof value !== 'number' || !Number.isFinite(value)) return null;
+  return Math.min(max, Math.max(0, Math.ceil(value)));
+}
+
+/** A reported height the host can use, or null for garbage (NaN, strings). */
+export function clampSlotHeight(height: unknown): number | null {
+  return clamp(height, MAX_SLOT_HEIGHT);
+}
+
+export function clampSlotWidth(width: unknown): number | null {
+  return clamp(width, MAX_INLINE_SLOT_WIDTH);
+}
diff --git a/lib/plugin-sandbox/tier.ts b/lib/plugin-sandbox/tier.ts
index 2861e2b91..1c92777fc 100644
--- a/lib/plugin-sandbox/tier.ts
+++ b/lib/plugin-sandbox/tier.ts
@@ -23,14 +23,10 @@ export type TierResolution =
  *
  * Privileged tier gates (ALL required):
  *  1. Manifest declares the umbrella high-risk permission `crypto:full`.
- *  2. Signed bundle: only bundles delivered through the admin/server channel
- *     are Ed25519-signed (verified at download time — see `verifySignature`
- *     usage in the plugin store). Self-uploaded bundles are unsigned and can
- *     therefore never reach the privileged tier. `managed` is the signal that
- *     the bundle came through that signed channel.
- *  3. Admin approval pins operator trust in this specific bundle.
- *  4. Explicit high-risk consent for `crypto:full` (granted via the consent
- *     dialog at enable time; admin-managed plugins are pre-approved).
+ *  2. An admin installed it (`managed`). Admin installs are the operator's
+ *     decision, so there is no separate approval or per-user consent step.
+ *  3. Its bundle verifies against the signature made at install time; the
+ *     download refuses an unsigned or mis-signed privileged bundle.
  */
 export function resolvePluginTier(plugin: InstalledPlugin): TierResolution {
   if (plugin.tier !== 'privileged') {
@@ -42,23 +38,14 @@ export function resolvePluginTier(plugin: InstalledPlugin): TierResolution {
     return { tier: null, error: 'Privileged tier requires the "crypto:full" permission' };
   }
 
-  // 2 + 3. Trust root: signed (managed) bundle AND admin approval. A bundle
-  // uploaded by the user directly carries no signature, so it cannot be
-  // privileged regardless of what its manifest claims.
+  // 2. Only an admin can install a privileged plugin. A plugin the user
+  // uploaded is never privileged, whatever its manifest claims; installing
+  // over an admin plugin's id is refused (see installPlugin). The bundle
+  // itself must carry the signature made at admin install time, which the
+  // bundle download checks for privileged plugins (downloadManagedBundle).
   if (!plugin.managed) {
     return { tier: null, error: 'Privileged tier requires a signed bundle delivered through the admin channel' };
   }
-  if (!(plugin.adminApproved || plugin.managed)) {
-    return { tier: null, error: 'Privileged tier requires administrator approval' };
-  }
-
-  // 4. Explicit high-risk consent. Admin-managed plugins are pre-approved by
-  // the operator and skip the per-user prompt (mirrors the existing consent
-  // gate in the plugin store); otherwise the user must have granted crypto:full.
-  const consented = plugin.managed || (plugin.grantedPermissions ?? []).includes('crypto:full');
-  if (!consented) {
-    return { tier: null, error: 'Privileged tier requires explicit consent for "crypto:full"' };
-  }
 
   return { tier: 'privileged' };
 }
diff --git a/lib/plugin-sandbox/ui-kit/components.tsx b/lib/plugin-sandbox/ui-kit/components.tsx
new file mode 100644
index 000000000..61e18d663
--- /dev/null
+++ b/lib/plugin-sandbox/ui-kit/components.tsx
@@ -0,0 +1,873 @@
+'use client';
+
+// The plugin UI kit: the app's own controls, for plugin iframes. Plugins get
+// it as `require('@plugin-host/ui')`; the runtime hands over this module, so
+// a plugin bundle carries none of it and always matches the app it runs in.
+//
+// Every component is built from the same Tailwind classes as its
+// counterpart in the app (named in each comment), and
+// ui-kit.test.tsx checks that those classes are still the app's. The CSS
+// comes from app/(sandbox)/plugin-kit.css, which scans this folder only, so
+// classes must be written out in full here (no string building).
+//
+// Each component's root carries `bk`, which scopes the CSS reset to kit
+// elements: a plugin's own markup keeps the browser defaults it was written
+// against.
+
+import * as React from 'react';
+import { cn } from '@/lib/utils';
+import { Button as AppButton } from '@/components/ui/button';
+import { Input as AppInput } from '@/components/ui/input';
+import { getFileIconByName, getFolderIcon } from '@/components/files/file-icons';
+import { iconForName } from '@/components/icons/named';
+import { Check, ChevronRight, Loader2, Puzzle, Search, X } from '@/components/icons';
+
+type Children = { children?: React.ReactNode };
+type Tone = 'neutral' | 'info' | 'success' | 'warning' | 'danger' | 'primary';
+
+// ─── Icons ─────────────────────────────────────────────────────
+
+/** An app icon by name (the names api.ui.setActions takes). Unknown names show a puzzle piece. */
+export function Icon({ name, size = 'md', className }: { name?: string; size?: 'xs' | 'sm' | 'md' | 'lg'; className?: string }) {
+  const Glyph = (name ? iconForName(name) : null) ?? Puzzle;
+  const sizeClass = { xs: 'w-3 h-3', sm: 'w-3.5 h-3.5', md: 'w-4 h-4', lg: 'w-5 h-5' }[size];
+  return <Glyph className={cn('bk flex-shrink-0', sizeClass, className)} aria-hidden="true" />;
+}
+
+/** The Files app's icon for a file name (by extension), or its folder icon. */
+export function FileIcon({ name = '', folder = false, size = 'sm' }: { name?: string; folder?: boolean; size?: 'sm' | 'md' | 'lg' }) {
+  return <span className="bk inline-flex flex-shrink-0" aria-hidden="true">{folder ? getFolderIcon(size) : getFileIconByName(name, size)}</span>;
+}
+
+/** Loader2 with animate-spin, as everywhere in the app. */
+export function Spinner({ size = 'md', label }: { size?: 'sm' | 'md' | 'lg'; label?: string }) {
+  const sizeClass = { sm: 'w-3.5 h-3.5', md: 'w-4 h-4', lg: 'w-6 h-6' }[size];
+  return (
+    <span className="bk inline-flex items-center gap-2 text-sm text-muted-foreground" role="status">
+      <Loader2 className={cn(sizeClass, 'animate-spin')} aria-hidden="true" />
+      {label ? <span>{label}</span> : <span className="sr-only">…</span>}
+    </span>
+  );
+}
+
+/** A spinner in the middle of a page or panel (plugin-page-app's loading state). */
+export function Loading({ label }: { label?: string }) {
+  return (
+    <div className="bk flex items-center justify-center py-12">
+      <Spinner size="lg" label={label} />
+    </div>
+  );
+}
+
+// ─── Buttons ───────────────────────────────────────────────────
+
+export interface KitButtonProps extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'children'> {
+  /** primary = the app's default button, secondary = outline. */
+  variant?: 'primary' | 'secondary' | 'ghost' | 'destructive';
+  size?: 'sm' | 'md' | 'icon';
+  icon?: string;
+  /** Shows a spinner and disables the button. */
+  busy?: boolean;
+  children?: React.ReactNode;
+}
+
+const BUTTON_VARIANT = { primary: 'default', secondary: 'outline', ghost: 'ghost', destructive: 'destructive' } as const;
+
+/** components/ui/button.tsx itself. */
+export const Button = React.forwardRef<HTMLButtonElement, KitButtonProps>(function Button(
+  { variant = 'primary', size = 'md', icon, busy = false, disabled, className, children, type = 'button', ...rest },
+  ref,
+) {
+  return (
+    <AppButton
+      ref={ref}
+      type={type}
+      variant={BUTTON_VARIANT[variant] ?? 'default'}
+      size={size}
+      disabled={disabled || busy}
+      aria-busy={busy || undefined}
+      className={cn('bk gap-1.5', size !== 'icon' && size !== 'sm' && 'text-sm', className)}
+      {...rest}
+    >
+      {busy ? <Loader2 className="w-4 h-4 animate-spin" aria-hidden="true" /> : icon ? <Icon name={icon} /> : null}
+      {children}
+    </AppButton>
+  );
+});
+
+/** A text link styled like the app's inline links ("Add condition"). */
+export function LinkButton({ icon, children, className, ...rest }: React.ButtonHTMLAttributes<HTMLButtonElement> & { icon?: string }) {
+  return (
+    <button type="button" className={cn('bk inline-flex items-center gap-1 text-sm text-primary hover:underline disabled:opacity-50 disabled:pointer-events-none', className)} {...rest}>
+      {icon && <Icon name={icon} size="sm" />}
+      {children}
+    </button>
+  );
+}
+
+/** An external link: opens in a new tab. */
+export function Link({ href, children, className }: { href: string; className?: string } & Children) {
+  return (
+    <a href={href} target="_blank" rel="noopener noreferrer" className={cn('bk text-primary hover:underline underline-offset-2', className)}>
+      {children}
+    </a>
+  );
+}
+
+// ─── Form controls ─────────────────────────────────────────────
+
+/** components/ui/input.tsx itself. */
+export const Input = React.forwardRef<HTMLInputElement, React.InputHTMLAttributes<HTMLInputElement>>(function Input({ className, ...rest }, ref) {
+  return <AppInput ref={ref} className={cn('bk', className)} {...rest} />;
+});
+
+/** The textarea of the identity form (Input without the fixed height). */
+export const Textarea = React.forwardRef<HTMLTextAreaElement, React.TextareaHTMLAttributes<HTMLTextAreaElement>>(function Textarea({ className, ...rest }, ref) {
+  return (
+    <textarea
+      ref={ref}
+      className={cn('bk flex w-full rounded-md border border-input bg-background px-3 py-2 text-sm text-foreground transition-all duration-200 placeholder:text-muted-foreground hover:border-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:border-ring disabled:cursor-not-allowed disabled:opacity-50', className)}
+      {...rest}
+    />
+  );
+});
+
+export interface KitSelectProps extends Omit<React.SelectHTMLAttributes<HTMLSelectElement>, 'onChange'> {
+  options?: { value: string; label: string; disabled?: boolean }[];
+  /** Called with the new value. */
+  onChange?: (value: string, event: React.ChangeEvent<HTMLSelectElement>) => void;
+  /** Stretch to the width of its container (forms); settings rows keep it narrow. */
+  block?: boolean;
+}
+
+/** The settings select (settings-section.tsx). */
+export function Select({ options, children, onChange, disabled, block = false, className, ...rest }: KitSelectProps) {
+  return (
+    <select
+      className={cn(
+        'bk px-3 py-1.5 text-sm rounded-md bg-muted border border-border text-foreground focus:outline-none focus:ring-2 focus:ring-ring transition-colors duration-150',
+        disabled ? 'opacity-60 cursor-not-allowed' : 'cursor-pointer hover:border-muted-foreground',
+        block && 'w-full',
+        className,
+      )}
+      disabled={disabled}
+      onChange={(e) => onChange?.(e.target.value, e)}
+      {...rest}
+    >
+      {options?.map((o) => <option key={o.value} value={o.value} disabled={o.disabled}>{o.label}</option>)}
+      {children}
+    </select>
+  );
+}
+
+export interface KitCheckboxProps {
+  checked: boolean;
+  onChange?: (checked: boolean) => void;
+  label?: React.ReactNode;
+  /** Name for screen readers when there is no visible label. */
+  ariaLabel?: string;
+  hint?: React.ReactNode;
+  disabled?: boolean;
+  id?: string;
+}
+
+/** The composer's check items and the Files app's select box: a drawn box, not the browser's. */
+export function Checkbox({ checked, onChange, label, hint, disabled = false, id, ariaLabel }: KitCheckboxProps) {
+  const autoId = React.useId();
+  const boxId = id ?? autoId;
+  const box = (
+    <button
+      id={boxId}
+      type="button"
+      role="checkbox"
+      aria-checked={checked}
+      aria-label={label ? undefined : ariaLabel}
+      disabled={disabled}
+      onClick={() => onChange?.(!checked)}
+      className={cn(
+        'bk mt-0.5 flex h-4 w-4 shrink-0 items-center justify-center rounded-sm border transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:opacity-50',
+        checked ? 'border-primary bg-primary text-primary-foreground' : 'border-muted-foreground/50 bg-background',
+      )}
+    >
+      {checked && <Check className="w-3 h-3" strokeWidth={3} aria-hidden="true" />}
+    </button>
+  );
+  if (!label) return box;
+  return (
+    <div className={cn('bk flex items-start gap-2', disabled && 'opacity-60')}>
+      {box}
+      <div className="min-w-0">
+        <label htmlFor={boxId} className="text-sm text-foreground cursor-pointer">{label}</label>
+        {hint && <p className="text-xs text-muted-foreground">{hint}</p>}
+      </div>
+    </div>
+  );
+}
+
+/** ToggleSwitch from settings-section.tsx. */
+export function Switch({ checked, onChange, disabled = false, label, id }: { checked: boolean; onChange?: (checked: boolean) => void; disabled?: boolean; label?: string; id?: string }) {
+  return (
+    <button
+      id={id}
+      type="button"
+      role="switch"
+      aria-checked={checked}
+      aria-label={label}
+      disabled={disabled}
+      onClick={() => onChange?.(!checked)}
+      className={cn(
+        'bk relative inline-flex h-6 w-11 items-center rounded-full transition-colors duration-150 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring',
+        checked ? 'bg-primary' : 'bg-muted',
+        disabled ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer',
+      )}
+    >
+      <span
+        className={cn(
+          'inline-block h-4 w-4 transform rounded-full bg-background transition-transform duration-150',
+          checked ? 'ltr:translate-x-6 rtl:-translate-x-6' : 'ltr:translate-x-1 rtl:-translate-x-1',
+        )}
+      />
+    </button>
+  );
+}
+
+/** RadioGroup from settings-section.tsx: a row of segments. */
+export function Segmented({ value, options, onChange, label }: { value: string; options: { value: string; label: string }[]; onChange?: (value: string) => void; label?: string }) {
+  return (
+    <div className="bk flex flex-wrap gap-1.5" role="radiogroup" aria-label={label}>
+      {options.map((o) => (
+        <button
+          key={o.value}
+          type="button"
+          role="radio"
+          aria-checked={o.value === value}
+          onClick={() => onChange?.(o.value)}
+          className={cn(
+            'px-3 py-1.5 text-xs rounded-md transition-colors duration-150 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring',
+            o.value === value ? 'bg-primary text-primary-foreground font-medium' : 'bg-muted hover:bg-accent text-foreground',
+          )}
+        >
+          {o.label}
+        </button>
+      ))}
+    </div>
+  );
+}
+
+/**
+ * A form field: label above, hint and error below (identity form). The
+ * control inside gets the label's id when it has none.
+ */
+export function Field({ label, hint, error, required = false, children }: { label: React.ReactNode; hint?: React.ReactNode; error?: React.ReactNode; required?: boolean } & Children) {
+  const autoId = React.useId();
+  const only = React.Children.count(children) === 1 && React.isValidElement(children) ? children as React.ReactElement<{ id?: string }> : null;
+  const controlId = only?.props.id ?? autoId;
+  return (
+    <div className="bk">
+      <label htmlFor={only ? controlId : undefined} className="text-sm font-medium mb-1 block text-foreground">
+        {label}
+        {required && <span className="text-destructive"> *</span>}
+      </label>
+      {only && !only.props.id ? React.cloneElement(only, { id: controlId }) : children}
+      {hint && !error && <p className="text-xs text-muted-foreground mt-1">{hint}</p>}
+      {error && <p className="text-sm text-destructive mt-1" role="alert">{error}</p>}
+    </div>
+  );
+}
+
+/** A search box like the Files toolbar's. */
+export function SearchInput({ value, onChange, placeholder, label, className }: { value: string; onChange: (value: string) => void; placeholder?: string; label?: string; className?: string }) {
+  return (
+    <div className={cn('bk relative w-56 max-w-full', className)}>
+      <Search className="absolute start-2.5 top-1/2 -translate-y-1/2 w-4 h-4 text-muted-foreground pointer-events-none" aria-hidden="true" />
+      <input
+        type="search"
+        value={value}
+        placeholder={placeholder}
+        aria-label={label ?? placeholder}
+        onChange={(e) => onChange(e.target.value)}
+        className="w-full h-8 rounded-md border border-input bg-background ps-8 pe-8 text-sm outline-none placeholder:text-muted-foreground focus-visible:ring-2 focus-visible:ring-ring [&::-webkit-search-cancel-button]:hidden"
+      />
+      {value && (
+        <button type="button" onClick={() => onChange('')} aria-label="×" className="absolute end-1.5 top-1/2 -translate-y-1/2 p-1 rounded text-muted-foreground hover:text-foreground">
+          <X className="w-3.5 h-3.5" aria-hidden="true" />
+        </button>
+      )}
+    </div>
+  );
+}
+
+// ─── Layout ────────────────────────────────────────────────────
+
+const GAP = { 0: 'gap-0', 1: 'gap-1', 2: 'gap-2', 3: 'gap-3', 4: 'gap-4', 6: 'gap-6' } as const;
+type Gap = keyof typeof GAP;
+
+/** Children one below the other. */
+export function Stack({ gap = 3, children, className }: { gap?: Gap; className?: string } & Children) {
+  return <div className={cn('bk flex flex-col min-w-0', GAP[gap], className)}>{children}</div>;
+}
+
+/** Children side by side. */
+export function Row({ gap = 2, wrap = true, justify = 'start', align = 'center', grow = false, fill = false, children, className }: {
+  gap?: Gap; wrap?: boolean; justify?: 'start' | 'end' | 'between'; align?: 'start' | 'center' | 'baseline'; grow?: boolean;
+  /** Children share the width equally, e.g. two Fields side by side; they wrap below 12rem each. */
+  fill?: boolean; className?: string;
+} & Children) {
+  return (
+    <div className={cn(
+      'bk flex min-w-0', GAP[gap], wrap && 'flex-wrap', grow && 'flex-1', fill && '[&>*]:flex-1 [&>*]:min-w-[12rem]',
+      { start: 'justify-start', end: 'justify-end', between: 'justify-between' }[justify],
+      { start: 'items-start', center: 'items-center', baseline: 'items-baseline' }[align],
+      className,
+    )}>
+      {children}
+    </div>
+  );
+}
+
+/** Body text. */
+export function Text({ tone = 'default', size = 'sm', weight = 'normal', truncate = false, children, className }: {
+  tone?: 'default' | 'muted' | 'danger' | 'success'; size?: 'xs' | 'sm' | 'base'; weight?: 'normal' | 'medium' | 'semibold'; truncate?: boolean; className?: string;
+} & Children) {
+  return (
+    <p className={cn(
+      'bk break-words',
+      { default: 'text-foreground', muted: 'text-muted-foreground', danger: 'text-destructive', success: 'text-success' }[tone],
+      { xs: 'text-xs', sm: 'text-sm', base: 'text-base' }[size],
+      { normal: '', medium: 'font-medium', semibold: 'font-semibold' }[weight],
+      truncate && 'truncate',
+      className,
+    )}>
+      {children}
+    </p>
+  );
+}
+
+/** A heading inside a section (settings subheading). */
+export function Heading({ children, level = 3 }: { level?: 2 | 3 | 4 } & Children) {
+  const Tag = `h${level}` as 'h2' | 'h3' | 'h4';
+  return <Tag className={cn('bk text-foreground', level === 2 ? 'text-lg font-semibold' : level === 3 ? 'text-base font-medium' : 'text-sm font-medium')}>{children}</Tag>;
+}
+
+export function Divider() {
+  return <div className="bk h-px bg-border" role="separator" />;
+}
+
+/**
+ * A plugin's full page (app-page slot): the app's content width and
+ * padding, with an optional header. Pages that are a tool, like a file
+ * browser, pass `flush` and put a Toolbar first instead.
+ */
+export function Page({ flush = false, wide = false, children }: { flush?: boolean; wide?: boolean } & Children) {
+  if (flush) return <div className="bk flex flex-col min-h-full text-foreground">{children}</div>;
+  return <div className={cn('bk mx-auto p-4 md:p-6 space-y-6 text-foreground', wide ? 'max-w-6xl' : 'max-w-4xl')}>{children}</div>;
+}
+
+/** The admin pages' header: title, subtitle, actions on the right. */
+export function PageHeader({ title, description, actions, icon }: { title: React.ReactNode; description?: React.ReactNode; actions?: React.ReactNode; icon?: string }) {
+  return (
+    <div className="bk flex flex-wrap items-start justify-between gap-3">
+      <div className="min-w-0">
+        <h1 className="flex items-center gap-2 text-2xl font-semibold text-foreground">
+          {icon && <Icon name={icon} size="lg" className="text-muted-foreground" />}
+          <span className="min-w-0 truncate">{title}</span>
+        </h1>
+        {description && <p className="text-sm text-muted-foreground mt-1">{description}</p>}
+      </div>
+      {actions && <div className="flex flex-wrap items-center gap-2">{actions}</div>}
+    </div>
+  );
+}
+
+/** SettingsSection: a titled group of settings. */
+export function Section({ title, description, children }: { title?: React.ReactNode; description?: React.ReactNode } & Children) {
+  return (
+    <section className="bk space-y-4">
+      {(title || description) && (
+        <div>
+          {title && <h3 className="text-lg font-medium text-foreground">{title}</h3>}
+          {description && <p className="text-sm text-muted-foreground mt-1">{description}</p>}
+        </div>
+      )}
+      <div className="space-y-4">{children}</div>
+    </section>
+  );
+}
+
+/** SettingItem: label and description on the left, the control on the right. */
+export function SettingRow({ label, description, children, htmlFor }: { label: React.ReactNode; description?: React.ReactNode; htmlFor?: string } & Children) {
+  return (
+    <div className="bk flex flex-col gap-2 sm:flex-row sm:items-start sm:justify-between sm:gap-4 py-3 border-b border-border last:border-0">
+      <div className="flex-1 min-w-0 sm:pe-4">
+        <label htmlFor={htmlFor} className="text-sm font-medium text-foreground">{label}</label>
+        {description && <p className="text-xs text-muted-foreground mt-1">{description}</p>}
+      </div>
+      <div className="flex-shrink-0">{children}</div>
+    </div>
+  );
+}
+
+/** The admin section card: a bordered box with a tinted head. */
+export function Card({ title, actions, children, padded = true }: { title?: React.ReactNode; actions?: React.ReactNode; padded?: boolean } & Children) {
+  return (
+    <div className="bk border border-border rounded-lg overflow-hidden">
+      {(title || actions) && (
+        <div className="flex items-center justify-between gap-2 px-4 py-3 border-b border-border bg-muted/30">
+          <h2 className="text-sm font-medium text-foreground min-w-0 truncate">{title}</h2>
+          {actions && <div className="flex items-center gap-1">{actions}</div>}
+        </div>
+      )}
+      <div className={cn(padded && 'p-4')}>{children}</div>
+    </div>
+  );
+}
+
+// ─── Tabs ──────────────────────────────────────────────────────
+
+/** The tab bar of the app's dialogs (iCal import). */
+export function Tabs({ value, tabs, onChange, label }: { value: string; tabs: { id: string; label: string; icon?: string; count?: number }[]; onChange: (id: string) => void; label?: string }) {
+  return (
+    <div className="bk flex border-b border-border overflow-x-auto" role="tablist" aria-label={label}>
+      {tabs.map((tab) => {
+        const active = tab.id === value;
+        return (
+          <button
+            key={tab.id}
+            type="button"
+            role="tab"
+            aria-selected={active}
+            onClick={() => onChange(tab.id)}
+            className={cn(
+              'flex items-center gap-1.5 px-4 py-2 text-sm font-medium border-b-2 -mb-px whitespace-nowrap transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-inset',
+              active ? 'border-primary text-primary' : 'border-transparent text-muted-foreground hover:text-foreground',
+            )}
+          >
+            {tab.icon && <Icon name={tab.icon} />}
+            <span>{tab.label}</span>
+            {tab.count !== undefined && <span className="text-xs font-semibold tabular-nums">{tab.count}</span>}
+          </button>
+        );
+      })}
+    </div>
+  );
+}
+
+// ─── Toolbar (Files app) ───────────────────────────────────────
+
+/** The Files app's toolbar row. */
+export function Toolbar({ children }: Children) {
+  return (
+    <div className="bk flex items-center gap-1 px-3 border-b border-border min-w-0 flex-shrink-0" style={{ paddingBlock: 'var(--density-header-py)' }}>
+      {children}
+    </div>
+  );
+}
+
+/** ToolButton from the Files header: ghost, 32 px high, icon-only when compact. */
+export function ToolbarButton({ icon, label, compact = false, active = false, danger = false, busy = false, disabled, onClick }: {
+  icon?: string; label: string; compact?: boolean; active?: boolean; danger?: boolean; busy?: boolean; disabled?: boolean; onClick?: () => void;
+}) {
+  return (
+    <AppButton
+      type="button"
+      variant="ghost"
+      size={compact ? 'icon' : 'sm'}
+      title={compact ? label : undefined}
+      aria-label={compact ? label : undefined}
+      aria-pressed={active || undefined}
+      disabled={disabled || busy}
+      onClick={onClick}
+      className={cn(
+        'bk h-8 shrink-0',
+        compact ? 'w-8' : 'gap-1.5 px-2.5',
+        active && 'bg-accent text-accent-foreground',
+        danger && 'text-destructive hover:text-destructive hover:bg-destructive/10',
+      )}
+    >
+      {busy ? <Loader2 className="w-4 h-4 animate-spin" aria-hidden="true" /> : icon ? <Icon name={icon} /> : null}
+      {!compact && <span>{label}</span>}
+    </AppButton>
+  );
+}
+
+/** Takes the free space in a Toolbar. */
+export function ToolbarSpacer() {
+  return <div className="bk flex-1 min-w-0" />;
+}
+
+/** The Files app's breadcrumbs. */
+export function Breadcrumbs({ items, onSelect, label }: { items: { id: string; label: string }[]; onSelect: (id: string) => void; label?: string }) {
+  return (
+    <nav className="bk flex-1 min-w-0" aria-label={label}>
+      <ol className="flex items-center text-sm min-w-0">
+        {items.map((item, i) => {
+          const last = i === items.length - 1;
+          return (
+            <li key={item.id} className="flex items-center min-w-0 shrink-0 last:shrink">
+              {i > 0 && <ChevronRight className="w-3.5 h-3.5 text-muted-foreground shrink-0 rtl:rotate-180" aria-hidden="true" />}
+              <button
+                type="button"
+                onClick={() => onSelect(item.id)}
+                aria-current={last ? 'page' : undefined}
+                className={cn('px-1.5 py-1 rounded-md transition-colors truncate max-w-[16rem]', last ? 'font-semibold text-foreground' : 'text-muted-foreground hover:text-foreground hover:bg-muted')}
+              >
+                {item.label}
+              </button>
+            </li>
+          );
+        })}
+      </ol>
+    </nav>
+  );
+}
+
+// ─── Lists (Files app rows) ────────────────────────────────────
+
+/** A list like the Files app's: optional column header, rows below. */
+export function List({ children, label, columns }: { label?: string; columns?: { label: string; align?: 'start' | 'end'; hideNarrow?: boolean }[] } & Children) {
+  return (
+    <div className="bk text-sm" role="list" aria-label={label}>
+      {columns && (
+        <div className="flex items-center gap-x-3 sticky top-0 z-10 bg-background/95 backdrop-blur border-b border-border px-4 h-9 text-xs font-medium text-muted-foreground" aria-hidden="true">
+          {columns.map((c, i) => (
+            <span key={i} className={cn(i === 0 ? 'flex-1 min-w-0 ps-8' : 'w-24 flex-shrink-0', c.align === 'end' && 'text-end', c.hideNarrow && 'hidden sm:block')}>{c.label}</span>
+          ))}
+        </div>
+      )}
+      {children}
+    </div>
+  );
+}
+
+export interface KitListRowProps {
+  title: React.ReactNode;
+  /** A line under the title. */
+  subtitle?: React.ReactNode;
+  /** Short right-hand columns (size, date). */
+  meta?: React.ReactNode[];
+  /** FileIcon or Icon; or a file name to use the Files app's icon for it. */
+  icon?: React.ReactNode;
+  folder?: boolean;
+  selected?: boolean;
+  /** Shows a select box in front. */
+  checked?: boolean;
+  onCheck?: (checked: boolean) => void;
+  /** Name of the select box for screen readers, e.g. "Select report.pdf". */
+  checkLabel?: string;
+  onClick?: () => void;
+  onDoubleClick?: () => void;
+  /** Buttons at the end of the row. */
+  actions?: React.ReactNode;
+  disabled?: boolean;
+}
+
+/** A Files app row: 40 px, icon, name, muted meta columns, hover and selected states. */
+export function ListRow({ title, subtitle, meta, icon, folder = false, selected = false, checked, onCheck, checkLabel, onClick, onDoubleClick, actions, disabled = false }: KitListRowProps) {
+  const clickable = !!onClick && !disabled;
+  return (
+    <div
+      role="listitem"
+      aria-selected={selected || undefined}
+      aria-disabled={disabled || undefined}
+      tabIndex={clickable ? 0 : undefined}
+      onClick={clickable ? onClick : undefined}
+      onDoubleClick={disabled ? undefined : onDoubleClick}
+      onKeyDown={clickable ? (e) => { if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); onClick?.(); } } : undefined}
+      className={cn(
+        'bk group flex items-center gap-x-3 px-4 border-b border-border/60 select-none transition-colors outline-none focus-visible:ring-1 focus-visible:ring-inset focus-visible:ring-ring/60',
+        subtitle ? 'min-h-[52px] py-1.5' : 'h-10',
+        selected ? 'bg-primary/10' : clickable && 'hover:bg-muted/60',
+        clickable ? 'cursor-pointer' : 'cursor-default',
+        disabled && 'opacity-50',
+      )}
+    >
+      {checked !== undefined && (
+        <span onClick={(e) => e.stopPropagation()} className="flex">
+          <Checkbox checked={checked} onChange={onCheck} disabled={disabled} ariaLabel={checkLabel ?? (typeof title === 'string' ? title : undefined)} />
+        </span>
+      )}
+      <span className="flex items-center gap-3 min-w-0 flex-1">
+        {typeof icon === 'string' ? <FileIcon name={icon} folder={folder} /> : icon ?? (folder ? <FileIcon folder /> : null)}
+        <span className="min-w-0 flex-1">
+          <span className={cn('block truncate text-start', folder && 'font-medium')}>{title}</span>
+          {subtitle && <span className="block truncate text-xs text-muted-foreground">{subtitle}</span>}
+        </span>
+      </span>
+      {meta?.map((m, i) => (
+        <span key={i} className={cn('flex-shrink-0 text-muted-foreground tabular-nums truncate text-end w-24', i > 0 && 'hidden sm:block')}>{m}</span>
+      ))}
+      {actions && <span className="flex items-center gap-1 flex-shrink-0" onClick={(e) => e.stopPropagation()}>{actions}</span>}
+    </div>
+  );
+}
+
+/** A row's icon button (Files row actions). */
+export function RowAction({ icon, label, onClick, danger = false }: { icon: string; label: string; onClick?: () => void; danger?: boolean }) {
+  return (
+    <button
+      type="button"
+      onClick={onClick}
+      title={label}
+      aria-label={label}
+      className={cn('bk p-1.5 rounded-md text-muted-foreground hover:text-foreground hover:bg-foreground/10 transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring', danger && 'hover:text-destructive')}
+    >
+      <Icon name={icon} />
+    </button>
+  );
+}
+
+// ─── Status ────────────────────────────────────────────────────
+
+const BADGE_TONE: Record<Tone, string> = {
+  neutral: 'bg-muted text-muted-foreground',
+  info: 'bg-info/15 text-info',
+  success: 'bg-success/15 text-success',
+  warning: 'bg-warning/15 text-warning',
+  danger: 'bg-destructive/15 text-destructive',
+  primary: 'bg-primary/10 text-primary',
+};
+
+/** The status pills (calendar invitation, identity "Default"). */
+export function Badge({ tone = 'neutral', children }: { tone?: Tone } & Children) {
+  return <span className={cn('bk inline-flex items-center rounded-full px-2 py-0.5 text-[11px] font-medium whitespace-nowrap', BADGE_TONE[tone])}>{children}</span>;
+}
+
+/** The reader's attachment chip: icon, label, muted detail. Clickable when onClick is set. */
+export function Chip({ icon, label, detail, onClick, onRemove, removeLabel, title }: {
+  icon?: string; label: React.ReactNode; detail?: React.ReactNode; onClick?: () => void; onRemove?: () => void; removeLabel?: string; title?: string;
+}) {
+  const body = (
+    <>
+      {icon && <Icon name={icon} className="text-muted-foreground" />}
+      <span className="text-sm text-foreground truncate max-w-[200px]">{label}</span>
+      {detail && <span className="text-xs text-muted-foreground flex-shrink-0">{detail}</span>}
+    </>
+  );
+  const box = 'bk inline-flex items-center gap-1.5 px-2.5 py-1.5 bg-muted/60 rounded-md border border-border/50 flex-shrink-0 max-w-full';
+  if (onClick && !onRemove) {
+    return <button type="button" title={title} onClick={onClick} className={cn(box, 'hover:bg-muted transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring')}>{body}</button>;
+  }
+  return (
+    <span className={box} title={title}>
+      {body}
+      {onRemove && (
+        <button type="button" onClick={onRemove} aria-label={removeLabel ?? '×'} className="p-0.5 -me-1 rounded hover:bg-accent transition-colors">
+          <X className="w-3.5 h-3.5" aria-hidden="true" />
+        </button>
+      )}
+    </span>
+  );
+}
+
+const INFO_TONE: Record<Tone, string> = {
+  neutral: 'bg-muted text-muted-foreground',
+  info: 'bg-info/15 text-info',
+  success: 'bg-success/15 text-success',
+  warning: 'bg-warning/15 text-warning',
+  danger: 'bg-destructive/15 text-destructive',
+  primary: 'bg-primary/10 text-primary',
+};
+
+/**
+ * The reader's info bar (external content, calendar invitation, read
+ * receipt): a round icon, a small caps label, the line, then buttons.
+ * `compact` drops the circle for a one-line bar.
+ */
+export function InfoBar({ tone = 'neutral', icon, eyebrow, title, children, compact = false }: {
+  tone?: Tone; icon?: string; eyebrow?: React.ReactNode; title?: React.ReactNode; compact?: boolean;
+} & Children) {
+  if (compact) {
+    return (
+      <div className="bk flex flex-wrap items-center gap-x-3 gap-y-1.5 px-6 py-1.5 border-b border-border bg-muted/30 text-sm">
+        {icon && <span className={cn('w-6 h-6 rounded-full flex items-center justify-center flex-shrink-0', INFO_TONE[tone])}><Icon name={icon} size="sm" /></span>}
+        {eyebrow && <span className="text-[10px] font-semibold uppercase tracking-wider text-muted-foreground">{eyebrow}</span>}
+        {title && <span className="min-w-0 flex-1 text-foreground break-words">{title}</span>}
+        {children}
+      </div>
+    );
+  }
+  return (
+    <div className="bk border-b border-border bg-muted/30">
+      <div className="px-6 py-1.5">
+        <div className="flex items-start gap-3 py-1">
+          {icon && (
+            <div className={cn('w-10 h-10 rounded-full flex items-center justify-center flex-shrink-0 shadow-sm', INFO_TONE[tone])}>
+              <Icon name={icon} size="lg" />
+            </div>
+          )}
+          <div className="flex-1 min-w-0 space-y-2">
+            {(eyebrow || title) && (
+              <div>
+                {eyebrow && <div className="text-[10px] font-semibold uppercase tracking-wider text-muted-foreground">{eyebrow}</div>}
+                {title && <div className="text-sm font-medium text-foreground break-words">{title}</div>}
+              </div>
+            )}
+            {children}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+/** The bordered buttons of the reader's info bars ("Load images", RSVP). */
+export function BarButton({ icon, children, onClick, active = false, busy = false, disabled }: { icon?: string; onClick?: () => void; active?: boolean; busy?: boolean; disabled?: boolean } & Children) {
+  return (
+    <button
+      type="button"
+      onClick={onClick}
+      disabled={disabled || busy}
+      aria-pressed={active || undefined}
+      className={cn(
+        'bk inline-flex items-center gap-1.5 text-sm px-3 py-1.5 rounded-md border transition-colors min-h-[36px] disabled:opacity-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring',
+        active ? 'bg-primary/10 text-primary border-primary/30 font-medium' : 'text-muted-foreground hover:text-foreground border-border hover:bg-muted',
+      )}
+    >
+      {busy ? <Loader2 className="w-3.5 h-3.5 animate-spin" aria-hidden="true" /> : icon ? <Icon name={icon} size="sm" /> : null}
+      {children}
+    </button>
+  );
+}
+
+const ALERT_TONE: Record<Exclude<Tone, 'primary' | 'neutral'> | 'neutral', string> = {
+  neutral: 'bg-muted text-foreground',
+  info: 'bg-info/10 text-foreground',
+  success: 'bg-success/10 text-success',
+  warning: 'bg-warning/10 text-foreground',
+  danger: 'bg-destructive/10 text-destructive',
+};
+
+/** The Files app's error bar, in other tones too. */
+export function Alert({ tone = 'danger', icon, children, action }: { tone?: 'neutral' | 'info' | 'success' | 'warning' | 'danger'; icon?: string; action?: React.ReactNode } & Children) {
+  return (
+    <div className={cn('bk px-3 py-2 rounded-md text-sm flex items-center gap-2', ALERT_TONE[tone])} role={tone === 'danger' ? 'alert' : 'status'}>
+      {icon && <Icon name={icon} />}
+      <div className="flex-1 min-w-0 break-words">{children}</div>
+      {action}
+    </div>
+  );
+}
+
+/** A thin progress bar; value 0..1, or null while unknown. */
+export function ProgressBar({ value, label }: { value: number | null; label?: string }) {
+  const pct = value === null ? null : Math.max(0, Math.min(1, value)) * 100;
+  return (
+    <div className="bk h-1.5 w-full rounded-full bg-muted overflow-hidden" role="progressbar" aria-label={label} aria-valuemin={0} aria-valuemax={100} aria-valuenow={pct === null ? undefined : Math.round(pct)}>
+      <div className={cn('h-full bg-primary transition-[width] duration-200', pct === null && 'w-1/3 animate-pulse')} style={pct === null ? undefined : { width: `${pct}%` }} />
+    </div>
+  );
+}
+
+/** The Files app's empty state: icon in a circle, title, text, buttons. */
+export function EmptyState({ icon, title, description, actions, compact = false }: { icon?: string; title: React.ReactNode; description?: React.ReactNode; actions?: React.ReactNode; compact?: boolean }) {
+  return (
+    <div className={cn('bk flex items-center justify-center', compact ? 'p-6' : 'min-h-[18rem] p-8')}>
+      <div className="flex flex-col items-center text-center max-w-sm">
+        {icon && (
+          <div className="w-14 h-14 rounded-full bg-muted flex items-center justify-center mb-4">
+            <Icon name={icon} className="w-7 h-7 text-muted-foreground" />
+          </div>
+        )}
+        <h3 className="text-base font-medium text-foreground">{title}</h3>
+        {description && <p className="text-sm text-muted-foreground mt-1">{description}</p>}
+        {actions && <div className="flex gap-2 flex-wrap justify-center mt-5">{actions}</div>}
+      </div>
+    </div>
+  );
+}
+
+// ─── Sidebar sections ──────────────────────────────────────────
+
+/** A row in a sidebar section, like a folder row. */
+export function SidebarRow({ icon, label, detail, onClick, title, ariaLabel }: { icon?: string; label: React.ReactNode; detail?: React.ReactNode; onClick?: () => void; title?: string; /** What a click does, for screen readers. */ ariaLabel?: string }) {
+  const Tag = onClick ? 'button' : 'div';
+  return (
+    <Tag
+      {...(onClick ? { type: 'button' as const, onClick } : {})}
+      title={title}
+      aria-label={ariaLabel}
+      className={cn('bk w-full flex items-center gap-2 ps-[28px] pe-3 text-sm text-foreground text-start border-s-2 border-transparent transition-colors duration-150', onClick && 'hover:bg-muted/50 focus-visible:outline-none focus-visible:bg-muted/50')}
+      style={{ paddingBlock: 'var(--density-sidebar-py)' }}
+    >
+      {icon && <span className="flex items-center justify-center flex-shrink-0 w-4 h-4 text-muted-foreground"><Icon name={icon} /></span>}
+      <span className="flex-1 min-w-0 truncate">{label}</span>
+      {detail && <span className="flex-shrink-0 text-xs text-muted-foreground tabular-nums">{detail}</span>}
+    </Tag>
+  );
+}
+
+/** The sidebar's "nothing here" line (as under Folders while loading). */
+export function SidebarEmpty({ children }: Children) {
+  return <p className="bk px-4 py-2 text-sm text-muted-foreground">{children}</p>;
+}
+
+// ─── Changes ───────────────────────────────────────────────────
+
+export interface DiffPart {
+  type: 'same' | 'add' | 'del';
+  text: string;
+}
+
+/**
+ * A text with its changes marked: removed words struck through in red,
+ * added ones highlighted. For previews of a rewrite before it is applied.
+ * `streaming` shows a caret at the end while the text is still coming in.
+ */
+export function DiffView({ parts, streaming = false, label }: { parts: DiffPart[]; streaming?: boolean; label?: string }) {
+  return (
+    <div className="bk rounded-md border border-border bg-muted/30 p-3 text-sm text-foreground leading-relaxed whitespace-pre-wrap break-words" aria-label={label} aria-busy={streaming || undefined}>
+      {parts.map((p, i) => (
+        p.type === 'del'
+          ? <del key={i} className="rounded-sm bg-destructive/10 text-destructive line-through decoration-destructive/60">{p.text}</del>
+          : p.type === 'add'
+            ? <ins key={i} className="rounded-sm bg-success/15 text-foreground no-underline">{p.text}</ins>
+            : <span key={i}>{p.text}</span>
+      ))}
+      {streaming && <span className="ms-0.5 inline-block h-4 w-1.5 translate-y-0.5 animate-pulse rounded-sm bg-primary/60" aria-hidden="true" />}
+    </div>
+  );
+}
+
+// ─── Panels and details ────────────────────────────────────────
+
+/** The padding of a side panel or detail section (message details, composer side panels). */
+export function Panel({ children }: Children) {
+  return <div className="bk p-4 space-y-3 text-sm text-foreground">{children}</div>;
+}
+
+/** The small caps heading of the message details' sections. */
+export function DetailHeading({ children }: Children) {
+  return <div className="bk text-[10px] font-semibold tracking-wider text-muted-foreground uppercase mb-1.5">{children}</div>;
+}
+
+/** Label and value rows like the message details (From, Date, Size...). Children are DetailRows. */
+export function DetailList({ children }: Children) {
+  return <dl className="bk grid grid-cols-[7rem_1fr] gap-x-4 gap-y-1.5">{children}</dl>;
+}
+
+export function DetailRow({ label, children, mono = false }: { label: React.ReactNode; mono?: boolean } & Children) {
+  return (
+    <>
+      <dt className="text-muted-foreground text-xs pt-1">{label}</dt>
+      <dd className={cn('text-sm text-foreground min-w-0 break-words', mono && 'font-mono text-xs')}>{children}</dd>
+    </>
+  );
+}
+
+/**
+ * A small round dot in a colour the data carries, like a calendar's or a
+ * tag's colour. Only #rgb/#rrggbb values are used; anything else shows the
+ * muted colour.
+ */
+export function ColorDot({ color, label }: { color?: string; label?: string }) {
+  const safe = typeof color === 'string' && /^#(?:[0-9a-f]{3}|[0-9a-f]{6})$/i.test(color) ? color : undefined;
+  return (
+    <span
+      className={cn('bk inline-block h-2.5 w-2.5 shrink-0 rounded-full', !safe && 'bg-muted-foreground')}
+      style={safe ? { backgroundColor: safe } : undefined}
+      role={label ? 'img' : undefined}
+      aria-label={label}
+      aria-hidden={label ? undefined : true}
+    />
+  );
+}
diff --git a/lib/plugin-sandbox/ui-kit/dialog-buttons.tsx b/lib/plugin-sandbox/ui-kit/dialog-buttons.tsx
new file mode 100644
index 000000000..08421ca7c
--- /dev/null
+++ b/lib/plugin-sandbox/ui-kit/dialog-buttons.tsx
@@ -0,0 +1,79 @@
+'use client';
+
+// Buttons for a plugin dialog, drawn by the host in the app's own dialog
+// footer (components/plugins/plugin-dialog-host.tsx) rather than inside the
+// iframe, so they look and sit like every other dialog's: right-aligned,
+// Cancel before the main action, fixed at the bottom while the body scrolls.
+//
+// The plugin renders <DialogButtons buttons onClick /> anywhere in its
+// dialog. It hands the list to the host through the `setDialogButtons`
+// prop; the host passes clicks back as the `dialogButtonClick` prop
+// ({ id, n }, n counting up). Outside a host dialog the buttons are drawn
+// in place.
+
+import * as React from 'react';
+import { Button } from './components';
+
+export interface DialogButtonSpec {
+  id: string;
+  label: string;
+  variant?: 'primary' | 'secondary' | 'ghost' | 'destructive';
+  disabled?: boolean;
+  busy?: boolean;
+  icon?: string;
+}
+
+/** The slot's props, for kit components that talk to the host. Set by the runtime. */
+export const SlotPropsContext = React.createContext<Record<string, unknown>>({});
+
+export function useSlotProps(): Record<string, unknown> {
+  return React.useContext(SlotPropsContext);
+}
+
+function clean(buttons: DialogButtonSpec[]): DialogButtonSpec[] {
+  return buttons.map((b) => ({
+    id: String(b.id),
+    label: String(b.label),
+    ...(b.variant ? { variant: b.variant } : {}),
+    ...(b.disabled ? { disabled: true } : {}),
+    ...(b.busy ? { busy: true } : {}),
+    ...(b.icon ? { icon: String(b.icon) } : {}),
+  }));
+}
+
+export function DialogButtons({ buttons, onClick }: { buttons: DialogButtonSpec[]; onClick: (id: string) => void }) {
+  const props = useSlotProps();
+  const setButtons = typeof props.setDialogButtons === 'function'
+    ? props.setDialogButtons as (buttons: DialogButtonSpec[]) => void
+    : null;
+  const onClickRef = React.useRef(onClick);
+  onClickRef.current = onClick;
+
+  const list = clean(buttons);
+  const key = JSON.stringify(list);
+  React.useEffect(() => {
+    setButtons?.(JSON.parse(key) as DialogButtonSpec[]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- setButtons is a new proxy on every props update
+  }, [key, !!setButtons]);
+  React.useEffect(() => () => { setButtons?.([]); }, [!!setButtons]); // eslint-disable-line react-hooks/exhaustive-deps
+
+  const click = props.dialogButtonClick as { id?: unknown; n?: unknown } | undefined;
+  const seen = React.useRef(typeof click?.n === 'number' ? click.n : 0);
+  React.useEffect(() => {
+    if (!click || typeof click.n !== 'number' || typeof click.id !== 'string') return;
+    if (click.n === seen.current) return;
+    seen.current = click.n;
+    onClickRef.current(click.id);
+  }, [click?.n]); // eslint-disable-line react-hooks/exhaustive-deps
+
+  if (setButtons) return null;
+  return (
+    <div className="bk flex items-center justify-end gap-2 pt-4">
+      {list.map((b) => (
+        <Button key={b.id} variant={b.variant ?? 'primary'} disabled={b.disabled} busy={b.busy} icon={b.icon} onClick={() => onClickRef.current(b.id)}>
+          {b.label}
+        </Button>
+      ))}
+    </div>
+  );
+}
diff --git a/lib/plugin-sandbox/ui-kit/index.ts b/lib/plugin-sandbox/ui-kit/index.ts
new file mode 100644
index 000000000..7f27e58b8
--- /dev/null
+++ b/lib/plugin-sandbox/ui-kit/index.ts
@@ -0,0 +1,22 @@
+// `@plugin-host/ui`: the module plugins require for the app's controls.
+// See components.tsx. Adding an export is a plugin API change: list it in
+// KIT_EXPORTS below (the plugins repo's docs and fake API read that list).
+
+import * as components from './components';
+import { DialogButtons, useSlotProps } from './dialog-buttons';
+
+export * from './components';
+export { DialogButtons, SlotPropsContext, useSlotProps } from './dialog-buttons';
+export type { DialogButtonSpec } from './dialog-buttons';
+
+/** Bumped when a component is added or its props change in a way plugins can see. */
+export const KIT_VERSION = 1;
+
+export const pluginUiKit = Object.freeze({
+  ...components,
+  DialogButtons,
+  useSlotProps,
+  KIT_VERSION,
+});
+
+export const KIT_EXPORTS = Object.freeze(Object.keys(pluginUiKit).sort());
diff --git a/lib/plugin-secrets/credentials.ts b/lib/plugin-secrets/credentials.ts
new file mode 100644
index 000000000..916043ba3
--- /dev/null
+++ b/lib/plugin-secrets/credentials.ts
@@ -0,0 +1,199 @@
+// Credentials a plugin may use through the server proxy (/api/plugin-proxy).
+// The plugin names a credential by id; the server adds the secret to the
+// request and forwards it only to the credential's origin. The secret never
+// reaches the plugin.
+//
+// A plugin declares its credentials in its manifest:
+//
+//   "credentials": {
+//     "nextcloud": { "label": "Nextcloud", "scope": "user", "inject": { "type": "basic" } },
+//     "openai": {
+//       "label": "OpenAI", "scope": "admin", "inject": { "type": "bearer" },
+//       "secretKey": "apiKey", "originKey": "baseUrl"
+//     }
+//   }
+//
+// scope "admin": the secret is a `type: "secret"` field of the plugin's admin
+// config (configSchema), and the origin is fixed in the manifest (`origin`) or
+// read from an admin config field (`originKey`).
+// scope "user": the user connects their own account in a dialog the host
+// shows; the origin is fixed in the manifest or chosen by the user there.
+
+export type CredentialInject =
+  | { type: 'none' }
+  | { type: 'bearer' }
+  | { type: 'basic' }
+  | { type: 'header'; name: string; prefix?: string };
+
+export interface AdminCredentialSpec {
+  label: string;
+  scope: 'admin';
+  inject: CredentialInject;
+  /** configSchema key holding the secret; it must be `type: "secret"`. */
+  secretKey: string;
+  /** Fixed origin, or */
+  origin?: string;
+  /** configSchema key holding the origin (a URL; only its origin is used). */
+  originKey?: string;
+  /** configSchema key holding the user name for basic auth. */
+  usernameKey?: string;
+}
+
+export interface UserCredentialSpec {
+  label: string;
+  scope: 'user';
+  inject: CredentialInject;
+  /** Fixed origin; when absent the user enters the server address. */
+  origin?: string;
+}
+
+export type CredentialSpec = AdminCredentialSpec | UserCredentialSpec;
+
+export const MAX_CREDENTIALS_PER_PLUGIN = 8;
+export const CREDENTIAL_ID_RE = /^[a-z][a-z0-9-]{0,39}$/;
+
+/** Headers a credential may not set: the proxy or the transport owns them. */
+const RESERVED_HEADERS = new Set([
+  'host', 'cookie', 'content-length', 'content-type', 'transfer-encoding', 'connection',
+  'origin', 'referer', 'forwarded', 'te', 'upgrade', 'keep-alive', 'proxy-authorization',
+]);
+const HEADER_NAME_RE = /^[A-Za-z0-9][A-Za-z0-9-]{0,63}$/;
+
+/**
+ * The origin (scheme + host + port) of a URL, or null. https only, except
+ * http for origins the admin listed in PLUGIN_PROXY_PRIVATE_ORIGINS.
+ */
+export function credentialOrigin(value: unknown): string | null {
+  if (typeof value !== 'string' || value.length === 0 || value.length > 2048) return null;
+  let url: URL;
+  try {
+    url = new URL(value);
+  } catch {
+    return null;
+  }
+  if (url.username || url.password) return null;
+  if (url.protocol === 'https:') return url.origin;
+  if (url.protocol === 'http:' && privateProxyOrigins().includes(url.origin)) return url.origin;
+  return null;
+}
+
+/**
+ * Origins on the admin's own network the proxy may reach although they are
+ * private addresses (a Nextcloud on the LAN). Comma separated, from
+ * PLUGIN_PROXY_PRIVATE_ORIGINS. Everything else must resolve to a public
+ * address.
+ */
+export function privateProxyOrigins(): string[] {
+  const raw = (typeof process !== 'undefined' && process.env?.PLUGIN_PROXY_PRIVATE_ORIGINS) || '';
+  const out: string[] = [];
+  for (const part of raw.split(',')) {
+    const trimmed = part.trim();
+    if (!trimmed) continue;
+    try {
+      const url = new URL(trimmed);
+      if (url.protocol === 'https:' || url.protocol === 'http:') out.push(url.origin);
+    } catch { /* ignore */ }
+  }
+  return out;
+}
+
+export function checkInject(value: unknown): CredentialInject | null {
+  if (!value || typeof value !== 'object') return null;
+  const v = value as Record<string, unknown>;
+  switch (v.type) {
+    case 'none':
+    case 'bearer':
+    case 'basic':
+      return { type: v.type };
+    case 'header': {
+      if (typeof v.name !== 'string' || !HEADER_NAME_RE.test(v.name)) return null;
+      if (RESERVED_HEADERS.has(v.name.toLowerCase())) return null;
+      if (v.prefix !== undefined && (typeof v.prefix !== 'string' || v.prefix.length > 32 || /[\r\n]/.test(v.prefix))) return null;
+      return { type: 'header', name: v.name, ...(typeof v.prefix === 'string' ? { prefix: v.prefix } : {}) };
+    }
+    default:
+      return null;
+  }
+}
+
+/**
+ * Check a manifest's `credentials` block. `configSchema` is the manifest's
+ * admin config schema, which admin credentials must point into.
+ */
+export function checkCredentials(
+  value: unknown,
+  configSchema: Record<string, { type?: string }> | undefined,
+): { credentials?: Record<string, CredentialSpec>; errors: string[] } {
+  if (value === undefined) return { errors: [] };
+  if (!value || typeof value !== 'object' || Array.isArray(value)) {
+    return { errors: ['credentials must be an object'] };
+  }
+  const entries = Object.entries(value as Record<string, unknown>);
+  if (entries.length > MAX_CREDENTIALS_PER_PLUGIN) {
+    return { errors: [`At most ${MAX_CREDENTIALS_PER_PLUGIN} credentials`] };
+  }
+  const errors: string[] = [];
+  const out: Record<string, CredentialSpec> = {};
+  for (const [id, raw] of entries) {
+    const where = `credentials.${id}`;
+    if (!CREDENTIAL_ID_RE.test(id)) { errors.push(`${where}: invalid id`); continue; }
+    if (!raw || typeof raw !== 'object') { errors.push(`${where} must be an object`); continue; }
+    const c = raw as Record<string, unknown>;
+    if (typeof c.label !== 'string' || !c.label.trim() || c.label.length > 80) { errors.push(`${where}.label is required (max 80 characters)`); continue; }
+    const inject = checkInject(c.inject);
+    if (!inject) { errors.push(`${where}.inject is invalid`); continue; }
+    let fixedOrigin: string | undefined;
+    if (c.origin !== undefined) {
+      const origin = credentialOrigin(c.origin);
+      if (!origin) { errors.push(`${where}.origin must be an https origin`); continue; }
+      fixedOrigin = origin;
+    }
+    if (c.scope === 'user') {
+      out[id] = { label: c.label, scope: 'user', inject, ...(fixedOrigin ? { origin: fixedOrigin } : {}) };
+      continue;
+    }
+    if (c.scope !== 'admin') { errors.push(`${where}.scope must be "admin" or "user"`); continue; }
+    const field = (key: unknown, name: string, type?: string): string | null => {
+      if (typeof key !== 'string' || !configSchema?.[key]) {
+        errors.push(`${where}.${name} must name a configSchema field`);
+        return null;
+      }
+      if (type && configSchema[key].type !== type) {
+        errors.push(`${where}.${name} must name a "${type}" field`);
+        return null;
+      }
+      return key;
+    };
+    const secretKey = field(c.secretKey, 'secretKey', 'secret');
+    if (!secretKey) continue;
+    if (!fixedOrigin && c.originKey === undefined) { errors.push(`${where} needs origin or originKey`); continue; }
+    const originKey = c.originKey === undefined ? undefined : field(c.originKey, 'originKey');
+    if (originKey === null) continue;
+    const usernameKey = c.usernameKey === undefined ? undefined : field(c.usernameKey, 'usernameKey');
+    if (usernameKey === null) continue;
+    out[id] = {
+      label: c.label, scope: 'admin', inject, secretKey,
+      ...(fixedOrigin ? { origin: fixedOrigin } : {}),
+      ...(originKey ? { originKey } : {}),
+      ...(usernameKey ? { usernameKey } : {}),
+    };
+  }
+  return { credentials: errors.length ? undefined : out, errors };
+}
+
+/** The header to add for a secret, or null when the credential adds none. */
+export function authHeaderFor(
+  inject: CredentialInject,
+  secret: string | undefined,
+  username: string | undefined,
+): [string, string] | null {
+  if (!secret || inject.type === 'none') return null;
+  switch (inject.type) {
+    case 'bearer':
+      return ['authorization', `Bearer ${secret}`];
+    case 'basic':
+      return ['authorization', `Basic ${Buffer.from(`${username ?? ''}:${secret}`, 'utf8').toString('base64')}`];
+    case 'header':
+      return [inject.name.toLowerCase(), `${inject.prefix ?? ''}${secret}`];
+  }
+}
diff --git a/lib/plugin-secrets/proxy.ts b/lib/plugin-secrets/proxy.ts
new file mode 100644
index 000000000..87cd7afc5
--- /dev/null
+++ b/lib/plugin-secrets/proxy.ts
@@ -0,0 +1,426 @@
+// Server side of the plugin secret proxy. A plugin asks the host to send a
+// request "with credential X"; the browser posts it to /api/plugin-proxy and
+// this module adds the secret and forwards it, but only to the credential's
+// own origin. Bodies stream in both directions (uploads, downloads, AI
+// responses), with size caps, a per-user rate limit and an audit line per
+// request that names no paths, headers or bodies.
+
+import { getPlugin } from '@/lib/admin/plugin-registry';
+import { getPluginConfig } from '@/lib/admin/plugin-config';
+import { logger } from '@/lib/logger';
+import { DisallowedUrlError, fetchPublicUrl } from '@/lib/security/url-guard';
+import { authHeaderFor, credentialOrigin, privateProxyOrigins, type CredentialInject, type CredentialSpec } from './credentials';
+import { getUserCredential, setUserCredentialSecret, userKey, type VaultUser } from './vault';
+
+/** Largest request body the proxy forwards (one upload chunk); see proxyClientMaxBodySize in next.config.ts. */
+export const MAX_PROXY_REQUEST_BYTES = 100 * 1024 * 1024;
+/** Largest response body it passes back (a download). */
+export const MAX_PROXY_RESPONSE_BYTES = 2 * 1024 * 1024 * 1024;
+/** Largest response it reads to capture a secret from. */
+export const MAX_CAPTURE_BYTES = 1024 * 1024;
+/** Requests per user and plugin per minute. */
+export const PROXY_RATE_LIMIT = 300;
+/** Requests one user may have running at once. */
+export const PROXY_MAX_CONCURRENT = 8;
+const PROXY_TIMEOUT_MS = 10 * 60 * 1000;
+const MAX_REDIRECTS = 3;
+
+export const PROXY_METHODS = new Set([
+  'GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE',
+  // WebDAV, for Nextcloud and other file servers.
+  'PROPFIND', 'PROPPATCH', 'MKCOL', 'COPY', 'MOVE', 'REPORT', 'SEARCH', 'LOCK', 'UNLOCK',
+]);
+
+/** Request headers never forwarded: the proxy owns auth, cookies and transport. */
+const DROP_REQUEST_HEADERS = new Set([
+  'host', 'cookie', 'authorization', 'proxy-authorization', 'origin', 'referer', 'connection',
+  'keep-alive', 'te', 'trailer', 'transfer-encoding', 'upgrade', 'forwarded', 'via',
+  'content-length', 'accept-encoding', 'expect', 'priority',
+]);
+const DROP_REQUEST_PREFIXES = ['x-forwarded-', 'x-real-', 'sec-', 'proxy-', 'x-bulwark-', 'cf-'];
+
+/** Response headers passed back to the plugin. */
+const PASS_RESPONSE_HEADERS = new Set([
+  'content-type', 'content-range', 'content-disposition', 'content-language', 'accept-ranges',
+  'etag', 'last-modified', 'dav', 'retry-after', 'oc-etag', 'oc-fileid', 'x-request-id',
+]);
+const PASS_RESPONSE_PREFIXES = ['x-ratelimit-', 'ratelimit-', 'anthropic-ratelimit-', 'x-oc-', 'oc-'];
+
+export class ProxyError extends Error {
+  constructor(message: string, readonly status: number, readonly code: string) {
+    super(message);
+  }
+}
+
+export interface ResolvedCredential {
+  origin: string;
+  inject: CredentialInject;
+  secret?: string;
+  username?: string;
+  /** May reach private addresses: the admin set it up. */
+  trusted: boolean;
+  scope: 'admin' | 'user';
+}
+
+/**
+ * The credential a plugin asks for: one the user connected, else one the
+ * admin configured for an installed plugin that declares it.
+ */
+export async function resolveCredential(user: VaultUser, pluginId: string, credentialId: string): Promise<ResolvedCredential | null> {
+  const stored = await getUserCredential(user, pluginId, credentialId);
+  if (stored) {
+    return {
+      origin: stored.origin, inject: stored.inject, secret: stored.secret, username: stored.username,
+      trusted: privateProxyOrigins().includes(stored.origin), scope: 'user',
+    };
+  }
+  const plugin = await getPlugin(pluginId);
+  const spec = (plugin as { credentials?: Record<string, CredentialSpec> } | null)?.credentials?.[credentialId];
+  if (!plugin || !plugin.enabled || !spec || spec.scope !== 'admin') return null;
+  const config = await getPluginConfig(pluginId);
+  const secret = config[spec.secretKey];
+  const origin = spec.origin ?? credentialOrigin(spec.originKey ? config[spec.originKey] : undefined);
+  // A credential that adds nothing (a keyless service such as a local Ollama)
+  // needs only its server.
+  const needsSecret = spec.inject.type !== 'none';
+  if (!origin || (needsSecret && (typeof secret !== 'string' || !secret))) return null;
+  const username = spec.usernameKey ? config[spec.usernameKey] : undefined;
+  return {
+    origin, inject: spec.inject, secret: typeof secret === 'string' && secret ? secret : undefined,
+    username: typeof username === 'string' ? username : undefined,
+    trusted: true, scope: 'admin',
+  };
+}
+
+/**
+ * Which of a plugin's admin credentials are ready to use (secret and server
+ * set). No secret or address leaves the server; plugins learn only yes/no.
+ */
+export async function adminCredentialStatus(pluginId: string): Promise<{ credentialId: string; configured: boolean }[]> {
+  return (await adminCredentials(pluginId)).map(({ credentialId, origin }) => ({ credentialId, configured: !!origin }));
+}
+
+/**
+ * The servers of a plugin's admin credentials that are set up. Only for the
+ * host page, which checks links a plugin shows against them: plugins
+ * themselves still learn only yes/no (adminCredentialStatus).
+ */
+export async function adminCredentialOrigins(pluginId: string): Promise<string[]> {
+  return (await adminCredentials(pluginId)).flatMap(({ origin }) => (origin ? [origin] : []));
+}
+
+async function adminCredentials(pluginId: string): Promise<{ credentialId: string; origin: string | null }[]> {
+  const plugin = await getPlugin(pluginId);
+  const specs = (plugin as { credentials?: Record<string, CredentialSpec> } | null)?.credentials;
+  if (!plugin || !plugin.enabled || !specs) return [];
+  const adminIds = Object.entries(specs).filter(([, spec]) => spec.scope === 'admin').map(([id]) => id);
+  if (adminIds.length === 0) return [];
+  const user = { username: '', serverUrl: '' };
+  return Promise.all(adminIds.map(async (credentialId) => ({
+    credentialId,
+    origin: (await resolveAdminOnly(user, pluginId, credentialId))?.origin ?? null,
+  })));
+}
+
+async function resolveAdminOnly(user: VaultUser, pluginId: string, credentialId: string): Promise<ResolvedCredential | null> {
+  const resolved = await resolveCredential(user, pluginId, credentialId);
+  return resolved?.scope === 'admin' ? resolved : null;
+}
+
+// ─── Rate limiting ────────────────────────────────────────────
+
+const windows = new Map<string, number[]>();
+const running = new Map<string, number>();
+
+function takeSlot(user: string, pluginId: string, now = Date.now()): { ok: true } | { ok: false; retryAfter: number } {
+  if ((running.get(user) ?? 0) >= PROXY_MAX_CONCURRENT) return { ok: false, retryAfter: 1 };
+  const key = `${user}:${pluginId}`;
+  const recent = (windows.get(key) ?? []).filter((t) => now - t < 60_000);
+  if (recent.length >= PROXY_RATE_LIMIT) {
+    windows.set(key, recent);
+    return { ok: false, retryAfter: Math.max(1, Math.ceil((60_000 - (now - recent[0])) / 1000)) };
+  }
+  recent.push(now);
+  windows.set(key, recent);
+  running.set(user, (running.get(user) ?? 0) + 1);
+  return { ok: true };
+}
+
+function releaseSlot(user: string): void {
+  const n = (running.get(user) ?? 1) - 1;
+  if (n <= 0) running.delete(user);
+  else running.set(user, n);
+}
+
+/** Test helper. */
+export function resetProxyLimits(): void {
+  windows.clear();
+  running.clear();
+}
+
+// ─── Forwarding ───────────────────────────────────────────────
+
+/** Ask the proxy to store a field of a JSON response as the secret. */
+export interface CaptureSpec {
+  /** Top-level JSON field holding the secret, e.g. Nextcloud's `appPassword`. */
+  secret: string;
+  /** Top-level JSON field holding the user name, e.g. `loginName`. */
+  username?: string;
+}
+
+export interface ProxyInput {
+  user: VaultUser;
+  pluginId: string;
+  credentialId: string;
+  url: string;
+  method: string;
+  headers: Headers;
+  body: ReadableStream<Uint8Array> | null;
+  capture?: CaptureSpec;
+  signal?: AbortSignal;
+}
+
+function forwardHeaders(input: Headers, credential: ResolvedCredential): Record<string, string> {
+  const out: Record<string, string> = {};
+  input.forEach((value, rawName) => {
+    const name = rawName.toLowerCase();
+    if (DROP_REQUEST_HEADERS.has(name)) return;
+    if (DROP_REQUEST_PREFIXES.some((p) => name.startsWith(p))) return;
+    out[name] = value;
+  });
+  // WebDAV COPY/MOVE name their target as a full URL: it must stay on the
+  // credential's server.
+  if (out.destination) {
+    let dest: URL;
+    try { dest = new URL(out.destination); } catch { throw new ProxyError('Invalid Destination header', 400, 'bad_destination'); }
+    if (dest.origin !== credential.origin) throw new ProxyError('Destination must be on the same server', 400, 'bad_destination');
+  }
+  const auth = authHeaderFor(credential.inject, credential.secret, credential.username);
+  if (auth) out[auth[0]] = auth[1];
+  return out;
+}
+
+function countingStream(limit: number, onDone: (bytes: number, overLimit: boolean) => void): TransformStream<Uint8Array, Uint8Array> {
+  let bytes = 0;
+  let finished = false;
+  const finish = (over: boolean) => { if (!finished) { finished = true; onDone(bytes, over); } };
+  return new TransformStream({
+    transform(chunk, controller) {
+      bytes += chunk.byteLength;
+      if (bytes > limit) {
+        finish(true);
+        controller.error(new ProxyError('Body too large', 413, 'too_large'));
+        return;
+      }
+      controller.enqueue(chunk);
+    },
+    flush() { finish(false); },
+  });
+}
+
+async function send(
+  url: string,
+  init: { method: string; headers: Record<string, string>; body?: Uint8Array | null; signal: AbortSignal },
+  trusted: boolean,
+): Promise<Response> {
+  const request = {
+    method: init.method,
+    headers: init.headers,
+    signal: init.signal,
+    ...(init.body ? { body: init.body } : {}),
+  };
+  if (trusted) return fetch(url, { ...request, redirect: 'manual' } as RequestInit);
+  return (await fetchPublicUrl(url, request as never)) as unknown as Response;
+}
+
+function responseHeaders(upstream: Response): Headers {
+  const out = new Headers();
+  upstream.headers.forEach((value, rawName) => {
+    const name = rawName.toLowerCase();
+    if (PASS_RESPONSE_HEADERS.has(name) || PASS_RESPONSE_PREFIXES.some((p) => name.startsWith(p))) out.set(name, value);
+  });
+  // fetch has already decoded a compressed body, so its length is unknown.
+  if (!upstream.headers.get('content-encoding')) {
+    const length = upstream.headers.get('content-length');
+    if (length) out.set('content-length', length);
+  }
+  out.set('cache-control', 'no-store');
+  return out;
+}
+
+function redact(body: Record<string, unknown>, capture: CaptureSpec): Record<string, unknown> {
+  const out = { ...body };
+  delete out[capture.secret];
+  if (capture.username) delete out[capture.username];
+  return out;
+}
+
+/**
+ * Forward one plugin request. Returns the upstream response with a filtered
+ * set of headers and a size-capped body, or throws ProxyError.
+ */
+export async function proxyRequest(input: ProxyInput): Promise<Response> {
+  const method = input.method.toUpperCase();
+  if (!PROXY_METHODS.has(method)) throw new ProxyError(`Method ${method} is not allowed`, 405, 'bad_method');
+
+  const credential = await resolveCredential(input.user, input.pluginId, input.credentialId);
+  if (!credential) throw new ProxyError('No such credential', 404, 'no_credential');
+
+  let target: URL;
+  try { target = new URL(input.url); } catch { throw new ProxyError('Invalid URL', 400, 'bad_url'); }
+  if (target.origin !== credential.origin || target.username || target.password) {
+    throw new ProxyError('This credential is only for its own server', 403, 'wrong_origin');
+  }
+  if (input.capture && credential.scope !== 'user') {
+    throw new ProxyError('Only a credential the user connected can be filled in', 400, 'bad_capture');
+  }
+
+  const who = userKey(input.user);
+  const slot = takeSlot(who, input.pluginId);
+  if (!slot.ok) {
+    throw Object.assign(new ProxyError('Too many requests', 429, 'rate_limited'), { retryAfter: slot.retryAfter });
+  }
+
+  const started = Date.now();
+  let sent = 0;
+  let released = false;
+  const release = () => { if (!released) { released = true; releaseSlot(who); } };
+  const audit = (status: number, received: number, note?: string) => {
+    logger.info('Plugin proxy request', {
+      plugin: input.pluginId, credential: input.credentialId, user: who.slice(0, 12),
+      method, host: target.host, status, sentBytes: sent, receivedBytes: received,
+      ms: Date.now() - started, ...(note ? { note } : {}),
+    });
+  };
+
+  const timeout = AbortSignal.timeout(PROXY_TIMEOUT_MS);
+  const signal = input.signal ? AbortSignal.any([input.signal, timeout]) : timeout;
+
+  try {
+    const headers = forwardHeaders(input.headers, credential);
+    // Read the whole body first and send it with a Content-Length. Streamed
+    // (chunked) uploads reach some servers empty: Paperless (Django) answers
+    // "No file was submitted". Next has buffered the body for proxy.ts
+    // already, up to the same limit (see proxyClientMaxBodySize).
+    let body = input.body && method !== 'GET' && method !== 'HEAD'
+      ? await readBody(input.body, MAX_PROXY_REQUEST_BYTES)
+      : null;
+    sent = body?.byteLength ?? 0;
+    let currentUrl = target.toString();
+    let currentMethod = method;
+    let upstream: Response | null = null;
+
+    for (let hop = 0; hop <= MAX_REDIRECTS; hop++) {
+      upstream = await send(currentUrl, { method: currentMethod, headers, body, signal }, credential.trusted);
+      if (upstream.status < 300 || upstream.status >= 400 || upstream.status === 304) break;
+      const location = upstream.headers.get('location');
+      if (!location) break;
+      await upstream.body?.cancel().catch(() => {});
+      const next = new URL(location, currentUrl);
+      // A redirect off the credential's server would take the secret along.
+      if (next.origin !== credential.origin) {
+        throw new ProxyError('The server redirected to another address', 502, 'redirect_off_origin');
+      }
+      if (body && upstream.status !== 307 && upstream.status !== 308) {
+        currentMethod = 'GET';
+        body = null;
+        delete headers['content-type'];
+      }
+      currentUrl = next.toString();
+      upstream = null;
+    }
+    if (!upstream) throw new ProxyError('Too many redirects', 502, 'too_many_redirects');
+
+    if (input.capture) {
+      const text = await readCapped(upstream, MAX_CAPTURE_BYTES);
+      let json: unknown;
+      try { json = JSON.parse(text); } catch { json = null; }
+      const out = new Headers({ 'content-type': 'application/json', 'cache-control': 'no-store' });
+      if (upstream.ok && json && typeof json === 'object' && !Array.isArray(json)) {
+        const record = json as Record<string, unknown>;
+        const secret = record[input.capture.secret];
+        const username = input.capture.username ? record[input.capture.username] : undefined;
+        if (typeof secret === 'string' && secret) {
+          await setUserCredentialSecret(input.user, input.pluginId, input.credentialId, secret, typeof username === 'string' ? username : undefined);
+          audit(upstream.status, text.length, 'captured');
+          return new Response(JSON.stringify({ ...redact(record, input.capture), captured: true }), { status: upstream.status, headers: out });
+        }
+        audit(upstream.status, text.length);
+        return new Response(JSON.stringify({ ...redact(record, input.capture), captured: false }), { status: upstream.status, headers: out });
+      }
+      audit(upstream.status, text.length);
+      // Never hand back a body that might hold the secret in another shape.
+      return new Response(JSON.stringify({ captured: false }), { status: upstream.status, headers: out });
+    }
+
+    const status = upstream.status;
+    const outHeaders = responseHeaders(upstream);
+    // Where a redirect on the same server ended up (CalDAV discovery needs it).
+    if (currentUrl !== target.toString()) outHeaders.set('x-bulwark-url', currentUrl);
+    if (!upstream.body) {
+      audit(status, 0);
+      release();
+      return new Response(null, { status, headers: outHeaders });
+    }
+    const stream = upstream.body.pipeThrough(countingStream(MAX_PROXY_RESPONSE_BYTES, (received, over) => {
+      audit(status, received, over ? 'response too large' : undefined);
+      release();
+    }));
+    // The browser may stop reading (cancelled download); free the slot then too.
+    signal.addEventListener('abort', release, { once: true });
+    return new Response(stream, { status, headers: outHeaders });
+  } catch (error) {
+    release();
+    if (error instanceof ProxyError) {
+      audit(error.status, 0, error.code);
+      throw error;
+    }
+    if (error instanceof DisallowedUrlError) {
+      audit(403, 0, 'blocked address');
+      throw new ProxyError('This server address is not allowed', 403, 'blocked_address');
+    }
+    if (signal.aborted) {
+      audit(504, 0, 'timeout');
+      throw new ProxyError('The server did not answer in time', 504, 'timeout');
+    }
+    audit(502, 0, 'unreachable');
+    throw new ProxyError('Could not reach the server', 502, 'unreachable');
+  } finally {
+    if (input.capture) release();
+  }
+}
+
+async function readBody(stream: ReadableStream<Uint8Array>, limit: number): Promise<Uint8Array> {
+  const reader = stream.getReader();
+  const chunks: Uint8Array[] = [];
+  let total = 0;
+  for (;;) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    total += value.byteLength;
+    if (total > limit) {
+      await reader.cancel().catch(() => {});
+      throw new ProxyError('Body too large', 413, 'too_large');
+    }
+    chunks.push(value);
+  }
+  return new Uint8Array(Buffer.concat(chunks));
+}
+
+async function readCapped(response: Response, limit: number): Promise<string> {
+  if (!response.body) return '';
+  const reader = response.body.getReader();
+  const chunks: Uint8Array[] = [];
+  let total = 0;
+  for (;;) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    total += value.byteLength;
+    if (total > limit) {
+      await reader.cancel().catch(() => {});
+      throw new ProxyError('Response too large', 502, 'too_large');
+    }
+    chunks.push(value);
+  }
+  return Buffer.concat(chunks).toString('utf8');
+}
diff --git a/lib/plugin-secrets/vault.ts b/lib/plugin-secrets/vault.ts
new file mode 100644
index 000000000..063521cae
--- /dev/null
+++ b/lib/plugin-secrets/vault.ts
@@ -0,0 +1,196 @@
+// Per-user store of the credentials users connected for plugins. One
+// encrypted file per mail account; the secrets never leave the server again
+// except as an auth header on a request the proxy forwards to the
+// credential's own origin.
+
+import { createHash } from 'node:crypto';
+import { readFile, writeFile, mkdir, rename, unlink } from 'node:fs/promises';
+import path from 'node:path';
+import { decryptPayload, encryptPayload } from '@/lib/auth/crypto';
+import type { CredentialInject } from './credentials';
+
+export interface VaultUser {
+  username: string;
+  serverUrl: string;
+}
+
+export interface StoredCredential {
+  origin: string;
+  inject: CredentialInject;
+  label: string;
+  username?: string;
+  secret?: string;
+  createdAt: string;
+  updatedAt: string;
+}
+
+/** What the browser may see about a stored credential: never the secret. */
+export interface CredentialSummary {
+  pluginId: string;
+  credentialId: string;
+  label: string;
+  origin: string;
+  username?: string;
+  connected: boolean;
+  updatedAt: string;
+}
+
+type VaultData = Record<string, Record<string, StoredCredential>>;
+
+/** Cap on credentials per user, across all plugins. */
+export const MAX_USER_CREDENTIALS = 64;
+
+function vaultDir(): string {
+  return process.env.PLUGIN_SECRETS_DIR
+    || path.join(process.env.SETTINGS_DATA_DIR || path.join(process.cwd(), 'data', 'settings'), '..', 'plugin-secrets');
+}
+
+export function userKey(user: VaultUser): string {
+  return createHash('sha256').update(`${user.username}:${user.serverUrl}`).digest('hex');
+}
+
+function vaultPath(user: VaultUser): string {
+  const dir = path.resolve(vaultDir());
+  const file = path.resolve(dir, `${userKey(user)}.enc`);
+  if (!file.startsWith(dir + path.sep)) throw new Error('Invalid vault path');
+  return file;
+}
+
+async function load(user: VaultUser): Promise<VaultData> {
+  let raw: string;
+  try {
+    raw = await readFile(vaultPath(user), 'utf8');
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code === 'ENOENT') return {};
+    throw error;
+  }
+  const payload = decryptPayload(raw, 'plugin-secrets');
+  // Bound to this user: a file copied over from another account's name
+  // decrypts, but carries the other account's key and is ignored.
+  if (!payload || payload.u !== userKey(user)) return {};
+  const data = payload.d;
+  return data && typeof data === 'object' ? (data as VaultData) : {};
+}
+
+async function save(user: VaultUser, data: VaultData): Promise<void> {
+  const file = vaultPath(user);
+  if (Object.keys(data).length === 0) {
+    try { await unlink(file); } catch { /* nothing stored */ }
+    return;
+  }
+  await mkdir(path.dirname(file), { recursive: true });
+  const tmp = `${file}.${process.pid}.tmp`;
+  await writeFile(tmp, encryptPayload({ u: userKey(user), d: data }, 'plugin-secrets'), { encoding: 'utf8', mode: 0o600 });
+  await rename(tmp, file);
+}
+
+// Writes for one user run one after another, so two saves can't drop each
+// other's changes.
+const queues = new Map<string, Promise<unknown>>();
+function serialize<T>(user: VaultUser, task: () => Promise<T>): Promise<T> {
+  const key = userKey(user);
+  const run = (queues.get(key) ?? Promise.resolve()).then(task, task);
+  const tail = run.catch(() => {});
+  queues.set(key, tail);
+  void tail.then(() => { if (queues.get(key) === tail) queues.delete(key); });
+  return run;
+}
+
+export async function getUserCredential(user: VaultUser, pluginId: string, credentialId: string): Promise<StoredCredential | null> {
+  const data = await load(user);
+  return data[pluginId]?.[credentialId] ?? null;
+}
+
+export async function listUserCredentials(user: VaultUser, pluginId?: string): Promise<CredentialSummary[]> {
+  const data = await load(user);
+  const out: CredentialSummary[] = [];
+  for (const [pid, creds] of Object.entries(data)) {
+    if (pluginId && pid !== pluginId) continue;
+    for (const [cid, c] of Object.entries(creds)) {
+      out.push({
+        pluginId: pid, credentialId: cid, label: c.label, origin: c.origin,
+        ...(c.username ? { username: c.username } : {}),
+        connected: !!c.secret || c.inject.type === 'none',
+        updatedAt: c.updatedAt,
+      });
+    }
+  }
+  return out;
+}
+
+export class VaultFullError extends Error {
+  constructor() {
+    super(`At most ${MAX_USER_CREDENTIALS} plugin credentials per account`);
+  }
+}
+
+/**
+ * Save a credential. Changing the origin of a saved one drops its secret, so
+ * a secret is only ever sent where the user first approved it.
+ */
+export function putUserCredential(
+  user: VaultUser,
+  pluginId: string,
+  credentialId: string,
+  input: { origin: string; inject: CredentialInject; label: string; username?: string; secret?: string },
+): Promise<void> {
+  return serialize(user, async () => {
+    const data = await load(user);
+    const existing = data[pluginId]?.[credentialId];
+    const count = Object.values(data).reduce((n, c) => n + Object.keys(c).length, 0);
+    if (!existing && count >= MAX_USER_CREDENTIALS) throw new VaultFullError();
+    const now = new Date().toISOString();
+    const keepSecret = existing && existing.origin === input.origin ? existing.secret : undefined;
+    data[pluginId] = {
+      ...(data[pluginId] ?? {}),
+      [credentialId]: {
+        origin: input.origin,
+        inject: input.inject,
+        label: input.label,
+        ...(input.username ? { username: input.username } : {}),
+        ...((input.secret ?? keepSecret) ? { secret: input.secret ?? keepSecret } : {}),
+        createdAt: existing?.createdAt ?? now,
+        updatedAt: now,
+      },
+    };
+    await save(user, data);
+  });
+}
+
+/** Store a secret captured from a response for an existing credential. */
+export function setUserCredentialSecret(
+  user: VaultUser,
+  pluginId: string,
+  credentialId: string,
+  secret: string,
+  username?: string,
+): Promise<boolean> {
+  return serialize(user, async () => {
+    const data = await load(user);
+    const existing = data[pluginId]?.[credentialId];
+    if (!existing) return false;
+    data[pluginId][credentialId] = {
+      ...existing,
+      secret,
+      ...(username ? { username } : {}),
+      updatedAt: new Date().toISOString(),
+    };
+    await save(user, data);
+    return true;
+  });
+}
+
+/** Remove one credential, or all of a plugin's when credentialId is omitted. */
+export function deleteUserCredentials(user: VaultUser, pluginId: string, credentialId?: string): Promise<void> {
+  return serialize(user, async () => {
+    const data = await load(user);
+    if (!data[pluginId]) return;
+    if (credentialId) {
+      delete data[pluginId][credentialId];
+      if (Object.keys(data[pluginId]).length === 0) delete data[pluginId];
+    } else {
+      delete data[pluginId];
+    }
+    await save(user, data);
+  });
+}
diff --git a/lib/plugin-settings.ts b/lib/plugin-settings.ts
new file mode 100644
index 000000000..0453b6046
--- /dev/null
+++ b/lib/plugin-settings.ts
@@ -0,0 +1,50 @@
+// What a plugin's settings actually are: the manifest defaults, overlaid
+// with what the user saved, each value checked against the schema. Used by
+// the settings page and by everything that hands settings to the plugin,
+// so the two can't disagree.
+
+import type { InstalledPlugin, SettingFieldSchema } from './plugin-types';
+
+function coerce(field: SettingFieldSchema, value: unknown): unknown {
+  switch (field.type) {
+    case 'boolean':
+      return typeof value === 'boolean' ? value : field.default;
+    case 'string':
+      return typeof value === 'string' ? value : field.default;
+    case 'select':
+      return typeof value === 'string' && Array.isArray(field.options) && field.options.includes(value)
+        ? value
+        : field.default;
+    case 'number': {
+      if (typeof value !== 'number' || !Number.isFinite(value)) return field.default;
+      if (field.min !== undefined && value < field.min) return field.min;
+      if (field.max !== undefined && value > field.max) return field.max;
+      return value;
+    }
+    default:
+      return field.default;
+  }
+}
+
+/**
+ * Settings as the plugin should see them. Without a schema the stored
+ * values pass through unchanged (older plugins read free-form settings).
+ * With one, every declared field has a valid value and nothing else is kept,
+ * so a field removed in an update or an option that no longer exists can't
+ * linger.
+ */
+export function effectiveSettings(plugin: Pick<InstalledPlugin, 'settings' | 'settingsSchema'>): Record<string, unknown> {
+  const stored = plugin.settings ?? {};
+  const schema = plugin.settingsSchema;
+  if (!schema || Object.keys(schema).length === 0) return { ...stored };
+  const out: Record<string, unknown> = {};
+  for (const [key, field] of Object.entries(schema)) {
+    out[key] = key in stored ? coerce(field, stored[key]) : field.default;
+  }
+  return out;
+}
+
+/** A single value as it will be stored, or the field's default if invalid. */
+export function coerceSetting(field: SettingFieldSchema, value: unknown): unknown {
+  return coerce(field, value);
+}
diff --git a/lib/plugin-slot-catalog.ts b/lib/plugin-slot-catalog.ts
new file mode 100644
index 000000000..e0b9354b4
--- /dev/null
+++ b/lib/plugin-slot-catalog.ts
@@ -0,0 +1,122 @@
+// Every place a plugin can put UI, in one table. The docs and the tests are
+// generated from it, the same way as the hook catalogue (plugin-hook-catalog.ts).
+//
+// Two kinds of surface:
+// - `frame`: the plugin renders its own React component into a sandboxed
+//   iframe (`exports.slots[name]`). For panels, sections and pages.
+// - `action`: the plugin declares buttons or menu entries as data
+//   (`api.ui.setActions(surface, [...])`) and the host draws them in its own
+//   style; a click reaches the plugin as `onAction`. For surfaces that repeat
+//   per row or item, where an iframe each would be far too heavy, and for
+//   menus that must look like the rest of the app.
+// - `data`: the plugin hands the host plain data to draw, such as labels on
+//   calendar days (`api.ui.setDayLabels`).
+// Badges on list rows are data too (the onEmailListItemRender hook).
+
+import type { Permission } from './plugin-types';
+
+export type SlotArea =
+  | 'app' | 'mail-list' | 'reader' | 'composer' | 'navigation'
+  | 'calendar' | 'contacts' | 'tasks' | 'files' | 'settings' | 'admin' | 'dialog';
+
+export interface SlotSpec {
+  area: SlotArea;
+  kind: 'frame' | 'action' | 'data';
+  /** Any one of these lets a plugin use the slot. */
+  permissions: readonly Permission[];
+  /** Props (frame) or click context (action) and the permission each needs; null = none. */
+  props: Record<string, Permission | null> | '*';
+  /** Sits in a row of buttons and sizes to its content. */
+  inline?: boolean;
+  /** Where it appears. */
+  where: string;
+}
+
+const S = (
+  area: SlotArea,
+  kind: SlotSpec['kind'],
+  permissions: readonly Permission[],
+  props: SlotSpec['props'],
+  where: string,
+  inline = false,
+): SlotSpec => ({ area, kind, permissions, props, where, ...(inline ? { inline } : {}) });
+
+export const SLOT_CATALOG = {
+  // ─── App ───────────────────────────────────────────────────
+  'app-top-banner': S('app', 'frame', ['ui:app-top-banner'], { username: 'account:read', serverUrl: 'account:read' }, 'a banner across the top of every page'),
+  'plugin-dialog': S('dialog', 'frame', ['ui:observe'], '*', 'inside a dialog the plugin opened with api.ui.openDialog'),
+  'command-palette': S('app', 'action', ['ui:commands'], {}, 'entries in the command palette (Ctrl+K)'),
+
+  // ─── Navigation ────────────────────────────────────────────
+  'navigation-rail-bottom': S('navigation', 'frame', ['ui:navigation-rail'], {}, 'the bottom of the navigation rail'),
+  'sidebar-widget': S('navigation', 'frame', ['ui:sidebar-widget'], {}, 'a widget at the bottom of the mail sidebar'),
+  'sidebar-section': S('navigation', 'frame', ['ui:sidebar-widget'], { mailboxId: null }, 'a collapsible section in the mail sidebar, below the folders'),
+  'top-bar-actions': S('navigation', 'action', ['ui:toolbar'], {}, 'buttons in the top bar, next to search', true),
+  'app-page': S('navigation', 'frame', ['ui:app-page'], { pageId: null, path: null }, 'a full page of its own, with an entry in the navigation rail (api.ui.setPages)'),
+
+  // ─── Message list ──────────────────────────────────────────
+  'message-list-header': S('mail-list', 'frame', ['ui:message-list'], { mailboxId: null, mailboxRole: null }, 'above the message list'),
+  'message-list-empty': S('mail-list', 'frame', ['ui:message-list'], { mailboxId: null, mailboxRole: null, searching: null }, 'in an empty message list, below the "no messages" text'),
+  'message-row-actions': S('mail-list', 'action', ['ui:message-list'], { emailId: 'email:read' }, 'hover buttons on a message row, and the row menu on phones', true),
+  'message-bulk-actions': S('mail-list', 'action', ['ui:message-list'], { emailIds: 'email:read' }, 'buttons in the toolbar shown while messages are selected', true),
+  'context-menu-email': S('mail-list', 'frame', ['ui:context-menu'], {}, 'the right-click menu of a message'),
+  'toolbar-actions': S('mail-list', 'frame', ['ui:toolbar'], {}, 'the message toolbar', true),
+
+  // ─── Reader ────────────────────────────────────────────────
+  'reader-header': S('reader', 'frame', ['ui:email-banner'], { email: 'email:read' }, 'at the top of the open message, above the subject'),
+  'reader-below-subject': S('reader', 'frame', ['ui:email-banner'], { email: 'email:read' }, 'right under the subject and sender of the open message'),
+  'email-banner': S('reader', 'frame', ['ui:email-banner'], { email: 'email:read' }, 'a banner above the message body'),
+  'reader-above-quote': S('reader', 'frame', ['ui:email-banner'], { email: 'email:read' }, 'between the new text of a message and the quoted text below it'),
+  'email-footer': S('reader', 'frame', ['ui:email-footer'], { emailId: 'email:read' }, 'below the message body'),
+  'thread-summary': S('reader', 'frame', ['ui:email-banner'], { threadId: 'email:read', emailIds: 'email:read' }, 'above the messages of an open conversation (the phone conversation view and Mountain View; the default desktop layout opens one message at a time and has no conversation view)'),
+  'reader-actions': S('reader', 'action', ['ui:toolbar'], { emailId: 'email:read' }, 'buttons in the open message\'s toolbar', true),
+  'email-detail-sidebar': S('reader', 'frame', ['ui:email-details'], { email: 'email:read' }, 'a side panel next to the open message'),
+  'email-details-section': S('reader', 'frame', ['ui:email-details'], { email: 'email:read', category: null }, 'a section in the message details'),
+  'attachment-actions': S('reader', 'frame', ['email:read'], { attachment: null }, 'buttons on each attachment', true),
+  'attachment-menu': S('reader', 'action', ['email:read'], { emailId: 'email:read', blobId: 'email:read', name: 'email:read', type: 'email:read', size: 'email:read' }, 'entries in each attachment\'s menu (for example "Save to Nextcloud")'),
+
+  // ─── Composer ──────────────────────────────────────────────
+  'composer-toolbar': S('composer', 'frame', ['ui:composer-toolbar'], { insertText: 'compose:open', getSelectedText: 'email:send', composerId: null }, 'the composer\'s plugin row above its bottom bar, for controls that need their own UI (a button belongs in composer-toolbar-actions)', true),
+  'composer-above-body': S('composer', 'frame', ['ui:composer-toolbar', 'ui:composer-sidebar'], { draft: 'email:send', insertText: 'compose:open', getSelectedText: 'email:send', composerId: null }, 'between the subject and the message text'),
+  'composer-below-body': S('composer', 'frame', ['ui:composer-toolbar', 'ui:composer-sidebar'], { draft: 'email:send', insertText: 'compose:open', getSelectedText: 'email:send', composerId: null }, 'below the message text, above the attachments'),
+  'composer-sidebar': S('composer', 'frame', ['ui:composer-sidebar'], {}, 'a panel left of the composer'),
+  'composer-sidebar-right': S('composer', 'frame', ['ui:composer-sidebar'], {}, 'a panel right of the composer'),
+  'composer-attachment-source': S('composer', 'frame', ['ui:composer-toolbar', 'ui:composer-sidebar'], { onAttach: null, insertText: 'compose:open', composerId: null }, 'the composer\'s plugin row, next to composer-toolbar, as a source of files (older plugins; an entry in the Attach menu, composer-attach-menu, with api.composer.attach looks like the app\'s own)', true),
+  'composer-send-menu': S('composer', 'action', ['ui:composer-toolbar'], { draft: 'email:send', composerId: null }, 'entries in the menu next to Send'),
+  'composer-attach-menu': S('composer', 'action', ['ui:composer-toolbar'], { composerId: null }, 'entries in the Attach menu (for example "From Nextcloud"); the click\'s composerId lets api.composer.attach add files'),
+  'composer-options-menu': S('composer', 'action', ['ui:composer-toolbar'], { composerId: null }, 'entries in the composer\'s Options menu'),
+  'composer-toolbar-actions': S('composer', 'action', ['ui:composer-toolbar'], { composerId: null }, 'buttons in the composer\'s bottom bar, after Attach, Templates and Options; an action\'s shortcut works while the composer has focus', true),
+
+  // ─── Calendar ──────────────────────────────────────────────
+  'calendar-event-actions': S('calendar', 'frame', ['ui:calendar-action'], { eventData: 'calendar:read', setVirtualLocation: null }, 'buttons in the event form', true),
+  'calendar-event-detail': S('calendar', 'frame', ['ui:calendar-action'], { event: 'calendar:read' }, 'a section in an event\'s details'),
+  'calendar-event-form': S('calendar', 'frame', ['ui:calendar-action'], { event: 'calendar:read' }, 'a section in the form for a new or edited event'),
+  'calendar-day-header': S('calendar', 'data', ['ui:calendar-action'], { date: null }, 'a short label under a day\'s name in the day, week and month views; a dot in the phone month view (api.ui.setDayLabels)'),
+  'mini-calendar-marks': S('calendar', 'data', ['ui:calendar-action'], { date: null }, 'dots on days in the small month calendar (api.ui.setDayLabels)'),
+
+  // ─── Contacts ──────────────────────────────────────────────
+  'contact-cryptokeys': S('contacts', 'frame', ['ui:contact-cryptokeys'], { cryptoKeys: 'contacts:read' }, 'the encryption keys section of a contact'),
+  'contact-detail-section': S('contacts', 'frame', ['ui:contacts'], { contact: 'contacts:read' }, 'a section in a contact\'s details'),
+  'contact-list-actions': S('contacts', 'action', ['ui:contacts'], { contactIds: 'contacts:read' }, 'buttons in the contact list toolbar', true),
+
+  // ─── Tasks ─────────────────────────────────────────────────
+  'task-detail-section': S('tasks', 'frame', ['ui:tasks'], { task: 'tasks:read' }, 'a section in a task\'s details'),
+  'task-list-actions': S('tasks', 'action', ['ui:tasks'], { taskIds: 'tasks:read' }, 'buttons in the task list toolbar', true),
+
+  // ─── Files ─────────────────────────────────────────────────
+  'file-actions': S('files', 'action', ['ui:files'], { files: 'files:read' }, 'entries in a file\'s menu and the selection toolbar'),
+  'file-preview-section': S('files', 'frame', ['ui:files'], { file: 'files:read' }, 'a section in the file preview'),
+
+  // ─── Settings and admin ────────────────────────────────────
+  'settings-section': S('settings', 'frame', ['ui:settings-section'], {}, 'a section on the plugin\'s own page in Settings (above its settings-page, when it has one: one entry per plugin)'),
+  'settings-page': S('settings', 'frame', ['ui:settings-section'], {}, 'a page of its own in Settings, listed under the plugin\'s name'),
+  'admin-plugin-page': S('admin', 'frame', ['ui:admin-page', 'admin:config'], {}, 'the plugin\'s page in the admin dashboard'),
+} as const satisfies Record<string, SlotSpec>;
+
+export type CatalogSlotName = keyof typeof SLOT_CATALOG;
+
+export function slotSpec(name: string): SlotSpec | null {
+  return Object.prototype.hasOwnProperty.call(SLOT_CATALOG, name)
+    ? SLOT_CATALOG[name as CatalogSlotName]
+    : null;
+}
diff --git a/lib/plugin-thread-expand.ts b/lib/plugin-thread-expand.ts
new file mode 100644
index 000000000..cad1b9b5d
--- /dev/null
+++ b/lib/plugin-thread-expand.ts
@@ -0,0 +1,22 @@
+// onThreadExpand: a conversation was expanded or collapsed, in the message
+// list or in the reading pane. Shared by every place that folds a thread so
+// they all report the same payload.
+
+import type { Email } from './jmap/types';
+import { emailHooks } from './plugin-hooks';
+import { threadIdFromKey } from './thread-utils';
+
+/**
+ * Tell plugins a conversation was expanded or collapsed. `emails` are the
+ * messages that were unfolded or folded: the whole thread for a list row, one
+ * message for a card in the reading pane.
+ */
+export function emitThreadExpand(
+  threadKey: string,
+  emails: ReadonlyArray<Pick<Email, 'id' | 'threadId'>>,
+  expanded: boolean,
+): void {
+  if (emailHooks.onThreadExpand.size === 0) return;
+  const threadId = emails[0]?.threadId || threadIdFromKey(threadKey);
+  void emailHooks.onThreadExpand.emit({ threadId, emailIds: emails.map((e) => e.id), expanded });
+}
diff --git a/lib/plugin-types.ts b/lib/plugin-types.ts
index f46a40f0e..f16ab8500 100644
--- a/lib/plugin-types.ts
+++ b/lib/plugin-types.ts
@@ -1,3 +1,6 @@
+import type { CredentialSpec } from './plugin-secrets/credentials';
+import type { CatalogSlotName } from './plugin-slot-catalog';
+
 // Plugin & Theme system types
 
 // ─── Common ──────────────────────────────────────────────────
@@ -103,6 +106,12 @@ export interface ThemeManifest {
 }
 
 export interface PluginManifest {
+  /**
+   * Accounts and API keys the plugin uses through the server proxy
+   * (`api.proxy.fetch`). The secret stays on the server; see
+   * lib/plugin-secrets/credentials.ts.
+   */
+  credentials?: Record<string, CredentialSpec>;
   id: string;
   name: string;
   version: string;
@@ -209,6 +218,8 @@ export interface InstalledTheme {
   builtIn: boolean;
   managed?: boolean;
   forceEnabled?: boolean;
+  /** Server content hash of a managed theme's CSS + skin; see ServerTheme. */
+  contentHash?: string;
 
   // ─── Advanced (Theme API v2) ─ carried over from the manifest ─
   apiVersion?: 1 | 2;
@@ -221,6 +232,8 @@ export interface InstalledTheme {
 }
 
 export interface InstalledPlugin {
+  /** From the manifest: see PluginManifest.credentials. */
+  credentials?: Record<string, CredentialSpec>;
   id: string;
   name: string;
   version: string;
@@ -268,35 +281,21 @@ export interface InstalledPlugin {
    * skip the consent prompt (admin pre-approval).
    */
   grantedPermissions?: string[];
+  /**
+   * For plugins the user installed: the validated manifest, kept so the
+   * package can be rebuilt for an approval request, and the hash an admin
+   * approval is pinned to (see packageHash in lib/extension-package.ts).
+   */
+  packageManifest?: Record<string, unknown>;
+  approvalHash?: string;
+  /** Last answer from the server about this package's approval. */
+  approvalStatus?: 'pending' | 'approved' | 'denied' | 'not-requested';
 }
 
 // ─── UI Slots ────────────────────────────────────────────────
 
-export type SlotName =
-  | 'toolbar-actions'
-  | 'app-top-banner'
-  | 'email-banner'
-  | 'email-footer'
-  | 'composer-toolbar'
-  | 'composer-sidebar'
-  | 'composer-sidebar-right'
-  | 'sidebar-widget'
-  | 'email-detail-sidebar'
-  | 'email-details-section'
-  | 'settings-section'
-  | 'context-menu-email'
-  | 'navigation-rail-bottom'
-  | 'calendar-event-actions'
-  | 'admin-plugin-page'
-  | 'contact-cryptokeys'
-  | 'attachment-actions'
-  | 'composer-attachment-source'
-  // Rendered inside a plugin-requested host dialog (see `ui.openDialog` /
-  // PluginDialogHost), NOT in-page like every other slot above - this is
-  // the only slot that renders inside the app-root fixed overlay instead of
-  // wherever the slot is placed in the page, so it's the one to use for a
-  // large, genuinely clickable custom UI a small toolbar/row slot can't fit.
-  | 'plugin-dialog';
+/** Every slot and action surface; see lib/plugin-slot-catalog.ts. */
+export type SlotName = CatalogSlotName;
 
 export interface SlotRegistration {
   pluginId: string;
@@ -408,6 +407,12 @@ export interface EmailReadView {
   isRead: boolean;
   isFlagged: boolean;
   hasAttachment: boolean;
+  /**
+   * The message's attachments. `blobId` is what `email.getAttachment`
+   * takes. Inline images are included and marked. Empty until the host has
+   * loaded the message's body structure.
+   */
+  attachments: { blobId: string; name: string; type: string; size: number; inline: boolean }[];
   preview: string;
   keywords: string[];
   /** Full plain-text body of the message (HTML-only bodies are stripped to
@@ -440,6 +445,25 @@ export interface EmailReadView {
   };
 }
 
+/**
+ * The light view of a message used by list-level hooks (new mail, selection,
+ * moves): headers and flags, no body or source. Same email:read sensitivity
+ * as EmailReadView.
+ */
+export interface EmailSummary {
+  id: string;
+  threadId: string;
+  mailboxIds: string[];
+  from: { name: string; email: string }[];
+  to: { name: string; email: string }[];
+  subject: string;
+  receivedAt: string;
+  preview: string;
+  keywords: string[];
+  hasAttachment: boolean;
+  size: number;
+}
+
 export interface DraftView {
   to: string[];
   cc: string[];
@@ -463,15 +487,26 @@ export interface MailboxView {
 
 export interface CalendarEventView {
   id: string;
+  /** JSCalendar uid, stable across edits and the same for every occurrence. */
+  uid: string;
   calendarId: string;
   title: string;
   description: string;
+  /** Local start, as stored (ISO 8601 without zone, see `timeZone`). */
   start: string;
-  end: string;
+  /** ISO 8601 duration, e.g. PT1H. */
+  duration: string;
+  timeZone: string | null;
+  /** UTC start and end when the server computed them. */
+  utcStart: string | null;
+  utcEnd: string | null;
   isAllDay: boolean;
   location: string;
   status: string;
-  recurrenceRule?: string;
+  /** Attendee addresses, organizer included. */
+  participants: { name: string; email: string; role: string; status: string }[];
+  isRecurring: boolean;
+  keywords: string[];
 }
 
 export interface CalendarView {
@@ -480,17 +515,86 @@ export interface CalendarView {
   color: string;
   isVisible: boolean;
   isDefault: boolean;
+  /** Holds tasks only; events can't be put in it. */
+  isTasksOnly: boolean;
+}
+
+/**
+ * What a plugin passes to `api.calendar.createEvent` (and, every field
+ * optional, to `updateEvent`). Times are written one of three ways:
+ * `2026-05-01` (a day), `2026-05-01T09:30` (a wall-clock time in `timeZone`)
+ * or `2026-05-01T07:30:00Z` (UTC). Give `end` or `duration`, not both; with
+ * neither an event lasts one hour, or one day when it is all-day.
+ */
+export interface CalendarEventInput {
+  /** 1-500 characters. */
+  title: string;
+  /** Up to 10,000 characters of plain text. */
+  description?: string;
+  start: string;
+  /** Exclusive: an all-day event on May 1 ends on `2026-05-02`. */
+  end?: string;
+  /** ISO 8601 duration such as `PT1H30M`, or whole days (`P2D`) when all-day. */
+  duration?: string;
+  /** IANA zone of a wall-clock `start`. Defaults to the user's zone. */
+  timeZone?: string;
+  /** Defaults to true when `start` is a date without a time. */
+  isAllDay?: boolean;
+  /** Up to 500 characters. */
+  location?: string;
+  /** From `api.calendar.listCalendars()`. Defaults to the default calendar. */
+  calendarId?: string;
+  /**
+   * Attendees, at most 50, stored with the user as organizer. No invitation
+   * is sent; the user can send them from the event. An empty array removes
+   * them.
+   */
+  participants?: { email: string; name?: string }[];
+  /**
+   * Repeat the event. `until` is a date (YYYY-MM-DD); give `count` or
+   * `until`, not both. null removes the repetition (updates).
+   */
+  repeat?: { frequency: 'daily' | 'weekly' | 'monthly' | 'yearly'; interval?: number; count?: number; until?: string } | null;
+  /**
+   * createEvent only: your own stable id for the event, 1-128 of
+   * `A-Z a-z 0-9 . _ : -`. It is stored as `<uid>@<pluginId>.plugin.bulwark`,
+   * which is what CalendarEventView.uid then shows, so you can find the
+   * event again without remembering its id.
+   */
+  uid?: string;
+}
+
+/** What a plugin passes to `api.tasks.create` (and, every field optional, to `update`). */
+export interface TaskInput {
+  /** 1-500 characters. */
+  title: string;
+  /** Up to 10,000 characters of plain text. */
+  description?: string;
+  /** `2026-05-01` or `2026-05-01T17:00` (wall clock). null removes it on update. */
+  due?: string | null;
+  /** 0 (none), 1 (highest) to 9 (lowest). */
+  priority?: number;
+  /** Defaults to the tasks calendar, else the default calendar. */
+  calendarId?: string;
 }
 
 export interface ContactView {
   id: string;
+  uid: string;
   addressBookId: string;
+  kind: string;
+  fullName: string;
   firstName: string;
   lastName: string;
   emails: string[];
   phones: string[];
   company: string;
   notes: string;
+  /**
+   * Birthdays, anniversaries and other dates, as `--MM-DD` when the year is
+   * unknown or `YYYY-MM-DD` when it is known.
+   */
+  anniversaries: { kind: string; date: string }[];
 }
 
 export interface AddressBookView {
@@ -527,20 +631,122 @@ export interface IdentityView {
 
 export interface TaskView {
   id: string;
+  uid: string;
   title: string;
   description: string;
   isComplete: boolean;
+  progress: string;
   dueDate: string | null;
-  priority: string;
+  /** 0 (none) or 1 (highest) to 9 (lowest), as in JSCalendar. */
+  priority: number;
   calendarId: string;
+  keywords: string[];
 }
 
 export interface TemplateView {
   id: string;
   name: string;
+  category: string;
   subject: string;
-  htmlBody: string;
-  textBody: string;
+  body: string;
+  isHTML: boolean;
+}
+
+/** What a plugin passes to `api.templates.create` (and, every field optional, to `update`). */
+export interface TemplateInput {
+  /** 1-200 characters. */
+  name: string;
+  /** Up to 998 characters. */
+  subject?: string;
+  /** Up to 100,000 characters. When isHTML, sanitised like any HTML a plugin hands the host. */
+  body?: string;
+  isHTML?: boolean;
+  /** Up to 100 characters; '' for none. */
+  category?: string;
+}
+
+/** What a plugin may change on a sender identity with `api.identities.update`. The address can't be changed. */
+export interface IdentityPatch {
+  /** Up to 256 characters. */
+  name?: string;
+  /** At most 10 addresses (`a@example.com` or `Name <a@example.com>`); null or [] removes them. */
+  replyTo?: string[] | null;
+  /** Up to 20,000 characters; null or '' removes it. */
+  textSignature?: string | null;
+  /** Up to 100,000 characters, sanitised like a signature typed into Settings; null or '' removes it. */
+  htmlSignature?: string | null;
+}
+
+/** What a plugin passes to `api.vacation.set`. Fields left out keep their value. */
+export interface VacationInput {
+  isEnabled: boolean;
+  /** Up to 500 characters. */
+  subject?: string;
+  /** Up to 64,000 characters. Derived from htmlBody when that is given and this is not. */
+  textBody?: string;
+  /** Up to 64,000 characters, sanitised like the HTML typed into Settings; null removes it. */
+  htmlBody?: string | null;
+  /** When the reply starts, with a zone (`2026-05-01T00:00:00Z`), or null for now. */
+  fromDate?: string | null;
+  /** When it ends, or null for open-ended. */
+  toDate?: string | null;
+}
+
+/**
+ * A file the plugin uploaded with `api.jmap.uploadBlob`, to attach to a
+ * message it opens or saves.
+ */
+export interface BlobAttachmentRef {
+  blobId: string;
+  /** 1-255 characters. */
+  name: string;
+  /** A media type such as application/pdf. */
+  type: string;
+  /** Bytes. */
+  size: number;
+}
+
+/**
+ * What a plugin passes to `api.compose.open`. Addresses are
+ * `a@example.com` or `Name <a@example.com>`; at most 100 recipients and 20
+ * attachments.
+ */
+export interface ComposeInput {
+  to?: string[];
+  cc?: string[];
+  bcc?: string[];
+  /** One line, up to 998 characters. */
+  subject?: string;
+  /** Up to 512 KB. Plain text unless isHtml; HTML is sanitised. */
+  body?: string;
+  isHtml?: boolean;
+  attachments?: BlobAttachmentRef[];
+}
+
+/** What a plugin passes to `api.drafts.create`: the same fields as ComposeInput. */
+export type DraftInput = ComposeInput;
+
+/**
+ * What a plugin passes to `api.notifications.show`. The plugin's name is
+ * added to what the user sees, so they know who sent it.
+ */
+export interface NotificationInput {
+  /** 1-120 characters, one line. */
+  title: string;
+  /** Up to 300 characters, one line. */
+  body?: string;
+  /**
+   * 1-64 letters, digits or `. _ : -`. A new notification with the same tag
+   * replaces the old one, and onNotificationClick hands the tag back.
+   */
+  tag?: string;
+  /**
+   * A link the host shows as a button on the toast and as a link in the
+   * notification panel, opened in a new tab. The URL must be http(s) and on
+   * a server the plugin already talks to: one of its `httpOrigins`, or the
+   * server of one of its proxy credentials.
+   */
+  action?: { label: string; url: string };
 }
 
 export interface FilterRuleView {
@@ -1048,12 +1254,22 @@ export const ALL_PERMISSIONS = [
   // Submit a fully-formed raw RFC822 message via JMAP (used after a plugin
   // signs/encrypts an outgoing message itself).
   'email:raw-send',
-  // Fetch a message blob's raw bytes by blobId (for decrypt/verify).
+  // Read the bytes of a message's attachments and its full source
+  // (email.getAttachment / email.getRaw), and of files the user attaches.
+  // Arbitrary blob ids (jmap.fetchBlob) stay privileged-tier only.
   'email:blob-read',
   // Upload a file to server (for encrypt).
   'email:blob-write',
   // Replace the rendered body of an opened email (render-takeover).
   'email:render-takeover',
+  // Open the composer filled in (api.compose.open). Low risk: the user still
+  // has to press Send.
+  'compose:open',
+  // Read the message being written (api.composer.getBody/getSelection), in
+  // a composer that handed the plugin its id.
+  'compose:read',
+  // Change the message being written (api.composer.replaceSelection/replaceBody).
+  'compose:write',
   'calendar:read', 'calendar:write',
   'contacts:read', 'contacts:write',
   'files:read', 'files:write',
@@ -1061,7 +1277,6 @@ export const ALL_PERMISSIONS = [
   'filters:read', 'filters:write',
   'tasks:read', 'tasks:write',
   'templates:read', 'templates:write',
-  'smime:read',
   'vacation:read', 'vacation:write',
   'settings:read', 'settings:write',
   'security:read',
@@ -1072,18 +1287,33 @@ export const ALL_PERMISSIONS = [
   'ui:observe', 'ui:toolbar', 'ui:app-top-banner', 'ui:email-banner', 'ui:email-footer', 'ui:contact-cryptokeys',
   'ui:email-details',
   'ui:download-file',
+  // Show a system notification, or a toast when the user hasn't allowed them
+  // (api.notifications.show).
+  'ui:notifications',
   // Register native message-list category tabs (Gmail-style inbox tabs).
   'ui:message-list-tabs',
   'ui:composer-toolbar', 'ui:composer-sidebar',
   'ui:sidebar-widget', 'ui:settings-section',
   'ui:context-menu', 'ui:navigation-rail', 'ui:keyboard',
   'ui:calendar-action', 'ui:admin-page',
+  // Surfaces from the slot catalogue (lib/plugin-slot-catalog.ts).
+  'ui:message-list', 'ui:contacts', 'ui:tasks', 'ui:files', 'ui:commands', 'ui:app-page',
+  // Requests that carry an account or API key, added by the server (lib/plugin-secrets).
+  'http:proxy',
   'admin:config',
   'app:lifecycle',
 ] as const;
 
 export type Permission = (typeof ALL_PERMISSIONS)[number];
 
+/**
+ * Permissions older plugins may still name that no longer grant anything:
+ * `smime:read` covered the built-in S/MIME code, which moved into a plugin.
+ * Accepted and dropped at install, with a warning, so those plugins still
+ * install.
+ */
+export const DEPRECATED_PERMISSIONS: readonly string[] = ['smime:read'];
+
 /** Permissions always granted regardless of manifest */
 export const IMPLICIT_PERMISSIONS: Permission[] = ['ui:observe', 'app:lifecycle'];
 
diff --git a/lib/plugin-validator.ts b/lib/plugin-validator.ts
index c37210f58..4082a04d2 100644
--- a/lib/plugin-validator.ts
+++ b/lib/plugin-validator.ts
@@ -1,18 +1,12 @@
 // Plugin/Theme ZIP upload validation, extraction, and manifest parsing
 
-import JSZip from 'jszip';
+import type { ThemeManifest, PluginManifest } from './plugin-types';
 import {
-  type ThemeManifest,
-  type PluginManifest,
-  type PluginType,
-  ALL_PERMISSIONS,
-  MAX_PLUGIN_SIZE,
-  MAX_THEME_SIZE,
-  MAX_THEME_SKIN_BYTES,
-  ALLOWED_PLUGIN_FILES,
-} from './plugin-types';
-import { sanitizeThemeCSS, sanitizeSkinCSS } from './theme-loader';
-import { compileAdvancedTheme, isAdvancedManifest } from './theme-compiler';
+  ExtensionPackageError,
+  readEntry,
+  readPluginPackage,
+  readThemePackage,
+} from './extension-package';
 
 export interface ValidationResult {
   valid: boolean;
@@ -37,358 +31,67 @@ export interface PluginExtractionResult extends ValidationResult {
   preview: string | null;
 }
 
-// ─── Manifest Validation ─────────────────────────────────────
-
-function validateBaseManifest(manifest: Record<string, unknown>): string[] {
-  const errors: string[] = [];
-
-  if (!manifest.id || typeof manifest.id !== 'string') errors.push('Missing or invalid "id"');
-  if (!manifest.name || typeof manifest.name !== 'string') errors.push('Missing or invalid "name"');
-  if (!manifest.version || typeof manifest.version !== 'string') errors.push('Missing or invalid "version"');
-  if (!manifest.author || typeof manifest.author !== 'string') errors.push('Missing or invalid "author"');
-  if (!manifest.type || typeof manifest.type !== 'string') errors.push('Missing or invalid "type"');
-
-  // Validate ID format (alphanumeric + hyphens)
-  if (manifest.id && typeof manifest.id === 'string' && !/^[a-z0-9][a-z0-9-]*[a-z0-9]$/.test(manifest.id)) {
-    errors.push('ID must be lowercase alphanumeric with hyphens, min 2 chars');
-  }
-
-  return errors;
-}
-
-function validateThemeManifest(manifest: Record<string, unknown>): { result: ThemeManifest | null; errors: string[] } {
-  const errors = validateBaseManifest(manifest);
-
-  if (manifest.type !== 'theme') {
-    errors.push(`Expected type "theme", got "${manifest.type}"`);
-  }
-
-  if (!manifest.variants || !Array.isArray(manifest.variants) || manifest.variants.length === 0) {
-    errors.push('Missing or empty "variants" array (must be ["light"], ["dark"], or ["light","dark"])');
-  } else {
-    const valid = manifest.variants.every((v: unknown) => v === 'light' || v === 'dark');
-    if (!valid) errors.push('Variants must be "light" or "dark"');
-  }
-
-  // ── Theme API v2 fields (all optional) ──
-  if (manifest.apiVersion !== undefined && manifest.apiVersion !== 1 && manifest.apiVersion !== 2) {
-    errors.push('"apiVersion" must be 1 or 2 if present');
-  }
-  if (manifest.extends !== undefined && typeof manifest.extends !== 'string') {
-    errors.push('"extends" must be a string (the parent theme id)');
-  }
-  if (manifest.tokens !== undefined && (typeof manifest.tokens !== 'object' || manifest.tokens === null)) {
-    errors.push('"tokens" must be an object with optional "common"/"light"/"dark" maps');
-  }
-  if (manifest.density !== undefined && !['compact', 'normal', 'touch'].includes(manifest.density as string)) {
-    errors.push('"density" must be "compact", "normal", or "touch"');
-  }
-  if (manifest.derive !== undefined && typeof manifest.derive !== 'boolean') {
-    errors.push('"derive" must be a boolean');
-  }
-  if (manifest.radii !== undefined && (typeof manifest.radii !== 'object' || manifest.radii === null)) {
-    errors.push('"radii" must be an object');
-  }
-  if (manifest.typography !== undefined && (typeof manifest.typography !== 'object' || manifest.typography === null)) {
-    errors.push('"typography" must be an object');
-  }
-
-  if (errors.length > 0) return { result: null, errors };
-
-  return {
-    result: manifest as unknown as ThemeManifest,
-    errors: [],
-  };
-}
-
-function validatePluginManifest(manifest: Record<string, unknown>): { result: PluginManifest | null; errors: string[] } {
-  const errors = validateBaseManifest(manifest);
-
-  const validTypes: PluginType[] = ['ui-extension', 'sidebar-app', 'hook'];
-  if (!validTypes.includes(manifest.type as PluginType)) {
-    errors.push(`Invalid type "${manifest.type}". Must be one of: ${validTypes.join(', ')}`);
-  }
-
-  if (!manifest.entrypoint || typeof manifest.entrypoint !== 'string') {
-    errors.push('Missing or invalid "entrypoint"');
-  }
-
-  if (manifest.permissions && Array.isArray(manifest.permissions)) {
-    const validPerms = new Set(ALL_PERMISSIONS as readonly string[]);
-    const unknown = (manifest.permissions as string[]).filter(p => !validPerms.has(p));
-    if (unknown.length > 0) {
-      errors.push(`Unknown permissions: ${unknown.join(', ')}`);
-    }
-  }
-
-  if (errors.length > 0) return { result: null, errors };
-
-  return {
-    result: {
-      ...(manifest as unknown as PluginManifest),
-      permissions: (manifest.permissions as string[]) || [],
-    },
-    errors: [],
-  };
-}
-
-// ─── JS Security Checks ─────────────────────────────────────
-
-const SUSPICIOUS_JS_PATTERNS = [
-  { pattern: /\beval\s*\(/g, label: 'eval()' },
-  { pattern: /\bnew\s+Function\s*\(/g, label: 'new Function()' },
-  { pattern: /document\.cookie/g, label: 'document.cookie' },
-  { pattern: /document\.write/g, label: 'document.write' },
-  { pattern: /innerHTML\s*=/g, label: 'innerHTML assignment' },
-];
-
-function checkJSSecurity(code: string): string[] {
-  const warnings: string[] = [];
-  for (const { pattern, label } of SUSPICIOUS_JS_PATTERNS) {
-    if (pattern.test(code)) {
-      warnings.push(`Contains ${label} - review for security`);
-    }
-    pattern.lastIndex = 0; // reset regex
-  }
-  return warnings;
-}
-
 // ─── ZIP Extraction ──────────────────────────────────────────
 
-function getExtension(filename: string): string {
-  const dot = filename.lastIndexOf('.');
-  return dot >= 0 ? filename.slice(dot).toLowerCase() : '';
-}
-
 /**
- * Find the root of the ZIP contents.
- * Some ZIPs have all files inside a single top-level folder.
- */
-function findZipRoot(zip: JSZip): string {
-  const entries = Object.keys(zip.files);
-  // Check if all entries share a common top-level directory
-  const topDirs = new Set(entries.map(e => e.split('/')[0]));
-  if (topDirs.size === 1) {
-    const dir = [...topDirs][0];
-    // Verify it's actually a directory (has entries inside it)
-    if (zip.files[dir + '/'] || entries.some(e => e.startsWith(dir + '/'))) {
-      return dir + '/';
-    }
-  }
-  return '';
-}
-
-/**
- * Extract and validate a theme ZIP file.
+ * Extract and validate a theme ZIP file. Same checks as the admin and
+ * marketplace installs (see extension-package.ts).
  */
 export async function extractTheme(file: File): Promise<ThemeExtractionResult> {
-  const errors: string[] = [];
-  const warnings: string[] = [];
-
-  // Size check
-  if (file.size > MAX_THEME_SIZE) {
-    return {
-      valid: false,
-      errors: [`Theme ZIP exceeds ${Math.round(MAX_THEME_SIZE / (1024 * 1024))} MB size limit`],
-      warnings: [],
-      manifest: null, css: '', skin: null, preview: null,
-    };
-  }
-
-  let zip: JSZip;
-  try {
-    const buffer = await file.arrayBuffer();
-    zip = await JSZip.loadAsync(buffer);
-  } catch {
-    return { valid: false, errors: ['Invalid ZIP file'], warnings: [], manifest: null, css: '', skin: null, preview: null };
-  }
-
-  const root = findZipRoot(zip);
-
-  // Read manifest
-  const manifestFile = zip.file(root + 'manifest.json');
-  if (!manifestFile) {
-    return { valid: false, errors: ['Missing manifest.json'], warnings: [], manifest: null, css: '', skin: null, preview: null };
-  }
-
-  let manifestData: Record<string, unknown>;
-  try {
-    const raw = await manifestFile.async('string');
-    manifestData = JSON.parse(raw);
-  } catch {
-    return { valid: false, errors: ['Invalid manifest.json (not valid JSON)'], warnings: [], manifest: null, css: '', skin: null, preview: null };
-  }
-
-  const { result: manifest, errors: manifestErrors } = validateThemeManifest(manifestData);
-  errors.push(...manifestErrors);
-  if (!manifest) {
-    return { valid: false, errors, warnings, manifest: null, css: '', skin: null, preview: null };
-  }
-
-  // Read theme.css - required for v1 themes, optional when the manifest
-  // declares Theme API v2 fields (tokens/extends/derive/density/radii/typography),
-  // since the compiler can produce CSS purely from the manifest.
-  const cssFile = zip.file(root + 'theme.css');
-  const isAdvanced = isAdvancedManifest(manifest);
-
-  let userCSS = '';
-  if (cssFile) {
-    userCSS = await cssFile.async('string');
-    // Sanitize instead of rejecting, and always: the sanitizer is also what
-    // drops rules outside :root and .dark.
-    const sanitized = sanitizeThemeCSS(userCSS);
-    userCSS = sanitized.css;
-    warnings.push(...sanitized.warnings);
-  } else if (!isAdvanced) {
-    errors.push('Missing theme.css');
-    return { valid: false, errors, warnings, manifest, css: '', skin: null, preview: null };
-  }
-
-  // Compile advanced tokens into CSS (for v2 manifests). The compiled output
-  // is concatenated with any user-supplied theme.css for fine-grained overrides.
-  let rawCSS = userCSS;
-  if (isAdvanced) {
-    const compiled = compileAdvancedTheme(manifest, { userCSS });
-    if (compiled.errors.length > 0) {
-      errors.push(...compiled.errors);
-      return { valid: false, errors, warnings, manifest, css: '', skin: null, preview: null };
-    }
-    warnings.push(...compiled.warnings);
-    rawCSS = compiled.css;
-
-    // Run sanitizer over the final compiled output as a defence-in-depth check.
-    const sanitized = sanitizeThemeCSS(rawCSS);
-    rawCSS = sanitized.css;
-    warnings.push(...sanitized.warnings);
-  }
-
-  // Read preview image if present
+  const result = await readThemePackage(await file.arrayBuffer());
+  const { pkg, ...rest } = result;
   let preview: string | null = null;
-  if (manifest.preview) {
-    const previewFile = zip.file(root + manifest.preview);
-    if (previewFile) {
-      try {
-        const blob = await previewFile.async('blob');
-        preview = await blobToDataUri(blob);
-      } catch {
-        warnings.push('Could not read preview image');
-      }
+  if (pkg && result.manifest?.preview) {
+    try {
+      const bytes = await readEntry(pkg, result.manifest.preview, 512 * 1024);
+      if (bytes) preview = await blobToDataUri(new Blob([bytes as BlobPart], { type: previewType(result.manifest.preview) }));
+    } catch {
+      rest.warnings.push('Could not read preview image');
     }
   }
-
-  // Read skin.css if present (Theme API v2 only). Skins target real
-  // component selectors and bypass the strict :root/.dark selector check -
-  // they still go through the dangerous-pattern sanitizer.
-  let skin: string | null = null;
-  const skinFile = zip.file(root + 'skin.css');
-  if (skinFile) {
-    if (!isAdvanced) {
-      warnings.push('skin.css ignored - only Theme API v2 manifests can ship a skin');
-    } else {
-      const rawSkin = await skinFile.async('string');
-      if (rawSkin.length > MAX_THEME_SKIN_BYTES) {
-        warnings.push(`skin.css exceeds ${Math.round(MAX_THEME_SKIN_BYTES / 1024)} KB and was dropped`);
-      } else {
-        const sanitized = sanitizeSkinCSS(rawSkin);
-        skin = sanitized.css;
-        warnings.push(...sanitized.warnings);
-      }
-    }
-  }
-
-  return {
-    valid: errors.length === 0,
-    errors,
-    warnings,
-    manifest,
-    css: rawCSS,
-    skin,
-    preview,
-  };
+  return { ...rest, preview };
 }
 
 /**
- * Extract and validate a plugin ZIP file.
+ * Extract and validate a plugin ZIP file. The checks are the ones every
+ * server install path runs too (see extension-package.ts).
  */
 export async function extractPlugin(file: File): Promise<PluginExtractionResult> {
-  const errors: string[] = [];
-  const warnings: string[] = [];
-
-  if (file.size > MAX_PLUGIN_SIZE) {
-    return { valid: false, errors: ['Plugin ZIP exceeds 5 MB size limit'], warnings: [], manifest: null, code: '', preview: null };
-  }
-
-  let zip: JSZip;
+  let result: Awaited<ReturnType<typeof readPluginPackage>>;
   try {
-    const buffer = await file.arrayBuffer();
-    zip = await JSZip.loadAsync(buffer);
-  } catch {
-    return { valid: false, errors: ['Invalid ZIP file'], warnings: [], manifest: null, code: '', preview: null };
+    result = await readPluginPackage(await file.arrayBuffer(), {
+      appVersion: process.env.NEXT_PUBLIC_APP_VERSION,
+    });
+  } catch (err) {
+    const message = err instanceof ExtensionPackageError ? err.message : 'Invalid ZIP file';
+    return { valid: false, errors: message.split('; '), warnings: [], manifest: null, code: '', preview: null };
   }
+  const warnings = [...result.warnings];
 
-  const root = findZipRoot(zip);
-
-  // Check for disallowed file extensions
-  for (const [path, entry] of Object.entries(zip.files)) {
-    if (entry.dir) continue;
-    const ext = getExtension(path);
-    if (ext && !ALLOWED_PLUGIN_FILES.has(ext)) {
-      errors.push(`Disallowed file type: ${path} (${ext})`);
-    }
-  }
-
-  // Read manifest
-  const manifestFile = zip.file(root + 'manifest.json');
-  if (!manifestFile) {
-    return { valid: false, errors: ['Missing manifest.json', ...errors], warnings, manifest: null, code: '', preview: null };
-  }
-
-  let manifestData: Record<string, unknown>;
-  try {
-    const raw = await manifestFile.async('string');
-    manifestData = JSON.parse(raw);
-  } catch {
-    return { valid: false, errors: ['Invalid manifest.json (not valid JSON)', ...errors], warnings, manifest: null, code: '', preview: null };
-  }
-
-  const { result: manifest, errors: manifestErrors } = validatePluginManifest(manifestData);
-  errors.push(...manifestErrors);
-  if (!manifest) {
-    return { valid: false, errors, warnings, manifest: null, code: '', preview: null };
-  }
-
-  // Read entrypoint
-  const entryFile = zip.file(root + manifest.entrypoint);
-  if (!entryFile) {
-    errors.push(`Missing entrypoint file: ${manifest.entrypoint}`);
-    return { valid: false, errors, warnings, manifest, code: '', preview: null };
-  }
-
-  const code = await entryFile.async('string');
-
-  // JS security checks
-  warnings.push(...checkJSSecurity(code));
-
-  // Read preview if present
   let preview: string | null = null;
-  const previewFile = zip.file(root + 'preview.png') || zip.file(root + 'preview.svg');
-  if (previewFile) {
+  const previewName = result.pkg.zip.file(result.pkg.root + 'preview.png') ? 'preview.png'
+    : result.pkg.zip.file(result.pkg.root + 'preview.svg') ? 'preview.svg' : null;
+  if (previewName) {
     try {
-      const blob = await previewFile.async('blob');
-      preview = await blobToDataUri(blob);
+      const bytes = await readEntry(result.pkg, previewName, 512 * 1024);
+      if (bytes) {
+        const type = previewName.endsWith('.svg') ? 'image/svg+xml' : 'image/png';
+        preview = await blobToDataUri(new Blob([bytes as BlobPart], { type }));
+      }
     } catch {
       warnings.push('Could not read preview image');
     }
   }
 
-  return {
-    valid: errors.length === 0,
-    errors,
-    warnings,
-    manifest,
-    code,
-    preview,
-  };
+  return { valid: true, errors: [], warnings, manifest: result.manifest, code: result.code, preview };
+}
+
+function previewType(name: string): string {
+  const lower = name.toLowerCase();
+  if (lower.endsWith('.svg')) return 'image/svg+xml';
+  if (lower.endsWith('.jpg') || lower.endsWith('.jpeg')) return 'image/jpeg';
+  if (lower.endsWith('.webp')) return 'image/webp';
+  return 'image/png';
 }
 
 function blobToDataUri(blob: Blob): Promise<string> {
diff --git a/lib/protocol-handlers/mailto.ts b/lib/protocol-handlers/mailto.ts
index 765bd6040..76afa09a8 100644
--- a/lib/protocol-handlers/mailto.ts
+++ b/lib/protocol-handlers/mailto.ts
@@ -6,6 +6,14 @@ export interface ParsedMailto {
   bcc: string[];
   subject: string;
   body: string;
+  /**
+   * Only from a plugin's api.compose.open, never from a mailto: URL: an HTML
+   * body (sanitised by the host) the composer opens in HTML mode instead of
+   * `body`.
+   */
+  htmlBody?: string;
+  /** Only from api.compose.open: files the plugin uploaded, attached as they are. */
+  attachments?: Array<{ blobId: string; name: string; type: string; size: number }>;
 }
 
 const MAX_RECIPIENTS = 200;
@@ -117,6 +125,23 @@ export function parseMailto(raw: string): ParsedMailto | null {
   };
 }
 
+/**
+ * A mailto: URL for parsed fields, for hooks that report the link when the
+ * original URL is gone (a request that came through the OS handler).
+ */
+export function formatMailto(fields: Pick<ParsedMailto, "to"> & Partial<Omit<ParsedMailto, "to">>): string {
+  const params: string[] = [];
+  const add = (key: string, value: string | undefined) => {
+    if (value) params.push(`${key}=${encodeURIComponent(value)}`);
+  };
+  add("cc", fields.cc?.join(","));
+  add("bcc", fields.bcc?.join(","));
+  add("subject", fields.subject);
+  add("body", fields.body);
+  const to = fields.to.map(encodeURIComponent).join(",");
+  return `mailto:${to}${params.length ? `?${params.join("&")}` : ""}`;
+}
+
 /** Window event carrying a parsed in-app mailto request to the mail page. */
 export const INTERNAL_MAILTO_EVENT = "bulwark:mailto";
 
@@ -134,10 +159,22 @@ export function requestInternalMailto(raw: string): boolean {
   if (typeof window === "undefined") return false;
   const parsed = parseMailto(raw);
   if (!parsed || parsed.to.length === 0) return false;
+  return requestInternalCompose(parsed, raw);
+}
+
+/**
+ * Ask the mail page to open its composer with this draft, the way an in-app
+ * mailto: click does. Returns false when no mail page is mounted to take it.
+ */
+export function requestInternalCompose(draft: ParsedMailto, href?: string): boolean {
+  if (typeof window === "undefined") return false;
   // The listener signals "handled" by cancelling the event, which makes
   // dispatchEvent report false - so an uncancelled dispatch means nobody took it.
   const uncancelled = window.dispatchEvent(
-    new CustomEvent<ParsedMailto>(INTERNAL_MAILTO_EVENT, { detail: parsed, cancelable: true }),
+    new CustomEvent<ParsedMailto & { href: string }>(INTERNAL_MAILTO_EVENT, {
+      detail: { ...draft, href: href ?? formatMailto(draft) },
+      cancelable: true,
+    }),
   );
   return !uncancelled;
 }
diff --git a/locales/ar/common.json b/locales/ar/common.json
index b5526fea4..a2cdc5cd6 100644
--- a/locales/ar/common.json
+++ b/locales/ar/common.json
@@ -620,7 +620,9 @@
       "copied": "تم نسخ الرمز",
       "copy_failed": "تعذّر نسخ الرمز"
     },
-    "mv_position": "{index} من {total}"
+    "mv_position": "{index} من {total}",
+    "plugin_panel_show": "إظهار لوحة الإضافة",
+    "plugin_panel_hide": "إخفاء لوحة الإضافة"
   },
   "email_composer": {
     "minimize": "تصغير",
@@ -813,7 +815,8 @@
       "remove_background_color": "إزالة لون الخلفية"
     },
     "send_filing_warning": "تم الإرسال - لكن التنظيف بعد الإرسال فشل، وقد تبقى مسودة قديمة.",
-    "pop_out": "فتح الرد في نافذة منفصلة"
+    "pop_out": "فتح الرد في نافذة منفصلة",
+    "send_guard_failed": "لم يُرسَل - فشلت إضافة تفحص الرسائل قبل الإرسال أو لم تستجب."
   },
   "confirm_dialog": {
     "confirm": "تأكيد",
@@ -3970,6 +3973,354 @@
       "failed_detail": "فشل التفويض: {error}",
       "missing_params": "رمز التفويض أو الحالة مفقود.",
       "delivery_failed": "تعذّر إرسال نتيجة التفويض إلى تبويب التطبيق. يرجى إغلاق هذه النافذة والمحاولة مرة أخرى."
+    },
+    "settings": {
+      "title": "الإضافات",
+      "description": "إضافات أضافها المسؤول. فعّلها أو أوقفها لحسابك.",
+      "description_uploads": "تضيف الإضافات ميزات إلى تطبيق البريد. فعّلها أو أوقفها لحسابك، أو ثبّت إضافاتك الخاصة.",
+      "description_demo": "الإضافات غير متاحة في الوضع التجريبي.",
+      "install_button": "تثبيت إضافة",
+      "install_hint": "اختر ملف ZIP لإضافة.",
+      "install_hint_approval": "اختر ملف ZIP لإضافة. يجب أن يوافق عليها المسؤول قبل أن تتمكن من تفعيلها.",
+      "install_uploads_off": "لا يسمح المسؤول بتثبيت الإضافات.",
+      "install_managed_id": "يوفّر المسؤول بالفعل إضافة بهذا الاسم، لذا لا يمكن استبدالها.",
+      "install_invalid": "هذا الملف ليس إضافة قابلة للتثبيت: {details}",
+      "toast_installed": "تم تثبيت الإضافة. فعّلها أدناه.",
+      "toast_installed_pending": "تم تثبيت الإضافة وإرسالها إلى المسؤول للموافقة عليها.",
+      "toast_enabled": "تم تفعيل {name}",
+      "toast_disabled": "تم إيقاف {name}",
+      "toast_removed": "تمت إزالة {name}",
+      "toast_forced": "يُبقي المسؤول {name} مفعّلة",
+      "toast_approval_requested": "{name} بانتظار موافقة المسؤول",
+      "empty_title": "لا توجد إضافات بعد",
+      "empty_admin": "لم يُضف المسؤول أي إضافات.",
+      "empty_uploads": "ثبّت إضافة من ملف ZIP للبدء.",
+      "empty_demo": "تحتاج الإضافات إلى حساب حقيقي، لذا لا يتضمن الوضع التجريبي أيًّا منها.",
+      "syncing": "جارٍ التحقق من الإضافات مع الخادم…",
+      "status_installed": "متوقفة",
+      "status_enabled": "جارٍ التشغيل",
+      "status_running": "مفعّلة",
+      "status_disabled": "متوقفة",
+      "status_error": "مشكلة",
+      "badge_forced": "مطلوبة",
+      "badge_managed": "من المسؤول",
+      "badge_yours": "ثبّتها أنت",
+      "badge_awaiting": "بانتظار الموافقة",
+      "toggle_label": "تفعيل {name} أو إيقافها",
+      "forced_note": "يشترط المسؤول هذه الإضافة، لذا لا يمكن إيقافها.",
+      "permissions": "ما يمكنها فعله",
+      "permissions_managed": "ما يمكنها فعله (بموافقة المسؤول)",
+      "settings": "الإعدادات",
+      "remove": "إزالة",
+      "remove_title": "إزالة {name}؟",
+      "remove_message": "ستُحذف الإضافة وكل ما خزّنته في هذا المتصفح. يمكنك تثبيتها مرة أخرى لاحقًا.",
+      "remove_confirm": "إزالة",
+      "error_user_plugins_off": "أوقف المسؤول الإضافات التي يثبّتها المستخدمون، لذا لا تعمل هذه الإضافة.",
+      "error_approval_unavailable": "ثُبّتت هذه الإضافة قبل أن تصبح الموافقة مطلوبة. أزلها وثبّتها مرة أخرى لإرسالها للموافقة.",
+      "error_approval_denied": "لم يوافق المسؤول على هذه الإضافة.",
+      "error_approval_pending": "بانتظار موافقة المسؤول على هذه الإضافة.",
+      "error_auto_disabled": "تم إيقافها لأنها فشلت مرارًا. شغّلها مرة أخرى للمحاولة من جديد.",
+      "accounts_heading": "الحسابات المرتبطة",
+      "account_on": "{label} على {host}",
+      "account_waiting": "{label} على {host} (لم يكتمل تسجيل الدخول)",
+      "disconnect": "فصل",
+      "disconnect_failed": "تعذّر فصل {label}"
+    },
+    "consent": {
+      "title": "هل تسمح لـ {name} بذلك؟",
+      "intro": "تطلب الإضافة الأذونات أدناه. لن تحصل عليها إلا إذا سمحت بذلك.",
+      "high_risk_note": "العناصر المميّزة تمنح الإضافة وصولًا إلى محتوى بريدك أو تتيح لها إرسال البيانات إلى جهات أخرى. لا تسمح بها إلا للإضافات التي تثق بها.",
+      "revoke_hint": "يمكنك إيقاف الإضافة أو إزالتها من الإعدادات في أي وقت.",
+      "deny": "عدم السماح",
+      "allow": "سماح"
+    },
+    "permissions": {
+      "none": "لا تحتاج إلى أذونات خاصة.",
+      "high_risk": "تتطلب الحذر",
+      "email_read": {
+        "title": "قراءة بريدك",
+        "body": "عرض المرسلين والمستلمين والمواضيع والنص الكامل لأي رسالة في حسابك، ومجلداتك."
+      },
+      "email_write": {
+        "title": "تغيير بريدك وتنظيمه",
+        "body": "إضافة الوسوم والعلامات والكلمات المفتاحية الأخرى إلى رسائلك أو إزالتها، ونقلها بين مجلداتك وإلى الأرشيف، وحفظ المسودات."
+      },
+      "email_send": {
+        "title": "تغيير البريد قبل إرساله",
+        "body": "قراءة وتغيير المستلمين والموضوع والنص والمرفقات في الرسائل التي تكتبها، ومنع إرسال رسالة."
+      },
+      "crypto_full": {
+        "title": "وصول كامل إلى هذا التطبيق",
+        "body": "تعمل بالصلاحيات نفسها التي يملكها تطبيق البريد. يمكنها قراءة كل بريدك ومفاتيحك المخزّنة والتصرف نيابةً عنك. لا تسمح بذلك إلا للإضافات التي تثق بها تمامًا."
+      },
+      "email_raw_send": {
+        "title": "إرسال رسائل أنشأتها بنفسها",
+        "body": "إرسال رسائل كاملة من حسابك، مثل الرسائل الموقّعة أو المشفّرة."
+      },
+      "email_blob_read": {
+        "title": "قراءة المحتوى الخام للرسائل",
+        "body": "قراءة البيانات الأصلية لرسائلك ومرفقاتها، ولكل ملف ترفقه قبل إرساله."
+      },
+      "email_blob_write": {
+        "title": "استبدال المرفقات قبل الإرسال",
+        "body": "رفع ملفات إلى خادم البريد واستبدال ملف أرفقته بملف آخر قبل إرسال الرسالة."
+      },
+      "email_render_takeover": {
+        "title": "تغيير طريقة عرض الرسائل",
+        "body": "استبدال نص الرسائل التي تفتحها ونص قائمة الرسائل، مثلًا لعرض محتوى مفكوك التشفير."
+      },
+      "calendar_read": {
+        "title": "قراءة تقويمك",
+        "body": "عرض تقويماتك وأحداثها."
+      },
+      "calendar_write": {
+        "title": "تغيير تقويمك",
+        "body": "إنشاء الأحداث وتغييرها وحذفها."
+      },
+      "contacts_read": {
+        "title": "قراءة جهات اتصالك",
+        "body": "البحث في دفاتر العناوين وقراءتها."
+      },
+      "contacts_write": {
+        "title": "تغيير جهات اتصالك",
+        "body": "إنشاء جهات الاتصال ودفاتر العناوين وتغييرها وحذفها."
+      },
+      "files_read": {
+        "title": "قراءة ملفاتك",
+        "body": "تصفّح الملفات المخزّنة في حسابك وفتحها."
+      },
+      "files_write": {
+        "title": "تغيير ملفاتك",
+        "body": "رفع الملفات في حسابك وإعادة تسميتها ونقلها وحذفها."
+      },
+      "identity_read": {
+        "title": "عرض عناوين المرسل",
+        "body": "عرض العناوين التي ترسل منها وتوقيعاتها."
+      },
+      "identity_write": {
+        "title": "تغيير عناوين المرسل",
+        "body": "إنشاء عناوين المرسل والتوقيعات وتغييرها وحذفها."
+      },
+      "filters_read": {
+        "title": "قراءة مرشحات البريد",
+        "body": "عرض القواعد التي تفرز بريدك الوارد."
+      },
+      "filters_write": {
+        "title": "تغيير مرشحات البريد",
+        "body": "إضافة قواعد إلى المرشحات على الخادم. يمكن لهذه القواعد نقل البريد الوارد أو إعادة توجيهه أو حذفه."
+      },
+      "tasks_read": {
+        "title": "قراءة مهامك",
+        "body": "عرض قوائم المهام والمهام."
+      },
+      "tasks_write": {
+        "title": "تغيير مهامك",
+        "body": "إنشاء المهام وتغييرها وإكمالها وحذفها."
+      },
+      "templates_read": {
+        "title": "قراءة قوالبك",
+        "body": "عرض قوالب الرسائل المحفوظة."
+      },
+      "templates_write": {
+        "title": "تغيير قوالبك",
+        "body": "إنشاء قوالب الرسائل وتغييرها وحذفها."
+      },
+      "smime_read": {
+        "title": "عرض حالة S/MIME",
+        "body": "معرفة ما إذا كانت لديك مفاتيح وشهادات S/MIME، دون الوصول إلى المفاتيح."
+      },
+      "vacation_read": {
+        "title": "عرض الرد التلقائي أثناء الغياب",
+        "body": "معرفة ما إذا كان الرد التلقائي مفعّلًا وما يقوله."
+      },
+      "vacation_write": {
+        "title": "تغيير الرد التلقائي أثناء الغياب",
+        "body": "تفعيل الرد التلقائي أو إيقافه وتغيير نصه وتواريخه."
+      },
+      "settings_read": {
+        "title": "قراءة إعداداتك",
+        "body": "عرض تفضيلاتك وتعريفات الوسوم."
+      },
+      "settings_write": {
+        "title": "تغيير إعداداتك",
+        "body": "إضافة الوسوم وإعادة ترتيبها وتغيير تفضيلاتك."
+      },
+      "security_read": {
+        "title": "عرض أمان حسابك",
+        "body": "معرفة ما إذا كانت المصادقة الثنائية والتشفير مفعّلين، دون الوصول إلى البيانات السرية."
+      },
+      "auth_observe": {
+        "title": "معرفة وقت تسجيل دخولك",
+        "body": "تلقّي إشعار عند تسجيل دخولك أو تبديل الحسابات أو تجديد جلستك."
+      },
+      "auth_emit": {
+        "title": "تسجيل خروجك",
+        "body": "تسجيل خروجك من تطبيق البريد."
+      },
+      "account_read": {
+        "title": "عرض حساباتك",
+        "body": "عرض الحسابات التي أضفتها، مع عناوينها وخوادمها."
+      },
+      "http_post": {
+        "title": "استخدام خادم البريد نيابةً عنك",
+        "body": "استدعاء نقاط النهاية هذه على الخادم ببيانات دخولك:"
+      },
+      "http_fetch": {
+        "title": "الاتصال بمواقع أخرى",
+        "body": "إرسال طلبات إلى هذه المواقع. قد يُرسل إليها أي شيء تستطيع الإضافة قراءته:"
+      },
+      "admin_config": {
+        "title": "قراءة إعداداتها من المسؤول",
+        "body": "قراءة الإعدادات التي حفظها المسؤول لهذه الإضافة."
+      },
+      "ui_observe": {
+        "title": "تتبّع موقعك في التطبيق",
+        "body": "معرفة الصفحة المفتوحة والتفاعل مع الروابط التي تنقر عليها."
+      },
+      "ui_toolbar": {
+        "title": "إضافة أزرار إلى أشرطة الأدوات",
+        "body": "عرض أزرارها الخاصة في شريط أدوات الرسائل، وعلى الرسالة المفتوحة، وفي الشريط العلوي."
+      },
+      "ui_app_top_banner": {
+        "title": "عرض شريط في الأعلى",
+        "body": "عرض إشعار على امتداد أعلى التطبيق."
+      },
+      "ui_email_banner": {
+        "title": "عرض إشعارات على الرسائل",
+        "body": "عرض إشعاراتها وملخصاتها الخاصة فوق أجزاء الرسالة أو المحادثة المفتوحة وداخلها وبينها."
+      },
+      "ui_email_footer": {
+        "title": "إضافة محتوى أسفل الرسائل",
+        "body": "عرض محتواها الخاص أسفل الرسالة المفتوحة."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "عرض مفاتيح تشفير جهات الاتصال",
+        "body": "عرض مفاتيح التشفير لجهة اتصال وإدارتها."
+      },
+      "ui_email_details": {
+        "title": "إضافة لوحات إلى تفاصيل الرسالة",
+        "body": "عرض لوحتها الخاصة بجانب الرسالة المفتوحة أو أسفلها."
+      },
+      "ui_download_file": {
+        "title": "حفظ الملفات على جهازك",
+        "body": "إتاحة ملفات أنشأتها للتنزيل."
+      },
+      "ui_message_list_tabs": {
+        "title": "إضافة علامات تبويب إلى البريد الوارد",
+        "body": "فرز البريد الوارد في علامات تبويب مثل التحديثات أو العروض الترويجية."
+      },
+      "ui_composer_toolbar": {
+        "title": "الإضافة إلى محرر الرسائل",
+        "body": "عرض أزرارها وعناصر القوائم والأقسام الخاصة بها أثناء كتابة رسالة."
+      },
+      "ui_composer_sidebar": {
+        "title": "إضافة لوحة إلى محرر الرسائل",
+        "body": "عرض لوحتها الخاصة بجانب الرسالة التي تكتبها."
+      },
+      "ui_sidebar_widget": {
+        "title": "الإضافة إلى الشريط الجانبي",
+        "body": "عرض مربعاتها وأقسامها الخاصة في الشريط الجانبي للبريد."
+      },
+      "ui_settings_section": {
+        "title": "إضافة صفحة إعدادات",
+        "body": "عرض صفحتها الخاصة في الإعدادات."
+      },
+      "ui_context_menu": {
+        "title": "الإضافة إلى قائمة الرسالة",
+        "body": "إضافة عناصر إلى القائمة التي تظهر عند النقر بالزر الأيمن على رسالة."
+      },
+      "ui_navigation_rail": {
+        "title": "الإضافة إلى شريط التنقل",
+        "body": "عرض زرها الخاص في شريط التنقل."
+      },
+      "ui_keyboard": {
+        "title": "إضافة اختصارات لوحة المفاتيح",
+        "body": "الاستجابة لاختصارات لوحة المفاتيح التي تحددها."
+      },
+      "ui_calendar_action": {
+        "title": "الإضافة إلى واجهة التقويم",
+        "body": "عرض أزرارها وأقسامها الخاصة على الأحداث، وتسميات قصيرة ونقاط على أيام التقويم."
+      },
+      "ui_admin_page": {
+        "title": "إضافة صفحة إدارة",
+        "body": "عرض صفحتها الخاصة في إعدادات الإدارة."
+      },
+      "app_lifecycle": {
+        "title": "معرفة وقت بدء التطبيق وتوقفه",
+        "body": "تلقّي إشعار عند بدء التطبيق أو انقطاع اتصاله أو تسجيل خروجك."
+      },
+      "compose_open": {
+        "title": "فتح محرر الرسائل لك",
+        "body": "فتح رسالة جديدة بعد تعبئة المستلمين أو النص أو المرفقات. يبقى قرار إرسالها لك."
+      },
+      "compose_read": {
+        "title": "قراءة الرسالة التي تكتبها",
+        "body": "قراءة نص الرسالة أثناء كتابتها، عندما تستخدم الإضافة في محرر الرسائل. لا يشمل التوقيع ولا الرسالة المقتبسة."
+      },
+      "compose_write": {
+        "title": "تعديل الرسالة التي تكتبها",
+        "body": "استبدال نص أو إضافته في الرسالة أثناء كتابتها، عندما تستخدم الإضافة في محرر الرسائل. يمكنك التراجع عن كل تغيير، وأنت من يقرر الإرسال."
+      },
+      "ui_notifications": {
+        "title": "عرض الإشعارات",
+        "body": "عرض إشعارات على جهازك، أو داخل التطبيق إذا لم تسمح بها. يذكر كل إشعار اسم الإضافة."
+      },
+      "ui_message_list": {
+        "title": "الإضافة إلى قائمة الرسائل",
+        "body": "عرض محتواها الخاص فوق قائمة الرسائل، وأزرار على الرسائل وفي شريط أدوات الرسائل المحددة."
+      },
+      "ui_contacts": {
+        "title": "الإضافة إلى واجهة جهات الاتصال",
+        "body": "عرض أقسامها الخاصة في تفاصيل جهة الاتصال، وأزرار في قائمة جهات الاتصال."
+      },
+      "ui_tasks": {
+        "title": "الإضافة إلى واجهة المهام",
+        "body": "عرض أقسامها الخاصة في تفاصيل المهمة، وأزرار في قائمة المهام."
+      },
+      "ui_files": {
+        "title": "الإضافة إلى واجهة الملفات",
+        "body": "عرض أقسامها الخاصة في معاينة الملف، وعناصر في قائمة خيارات الملف."
+      },
+      "ui_commands": {
+        "title": "إضافة أوامر",
+        "body": "إضافة عناصرها الخاصة إلى لوحة الأوامر (Ctrl+K)."
+      },
+      "ui_app_page": {
+        "title": "إضافة صفحات",
+        "body": "إضافة صفحاتها الخاصة إلى التطبيق، لكل منها زر في شريط التنقل."
+      },
+      "http_proxy": {
+        "title": "استخدام الحسابات التي تربطها",
+        "body": "إرسال طلبات عبر خادم Bulwark باستخدام حساب أو مفتاح أعددته أنت أو مسؤول النظام. لا ترى الإضافة كلمة المرور أبدًا، لكنها تستطيع فعل أي شيء يستطيعه ذلك الحساب على خادمه."
+      }
+    },
+    "dialog": {
+      "from_plugin": "من الإضافة {name}",
+      "ok": "حسنًا",
+      "submit": "إرسال",
+      "confirm": "تأكيد",
+      "cancel": "إلغاء",
+      "close": "إغلاق",
+      "turn_off": "إيقاف {name}",
+      "plugin_menu": "خيارات {name}",
+      "password_note": "هذا النموذج من الإضافة {name} وليس من بريد الويب. لا تدخل كلمة مرور إلا إذا كنت تثق بهذه الإضافة.",
+      "toast_auto_disabled": "تم إيقاف {name} لأنها فشلت مرارًا."
+    },
+    "connect": {
+      "title": "ربط {label}",
+      "intro_password": "يريد {name} استخدام حسابك على {label}. يحتفظ Bulwark بكلمة المرور على خادمه ولا يرسلها إلا إلى {host}. لا ترى الإضافة كلمة المرور أبدًا.",
+      "intro_password_any": "يريد {name} استخدام حسابك على {label}. يحتفظ Bulwark بكلمة المرور على خادمه ولا يرسلها إلا إلى الخادم الذي تدخله هنا. لا ترى الإضافة كلمة المرور أبدًا.",
+      "intro_signin": "يريد {name} تسجيل الدخول إلى حسابك على {label}. أدخل الخادم هنا، ثم سجّل الدخول في صفحة ذلك الخادم. يحتفظ Bulwark بالوصول الذي يحصل عليه على خادمه، ولا تراه الإضافة أبدًا.",
+      "server": "عنوان الخادم",
+      "server_hint": "cloud.example.com",
+      "username": "اسم المستخدم",
+      "secret": "كلمة المرور أو المفتاح",
+      "connect": "ربط",
+      "continue": "متابعة",
+      "cancel": "إلغاء",
+      "saving": "جارٍ الحفظ…",
+      "error_server": "أدخل عنوان الخادم، مثل https://cloud.example.com",
+      "error_save": "تعذّر الحفظ: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "اختر نتيجة لمعاينتها",
     "open_full": "فتح",
     "view_label": "العرض"
+  },
+  "top_bar": {
+    "more": "خيارات أخرى"
+  },
+  "plugin_pages": {
+    "loading": "جارٍ تحميل الصفحة",
+    "not_available_title": "هذه الصفحة غير متاحة",
+    "not_available_description": "الإضافة التي أضافتها متوقفة أو لم تعد مثبتة.",
+    "back_to_mail": "العودة إلى البريد",
+    "settings_group": "الإضافات"
+  },
+  "command_palette": {
+    "title": "لوحة الأوامر",
+    "open": "فتح لوحة الأوامر",
+    "placeholder": "اكتب أمرًا",
+    "no_results": "لا توجد أوامر مطابقة",
+    "go_to": "الانتقال إلى {name}",
+    "compose": "رسالة جديدة",
+    "search": "البحث في البريد",
+    "theme_dark": "التبديل إلى المظهر الداكن",
+    "theme_light": "التبديل إلى المظهر الفاتح",
+    "shortcuts": "عرض اختصارات لوحة المفاتيح",
+    "group_navigation": "الانتقال إلى",
+    "group_actions": "إجراءات",
+    "group_plugins": "الإضافات"
+  },
+  "notification_center": {
+    "title": "الإشعارات",
+    "mark_all_read": "تعليم الكل كمقروء",
+    "clear": "مسح",
+    "empty": "لا توجد إشعارات",
+    "close": "إغلاق",
+    "unread": "غير مقروء",
+    "unread_count": "غير المقروءة: {count}",
+    "level_error": "خطأ",
+    "level_warning": "تحذير"
   }
 }
diff --git a/locales/ca/common.json b/locales/ca/common.json
index 3e0d3b434..eccc0aa81 100644
--- a/locales/ca/common.json
+++ b/locales/ca/common.json
@@ -620,7 +620,9 @@
       "copied": "Codi copiat",
       "copy_failed": "No s'ha pogut copiar el codi"
     },
-    "mv_position": "{index} de {total}"
+    "mv_position": "{index} de {total}",
+    "plugin_panel_show": "Mostra el tauler del connector",
+    "plugin_panel_hide": "Amaga el tauler del connector"
   },
   "email_composer": {
     "minimize": "Minimitza",
@@ -813,7 +815,8 @@
       "remove_background_color": "Elimina el color de fons"
     },
     "send_filing_warning": "Enviat, però la neteja posterior a l'enviament ha fallat; és possible que quedi un esborrany obsolet.",
-    "pop_out": "Obre la resposta en una finestra"
+    "pop_out": "Obre la resposta en una finestra",
+    "send_guard_failed": "No s'ha enviat: un connector que revisa els missatges abans d'enviar-los ha fallat o no ha respost."
   },
   "confirm_dialog": {
     "confirm": "Confirma",
@@ -3970,6 +3973,354 @@
       "failed_detail": "Ha fallat lautorització: {error}",
       "missing_params": "Falta el codi dautorització o lestat.",
       "delivery_failed": "No sha pogut lliurar el resultat de lautorització a la pestanya de laplicació. Tanqueu aquesta finestra i torneu-ho a provar."
+    },
+    "settings": {
+      "title": "Connectors",
+      "description": "Connectors que ha afegit l'administrador. Activeu-los o desactiveu-los per al vostre compte.",
+      "description_uploads": "Els connectors afegeixen funcions al webmail. Activeu-los o desactiveu-los per al vostre compte, o instal·leu-ne de propis.",
+      "description_demo": "Els connectors no estan disponibles a la demo.",
+      "install_button": "Instal·la un connector",
+      "install_hint": "Trieu un fitxer ZIP de connector.",
+      "install_hint_approval": "Trieu un fitxer ZIP de connector. Un administrador l'ha d'aprovar abans que el pugueu activar.",
+      "install_uploads_off": "L'administrador no permet instal·lar connectors.",
+      "install_managed_id": "L'administrador ja proporciona un connector amb aquest nom, així que no es pot substituir.",
+      "install_invalid": "Aquest fitxer no és un connector que es pugui instal·lar: {details}",
+      "toast_installed": "S'ha instal·lat el connector. Activeu-lo a continuació.",
+      "toast_installed_pending": "S'ha instal·lat el connector i s'ha enviat a l'administrador perquè l'aprovi.",
+      "toast_enabled": "{name} està activat",
+      "toast_disabled": "{name} està desactivat",
+      "toast_removed": "S'ha eliminat {name}",
+      "toast_forced": "L'administrador manté {name} activat",
+      "toast_approval_requested": "{name} està pendent de l'aprovació de l'administrador",
+      "empty_title": "Encara no hi ha connectors",
+      "empty_admin": "L'administrador no ha afegit cap connector.",
+      "empty_uploads": "Per començar, instal·leu un connector des d'un fitxer ZIP.",
+      "empty_demo": "Els connectors necessiten un compte real, així que la demo no en té cap.",
+      "syncing": "S'estan comprovant els connectors amb el servidor…",
+      "status_installed": "Desactivat",
+      "status_enabled": "S'està iniciant",
+      "status_running": "Activat",
+      "status_disabled": "Desactivat",
+      "status_error": "Problema",
+      "badge_forced": "Obligatori",
+      "badge_managed": "De l'administrador",
+      "badge_yours": "Instal·lat per vós",
+      "badge_awaiting": "Pendent d'aprovació",
+      "toggle_label": "Activa o desactiva {name}",
+      "forced_note": "L'administrador requereix aquest connector, així que no es pot desactivar.",
+      "permissions": "Què pot fer",
+      "permissions_managed": "Què pot fer (aprovat per l'administrador)",
+      "settings": "Configuració",
+      "remove": "Elimina",
+      "remove_title": "Voleu eliminar {name}?",
+      "remove_message": "S'eliminaran el connector i tot el que ha desat en aquest navegador. El podeu tornar a instal·lar més endavant.",
+      "remove_confirm": "Elimina",
+      "error_user_plugins_off": "L'administrador ha desactivat els connectors instal·lats pels usuaris, així que aquest connector no s'executa.",
+      "error_approval_unavailable": "Aquest connector es va instal·lar abans que calgués l'aprovació. Elimineu-lo i torneu-lo a instal·lar per enviar-lo a aprovar.",
+      "error_approval_denied": "L'administrador no ha aprovat aquest connector.",
+      "error_approval_pending": "S'espera que l'administrador aprovi aquest connector.",
+      "error_auto_disabled": "S'ha desactivat perquè fallava repetidament. Torneu-lo a activar per tornar-ho a provar.",
+      "accounts_heading": "Comptes connectats",
+      "account_on": "{label} a {host}",
+      "account_waiting": "{label} a {host} (inici de sessió sense acabar)",
+      "disconnect": "Desconnecta",
+      "disconnect_failed": "No s'ha pogut desconnectar {label}"
+    },
+    "consent": {
+      "title": "Voleu permetre que {name} faci això?",
+      "intro": "El connector demana els permisos següents. Només els obté si ho permeteu.",
+      "high_risk_note": "Els elements marcats donen al connector accés al contingut del vostre correu o li permeten enviar dades a altres llocs. Permeteu-los només als connectors de confiança.",
+      "revoke_hint": "Podeu desactivar o eliminar el connector a Configuració en qualsevol moment.",
+      "deny": "No ho permetis",
+      "allow": "Permet"
+    },
+    "permissions": {
+      "none": "No necessita cap permís especial.",
+      "high_risk": "Cal anar amb compte",
+      "email_read": {
+        "title": "Llegir el vostre correu",
+        "body": "Veure remitents, destinataris, assumptes i el text complet de qualsevol missatge del vostre compte, i les vostres carpetes."
+      },
+      "email_write": {
+        "title": "Canviar i organitzar el vostre correu",
+        "body": "Afegir o treure etiquetes, marques i altres paraules clau dels vostres missatges, moure'ls entre les vostres carpetes i a l'arxiu, i desar esborranys."
+      },
+      "email_send": {
+        "title": "Canviar el correu abans d'enviar-lo",
+        "body": "Llegir i canviar els destinataris, l'assumpte, el text i els adjunts dels missatges que escriviu, i impedir que s'enviï un missatge."
+      },
+      "crypto_full": {
+        "title": "Accés complet a aquesta aplicació",
+        "body": "S'executa amb els mateixos drets que el mateix webmail. Pot llegir tot el vostre correu i les claus desades i actuar en nom vostre. Permeteu-ho només als connectors en què confieu plenament."
+      },
+      "email_raw_send": {
+        "title": "Enviar missatges que ha creat ell mateix",
+        "body": "Enviar missatges complets, per exemple signats o xifrats, des del vostre compte."
+      },
+      "email_blob_read": {
+        "title": "Llegir el contingut original dels missatges",
+        "body": "Llegir les dades originals dels vostres missatges i adjunts, i de cada fitxer que adjunteu abans d'enviar-lo."
+      },
+      "email_blob_write": {
+        "title": "Substituir adjunts abans d'enviar",
+        "body": "Pujar fitxers al vostre servidor de correu i substituir un fitxer adjunt per un altre abans que s'enviï el missatge."
+      },
+      "email_render_takeover": {
+        "title": "Canviar com es mostren els missatges",
+        "body": "Substituir el text dels missatges que obriu i de la llista de missatges, per exemple per mostrar contingut desxifrat."
+      },
+      "calendar_read": {
+        "title": "Llegir el vostre calendari",
+        "body": "Veure els vostres calendaris i els seus esdeveniments."
+      },
+      "calendar_write": {
+        "title": "Canviar el vostre calendari",
+        "body": "Crear, canviar i suprimir esdeveniments."
+      },
+      "contacts_read": {
+        "title": "Llegir els vostres contactes",
+        "body": "Cercar i llegir les vostres llibretes d'adreces."
+      },
+      "contacts_write": {
+        "title": "Canviar els vostres contactes",
+        "body": "Crear, canviar i suprimir contactes i llibretes d'adreces."
+      },
+      "files_read": {
+        "title": "Llegir els vostres fitxers",
+        "body": "Navegar pels fitxers desats al vostre compte i obrir-los."
+      },
+      "files_write": {
+        "title": "Canviar els vostres fitxers",
+        "body": "Pujar, canviar el nom, moure i suprimir fitxers del vostre compte."
+      },
+      "identity_read": {
+        "title": "Veure les vostres identitats d'enviament",
+        "body": "Veure les adreces des de les quals envieu i les seves signatures."
+      },
+      "identity_write": {
+        "title": "Canviar les vostres identitats d'enviament",
+        "body": "Crear, canviar i suprimir identitats d'enviament i signatures."
+      },
+      "filters_read": {
+        "title": "Llegir els vostres filtres de correu",
+        "body": "Veure les regles que classifiquen el correu entrant."
+      },
+      "filters_write": {
+        "title": "Canviar els vostres filtres de correu",
+        "body": "Afegir regles als filtres del servidor. Aquestes regles poden moure, reenviar o suprimir el correu entrant."
+      },
+      "tasks_read": {
+        "title": "Llegir les vostres tasques",
+        "body": "Veure les vostres llistes de tasques i les tasques."
+      },
+      "tasks_write": {
+        "title": "Canviar les vostres tasques",
+        "body": "Crear, canviar, completar i suprimir tasques."
+      },
+      "templates_read": {
+        "title": "Llegir les vostres plantilles",
+        "body": "Veure les plantilles de missatge desades."
+      },
+      "templates_write": {
+        "title": "Canviar les vostres plantilles",
+        "body": "Crear, canviar i suprimir plantilles de missatge."
+      },
+      "smime_read": {
+        "title": "Veure l'estat de S/MIME",
+        "body": "Veure si teniu claus i certificats S/MIME, sense accés a les claus."
+      },
+      "vacation_read": {
+        "title": "Veure la resposta automàtica",
+        "body": "Veure si la resposta automàtica està activada i què diu."
+      },
+      "vacation_write": {
+        "title": "Canviar la resposta automàtica",
+        "body": "Activar o desactivar la resposta automàtica i canviar-ne el text i les dates."
+      },
+      "settings_read": {
+        "title": "Llegir la vostra configuració",
+        "body": "Veure les vostres preferències i les definicions d'etiquetes."
+      },
+      "settings_write": {
+        "title": "Canviar la vostra configuració",
+        "body": "Afegir i reordenar etiquetes i canviar les vostres preferències."
+      },
+      "security_read": {
+        "title": "Veure la seguretat del compte",
+        "body": "Veure si l'autenticació de dos factors i el xifratge estan activats, sense accés als secrets."
+      },
+      "auth_observe": {
+        "title": "Saber quan inicieu la sessió",
+        "body": "Rebre un avís quan inicieu la sessió, canvieu de compte o es renova la sessió."
+      },
+      "auth_emit": {
+        "title": "Tancar la vostra sessió",
+        "body": "Tancar la vostra sessió al webmail."
+      },
+      "account_read": {
+        "title": "Veure els vostres comptes",
+        "body": "Veure els comptes que heu afegit, amb les seves adreces i servidors."
+      },
+      "http_post": {
+        "title": "Fer servir el servidor del webmail en nom vostre",
+        "body": "Cridar aquests punts d'accés del servidor amb el vostre inici de sessió:"
+      },
+      "http_fetch": {
+        "title": "Connectar-se a altres llocs web",
+        "body": "Enviar peticions a aquests llocs. Qualsevol cosa que el connector pugui llegir s'hi pot enviar:"
+      },
+      "admin_config": {
+        "title": "Llegir la configuració que li ha posat l'administrador",
+        "body": "Llegir la configuració que l'administrador ha desat per a aquest connector."
+      },
+      "ui_observe": {
+        "title": "Seguir on sou dins l'aplicació",
+        "body": "Saber quina pàgina està oberta i reaccionar als enllaços en què feu clic."
+      },
+      "ui_toolbar": {
+        "title": "Afegir botons a les barres d'eines",
+        "body": "Mostrar botons propis a la barra d'eines dels missatges, en un missatge obert i a la barra superior."
+      },
+      "ui_app_top_banner": {
+        "title": "Mostrar un bàner a dalt",
+        "body": "Mostrar un avís a la part superior de l'aplicació."
+      },
+      "ui_email_banner": {
+        "title": "Mostrar avisos als missatges",
+        "body": "Mostrar avisos i resums propis a sobre, dins i entre les parts d'un missatge o una conversa oberts."
+      },
+      "ui_email_footer": {
+        "title": "Afegir contingut sota els missatges",
+        "body": "Mostrar contingut propi a sota d'un missatge obert."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "Mostrar les claus de xifratge dels contactes",
+        "body": "Mostrar i gestionar les claus de xifratge d'un contacte."
+      },
+      "ui_email_details": {
+        "title": "Afegir panells als detalls del missatge",
+        "body": "Mostrar un panell propi al costat o a sota d'un missatge obert."
+      },
+      "ui_download_file": {
+        "title": "Desar fitxers al dispositiu",
+        "body": "Oferir per baixar fitxers que ha creat."
+      },
+      "ui_message_list_tabs": {
+        "title": "Afegir pestanyes a la safata d'entrada",
+        "body": "Classificar la safata d'entrada en pestanyes com ara Actualitzacions o Promocions."
+      },
+      "ui_composer_toolbar": {
+        "title": "Afegir elements al redactor",
+        "body": "Mostrar botons, elements de menú i seccions propis mentre escriviu un missatge."
+      },
+      "ui_composer_sidebar": {
+        "title": "Afegir un panell al redactor",
+        "body": "Mostrar un panell propi al costat del missatge que escriviu."
+      },
+      "ui_sidebar_widget": {
+        "title": "Afegir elements a la barra lateral",
+        "body": "Mostrar quadres i seccions propis a la barra lateral del correu."
+      },
+      "ui_settings_section": {
+        "title": "Afegir una pàgina de configuració",
+        "body": "Mostrar una pàgina pròpia a Configuració."
+      },
+      "ui_context_menu": {
+        "title": "Afegir elements al menú del missatge",
+        "body": "Afegir elements al menú que s'obre quan feu clic amb el botó dret en un missatge."
+      },
+      "ui_navigation_rail": {
+        "title": "Afegir elements a la barra de navegació",
+        "body": "Mostrar un botó propi a la barra de navegació."
+      },
+      "ui_keyboard": {
+        "title": "Afegir dreceres de teclat",
+        "body": "Reaccionar a les dreceres de teclat que defineix."
+      },
+      "ui_calendar_action": {
+        "title": "Afegir elements a la vista del calendari",
+        "body": "Mostrar botons i seccions propis als esdeveniments, i etiquetes curtes i punts als dies del calendari."
+      },
+      "ui_admin_page": {
+        "title": "Afegir una pàgina d'administració",
+        "body": "Mostrar una pàgina pròpia a la configuració d'administració."
+      },
+      "app_lifecycle": {
+        "title": "Saber quan l'aplicació s'inicia i s'atura",
+        "body": "Rebre un avís quan l'aplicació s'inicia, es queda sense connexió o tanqueu la sessió."
+      },
+      "compose_open": {
+        "title": "Obrir el redactor per a vós",
+        "body": "Obrir un missatge nou amb els destinataris, el text o els adjunts ja emplenats. Sou vós qui decidiu si s'envia."
+      },
+      "compose_read": {
+        "title": "Llegir el missatge que escriviu",
+        "body": "Llegir el text d'un missatge mentre l'escriviu, quan feu servir el connector a l'editor. No la signatura ni el missatge citat."
+      },
+      "compose_write": {
+        "title": "Canviar el missatge que escriviu",
+        "body": "Substituir o afegir text en un missatge mentre l'escriviu, quan feu servir el connector a l'editor. Podeu desfer cada canvi i continueu decidint si l'envieu."
+      },
+      "ui_notifications": {
+        "title": "Mostrar notificacions",
+        "body": "Mostrar notificacions al dispositiu, o dins l'aplicació si no les heu permeses. Cadascuna indica el nom del connector."
+      },
+      "ui_message_list": {
+        "title": "Afegir elements a la llista de missatges",
+        "body": "Mostrar contingut propi a sobre de la llista de missatges, i botons als missatges i a la barra dels missatges seleccionats."
+      },
+      "ui_contacts": {
+        "title": "Afegir elements a la vista de contactes",
+        "body": "Mostrar seccions pròpies als detalls d'un contacte i botons a la llista de contactes."
+      },
+      "ui_tasks": {
+        "title": "Afegir elements a la vista de tasques",
+        "body": "Mostrar seccions pròpies als detalls d'una tasca i botons a la llista de tasques."
+      },
+      "ui_files": {
+        "title": "Afegir elements a la vista de fitxers",
+        "body": "Mostrar seccions pròpies a la previsualització de fitxers i entrades al menú d'un fitxer."
+      },
+      "ui_commands": {
+        "title": "Afegir ordres",
+        "body": "Afegir entrades pròpies a la paleta d'ordres (Ctrl+K)."
+      },
+      "ui_app_page": {
+        "title": "Afegir pàgines",
+        "body": "Afegir pàgines pròpies a l'aplicació, cadascuna amb un botó a la barra de navegació."
+      },
+      "http_proxy": {
+        "title": "Fer servir els comptes que connecteu",
+        "body": "Enviar peticions a través del servidor de Bulwark amb un compte o una clau que heu configurat vós o el vostre administrador. El connector no veu mai la contrasenya, però pot fer tot el que aquest compte pot fer al seu propi servidor."
+      }
+    },
+    "dialog": {
+      "from_plugin": "Del connector {name}",
+      "ok": "D'acord",
+      "submit": "Envia",
+      "confirm": "Confirma",
+      "cancel": "Cancel·la",
+      "close": "Tanca",
+      "turn_off": "Desactiva {name}",
+      "plugin_menu": "Opcions de {name}",
+      "password_note": "Aquest formulari ve del connector {name}, no del correu web. Introduïu una contrasenya només si confieu en aquest connector.",
+      "toast_auto_disabled": "{name} s'ha desactivat perquè fallava repetidament."
+    },
+    "connect": {
+      "title": "Connecta {label}",
+      "intro_password": "{name} vol utilitzar el vostre compte de {label}. Bulwark desa la contrasenya al seu servidor i només l'envia a {host}. El connector no la veu mai.",
+      "intro_password_any": "{name} vol utilitzar el vostre compte de {label}. Bulwark desa la contrasenya al seu servidor i només l'envia al servidor que introduïu aquí. El connector no la veu mai.",
+      "intro_signin": "{name} vol iniciar la sessió al vostre compte de {label}. Introduïu aquí el servidor i després inicieu la sessió a la seva pròpia pàgina. Bulwark desa al seu servidor l'accés que obté; el connector no el veu mai.",
+      "server": "Adreça del servidor",
+      "server_hint": "cloud.example.com",
+      "username": "Nom d'usuari",
+      "secret": "Contrasenya o clau",
+      "connect": "Connecta",
+      "continue": "Continua",
+      "cancel": "Cancel·la",
+      "saving": "S'està desant…",
+      "error_server": "Introduïu l'adreça del servidor, per exemple https://cloud.example.com",
+      "error_save": "No s'ha pogut desar: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "Seleccioneu un resultat per previsualitzar-lo",
     "open_full": "Obre",
     "view_label": "Vista"
+  },
+  "top_bar": {
+    "more": "Més opcions"
+  },
+  "plugin_pages": {
+    "loading": "S'està carregant la pàgina",
+    "not_available_title": "Aquesta pàgina no està disponible",
+    "not_available_description": "El connector que l'ha afegida està desactivat o ja no està instal·lat.",
+    "back_to_mail": "Torna al correu",
+    "settings_group": "Connectors"
+  },
+  "command_palette": {
+    "title": "Paleta d'ordres",
+    "open": "Obre la paleta d'ordres",
+    "placeholder": "Escriviu una ordre",
+    "no_results": "Cap ordre coincident",
+    "go_to": "Ves a {name}",
+    "compose": "Missatge nou",
+    "search": "Cerca al correu",
+    "theme_dark": "Canvia al tema fosc",
+    "theme_light": "Canvia al tema clar",
+    "shortcuts": "Mostra les dreceres de teclat",
+    "group_navigation": "Ves a",
+    "group_actions": "Accions",
+    "group_plugins": "Connectors"
+  },
+  "notification_center": {
+    "title": "Notificacions",
+    "mark_all_read": "Marca-ho tot com a llegit",
+    "clear": "Esborra",
+    "empty": "No hi ha notificacions",
+    "close": "Tanca",
+    "unread": "No llegida",
+    "unread_count": "{count} sense llegir",
+    "level_error": "Error",
+    "level_warning": "Avís"
   }
 }
diff --git a/locales/cs/common.json b/locales/cs/common.json
index 2bcc4524d..f899dbddb 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -620,7 +620,9 @@
       "copied": "Kód zkopírován",
       "copy_failed": "Kód se nepodařilo zkopírovat"
     },
-    "mv_position": "{index} z {total}"
+    "mv_position": "{index} z {total}",
+    "plugin_panel_show": "Zobrazit panel pluginu",
+    "plugin_panel_hide": "Skrýt panel pluginu"
   },
   "email_composer": {
     "minimize": "Minimalizovat",
@@ -813,7 +815,8 @@
       "remove_background_color": "Odebrat barvu pozadí"
     },
     "send_filing_warning": "Odesláno - ale následný úklid selhal, může zůstat zastaralý koncept.",
-    "pop_out": "Otevřít odpověď v okně"
+    "pop_out": "Otevřít odpověď v okně",
+    "send_guard_failed": "Neodesláno - plugin, který kontroluje zprávy před odesláním, selhal nebo neodpověděl."
   },
   "confirm_dialog": {
     "confirm": "Potvrdit",
@@ -3970,6 +3973,354 @@
       "failed_detail": "Autorizace se nezdařila: {error}",
       "missing_params": "Chybí autorizační kód nebo stav.",
       "delivery_failed": "Výsledek autorizace se nepodařilo předat kartě aplikace. Zavřete toto okno a zkuste to znovu."
+    },
+    "settings": {
+      "title": "Pluginy",
+      "description": "Pluginy přidané vaším správcem. Pro svůj účet je můžete zapnout nebo vypnout.",
+      "description_uploads": "Pluginy přidávají do webmailu další funkce. Pro svůj účet je můžete zapnout nebo vypnout, případně nainstalovat vlastní.",
+      "description_demo": "Pluginy nejsou v ukázkové verzi k dispozici.",
+      "install_button": "Nainstalovat plugin",
+      "install_hint": "Vyberte soubor ZIP s pluginem.",
+      "install_hint_approval": "Vyberte soubor ZIP s pluginem. Než ho budete moci zapnout, musí ho schválit správce.",
+      "install_uploads_off": "Váš správce nepovoluje instalaci pluginů.",
+      "install_managed_id": "Váš správce už poskytuje plugin s tímto názvem, proto ho nelze nahradit.",
+      "install_invalid": "Tento soubor není plugin, který lze nainstalovat: {details}",
+      "toast_installed": "Plugin nainstalován. Zapněte ho níže.",
+      "toast_installed_pending": "Plugin nainstalován a odeslán správci ke schválení.",
+      "toast_enabled": "Plugin {name} je zapnutý",
+      "toast_disabled": "Plugin {name} je vypnutý",
+      "toast_removed": "Plugin {name} byl odstraněn",
+      "toast_forced": "Váš správce ponechává plugin {name} zapnutý",
+      "toast_approval_requested": "Plugin {name} čeká na schválení správcem",
+      "empty_title": "Zatím žádné pluginy",
+      "empty_admin": "Váš správce zatím nepřidal žádné pluginy.",
+      "empty_uploads": "Začněte instalací pluginu ze souboru ZIP.",
+      "empty_demo": "Pluginy vyžadují skutečný účet, proto je ukázková verze nemá.",
+      "syncing": "Kontrola pluginů na serveru…",
+      "status_installed": "Vypnuto",
+      "status_enabled": "Spouští se",
+      "status_running": "Zapnuto",
+      "status_disabled": "Vypnuto",
+      "status_error": "Problém",
+      "badge_forced": "Povinný",
+      "badge_managed": "Od správce",
+      "badge_yours": "Nainstalováno vámi",
+      "badge_awaiting": "Čeká na schválení",
+      "toggle_label": "Zapnout nebo vypnout plugin {name}",
+      "forced_note": "Váš správce tento plugin vyžaduje, proto ho nelze vypnout.",
+      "permissions": "Co může dělat",
+      "permissions_managed": "Co může dělat (schváleno správcem)",
+      "settings": "Nastavení",
+      "remove": "Odstranit",
+      "remove_title": "Odstranit plugin {name}?",
+      "remove_message": "Plugin i vše, co uložil v tomto prohlížeči, bude smazáno. Později ho můžete nainstalovat znovu.",
+      "remove_confirm": "Odstranit",
+      "error_user_plugins_off": "Váš správce vypnul pluginy instalované uživateli, proto tento plugin neběží.",
+      "error_approval_unavailable": "Tento plugin byl nainstalován dříve, než bylo vyžadováno schválení. Odstraňte ho a nainstalujte znovu, aby se odeslal ke schválení.",
+      "error_approval_denied": "Váš správce tento plugin neschválil.",
+      "error_approval_pending": "Čeká se, až správce tento plugin schválí.",
+      "error_auto_disabled": "Vypnuto, protože opakovaně selhávalo. Zapněte ho znovu a zkuste to znovu.",
+      "accounts_heading": "Připojené účty",
+      "account_on": "{label} na {host}",
+      "account_waiting": "{label} na {host} (přihlášení nedokončeno)",
+      "disconnect": "Odpojit",
+      "disconnect_failed": "{label} se nepodařilo odpojit"
+    },
+    "consent": {
+      "title": "Povolit pluginu {name} tyto akce?",
+      "intro": "Plugin žádá o níže uvedená oprávnění. Dostane je, jen pokud je povolíte.",
+      "high_risk_note": "Označené položky dávají pluginu přístup k obsahu vaší pošty nebo mu umožňují posílat data jinam. Povolte je jen pluginům, kterým důvěřujete.",
+      "revoke_hint": "Plugin můžete kdykoli vypnout nebo odstranit v Nastavení.",
+      "deny": "Nepovolit",
+      "allow": "Povolit"
+    },
+    "permissions": {
+      "none": "Nepotřebuje žádná zvláštní oprávnění.",
+      "high_risk": "Vyžaduje opatrnost",
+      "email_read": {
+        "title": "Číst vaši poštu",
+        "body": "Vidí odesílatele, příjemce, předměty a celý text kterékoli zprávy ve vašem účtu i vaše složky."
+      },
+      "email_write": {
+        "title": "Měnit a třídit vaši poštu",
+        "body": "Přidává nebo odebírá štítky, příznaky a další klíčová slova u vašich zpráv, přesouvá je mezi vašimi složkami a do archivu a ukládá koncepty."
+      },
+      "email_send": {
+        "title": "Měnit poštu před odesláním",
+        "body": "Čte a mění příjemce, předmět, text a přílohy zpráv, které píšete, a může zastavit odeslání zprávy."
+      },
+      "crypto_full": {
+        "title": "Plný přístup k této aplikaci",
+        "body": "Běží se stejnými právy jako samotný webmail. Může číst veškerou vaši poštu a uložené klíče a jednat vaším jménem. Povolte to jen pluginům, kterým plně důvěřujete."
+      },
+      "email_raw_send": {
+        "title": "Odesílat zprávy, které sám vytvořil",
+        "body": "Odesílá z vašeho účtu kompletní zprávy, například podepsané nebo šifrované."
+      },
+      "email_blob_read": {
+        "title": "Číst nezpracovaný obsah zpráv",
+        "body": "Čte původní data vašich zpráv a příloh i každého souboru, který připojíte před odesláním."
+      },
+      "email_blob_write": {
+        "title": "Nahrazovat přílohy před odesláním",
+        "body": "Nahrává soubory na váš poštovní server a před odesláním zprávy nahradí připojený soubor jiným."
+      },
+      "email_render_takeover": {
+        "title": "Měnit zobrazení zpráv",
+        "body": "Nahrazuje text zpráv, které otevřete, i seznamu zpráv, například aby zobrazil dešifrovaný obsah."
+      },
+      "calendar_read": {
+        "title": "Číst váš kalendář",
+        "body": "Vidí vaše kalendáře a jejich události."
+      },
+      "calendar_write": {
+        "title": "Měnit váš kalendář",
+        "body": "Vytváří, mění a maže události."
+      },
+      "contacts_read": {
+        "title": "Číst vaše kontakty",
+        "body": "Prohledává a čte vaše adresáře."
+      },
+      "contacts_write": {
+        "title": "Měnit vaše kontakty",
+        "body": "Vytváří, mění a maže kontakty a adresáře."
+      },
+      "files_read": {
+        "title": "Číst vaše soubory",
+        "body": "Prochází a otevírá soubory uložené ve vašem účtu."
+      },
+      "files_write": {
+        "title": "Měnit vaše soubory",
+        "body": "Nahrává, přejmenovává, přesouvá a maže soubory ve vašem účtu."
+      },
+      "identity_read": {
+        "title": "Vidět vaše identity odesílatele",
+        "body": "Vidí adresy, ze kterých odesíláte, a jejich podpisy."
+      },
+      "identity_write": {
+        "title": "Měnit vaše identity odesílatele",
+        "body": "Vytváří, mění a maže identity odesílatele a podpisy."
+      },
+      "filters_read": {
+        "title": "Číst vaše filtry pošty",
+        "body": "Vidí pravidla, která třídí vaši příchozí poštu."
+      },
+      "filters_write": {
+        "title": "Měnit vaše filtry pošty",
+        "body": "Přidává pravidla do filtrů na serveru. Taková pravidla mohou příchozí poštu přesouvat, přeposílat nebo mazat."
+      },
+      "tasks_read": {
+        "title": "Číst vaše úkoly",
+        "body": "Vidí vaše seznamy úkolů a úkoly."
+      },
+      "tasks_write": {
+        "title": "Měnit vaše úkoly",
+        "body": "Vytváří, mění, dokončuje a maže úkoly."
+      },
+      "templates_read": {
+        "title": "Číst vaše šablony",
+        "body": "Vidí vaše uložené šablony zpráv."
+      },
+      "templates_write": {
+        "title": "Měnit vaše šablony",
+        "body": "Vytváří, mění a maže šablony zpráv."
+      },
+      "smime_read": {
+        "title": "Vidět stav S/MIME",
+        "body": "Vidí, zda máte klíče a certifikáty S/MIME, bez přístupu ke klíčům."
+      },
+      "vacation_read": {
+        "title": "Vidět automatickou odpověď v nepřítomnosti",
+        "body": "Vidí, zda je automatická odpověď zapnutá a co obsahuje."
+      },
+      "vacation_write": {
+        "title": "Měnit automatickou odpověď v nepřítomnosti",
+        "body": "Zapíná a vypíná automatickou odpověď a mění její text a data."
+      },
+      "settings_read": {
+        "title": "Číst vaše nastavení",
+        "body": "Vidí vaše předvolby a definice štítků."
+      },
+      "settings_write": {
+        "title": "Měnit vaše nastavení",
+        "body": "Přidává štítky, mění jejich pořadí a mění vaše předvolby."
+      },
+      "security_read": {
+        "title": "Vidět zabezpečení účtu",
+        "body": "Vidí, zda je zapnuté dvoufázové ověření a šifrování, bez přístupu k tajným údajům."
+      },
+      "auth_observe": {
+        "title": "Vědět, kdy se přihlásíte",
+        "body": "Dostává zprávu, když se přihlásíte, přepnete účet nebo se obnoví vaše relace."
+      },
+      "auth_emit": {
+        "title": "Odhlásit vás",
+        "body": "Může vás odhlásit z webmailu."
+      },
+      "account_read": {
+        "title": "Vidět vaše účty",
+        "body": "Vidí účty, které jste přidali, včetně jejich adres a serverů."
+      },
+      "http_post": {
+        "title": "Používat server webmailu vaším jménem",
+        "body": "Volá tyto koncové body serveru s vaším přihlášením:"
+      },
+      "http_fetch": {
+        "title": "Připojovat se k jiným webům",
+        "body": "Odesílá požadavky na tyto weby. Cokoli, co plugin může číst, tam může být odesláno:"
+      },
+      "admin_config": {
+        "title": "Číst nastavení od správce",
+        "body": "Čte nastavení, která pro tento plugin uložil váš správce."
+      },
+      "ui_observe": {
+        "title": "Sledovat, kde se v aplikaci nacházíte",
+        "body": "Ví, která stránka je otevřená, a reaguje na odkazy, na které kliknete."
+      },
+      "ui_toolbar": {
+        "title": "Přidávat tlačítka na panely nástrojů",
+        "body": "Zobrazuje vlastní tlačítka na panelu nástrojů zpráv, u otevřené zprávy a v horní liště."
+      },
+      "ui_app_top_banner": {
+        "title": "Zobrazovat banner nahoře",
+        "body": "Zobrazuje oznámení přes horní část aplikace."
+      },
+      "ui_email_banner": {
+        "title": "Zobrazovat oznámení u zpráv",
+        "body": "Zobrazuje vlastní oznámení a shrnutí nad částmi otevřené zprávy nebo konverzace, uvnitř nich a mezi nimi."
+      },
+      "ui_email_footer": {
+        "title": "Přidávat obsah pod zprávy",
+        "body": "Zobrazuje vlastní obsah pod otevřenou zprávou."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "Zobrazovat šifrovací klíče kontaktů",
+        "body": "Zobrazuje a spravuje šifrovací klíče u kontaktu."
+      },
+      "ui_email_details": {
+        "title": "Přidávat panely do podrobností zprávy",
+        "body": "Zobrazuje vlastní panel vedle otevřené zprávy nebo pod ní."
+      },
+      "ui_download_file": {
+        "title": "Ukládat soubory do zařízení",
+        "body": "Nabízí ke stažení soubory, které vytvořil."
+      },
+      "ui_message_list_tabs": {
+        "title": "Přidávat karty do Doručených",
+        "body": "Rozděluje Doručené do karet, například Aktualizace nebo Akce."
+      },
+      "ui_composer_toolbar": {
+        "title": "Přidávat obsah do editoru zprávy",
+        "body": "Zobrazuje vlastní tlačítka, položky nabídky a sekce, když píšete zprávu."
+      },
+      "ui_composer_sidebar": {
+        "title": "Přidávat panel do editoru zprávy",
+        "body": "Zobrazuje vlastní panel vedle zprávy, kterou píšete."
+      },
+      "ui_sidebar_widget": {
+        "title": "Přidávat obsah do postranního panelu",
+        "body": "Zobrazuje vlastní pole a sekce v postranním panelu pošty."
+      },
+      "ui_settings_section": {
+        "title": "Přidávat stránku nastavení",
+        "body": "Zobrazuje vlastní stránku v Nastavení."
+      },
+      "ui_context_menu": {
+        "title": "Přidávat položky do nabídky zprávy",
+        "body": "Přidává položky do nabídky, která se otevře po kliknutí pravým tlačítkem na zprávu."
+      },
+      "ui_navigation_rail": {
+        "title": "Přidávat tlačítko do navigačního panelu",
+        "body": "Zobrazuje vlastní tlačítko v navigačním panelu."
+      },
+      "ui_keyboard": {
+        "title": "Přidávat klávesové zkratky",
+        "body": "Reaguje na klávesové zkratky, které sám definuje."
+      },
+      "ui_calendar_action": {
+        "title": "Přidávat obsah do sekce Kalendář",
+        "body": "Zobrazuje vlastní tlačítka a sekce u událostí a krátké popisky a tečky u dnů v kalendáři."
+      },
+      "ui_admin_page": {
+        "title": "Přidávat stránku administrace",
+        "body": "Zobrazuje vlastní stránku v nastavení administrace."
+      },
+      "app_lifecycle": {
+        "title": "Vědět, kdy se aplikace spouští a ukončuje",
+        "body": "Dostává zprávu, když se aplikace spustí, přejde do režimu offline nebo když se odhlásíte."
+      },
+      "compose_open": {
+        "title": "Otevírat editor zprávy",
+        "body": "Otevře novou zprávu s vyplněnými příjemci, textem nebo přílohami. O odeslání stále rozhodujete vy."
+      },
+      "compose_read": {
+        "title": "Číst zprávu, kterou píšete",
+        "body": "Číst text zprávy během psaní, když plugin použijete v editoru. Ne podpis ani citovanou zprávu."
+      },
+      "compose_write": {
+        "title": "Měnit zprávu, kterou píšete",
+        "body": "Nahrazovat nebo přidávat text ve zprávě během psaní, když plugin použijete v editoru. Každou změnu můžete vrátit a o odeslání stále rozhodujete vy."
+      },
+      "ui_notifications": {
+        "title": "Zobrazovat oznámení",
+        "body": "Zobrazuje oznámení ve vašem zařízení, nebo v aplikaci, pokud jste je nepovolili. Každé uvádí název pluginu."
+      },
+      "ui_message_list": {
+        "title": "Přidávat obsah do seznamu zpráv",
+        "body": "Zobrazuje vlastní obsah nad seznamem zpráv a tlačítka u zpráv a na panelu nástrojů pro vybrané zprávy."
+      },
+      "ui_contacts": {
+        "title": "Přidávat obsah do sekce Kontakty",
+        "body": "Zobrazuje vlastní sekce v podrobnostech kontaktu a tlačítka v seznamu kontaktů."
+      },
+      "ui_tasks": {
+        "title": "Přidávat obsah do sekce Úkoly",
+        "body": "Zobrazuje vlastní sekce v podrobnostech úkolu a tlačítka v seznamu úkolů."
+      },
+      "ui_files": {
+        "title": "Přidávat obsah do sekce Soubory",
+        "body": "Zobrazuje vlastní sekce v náhledu souboru a položky v nabídce souboru."
+      },
+      "ui_commands": {
+        "title": "Přidávat příkazy",
+        "body": "Přidává vlastní položky do palety příkazů (Ctrl+K)."
+      },
+      "ui_app_page": {
+        "title": "Přidávat stránky",
+        "body": "Přidává do aplikace vlastní stránky, každou s tlačítkem v navigačním panelu."
+      },
+      "http_proxy": {
+        "title": "Používat účty, které připojíte",
+        "body": "Odesílá požadavky přes server Bulwarku pomocí účtu nebo klíče, který jste nastavili vy nebo váš správce. Plugin nikdy nevidí heslo, ale může na příslušném serveru dělat cokoli, co může tento účet."
+      }
+    },
+    "dialog": {
+      "from_plugin": "Od pluginu {name}",
+      "ok": "OK",
+      "submit": "Odeslat",
+      "confirm": "Potvrdit",
+      "cancel": "Zrušit",
+      "close": "Zavřít",
+      "turn_off": "Vypnout {name}",
+      "plugin_menu": "Možnosti pro {name}",
+      "password_note": "Tento formulář pochází z pluginu {name}, ne z webmailu. Heslo zadejte jen tehdy, když tomuto pluginu důvěřujete.",
+      "toast_auto_disabled": "{name} byl vypnut, protože opakovaně selhával."
+    },
+    "connect": {
+      "title": "Připojit {label}",
+      "intro_password": "{name} chce používat váš účet {label}. Bulwark uchovává heslo na svém serveru a posílá ho jen na {host}. Plugin ho nikdy nevidí.",
+      "intro_password_any": "{name} chce používat váš účet {label}. Bulwark uchovává heslo na svém serveru a posílá ho jen na server, který zde zadáte. Plugin ho nikdy nevidí.",
+      "intro_signin": "{name} se chce přihlásit k vašemu účtu {label}. Zadejte zde server a pak se přihlaste na jeho vlastní stránce. Bulwark uchovává získaný přístup na svém serveru; plugin ho nikdy nevidí.",
+      "server": "Adresa serveru",
+      "server_hint": "cloud.example.com",
+      "username": "Uživatelské jméno",
+      "secret": "Heslo nebo klíč",
+      "connect": "Připojit",
+      "continue": "Pokračovat",
+      "cancel": "Zrušit",
+      "saving": "Ukládání…",
+      "error_server": "Zadejte adresu serveru, například https://cloud.example.com",
+      "error_save": "Uložení se nezdařilo: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "Vyberte výsledek pro náhled",
     "open_full": "Otevřít",
     "view_label": "Zobrazení"
+  },
+  "top_bar": {
+    "more": "Další možnosti"
+  },
+  "plugin_pages": {
+    "loading": "Načítání stránky",
+    "not_available_title": "Tato stránka není k dispozici",
+    "not_available_description": "Plugin, který ji přidal, je vypnutý nebo už není nainstalovaný.",
+    "back_to_mail": "Zpět na poštu",
+    "settings_group": "Pluginy"
+  },
+  "command_palette": {
+    "title": "Paleta příkazů",
+    "open": "Otevřít paletu příkazů",
+    "placeholder": "Zadejte příkaz",
+    "no_results": "Žádné odpovídající příkazy",
+    "go_to": "Přejít na {name}",
+    "compose": "Nová zpráva",
+    "search": "Hledat v poště",
+    "theme_dark": "Přepnout na tmavý motiv",
+    "theme_light": "Přepnout na světlý motiv",
+    "shortcuts": "Zobrazit klávesové zkratky",
+    "group_navigation": "Přejít na",
+    "group_actions": "Akce",
+    "group_plugins": "Pluginy"
+  },
+  "notification_center": {
+    "title": "Oznámení",
+    "mark_all_read": "Označit vše jako přečtené",
+    "clear": "Vymazat",
+    "empty": "Žádná oznámení",
+    "close": "Zavřít",
+    "unread": "Nepřečtené",
+    "unread_count": "Nepřečtené: {count}",
+    "level_error": "Chyba",
+    "level_warning": "Upozornění"
   }
 }
diff --git a/locales/da/common.json b/locales/da/common.json
index 09b5c9dec..76dfe73a1 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -620,7 +620,9 @@
       "copied": "Kode kopieret",
       "copy_failed": "Koden kunne ikke kopieres"
     },
-    "mv_position": "{index} af {total}"
+    "mv_position": "{index} af {total}",
+    "plugin_panel_show": "Vis pluginpanel",
+    "plugin_panel_hide": "Skjul pluginpanel"
   },
   "email_composer": {
     "minimize": "Minimer",
@@ -813,7 +815,8 @@
       "remove_background_color": "Fjern baggrundsfarve"
     },
     "send_filing_warning": "Sendt - men oprydningen bagefter mislykkedes, en forældet kladde kan blive stående.",
-    "pop_out": "Åbn svaret i et vindue"
+    "pop_out": "Åbn svaret i et vindue",
+    "send_guard_failed": "Ikke sendt - et plugin, der kontrollerer beskeder før afsendelse, fejlede eller svarede ikke."
   },
   "confirm_dialog": {
     "confirm": "Bekræft",
@@ -3970,6 +3973,354 @@
       "failed_detail": "Godkendelse mislykkedes: {error}",
       "missing_params": "Autorisationskode eller tilstand mangler.",
       "delivery_failed": "Resultatet af godkendelsen kunne ikke leveres til app-fanen. Luk dette vindue og prøv igen."
+    },
+    "settings": {
+      "title": "Plugins",
+      "description": "Plugins, som din administrator har tilføjet. Slå dem til eller fra for din konto.",
+      "description_uploads": "Plugins tilføjer funktioner til webmailen. Slå dem til eller fra for din konto, eller installer dine egne.",
+      "description_demo": "Plugins er ikke tilgængelige i demoen.",
+      "install_button": "Installer plugin",
+      "install_hint": "Vælg en ZIP-fil med et plugin.",
+      "install_hint_approval": "Vælg en ZIP-fil med et plugin. En administrator skal godkende det, før du kan slå det til.",
+      "install_uploads_off": "Din administrator tillader ikke, at du installerer plugins.",
+      "install_managed_id": "Din administrator leverer allerede et plugin med dette navn, så det kan ikke erstattes.",
+      "install_invalid": "Filen er ikke et plugin, der kan installeres: {details}",
+      "toast_installed": "Plugin installeret. Slå det til herunder.",
+      "toast_installed_pending": "Plugin installeret og sendt til din administrator til godkendelse.",
+      "toast_enabled": "{name} er slået til",
+      "toast_disabled": "{name} er slået fra",
+      "toast_removed": "{name} er fjernet",
+      "toast_forced": "Din administrator holder {name} slået til",
+      "toast_approval_requested": "{name} venter på godkendelse fra din administrator",
+      "empty_title": "Ingen plugins endnu",
+      "empty_admin": "Din administrator har ikke tilføjet nogen plugins.",
+      "empty_uploads": "Installer et plugin fra en ZIP-fil for at komme i gang.",
+      "empty_demo": "Plugins kræver en rigtig konto, så demoen har ingen.",
+      "syncing": "Tjekker plugins med serveren…",
+      "status_installed": "Fra",
+      "status_enabled": "Starter",
+      "status_running": "Til",
+      "status_disabled": "Fra",
+      "status_error": "Problem",
+      "badge_forced": "Påkrævet",
+      "badge_managed": "Fra din administrator",
+      "badge_yours": "Installeret af dig",
+      "badge_awaiting": "Venter på godkendelse",
+      "toggle_label": "Slå {name} til eller fra",
+      "forced_note": "Din administrator kræver dette plugin, så det kan ikke slås fra.",
+      "permissions": "Hvad det kan",
+      "permissions_managed": "Hvad det kan (godkendt af din administrator)",
+      "settings": "Indstillinger",
+      "remove": "Fjern",
+      "remove_title": "Fjern {name}?",
+      "remove_message": "Pluginnet og alt, hvad det har gemt i denne browser, slettes. Du kan installere det igen senere.",
+      "remove_confirm": "Fjern",
+      "error_user_plugins_off": "Din administrator har slået plugins installeret af brugere fra, så dette plugin kører ikke.",
+      "error_approval_unavailable": "Dette plugin blev installeret, før godkendelse var påkrævet. Fjern det, og installer det igen for at sende det til godkendelse.",
+      "error_approval_denied": "Din administrator har ikke godkendt dette plugin.",
+      "error_approval_pending": "Venter på, at din administrator godkender dette plugin.",
+      "error_auto_disabled": "Slået fra, fordi det blev ved med at fejle. Slå det til igen for at prøve igen.",
+      "accounts_heading": "Forbundne konti",
+      "account_on": "{label} på {host}",
+      "account_waiting": "{label} på {host} (login ikke afsluttet)",
+      "disconnect": "Afbryd forbindelse",
+      "disconnect_failed": "Kunne ikke afbryde forbindelsen til {label}"
+    },
+    "consent": {
+      "title": "Vil du tillade {name} at gøre dette?",
+      "intro": "Pluginnet beder om tilladelserne herunder. Det får dem kun, hvis du tillader det.",
+      "high_risk_note": "Markerede punkter giver pluginnet adgang til indholdet af dine e-mails eller lader det sende data andre steder hen. Tillad dem kun for plugins, du stoler på.",
+      "revoke_hint": "Du kan altid slå pluginnet fra eller fjerne det under Indstillinger.",
+      "deny": "Tillad ikke",
+      "allow": "Tillad"
+    },
+    "permissions": {
+      "none": "Det kræver ingen særlige tilladelser.",
+      "high_risk": "Kræver omtanke",
+      "email_read": {
+        "title": "Læse dine e-mails",
+        "body": "Se afsendere, modtagere, emner og den fulde tekst i alle beskeder på din konto samt dine mapper."
+      },
+      "email_write": {
+        "title": "Ændre og organisere dine e-mails",
+        "body": "Tilføje eller fjerne tags, markeringer og andre nøgleord på dine beskeder, flytte dem mellem dine mapper og til arkivet og gemme kladder."
+      },
+      "email_send": {
+        "title": "Ændre e-mails, før de sendes",
+        "body": "Læse og ændre modtagere, emne, tekst og vedhæftninger i de beskeder, du skriver, og forhindre, at en besked bliver sendt."
+      },
+      "crypto_full": {
+        "title": "Fuld adgang til denne app",
+        "body": "Kører med de samme rettigheder som selve webmailen. Det kan læse alle dine e-mails og gemte nøgler og handle på dine vegne. Tillad det kun for plugins, du stoler fuldt ud på."
+      },
+      "email_raw_send": {
+        "title": "Sende beskeder, det selv har lavet",
+        "body": "Sende færdige beskeder, f.eks. signerede eller krypterede, fra din konto."
+      },
+      "email_blob_read": {
+        "title": "Læse beskeders rå indhold",
+        "body": "Læse de originale data i dine beskeder og vedhæftninger og i alle filer, du vedhæfter, før de sendes."
+      },
+      "email_blob_write": {
+        "title": "Erstatte vedhæftninger før afsendelse",
+        "body": "Uploade filer til din mailserver og erstatte en vedhæftet fil med en anden, før beskeden sendes."
+      },
+      "email_render_takeover": {
+        "title": "Ændre, hvordan beskeder vises",
+        "body": "Erstatte teksten i de beskeder, du åbner, og i beskedlisten, f.eks. for at vise dekrypteret indhold."
+      },
+      "calendar_read": {
+        "title": "Læse din kalender",
+        "body": "Se dine kalendere og deres begivenheder."
+      },
+      "calendar_write": {
+        "title": "Ændre din kalender",
+        "body": "Oprette, ændre og slette begivenheder."
+      },
+      "contacts_read": {
+        "title": "Læse dine kontakter",
+        "body": "Søge i og læse dine adressebøger."
+      },
+      "contacts_write": {
+        "title": "Ændre dine kontakter",
+        "body": "Oprette, ændre og slette kontakter og adressebøger."
+      },
+      "files_read": {
+        "title": "Læse dine filer",
+        "body": "Gennemse og åbne de filer, der er gemt på din konto."
+      },
+      "files_write": {
+        "title": "Ændre dine filer",
+        "body": "Uploade, omdøbe, flytte og slette filer på din konto."
+      },
+      "identity_read": {
+        "title": "Se dine afsenderidentiteter",
+        "body": "Se de adresser, du sender fra, og deres signaturer."
+      },
+      "identity_write": {
+        "title": "Ændre dine afsenderidentiteter",
+        "body": "Oprette, ændre og slette afsenderidentiteter og signaturer."
+      },
+      "filters_read": {
+        "title": "Læse dine mailfiltre",
+        "body": "Se de regler, der sorterer din indgående mail."
+      },
+      "filters_write": {
+        "title": "Ændre dine mailfiltre",
+        "body": "Tilføje regler til dine filtre på serveren. Sådanne regler kan flytte, videresende eller slette indgående mail."
+      },
+      "tasks_read": {
+        "title": "Læse dine opgaver",
+        "body": "Se dine opgavelister og opgaver."
+      },
+      "tasks_write": {
+        "title": "Ændre dine opgaver",
+        "body": "Oprette, ændre, fuldføre og slette opgaver."
+      },
+      "templates_read": {
+        "title": "Læse dine skabeloner",
+        "body": "Se dine gemte beskedskabeloner."
+      },
+      "templates_write": {
+        "title": "Ændre dine skabeloner",
+        "body": "Oprette, ændre og slette beskedskabeloner."
+      },
+      "smime_read": {
+        "title": "Se din S/MIME-status",
+        "body": "Se, om du har S/MIME-nøgler og -certifikater, uden adgang til nøglerne."
+      },
+      "vacation_read": {
+        "title": "Se dit fraværssvar",
+        "body": "Se, om dit automatiske svar er slået til, og hvad der står i det."
+      },
+      "vacation_write": {
+        "title": "Ændre dit fraværssvar",
+        "body": "Slå dit automatiske svar til eller fra og ændre teksten og datoerne."
+      },
+      "settings_read": {
+        "title": "Læse dine indstillinger",
+        "body": "Se dine præferencer og tagdefinitioner."
+      },
+      "settings_write": {
+        "title": "Ændre dine indstillinger",
+        "body": "Tilføje og omarrangere tags og ændre dine præferencer."
+      },
+      "security_read": {
+        "title": "Se din kontos sikkerhed",
+        "body": "Se, om to-faktor-godkendelse og kryptering er slået til, uden adgang til hemmeligheder."
+      },
+      "auth_observe": {
+        "title": "Vide, når du logger ind",
+        "body": "Få besked, når du logger ind, skifter konto, eller din session fornyes."
+      },
+      "auth_emit": {
+        "title": "Logge dig ud",
+        "body": "Logge dig ud af webmailen."
+      },
+      "account_read": {
+        "title": "Se dine konti",
+        "body": "Se de konti, du har tilføjet, med deres adresser og servere."
+      },
+      "http_post": {
+        "title": "Bruge webmail-serveren for dig",
+        "body": "Kalde disse server-endpoints med dit login:"
+      },
+      "http_fetch": {
+        "title": "Forbinde til andre websteder",
+        "body": "Sende forespørgsler til disse websteder. Alt, hvad pluginnet kan læse, kan blive sendt dertil:"
+      },
+      "admin_config": {
+        "title": "Læse sine indstillinger fra din administrator",
+        "body": "Læse de indstillinger, din administrator har gemt for dette plugin."
+      },
+      "ui_observe": {
+        "title": "Følge med i, hvor du er i appen",
+        "body": "Vide, hvilken side der er åben, og reagere på links, du klikker på."
+      },
+      "ui_toolbar": {
+        "title": "Tilføje knapper til værktøjslinjer",
+        "body": "Vise sine egne knapper på beskedernes værktøjslinje, på en åben besked og på den øverste bjælke."
+      },
+      "ui_app_top_banner": {
+        "title": "Vise et banner øverst",
+        "body": "Vise en meddelelse hen over toppen af appen."
+      },
+      "ui_email_banner": {
+        "title": "Vise meddelelser på beskeder",
+        "body": "Vise sine egne meddelelser og resuméer over, i og mellem delene af en åben besked eller samtale."
+      },
+      "ui_email_footer": {
+        "title": "Tilføje indhold under beskeder",
+        "body": "Vise sit eget indhold under en åben besked."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "Vise kontakters krypteringsnøgler",
+        "body": "Vise og administrere krypteringsnøglerne på en kontakt."
+      },
+      "ui_email_details": {
+        "title": "Tilføje paneler til beskeddetaljer",
+        "body": "Vise sit eget panel ved siden af eller under en åben besked."
+      },
+      "ui_download_file": {
+        "title": "Gemme filer på din enhed",
+        "body": "Tilbyde filer, det har lavet, til download."
+      },
+      "ui_message_list_tabs": {
+        "title": "Tilføje faner til din indbakke",
+        "body": "Sortere din indbakke i faner som Opdateringer eller Kampagner."
+      },
+      "ui_composer_toolbar": {
+        "title": "Tilføje til komponisten",
+        "body": "Vise sine egne knapper, menupunkter og sektioner, mens du skriver en besked."
+      },
+      "ui_composer_sidebar": {
+        "title": "Tilføje et panel til komponisten",
+        "body": "Vise sit eget panel ved siden af den besked, du skriver."
+      },
+      "ui_sidebar_widget": {
+        "title": "Tilføje til sidepanelet",
+        "body": "Vise sine egne bokse og sektioner i mailens sidepanel."
+      },
+      "ui_settings_section": {
+        "title": "Tilføje en indstillingsside",
+        "body": "Vise sin egen side under Indstillinger."
+      },
+      "ui_context_menu": {
+        "title": "Tilføje til beskedmenuen",
+        "body": "Tilføje punkter til den menu, der åbner, når du højreklikker på en besked."
+      },
+      "ui_navigation_rail": {
+        "title": "Tilføje til navigationslinjen",
+        "body": "Vise sin egen knap på navigationslinjen."
+      },
+      "ui_keyboard": {
+        "title": "Tilføje tastaturgenveje",
+        "body": "Reagere på tastaturgenveje, som det selv definerer."
+      },
+      "ui_calendar_action": {
+        "title": "Tilføje til kalendervisningen",
+        "body": "Vise sine egne knapper og sektioner på begivenheder og korte etiketter og prikker på kalenderdage."
+      },
+      "ui_admin_page": {
+        "title": "Tilføje en administratorside",
+        "body": "Vise sin egen side i administratorindstillingerne."
+      },
+      "app_lifecycle": {
+        "title": "Vide, når appen starter og stopper",
+        "body": "Få besked, når appen starter, går offline, eller du logger ud."
+      },
+      "compose_open": {
+        "title": "Åbne komponisten for dig",
+        "body": "Åbne en ny besked med modtagere, tekst eller vedhæftninger udfyldt. Du bestemmer stadig, om den sendes."
+      },
+      "compose_read": {
+        "title": "Læse den besked, du skriver",
+        "body": "Læse teksten i en besked, mens du skriver den, når du bruger pluginet i editoren. Ikke signaturen eller den citerede besked."
+      },
+      "compose_write": {
+        "title": "Ændre den besked, du skriver",
+        "body": "Erstatte eller tilføje tekst i en besked, mens du skriver den, når du bruger pluginet i editoren. Du kan fortryde hver ændring, og du bestemmer stadig, om den sendes."
+      },
+      "ui_notifications": {
+        "title": "Vise notifikationer",
+        "body": "Vise notifikationer på din enhed eller i appen, hvis du ikke har tilladt dem. Hver af dem nævner pluginets navn."
+      },
+      "ui_message_list": {
+        "title": "Tilføje til beskedlisten",
+        "body": "Vise sit eget indhold over beskedlisten og knapper på beskeder og på værktøjslinjen for valgte beskeder."
+      },
+      "ui_contacts": {
+        "title": "Tilføje til kontaktvisningen",
+        "body": "Vise sine egne sektioner i en kontakts detaljer og knapper i kontaktlisten."
+      },
+      "ui_tasks": {
+        "title": "Tilføje til opgavevisningen",
+        "body": "Vise sine egne sektioner i en opgaves detaljer og knapper i opgavelisten."
+      },
+      "ui_files": {
+        "title": "Tilføje til filvisningen",
+        "body": "Vise sine egne sektioner i forhåndsvisningen af filer og punkter i en fils menu."
+      },
+      "ui_commands": {
+        "title": "Tilføje kommandoer",
+        "body": "Tilføje sine egne punkter til kommandopaletten (Ctrl+K)."
+      },
+      "ui_app_page": {
+        "title": "Tilføje sider",
+        "body": "Tilføje sine egne sider til appen, hver med en knap på navigationslinjen."
+      },
+      "http_proxy": {
+        "title": "Bruge konti, du forbinder",
+        "body": "Sende forespørgsler via Bulwarks server med en konto eller nøgle, som du eller din administrator har sat op. Pluginnet ser aldrig adgangskoden, men det kan gøre alt, hvad kontoen kan gøre på sin egen server."
+      }
+    },
+    "dialog": {
+      "from_plugin": "Fra pluginet {name}",
+      "ok": "OK",
+      "submit": "Send",
+      "confirm": "Bekræft",
+      "cancel": "Annuller",
+      "close": "Luk",
+      "turn_off": "Slå {name} fra",
+      "plugin_menu": "Indstillinger for {name}",
+      "password_note": "Denne formular kommer fra pluginet {name}, ikke fra webmailen. Indtast kun en adgangskode, hvis du stoler på dette plugin.",
+      "toast_auto_disabled": "{name} blev slået fra, fordi det blev ved med at fejle."
+    },
+    "connect": {
+      "title": "Forbind {label}",
+      "intro_password": "{name} vil bruge din konto hos {label}. Bulwark gemmer adgangskoden på sin server og sender den kun til {host}. Pluginnet ser den aldrig.",
+      "intro_password_any": "{name} vil bruge din konto hos {label}. Bulwark gemmer adgangskoden på sin server og sender den kun til den server, du angiver her. Pluginnet ser den aldrig.",
+      "intro_signin": "{name} vil logge ind på din konto hos {label}. Angiv serveren her, og log derefter ind på serverens egen side. Bulwark gemmer den adgang, det får, på sin server; pluginnet ser den aldrig.",
+      "server": "Serveradresse",
+      "server_hint": "cloud.example.com",
+      "username": "Brugernavn",
+      "secret": "Adgangskode eller nøgle",
+      "connect": "Forbind",
+      "continue": "Fortsæt",
+      "cancel": "Annuller",
+      "saving": "Gemmer…",
+      "error_server": "Angiv serverens adresse, for eksempel https://cloud.example.com",
+      "error_save": "Kunne ikke gemme: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "Vælg et resultat for at se det",
     "open_full": "Åbn",
     "view_label": "Visning"
+  },
+  "top_bar": {
+    "more": "Flere muligheder"
+  },
+  "plugin_pages": {
+    "loading": "Indlæser side",
+    "not_available_title": "Denne side er ikke tilgængelig",
+    "not_available_description": "Det plugin, der tilføjede den, er slået fra eller ikke længere installeret.",
+    "back_to_mail": "Tilbage til mail",
+    "settings_group": "Plugins"
+  },
+  "command_palette": {
+    "title": "Kommandopalet",
+    "open": "Åbn kommandopaletten",
+    "placeholder": "Skriv en kommando",
+    "no_results": "Ingen matchende kommandoer",
+    "go_to": "Gå til {name}",
+    "compose": "Ny besked",
+    "search": "Søg i mail",
+    "theme_dark": "Skift til mørkt tema",
+    "theme_light": "Skift til lyst tema",
+    "shortcuts": "Vis tastaturgenveje",
+    "group_navigation": "Gå til",
+    "group_actions": "Handlinger",
+    "group_plugins": "Plugins"
+  },
+  "notification_center": {
+    "title": "Notifikationer",
+    "mark_all_read": "Markér alle som læst",
+    "clear": "Ryd",
+    "empty": "Ingen notifikationer",
+    "close": "Luk",
+    "unread": "Ulæst",
+    "unread_count": "{count} ulæste",
+    "level_error": "Fejl",
+    "level_warning": "Advarsel"
   }
 }
diff --git a/locales/de/common.json b/locales/de/common.json
index 06d33815f..9dea6dbff 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -359,15 +359,15 @@
     "external_content_warning": "Bilder und externe Inhalte wurden blockiert",
     "load_external_content": "Bilder laden",
     "trust_sender": "Diesem Absender immer vertrauen",
-    "sender_check": {
-      "unverified_label": "Absender nicht bestätigt",
-      "failed_label": "Absenderprüfung fehlgeschlagen",
-      "unverified": "Diese Nachricht gibt vor, von {domain} zu kommen, aber nichts bestätigt das. Sie trägt keine gültige Signatur von {domain} und kam nicht von einem Server, den {domain} zulässt.",
-      "unverified_sent_from": "Diese Nachricht gibt vor, von {domain} zu kommen, wurde aber von {host} verschickt und trägt keine gültige Signatur von {domain}.",
-      "failed": "Diese Nachricht gibt vor, von {domain} zu kommen, hat aber die Absenderprüfung dieser Domain nicht bestanden. Sie ist möglicherweise gefälscht.",
-      "failed_sent_from": "Diese Nachricht gibt vor, von {domain} zu kommen, wurde aber von {host} verschickt und hat die Absenderprüfung von {domain} nicht bestanden. Sie ist möglicherweise gefälscht.",
-      "caution": "Seien Sie vorsichtig mit Links, Anhängen und Fragen nach Passwörtern oder Zahlungsdaten."
-    },
+    "sender_check": {
+      "unverified_label": "Absender nicht bestätigt",
+      "failed_label": "Absenderprüfung fehlgeschlagen",
+      "unverified": "Diese Nachricht gibt vor, von {domain} zu kommen, aber nichts bestätigt das. Sie trägt keine gültige Signatur von {domain} und kam nicht von einem Server, den {domain} zulässt.",
+      "unverified_sent_from": "Diese Nachricht gibt vor, von {domain} zu kommen, wurde aber von {host} verschickt und trägt keine gültige Signatur von {domain}.",
+      "failed": "Diese Nachricht gibt vor, von {domain} zu kommen, hat aber die Absenderprüfung dieser Domain nicht bestanden. Sie ist möglicherweise gefälscht.",
+      "failed_sent_from": "Diese Nachricht gibt vor, von {domain} zu kommen, wurde aber von {host} verschickt und hat die Absenderprüfung von {domain} nicht bestanden. Sie ist möglicherweise gefälscht.",
+      "caution": "Seien Sie vorsichtig mit Links, Anhängen und Fragen nach Passwörtern oder Zahlungsdaten."
+    },
     "back_to_list": "Zurück zur Liste",
     "view_contact": "Kontakt anzeigen",
     "message_details": "Nachrichtendetails",
@@ -620,7 +620,9 @@
       "copied": "Code kopiert",
       "copy_failed": "Code konnte nicht kopiert werden"
     },
-    "mv_position": "{index} von {total}"
+    "mv_position": "{index} von {total}",
+    "plugin_panel_show": "Plugin-Bereich einblenden",
+    "plugin_panel_hide": "Plugin-Bereich ausblenden"
   },
   "email_composer": {
     "minimize": "Minimieren",
@@ -813,7 +815,8 @@
       "remove_background_color": "Hintergrundfarbe entfernen"
     },
     "send_filing_warning": "Gesendet - aber das Aufräumen danach schlug fehl, evtl. bleibt ein alter Entwurf sichtbar.",
-    "pop_out": "Antwort in eigenem Fenster öffnen"
+    "pop_out": "Antwort in eigenem Fenster öffnen",
+    "send_guard_failed": "Nicht gesendet - ein Plugin, das Nachrichten vor dem Senden prüft, ist fehlgeschlagen oder hat nicht geantwortet."
   },
   "confirm_dialog": {
     "confirm": "Bestätigen",
@@ -3970,6 +3973,354 @@
       "failed_detail": "Autorisierung fehlgeschlagen: {error}",
       "missing_params": "Autorisierungscode oder State fehlt.",
       "delivery_failed": "Das Autorisierungsergebnis konnte nicht an den App-Tab übermittelt werden. Bitte schließen Sie dieses Fenster und versuchen Sie es erneut."
+    },
+    "settings": {
+      "title": "Plugins",
+      "description": "Plugins, die Ihr Administrator hinzugefügt hat. Schalten Sie sie für Ihr Konto ein oder aus.",
+      "description_uploads": "Plugins erweitern das Webmail um Funktionen. Schalten Sie sie für Ihr Konto ein oder aus, oder installieren Sie eigene.",
+      "description_demo": "In der Demo sind keine Plugins verfügbar.",
+      "install_button": "Plugin installieren",
+      "install_hint": "Wählen Sie eine Plugin-ZIP-Datei.",
+      "install_hint_approval": "Wählen Sie eine Plugin-ZIP-Datei. Ein Administrator muss das Plugin freigeben, bevor Sie es einschalten können.",
+      "install_uploads_off": "Ihr Administrator erlaubt keine Installation von Plugins.",
+      "install_managed_id": "Ihr Administrator stellt bereits ein Plugin mit diesem Namen bereit. Es kann daher nicht ersetzt werden.",
+      "install_invalid": "Diese Datei ist kein installierbares Plugin: {details}",
+      "toast_installed": "Plugin installiert. Schalten Sie es unten ein.",
+      "toast_installed_pending": "Plugin installiert und Ihrem Administrator zur Freigabe vorgelegt.",
+      "toast_enabled": "{name} ist eingeschaltet",
+      "toast_disabled": "{name} ist ausgeschaltet",
+      "toast_removed": "{name} wurde entfernt",
+      "toast_forced": "Ihr Administrator lässt {name} eingeschaltet",
+      "toast_approval_requested": "{name} wartet auf die Freigabe durch Ihren Administrator",
+      "empty_title": "Noch keine Plugins",
+      "empty_admin": "Ihr Administrator hat keine Plugins hinzugefügt.",
+      "empty_uploads": "Installieren Sie zum Start ein Plugin aus einer ZIP-Datei.",
+      "empty_demo": "Plugins brauchen ein echtes Konto, daher gibt es in der Demo keine.",
+      "syncing": "Plugins werden mit dem Server abgeglichen…",
+      "status_installed": "Aus",
+      "status_enabled": "Wird gestartet",
+      "status_running": "An",
+      "status_disabled": "Aus",
+      "status_error": "Problem",
+      "badge_forced": "Erforderlich",
+      "badge_managed": "Von Ihrem Administrator",
+      "badge_yours": "Von Ihnen installiert",
+      "badge_awaiting": "Wartet auf Freigabe",
+      "toggle_label": "{name} ein- oder ausschalten",
+      "forced_note": "Ihr Administrator schreibt dieses Plugin vor. Es kann daher nicht ausgeschaltet werden.",
+      "permissions": "Was es darf",
+      "permissions_managed": "Was es darf (von Ihrem Administrator freigegeben)",
+      "settings": "Einstellungen",
+      "remove": "Entfernen",
+      "remove_title": "{name} entfernen?",
+      "remove_message": "Das Plugin und alles, was es in diesem Browser gespeichert hat, wird gelöscht. Sie können es später erneut installieren.",
+      "remove_confirm": "Entfernen",
+      "error_user_plugins_off": "Ihr Administrator hat von Benutzern installierte Plugins ausgeschaltet. Dieses Plugin läuft daher nicht.",
+      "error_approval_unavailable": "Dieses Plugin wurde installiert, bevor eine Freigabe nötig war. Entfernen Sie es und installieren Sie es erneut, um es zur Freigabe vorzulegen.",
+      "error_approval_denied": "Ihr Administrator hat dieses Plugin nicht freigegeben.",
+      "error_approval_pending": "Wartet darauf, dass Ihr Administrator dieses Plugin freigibt.",
+      "error_auto_disabled": "Ausgeschaltet, weil es wiederholt fehlgeschlagen ist. Schalten Sie es wieder ein, um es erneut zu versuchen.",
+      "accounts_heading": "Verbundene Konten",
+      "account_on": "{label} auf {host}",
+      "account_waiting": "{label} auf {host} (Anmeldung nicht abgeschlossen)",
+      "disconnect": "Trennen",
+      "disconnect_failed": "{label} konnte nicht getrennt werden"
+    },
+    "consent": {
+      "title": "{name} Folgendes erlauben?",
+      "intro": "Das Plugin bittet um die folgenden Berechtigungen. Es erhält sie nur, wenn Sie zustimmen.",
+      "high_risk_note": "Markierte Punkte geben dem Plugin Zugriff auf den Inhalt Ihrer E-Mails oder erlauben ihm, Daten anderswohin zu senden. Erlauben Sie sie nur Plugins, denen Sie vertrauen.",
+      "revoke_hint": "Sie können das Plugin jederzeit in den Einstellungen ausschalten oder entfernen.",
+      "deny": "Nicht erlauben",
+      "allow": "Erlauben"
+    },
+    "permissions": {
+      "none": "Es braucht keine besonderen Berechtigungen.",
+      "high_risk": "Mit Vorsicht",
+      "email_read": {
+        "title": "Ihre E-Mails lesen",
+        "body": "Absender, Empfänger, Betreff und den vollständigen Text jeder Nachricht in Ihrem Konto sowie Ihre Ordner sehen."
+      },
+      "email_write": {
+        "title": "Ihre E-Mails ändern und ordnen",
+        "body": "Labels, Markierungen und andere Schlüsselwörter an Ihren Nachrichten hinzufügen oder entfernen, Nachrichten zwischen Ihren Ordnern und ins Archiv verschieben und Entwürfe speichern."
+      },
+      "email_send": {
+        "title": "E-Mails vor dem Senden ändern",
+        "body": "Empfänger, Betreff, Text und Anhänge der Nachrichten lesen und ändern, die Sie schreiben, und das Senden einer Nachricht verhindern."
+      },
+      "crypto_full": {
+        "title": "Vollzugriff auf diese App",
+        "body": "Läuft mit denselben Rechten wie das Webmail selbst. Es kann alle Ihre E-Mails und gespeicherten Schlüssel lesen und in Ihrem Namen handeln. Erlauben Sie das nur Plugins, denen Sie voll vertrauen."
+      },
+      "email_raw_send": {
+        "title": "Selbst erstellte Nachrichten senden",
+        "body": "Vollständige Nachrichten, zum Beispiel signierte oder verschlüsselte, von Ihrem Konto senden."
+      },
+      "email_blob_read": {
+        "title": "Rohinhalt von Nachrichten lesen",
+        "body": "Die Originaldaten Ihrer Nachrichten und Anhänge lesen, auch jeder Datei, die Sie vor dem Senden anhängen."
+      },
+      "email_blob_write": {
+        "title": "Anhänge vor dem Senden ersetzen",
+        "body": "Dateien auf Ihren Mailserver hochladen und eine angehängte Datei vor dem Senden durch eine andere ersetzen."
+      },
+      "email_render_takeover": {
+        "title": "Darstellung von Nachrichten ändern",
+        "body": "Den Text geöffneter Nachrichten und der Nachrichtenliste ersetzen, zum Beispiel um entschlüsselte Inhalte anzuzeigen."
+      },
+      "calendar_read": {
+        "title": "Ihren Kalender lesen",
+        "body": "Ihre Kalender und deren Termine sehen."
+      },
+      "calendar_write": {
+        "title": "Ihren Kalender ändern",
+        "body": "Termine erstellen, ändern und löschen."
+      },
+      "contacts_read": {
+        "title": "Ihre Kontakte lesen",
+        "body": "Ihre Adressbücher durchsuchen und lesen."
+      },
+      "contacts_write": {
+        "title": "Ihre Kontakte ändern",
+        "body": "Kontakte und Adressbücher erstellen, ändern und löschen."
+      },
+      "files_read": {
+        "title": "Ihre Dateien lesen",
+        "body": "Die in Ihrem Konto gespeicherten Dateien durchsuchen und öffnen."
+      },
+      "files_write": {
+        "title": "Ihre Dateien ändern",
+        "body": "Dateien in Ihrem Konto hochladen, umbenennen, verschieben und löschen."
+      },
+      "identity_read": {
+        "title": "Ihre Absenderadressen sehen",
+        "body": "Die Adressen, von denen Sie senden, und deren Signaturen sehen."
+      },
+      "identity_write": {
+        "title": "Ihre Absenderadressen ändern",
+        "body": "Absenderadressen und Signaturen erstellen, ändern und löschen."
+      },
+      "filters_read": {
+        "title": "Ihre E-Mail-Filter lesen",
+        "body": "Die Regeln sehen, die Ihre eingehenden E-Mails sortieren."
+      },
+      "filters_write": {
+        "title": "Ihre E-Mail-Filter ändern",
+        "body": "Regeln zu Ihren serverseitigen Filtern hinzufügen. Solche Regeln können eingehende E-Mails verschieben, weiterleiten oder löschen."
+      },
+      "tasks_read": {
+        "title": "Ihre Aufgaben lesen",
+        "body": "Ihre Aufgabenlisten und Aufgaben sehen."
+      },
+      "tasks_write": {
+        "title": "Ihre Aufgaben ändern",
+        "body": "Aufgaben erstellen, ändern, erledigen und löschen."
+      },
+      "templates_read": {
+        "title": "Ihre Vorlagen lesen",
+        "body": "Ihre gespeicherten Nachrichtenvorlagen sehen."
+      },
+      "templates_write": {
+        "title": "Ihre Vorlagen ändern",
+        "body": "Nachrichtenvorlagen erstellen, ändern und löschen."
+      },
+      "smime_read": {
+        "title": "Ihren S/MIME-Status sehen",
+        "body": "Sehen, ob Sie S/MIME-Schlüssel und -Zertifikate haben, ohne Zugriff auf die Schlüssel."
+      },
+      "vacation_read": {
+        "title": "Ihre Abwesenheitsnotiz sehen",
+        "body": "Sehen, ob Ihre automatische Antwort eingeschaltet ist und was sie enthält."
+      },
+      "vacation_write": {
+        "title": "Ihre Abwesenheitsnotiz ändern",
+        "body": "Ihre automatische Antwort ein- oder ausschalten und ihren Text und Zeitraum ändern."
+      },
+      "settings_read": {
+        "title": "Ihre Einstellungen lesen",
+        "body": "Ihre Einstellungen und Label-Definitionen sehen."
+      },
+      "settings_write": {
+        "title": "Ihre Einstellungen ändern",
+        "body": "Labels hinzufügen und neu anordnen und Ihre Einstellungen ändern."
+      },
+      "security_read": {
+        "title": "Ihre Kontosicherheit sehen",
+        "body": "Sehen, ob Zwei-Faktor-Anmeldung und Verschlüsselung eingeschaltet sind, ohne Zugriff auf Geheimnisse."
+      },
+      "auth_observe": {
+        "title": "Erfahren, wann Sie sich anmelden",
+        "body": "Benachrichtigt werden, wenn Sie sich anmelden, das Konto wechseln oder Ihre Sitzung erneuert wird."
+      },
+      "auth_emit": {
+        "title": "Sie abmelden",
+        "body": "Sie vom Webmail abmelden."
+      },
+      "account_read": {
+        "title": "Ihre Konten sehen",
+        "body": "Die von Ihnen hinzugefügten Konten mit ihren Adressen und Servern sehen."
+      },
+      "http_post": {
+        "title": "Den Webmail-Server für Sie nutzen",
+        "body": "Diese Server-Endpunkte mit Ihrer Anmeldung aufrufen:"
+      },
+      "http_fetch": {
+        "title": "Mit anderen Websites verbinden",
+        "body": "Anfragen an diese Websites senden. Alles, was das Plugin lesen kann, kann dorthin gesendet werden:"
+      },
+      "admin_config": {
+        "title": "Seine Einstellungen von Ihrem Administrator lesen",
+        "body": "Die Einstellungen lesen, die Ihr Administrator für dieses Plugin gespeichert hat."
+      },
+      "ui_observe": {
+        "title": "Verfolgen, wo Sie sich in der App befinden",
+        "body": "Wissen, welche Seite geöffnet ist, und auf angeklickte Links reagieren."
+      },
+      "ui_toolbar": {
+        "title": "Schaltflächen zu Symbolleisten hinzufügen",
+        "body": "Eigene Schaltflächen in der Nachrichten-Symbolleiste, bei einer geöffneten Nachricht und in der oberen Leiste anzeigen."
+      },
+      "ui_app_top_banner": {
+        "title": "Oben ein Banner anzeigen",
+        "body": "Einen Hinweis über die gesamte Breite oben in der App anzeigen."
+      },
+      "ui_email_banner": {
+        "title": "Hinweise bei Nachrichten anzeigen",
+        "body": "Eigene Hinweise und Zusammenfassungen über, in und zwischen den Teilen einer geöffneten Nachricht oder Unterhaltung anzeigen."
+      },
+      "ui_email_footer": {
+        "title": "Inhalte unter Nachrichten hinzufügen",
+        "body": "Eigene Inhalte unter einer geöffneten Nachricht anzeigen."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "Verschlüsselungsschlüssel von Kontakten anzeigen",
+        "body": "Die Verschlüsselungsschlüssel eines Kontakts anzeigen und verwalten."
+      },
+      "ui_email_details": {
+        "title": "Bereiche zu Nachrichtendetails hinzufügen",
+        "body": "Einen eigenen Bereich neben oder unter einer geöffneten Nachricht anzeigen."
+      },
+      "ui_download_file": {
+        "title": "Dateien auf Ihrem Gerät speichern",
+        "body": "Selbst erstellte Dateien zum Herunterladen anbieten."
+      },
+      "ui_message_list_tabs": {
+        "title": "Tabs zu Ihrem Posteingang hinzufügen",
+        "body": "Ihren Posteingang in Tabs wie Updates oder Werbung aufteilen."
+      },
+      "ui_composer_toolbar": {
+        "title": "Zum Editor hinzufügen",
+        "body": "Eigene Schaltflächen, Menüeinträge und Abschnitte anzeigen, während Sie eine Nachricht schreiben."
+      },
+      "ui_composer_sidebar": {
+        "title": "Einen Bereich zum Editor hinzufügen",
+        "body": "Einen eigenen Bereich neben der Nachricht anzeigen, die Sie schreiben."
+      },
+      "ui_sidebar_widget": {
+        "title": "Zur Seitenleiste hinzufügen",
+        "body": "Eigene Felder und Abschnitte in der E-Mail-Seitenleiste anzeigen."
+      },
+      "ui_settings_section": {
+        "title": "Eine Einstellungsseite hinzufügen",
+        "body": "Eine eigene Seite in den Einstellungen anzeigen."
+      },
+      "ui_context_menu": {
+        "title": "Zum Nachrichtenmenü hinzufügen",
+        "body": "Einträge zu dem Menü hinzufügen, das sich per Rechtsklick auf eine Nachricht öffnet."
+      },
+      "ui_navigation_rail": {
+        "title": "Zur Navigationsleiste hinzufügen",
+        "body": "Eine eigene Schaltfläche in der Navigationsleiste anzeigen."
+      },
+      "ui_keyboard": {
+        "title": "Tastaturkürzel hinzufügen",
+        "body": "Auf selbst festgelegte Tastaturkürzel reagieren."
+      },
+      "ui_calendar_action": {
+        "title": "Kalenderansicht erweitern",
+        "body": "Eigene Schaltflächen und Abschnitte bei Terminen sowie kurze Beschriftungen und Punkte an Kalendertagen anzeigen."
+      },
+      "ui_admin_page": {
+        "title": "Eine Admin-Seite hinzufügen",
+        "body": "Eine eigene Seite in den Admin-Einstellungen anzeigen."
+      },
+      "app_lifecycle": {
+        "title": "Erfahren, wann die App startet und beendet wird",
+        "body": "Benachrichtigt werden, wenn die App startet, offline geht oder Sie sich abmelden."
+      },
+      "compose_open": {
+        "title": "Den Editor für Sie öffnen",
+        "body": "Eine neue Nachricht mit bereits ausgefüllten Empfängern, Text oder Anhängen öffnen. Ob sie gesendet wird, entscheiden weiterhin Sie."
+      },
+      "compose_read": {
+        "title": "Die Nachricht lesen, die Sie schreiben",
+        "body": "Den Text einer Nachricht lesen, während Sie sie schreiben, wenn Sie das Plugin im Editor benutzen. Nicht die Signatur und nicht die zitierte Nachricht."
+      },
+      "compose_write": {
+        "title": "Die Nachricht ändern, die Sie schreiben",
+        "body": "Text in einer Nachricht ersetzen oder ergänzen, während Sie sie schreiben, wenn Sie das Plugin im Editor benutzen. Jede Änderung lässt sich rückgängig machen, und Sie entscheiden weiterhin, ob Sie senden."
+      },
+      "ui_notifications": {
+        "title": "Benachrichtigungen anzeigen",
+        "body": "Benachrichtigungen auf Ihrem Gerät anzeigen oder in der App, wenn Sie sie nicht erlaubt haben. Jede nennt den Namen des Plugins."
+      },
+      "ui_message_list": {
+        "title": "Zur Nachrichtenliste hinzufügen",
+        "body": "Eigene Inhalte über der Nachrichtenliste sowie Schaltflächen bei Nachrichten und in der Leiste für ausgewählte Nachrichten anzeigen."
+      },
+      "ui_contacts": {
+        "title": "Kontaktansicht erweitern",
+        "body": "Eigene Abschnitte in den Details eines Kontakts und Schaltflächen in der Kontaktliste anzeigen."
+      },
+      "ui_tasks": {
+        "title": "Aufgabenansicht erweitern",
+        "body": "Eigene Abschnitte in den Details einer Aufgabe und Schaltflächen in der Aufgabenliste anzeigen."
+      },
+      "ui_files": {
+        "title": "Dateiansicht erweitern",
+        "body": "Eigene Abschnitte in der Dateivorschau und Einträge im Menü einer Datei anzeigen."
+      },
+      "ui_commands": {
+        "title": "Befehle hinzufügen",
+        "body": "Eigene Einträge zur Befehlspalette (Ctrl+K) hinzufügen."
+      },
+      "ui_app_page": {
+        "title": "Seiten hinzufügen",
+        "body": "Eigene Seiten zur App hinzufügen, jede mit einer Schaltfläche in der Navigationsleiste."
+      },
+      "http_proxy": {
+        "title": "Von Ihnen verbundene Konten nutzen",
+        "body": "Anfragen über den Server von Bulwark senden, mit einem Konto oder Schlüssel, das Sie oder Ihr Administrator eingerichtet haben. Das Plugin sieht das Passwort nie, kann auf dem zugehörigen Server aber alles tun, was dieses Konto darf."
+      }
+    },
+    "dialog": {
+      "from_plugin": "Vom Plugin {name}",
+      "ok": "OK",
+      "submit": "Senden",
+      "confirm": "Bestätigen",
+      "cancel": "Abbrechen",
+      "close": "Schließen",
+      "turn_off": "{name} ausschalten",
+      "plugin_menu": "Optionen für {name}",
+      "password_note": "Dieses Formular stammt vom Plugin {name}, nicht vom Webmail. Geben Sie ein Passwort nur ein, wenn Sie diesem Plugin vertrauen.",
+      "toast_auto_disabled": "{name} wurde ausgeschaltet, weil es wiederholt fehlgeschlagen ist."
+    },
+    "connect": {
+      "title": "{label} verbinden",
+      "intro_password": "{name} möchte Ihr Konto bei {label} verwenden. Bulwark speichert das Passwort auf seinem Server und sendet es nur an {host}. Das Plugin sieht es nie.",
+      "intro_password_any": "{name} möchte Ihr Konto bei {label} verwenden. Bulwark speichert das Passwort auf seinem Server und sendet es nur an den Server, den Sie hier eingeben. Das Plugin sieht es nie.",
+      "intro_signin": "{name} möchte sich bei Ihrem Konto bei {label} anmelden. Geben Sie hier den Server ein und melden Sie sich dann auf dessen eigener Seite an. Bulwark speichert den erhaltenen Zugang auf seinem Server; das Plugin sieht ihn nie.",
+      "server": "Serveradresse",
+      "server_hint": "cloud.example.com",
+      "username": "Benutzername",
+      "secret": "Passwort oder Schlüssel",
+      "connect": "Verbinden",
+      "continue": "Weiter",
+      "cancel": "Abbrechen",
+      "saving": "Wird gespeichert…",
+      "error_server": "Geben Sie die Adresse des Servers ein, zum Beispiel https://cloud.example.com",
+      "error_save": "Speichern fehlgeschlagen: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "Ergebnis auswählen, um es anzuzeigen",
     "open_full": "Öffnen",
     "view_label": "Ansicht"
+  },
+  "top_bar": {
+    "more": "Weitere Optionen"
+  },
+  "plugin_pages": {
+    "loading": "Seite wird geladen",
+    "not_available_title": "Diese Seite ist nicht verfügbar",
+    "not_available_description": "Das Plugin, das sie hinzugefügt hat, ist ausgeschaltet oder nicht mehr installiert.",
+    "back_to_mail": "Zurück zu E-Mail",
+    "settings_group": "Plugins"
+  },
+  "command_palette": {
+    "title": "Befehlspalette",
+    "open": "Befehlspalette öffnen",
+    "placeholder": "Befehl eingeben",
+    "no_results": "Keine passenden Befehle",
+    "go_to": "Zu {name} wechseln",
+    "compose": "Neue Nachricht",
+    "search": "E-Mails durchsuchen",
+    "theme_dark": "Dunkles Design verwenden",
+    "theme_light": "Helles Design verwenden",
+    "shortcuts": "Tastaturkürzel anzeigen",
+    "group_navigation": "Wechseln zu",
+    "group_actions": "Aktionen",
+    "group_plugins": "Plugins"
+  },
+  "notification_center": {
+    "title": "Benachrichtigungen",
+    "mark_all_read": "Alle als gelesen markieren",
+    "clear": "Leeren",
+    "empty": "Keine Benachrichtigungen",
+    "close": "Schließen",
+    "unread": "Ungelesen",
+    "unread_count": "{count} ungelesen",
+    "level_error": "Fehler",
+    "level_warning": "Warnung"
   }
 }
diff --git a/locales/en/common.json b/locales/en/common.json
index 21bd7d292..4e9de0c46 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -359,15 +359,15 @@
     "external_content_warning": "Images and external content have been blocked",
     "load_external_content": "Load images",
     "trust_sender": "Always trust this sender",
-    "sender_check": {
-      "unverified_label": "Unverified sender",
-      "failed_label": "Sender check failed",
-      "unverified": "This message claims to be from {domain}, but nothing confirms that. It has no valid signature from {domain} and didn't come from a server {domain} authorizes.",
-      "unverified_sent_from": "This message claims to be from {domain}, but it was sent from {host} and has no valid signature from {domain}.",
-      "failed": "This message claims to be from {domain}, but it failed that domain's sender checks. It may be forged.",
-      "failed_sent_from": "This message claims to be from {domain}, but it was sent from {host} and failed {domain}'s sender checks. It may be forged.",
-      "caution": "Be careful with links, attachments and requests for passwords or payment details."
-    },
+    "sender_check": {
+      "unverified_label": "Unverified sender",
+      "failed_label": "Sender check failed",
+      "unverified": "This message claims to be from {domain}, but nothing confirms that. It has no valid signature from {domain} and didn't come from a server {domain} authorizes.",
+      "unverified_sent_from": "This message claims to be from {domain}, but it was sent from {host} and has no valid signature from {domain}.",
+      "failed": "This message claims to be from {domain}, but it failed that domain's sender checks. It may be forged.",
+      "failed_sent_from": "This message claims to be from {domain}, but it was sent from {host} and failed {domain}'s sender checks. It may be forged.",
+      "caution": "Be careful with links, attachments and requests for passwords or payment details."
+    },
     "back_to_list": "Back to list",
     "view_contact": "View contact",
     "message_details": "Message Details",
@@ -620,7 +620,9 @@
       "copied": "Code copied",
       "copy_failed": "Could not copy the code"
     },
-    "mv_position": "{index} of {total}"
+    "mv_position": "{index} of {total}",
+    "plugin_panel_show": "Show plugin panel",
+    "plugin_panel_hide": "Hide plugin panel"
   },
   "email_composer": {
     "minimize": "Minimize",
@@ -813,7 +815,8 @@
       "remove_background_color": "Remove background color"
     },
     "send_filing_warning": "Sent - but the post-send cleanup failed, a stale draft may remain.",
-    "pop_out": "Pop out reply"
+    "pop_out": "Pop out reply",
+    "send_guard_failed": "Not sent - a plugin that checks messages before sending failed or did not answer."
   },
   "confirm_dialog": {
     "confirm": "Confirm",
@@ -3970,6 +3973,354 @@
       "failed_detail": "Authorization failed: {error}",
       "missing_params": "Missing authorization code or state.",
       "delivery_failed": "The authorization result could not be delivered to the app tab. Please close this window and try again."
+    },
+    "settings": {
+      "title": "Plugins",
+      "description": "Plugins your administrator added. Turn them on or off for your account.",
+      "description_uploads": "Plugins add features to the webmail. Turn them on or off for your account, or install your own.",
+      "description_demo": "Plugins are not available in the demo.",
+      "install_button": "Install plugin",
+      "install_hint": "Choose a plugin ZIP file.",
+      "install_hint_approval": "Choose a plugin ZIP file. An administrator has to approve it before you can turn it on.",
+      "install_uploads_off": "Your administrator does not allow installing plugins.",
+      "install_managed_id": "Your administrator already provides a plugin with this name, so it can't be replaced.",
+      "install_invalid": "This file is not a plugin that can be installed: {details}",
+      "toast_installed": "Plugin installed. Turn it on below.",
+      "toast_installed_pending": "Plugin installed and sent to your administrator for approval.",
+      "toast_enabled": "{name} is on",
+      "toast_disabled": "{name} is off",
+      "toast_removed": "{name} was removed",
+      "toast_forced": "Your administrator keeps {name} turned on",
+      "toast_approval_requested": "{name} is waiting for approval by your administrator",
+      "empty_title": "No plugins yet",
+      "empty_admin": "Your administrator has not added any plugins.",
+      "empty_uploads": "Install a plugin from a ZIP file to get started.",
+      "empty_demo": "Plugins need a real account, so the demo has none.",
+      "syncing": "Checking plugins with the server…",
+      "status_installed": "Off",
+      "status_enabled": "Starting",
+      "status_running": "On",
+      "status_disabled": "Off",
+      "status_error": "Problem",
+      "badge_forced": "Required",
+      "badge_managed": "From your administrator",
+      "badge_yours": "Installed by you",
+      "badge_awaiting": "Awaiting approval",
+      "toggle_label": "Turn {name} on or off",
+      "forced_note": "Your administrator requires this plugin, so it can't be turned off.",
+      "permissions": "What it can do",
+      "permissions_managed": "What it can do (approved by your administrator)",
+      "settings": "Settings",
+      "remove": "Remove",
+      "remove_title": "Remove {name}?",
+      "remove_message": "The plugin and everything it stored in this browser are deleted. You can install it again later.",
+      "remove_confirm": "Remove",
+      "error_user_plugins_off": "Your administrator turned off plugins installed by users, so this plugin does not run.",
+      "error_approval_unavailable": "This plugin was installed before approvals were required. Remove it and install it again to send it for approval.",
+      "error_approval_denied": "Your administrator did not approve this plugin.",
+      "error_approval_pending": "Waiting for your administrator to approve this plugin.",
+      "error_auto_disabled": "Turned off because it kept failing. Turn it on again to retry.",
+      "accounts_heading": "Connected accounts",
+      "account_on": "{label} on {host}",
+      "account_waiting": "{label} on {host} (sign-in not finished)",
+      "disconnect": "Disconnect",
+      "disconnect_failed": "Could not disconnect {label}"
+    },
+    "consent": {
+      "title": "Allow {name} to do this?",
+      "intro": "The plugin asks for the permissions below. It only gets them if you allow it.",
+      "high_risk_note": "Marked items give the plugin access to the content of your mail or let it send data elsewhere. Only allow them for plugins you trust.",
+      "revoke_hint": "You can turn the plugin off or remove it in Settings at any time.",
+      "deny": "Don't allow",
+      "allow": "Allow"
+    },
+    "permissions": {
+      "none": "It needs no special permissions.",
+      "high_risk": "Needs care",
+      "email_read": {
+        "title": "Read your email",
+        "body": "See senders, recipients, subjects and the full text of any message in your account, and your folders."
+      },
+      "email_write": {
+        "title": "Change and organise your email",
+        "body": "Add or remove tags, flags and other keywords on your messages, move them between your folders and to the archive, and save drafts."
+      },
+      "email_send": {
+        "title": "Change mail before it is sent",
+        "body": "Read and change the recipients, subject, text and attachments of messages you write, and stop a message from being sent."
+      },
+      "crypto_full": {
+        "title": "Full access to this app",
+        "body": "Runs with the same rights as the webmail itself. It can read all your mail and stored keys and act for you. Only allow this for plugins you fully trust."
+      },
+      "email_raw_send": {
+        "title": "Send messages it built itself",
+        "body": "Send complete messages, for example signed or encrypted ones, from your account."
+      },
+      "email_blob_read": {
+        "title": "Read the raw content of messages",
+        "body": "Read attachments and the full source of messages you act on, and every file you attach before it is sent."
+      },
+      "email_blob_write": {
+        "title": "Replace attachments before sending",
+        "body": "Upload files to your mail server and replace a file you attached with another one before the message is sent."
+      },
+      "email_render_takeover": {
+        "title": "Change how messages are shown",
+        "body": "Replace the text of messages you open and of the message list, for example to show decrypted content."
+      },
+      "calendar_read": {
+        "title": "Read your calendar",
+        "body": "See your calendars and their events."
+      },
+      "calendar_write": {
+        "title": "Change your calendar",
+        "body": "Create, change and delete events."
+      },
+      "contacts_read": {
+        "title": "Read your contacts",
+        "body": "Search and read your address books."
+      },
+      "contacts_write": {
+        "title": "Change your contacts",
+        "body": "Create, change and delete contacts and address books."
+      },
+      "files_read": {
+        "title": "Read your files",
+        "body": "Browse and open the files stored in your account."
+      },
+      "files_write": {
+        "title": "Change your files",
+        "body": "Upload, rename, move and delete files in your account."
+      },
+      "identity_read": {
+        "title": "See your sender addresses",
+        "body": "See the addresses you send from and their signatures."
+      },
+      "identity_write": {
+        "title": "Change your sender addresses",
+        "body": "Create, change and delete sender addresses and signatures."
+      },
+      "filters_read": {
+        "title": "Read your mail filters",
+        "body": "See the rules that sort your incoming mail."
+      },
+      "filters_write": {
+        "title": "Change your mail filters",
+        "body": "Add rules to your server-side filters. Such rules can move, forward or delete incoming mail."
+      },
+      "tasks_read": {
+        "title": "Read your tasks",
+        "body": "See your task lists and tasks."
+      },
+      "tasks_write": {
+        "title": "Change your tasks",
+        "body": "Create, change, complete and delete tasks."
+      },
+      "templates_read": {
+        "title": "Read your templates",
+        "body": "See your saved message templates."
+      },
+      "templates_write": {
+        "title": "Change your templates",
+        "body": "Create, change and delete message templates."
+      },
+      "smime_read": {
+        "title": "See your S/MIME status",
+        "body": "See whether you have S/MIME keys and certificates, without access to the keys."
+      },
+      "vacation_read": {
+        "title": "See your out-of-office reply",
+        "body": "See whether your automatic reply is on and what it says."
+      },
+      "vacation_write": {
+        "title": "Change your out-of-office reply",
+        "body": "Turn your automatic reply on or off and change its text and dates."
+      },
+      "settings_read": {
+        "title": "Read your settings",
+        "body": "See your preferences and tag definitions."
+      },
+      "settings_write": {
+        "title": "Change your settings",
+        "body": "Add and reorder tags and change your preferences."
+      },
+      "security_read": {
+        "title": "See your account security",
+        "body": "See whether two-factor sign-in and encryption are on, without access to secrets."
+      },
+      "auth_observe": {
+        "title": "Know when you sign in",
+        "body": "Be told when you sign in, switch accounts or your session is renewed."
+      },
+      "auth_emit": {
+        "title": "Sign you out",
+        "body": "Sign you out of the webmail."
+      },
+      "account_read": {
+        "title": "See your accounts",
+        "body": "See the accounts you added, with their addresses and servers."
+      },
+      "http_post": {
+        "title": "Use the webmail server for you",
+        "body": "Call these server endpoints with your login:"
+      },
+      "http_fetch": {
+        "title": "Connect to other websites",
+        "body": "Send requests to these sites. Anything the plugin can read may be sent there:"
+      },
+      "admin_config": {
+        "title": "Read its settings from your administrator",
+        "body": "Read the settings your administrator saved for this plugin."
+      },
+      "ui_observe": {
+        "title": "Follow where you are in the app",
+        "body": "Know which page is open and react to links you click."
+      },
+      "ui_toolbar": {
+        "title": "Add buttons to toolbars",
+        "body": "Show its own buttons in the message toolbar, on an open message and in the top bar."
+      },
+      "ui_app_top_banner": {
+        "title": "Show a banner at the top",
+        "body": "Show a notice across the top of the app."
+      },
+      "ui_email_banner": {
+        "title": "Show notices on messages",
+        "body": "Show its own notices and summaries above, inside and between the parts of an open message or conversation."
+      },
+      "ui_email_footer": {
+        "title": "Add content below messages",
+        "body": "Show its own content under an open message."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "Show encryption keys of contacts",
+        "body": "Show and manage the encryption keys on a contact."
+      },
+      "ui_email_details": {
+        "title": "Add panels to message details",
+        "body": "Show its own panel next to or below an open message."
+      },
+      "ui_download_file": {
+        "title": "Save files to your device",
+        "body": "Offer files it created for download."
+      },
+      "ui_message_list_tabs": {
+        "title": "Add tabs to your inbox",
+        "body": "Sort your inbox into tabs such as Updates or Promotions."
+      },
+      "ui_composer_toolbar": {
+        "title": "Add to the composer",
+        "body": "Show its own buttons, menu entries and sections while you write a message."
+      },
+      "ui_composer_sidebar": {
+        "title": "Add a panel to the composer",
+        "body": "Show its own panel next to the message you write."
+      },
+      "ui_sidebar_widget": {
+        "title": "Add to the sidebar",
+        "body": "Show its own boxes and sections in the mail sidebar."
+      },
+      "ui_settings_section": {
+        "title": "Add a settings page",
+        "body": "Show its own page in Settings."
+      },
+      "ui_context_menu": {
+        "title": "Add to the message menu",
+        "body": "Add entries to the menu that opens when you right-click a message."
+      },
+      "ui_navigation_rail": {
+        "title": "Add to the navigation bar",
+        "body": "Show its own button in the navigation bar."
+      },
+      "ui_keyboard": {
+        "title": "Add keyboard shortcuts",
+        "body": "React to keyboard shortcuts it defines."
+      },
+      "ui_calendar_action": {
+        "title": "Add to the calendar",
+        "body": "Show its own buttons and sections on events, and short labels and dots on calendar days."
+      },
+      "ui_admin_page": {
+        "title": "Add an admin page",
+        "body": "Show its own page in the admin settings."
+      },
+      "app_lifecycle": {
+        "title": "Know when the app starts and stops",
+        "body": "Be told when the app starts, goes offline or you sign out."
+      },
+      "ui_message_list": {
+        "title": "Add to the message list",
+        "body": "Show its own content above the message list, and buttons on messages and in the selection toolbar."
+      },
+      "ui_contacts": {
+        "title": "Add to contacts",
+        "body": "Show its own sections in a contact's details and buttons in the contact list."
+      },
+      "ui_tasks": {
+        "title": "Add to tasks",
+        "body": "Show its own sections in a task's details and buttons in the task list."
+      },
+      "ui_files": {
+        "title": "Add to files",
+        "body": "Show its own sections in the file preview and entries in a file's menu."
+      },
+      "ui_commands": {
+        "title": "Add commands",
+        "body": "Add its own entries to the command palette (Ctrl+K)."
+      },
+      "ui_app_page": {
+        "title": "Add pages",
+        "body": "Add its own pages to the app, each with a button in the navigation bar."
+      },
+      "http_proxy": {
+        "title": "Use accounts you connect",
+        "body": "Send requests through Bulwark's server with an account or key that you or your administrator set up. The plugin never sees the password, but it can do anything that account can do on its own server."
+      },
+      "compose_open": {
+        "title": "Open the composer for you",
+        "body": "Open a new message with recipients, text or attachments filled in. You still decide whether to send it."
+      },
+      "compose_read": {
+        "title": "Read the message you are writing",
+        "body": "Read the text of a message while you write it, when you use the plugin in the composer. Not the signature or the quoted message."
+      },
+      "compose_write": {
+        "title": "Change the message you are writing",
+        "body": "Replace or add text in a message while you write it, when you use the plugin in the composer. You can undo each change, and you still decide whether to send."
+      },
+      "ui_notifications": {
+        "title": "Show notifications",
+        "body": "Show notifications on your device, or in the app if you haven't allowed them. Each one names the plugin."
+      }
+    },
+    "dialog": {
+      "from_plugin": "From the plugin {name}",
+      "ok": "OK",
+      "submit": "Submit",
+      "confirm": "Confirm",
+      "cancel": "Cancel",
+      "close": "Close",
+      "turn_off": "Turn off {name}",
+      "plugin_menu": "Options for {name}",
+      "password_note": "This form comes from the plugin {name}, not from the webmail. Only enter a password if you trust this plugin.",
+      "toast_auto_disabled": "{name} was turned off because it kept failing."
+    },
+    "connect": {
+      "title": "Connect {label}",
+      "intro_password": "{name} wants to use your {label} account. Bulwark keeps the password on its server and only sends it to {host}. The plugin never sees it.",
+      "intro_password_any": "{name} wants to use your {label} account. Bulwark keeps the password on its server and only sends it to the server you enter here. The plugin never sees it.",
+      "intro_signin": "{name} wants to sign in to your {label} account. Enter the server here, then sign in on its own page. Bulwark keeps the access it gets on its server; the plugin never sees it.",
+      "server": "Server address",
+      "server_hint": "cloud.example.com",
+      "username": "User name",
+      "secret": "Password or key",
+      "connect": "Connect",
+      "continue": "Continue",
+      "cancel": "Cancel",
+      "saving": "Saving…",
+      "error_server": "Enter the server's address, for example https://cloud.example.com",
+      "error_save": "Could not save: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "Select a result to preview it",
     "open_full": "Open",
     "view_label": "View"
+  },
+  "top_bar": {
+    "more": "More options"
+  },
+  "plugin_pages": {
+    "loading": "Loading page",
+    "not_available_title": "This page is not available",
+    "not_available_description": "The plugin that added it is turned off or no longer installed.",
+    "back_to_mail": "Back to Mail",
+    "settings_group": "Plugins"
+  },
+  "command_palette": {
+    "title": "Command palette",
+    "open": "Open the command palette",
+    "placeholder": "Type a command",
+    "no_results": "No matching commands",
+    "go_to": "Go to {name}",
+    "compose": "New message",
+    "search": "Search mail",
+    "theme_dark": "Switch to dark theme",
+    "theme_light": "Switch to light theme",
+    "shortcuts": "Show keyboard shortcuts",
+    "group_navigation": "Go to",
+    "group_actions": "Actions",
+    "group_plugins": "Plugins"
+  },
+  "notification_center": {
+    "title": "Notifications",
+    "mark_all_read": "Mark all read",
+    "clear": "Clear",
+    "empty": "No notifications",
+    "close": "Close",
+    "unread": "Unread",
+    "unread_count": "{count} unread",
+    "level_error": "Error",
+    "level_warning": "Warning"
   }
 }
diff --git a/locales/es/common.json b/locales/es/common.json
index b9c0de9da..02702762f 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -620,7 +620,9 @@
       "copied": "Código copiado",
       "copy_failed": "No se pudo copiar el código"
     },
-    "mv_position": "{index} de {total}"
+    "mv_position": "{index} de {total}",
+    "plugin_panel_show": "Mostrar el panel del complemento",
+    "plugin_panel_hide": "Ocultar el panel del complemento"
   },
   "email_composer": {
     "minimize": "Minimizar",
@@ -813,7 +815,8 @@
       "remove_background_color": "Quitar color de fondo"
     },
     "send_filing_warning": "Enviado - pero la limpieza posterior falló, puede quedar un borrador obsoleto.",
-    "pop_out": "Abrir la respuesta en una ventana"
+    "pop_out": "Abrir la respuesta en una ventana",
+    "send_guard_failed": "No enviado: un complemento que revisa los mensajes antes de enviarlos falló o no respondió."
   },
   "confirm_dialog": {
     "confirm": "Confirmar",
@@ -3970,6 +3973,354 @@
       "failed_detail": "Error de autorización: {error}",
       "missing_params": "Falta el código de autorización o el estado.",
       "delivery_failed": "No se pudo entregar el resultado de la autorización a la pestaña de la aplicación. Cierre esta ventana e inténtelo de nuevo."
+    },
+    "settings": {
+      "title": "Complementos",
+      "description": "Complementos que añadió tu administrador. Actívalos o desactívalos para tu cuenta.",
+      "description_uploads": "Los complementos añaden funciones al webmail. Actívalos o desactívalos para tu cuenta, o instala los tuyos.",
+      "description_demo": "Los complementos no están disponibles en la demo.",
+      "install_button": "Instalar complemento",
+      "install_hint": "Elige el archivo ZIP de un complemento.",
+      "install_hint_approval": "Elige el archivo ZIP de un complemento. Un administrador tiene que aprobarlo antes de que puedas activarlo.",
+      "install_uploads_off": "Tu administrador no permite instalar complementos.",
+      "install_managed_id": "Tu administrador ya ofrece un complemento con este nombre, así que no se puede reemplazar.",
+      "install_invalid": "Este archivo no es un complemento que se pueda instalar: {details}",
+      "toast_installed": "Complemento instalado. Actívalo abajo.",
+      "toast_installed_pending": "Complemento instalado y enviado a tu administrador para su aprobación.",
+      "toast_enabled": "{name} está activado",
+      "toast_disabled": "{name} está desactivado",
+      "toast_removed": "Se eliminó {name}",
+      "toast_forced": "Tu administrador mantiene {name} activado",
+      "toast_approval_requested": "{name} está pendiente de la aprobación de tu administrador",
+      "empty_title": "Aún no hay complementos",
+      "empty_admin": "Tu administrador no ha añadido ningún complemento.",
+      "empty_uploads": "Instala un complemento desde un archivo ZIP para empezar.",
+      "empty_demo": "Los complementos necesitan una cuenta real, así que la demo no tiene ninguno.",
+      "syncing": "Comprobando los complementos con el servidor…",
+      "status_installed": "Desactivado",
+      "status_enabled": "Iniciando",
+      "status_running": "Activado",
+      "status_disabled": "Desactivado",
+      "status_error": "Problema",
+      "badge_forced": "Obligatorio",
+      "badge_managed": "De tu administrador",
+      "badge_yours": "Instalado por ti",
+      "badge_awaiting": "Pendiente de aprobación",
+      "toggle_label": "Activar o desactivar {name}",
+      "forced_note": "Tu administrador exige este complemento, así que no se puede desactivar.",
+      "permissions": "Qué puede hacer",
+      "permissions_managed": "Qué puede hacer (aprobado por tu administrador)",
+      "settings": "Configuración",
+      "remove": "Eliminar",
+      "remove_title": "¿Eliminar {name}?",
+      "remove_message": "Se eliminarán el complemento y todo lo que guardó en este navegador. Puedes volver a instalarlo más tarde.",
+      "remove_confirm": "Eliminar",
+      "error_user_plugins_off": "Tu administrador desactivó los complementos instalados por usuarios, así que este complemento no se ejecuta.",
+      "error_approval_unavailable": "Este complemento se instaló antes de que se exigiera aprobación. Elimínalo e instálalo de nuevo para enviarlo a aprobación.",
+      "error_approval_denied": "Tu administrador no aprobó este complemento.",
+      "error_approval_pending": "Esperando a que tu administrador apruebe este complemento.",
+      "error_auto_disabled": "Desactivado porque fallaba una y otra vez. Actívalo de nuevo para volver a intentarlo.",
+      "accounts_heading": "Cuentas conectadas",
+      "account_on": "{label} en {host}",
+      "account_waiting": "{label} en {host} (inicio de sesión sin terminar)",
+      "disconnect": "Desconectar",
+      "disconnect_failed": "No se pudo desconectar {label}"
+    },
+    "consent": {
+      "title": "¿Permitir que {name} haga esto?",
+      "intro": "El complemento pide los permisos de abajo. Solo los obtiene si se los concedes.",
+      "high_risk_note": "Los elementos marcados dan al complemento acceso al contenido de tu correo o le permiten enviar datos a otros sitios. Permítelos solo en complementos de confianza.",
+      "revoke_hint": "Puedes desactivar o eliminar el complemento en Configuración en cualquier momento.",
+      "deny": "No permitir",
+      "allow": "Permitir"
+    },
+    "permissions": {
+      "none": "No necesita permisos especiales.",
+      "high_risk": "Con cuidado",
+      "email_read": {
+        "title": "Leer tu correo",
+        "body": "Ver remitentes, destinatarios, asuntos y el texto completo de cualquier mensaje de tu cuenta, y tus carpetas."
+      },
+      "email_write": {
+        "title": "Cambiar y organizar tu correo",
+        "body": "Añadir o quitar etiquetas, marcas y otras palabras clave de tus mensajes, moverlos entre tus carpetas y al archivo, y guardar borradores."
+      },
+      "email_send": {
+        "title": "Cambiar el correo antes de enviarlo",
+        "body": "Leer y cambiar los destinatarios, el asunto, el texto y los adjuntos de los mensajes que escribes, e impedir que se envíe un mensaje."
+      },
+      "crypto_full": {
+        "title": "Acceso total a esta aplicación",
+        "body": "Se ejecuta con los mismos derechos que el propio webmail. Puede leer todo tu correo y tus claves guardadas y actuar en tu nombre. Permítelo solo en complementos en los que confíes plenamente."
+      },
+      "email_raw_send": {
+        "title": "Enviar mensajes que creó él mismo",
+        "body": "Enviar mensajes completos, por ejemplo firmados o cifrados, desde tu cuenta."
+      },
+      "email_blob_read": {
+        "title": "Leer el contenido sin procesar de los mensajes",
+        "body": "Leer los datos originales de tus mensajes y adjuntos, y de cada archivo que adjuntas antes de enviarlo."
+      },
+      "email_blob_write": {
+        "title": "Reemplazar adjuntos antes de enviar",
+        "body": "Subir archivos a tu servidor de correo y reemplazar un archivo adjunto por otro antes de enviar el mensaje."
+      },
+      "email_render_takeover": {
+        "title": "Cambiar cómo se muestran los mensajes",
+        "body": "Reemplazar el texto de los mensajes que abres y de la lista de mensajes, por ejemplo para mostrar contenido descifrado."
+      },
+      "calendar_read": {
+        "title": "Leer tu calendario",
+        "body": "Ver tus calendarios y sus eventos."
+      },
+      "calendar_write": {
+        "title": "Cambiar tu calendario",
+        "body": "Crear, cambiar y eliminar eventos."
+      },
+      "contacts_read": {
+        "title": "Leer tus contactos",
+        "body": "Buscar y leer en tus libretas de direcciones."
+      },
+      "contacts_write": {
+        "title": "Cambiar tus contactos",
+        "body": "Crear, cambiar y eliminar contactos y libretas de direcciones."
+      },
+      "files_read": {
+        "title": "Leer tus archivos",
+        "body": "Explorar y abrir los archivos guardados en tu cuenta."
+      },
+      "files_write": {
+        "title": "Cambiar tus archivos",
+        "body": "Subir, renombrar, mover y eliminar archivos de tu cuenta."
+      },
+      "identity_read": {
+        "title": "Ver tus direcciones de remitente",
+        "body": "Ver las direcciones desde las que envías y sus firmas."
+      },
+      "identity_write": {
+        "title": "Cambiar tus direcciones de remitente",
+        "body": "Crear, cambiar y eliminar direcciones de remitente y firmas."
+      },
+      "filters_read": {
+        "title": "Leer tus filtros de correo",
+        "body": "Ver las reglas que ordenan tu correo entrante."
+      },
+      "filters_write": {
+        "title": "Cambiar tus filtros de correo",
+        "body": "Añadir reglas a tus filtros del servidor. Esas reglas pueden mover, reenviar o eliminar el correo entrante."
+      },
+      "tasks_read": {
+        "title": "Leer tus tareas",
+        "body": "Ver tus listas de tareas y tus tareas."
+      },
+      "tasks_write": {
+        "title": "Cambiar tus tareas",
+        "body": "Crear, cambiar, completar y eliminar tareas."
+      },
+      "templates_read": {
+        "title": "Leer tus plantillas",
+        "body": "Ver tus plantillas de mensaje guardadas."
+      },
+      "templates_write": {
+        "title": "Cambiar tus plantillas",
+        "body": "Crear, cambiar y eliminar plantillas de mensaje."
+      },
+      "smime_read": {
+        "title": "Ver tu estado de S/MIME",
+        "body": "Ver si tienes claves y certificados S/MIME, sin acceso a las claves."
+      },
+      "vacation_read": {
+        "title": "Ver tu respuesta de ausencia",
+        "body": "Ver si tu respuesta automática está activada y qué dice."
+      },
+      "vacation_write": {
+        "title": "Cambiar tu respuesta de ausencia",
+        "body": "Activar o desactivar tu respuesta automática y cambiar su texto y sus fechas."
+      },
+      "settings_read": {
+        "title": "Leer tu configuración",
+        "body": "Ver tus preferencias y las definiciones de tus etiquetas."
+      },
+      "settings_write": {
+        "title": "Cambiar tu configuración",
+        "body": "Añadir y reordenar etiquetas y cambiar tus preferencias."
+      },
+      "security_read": {
+        "title": "Ver la seguridad de tu cuenta",
+        "body": "Ver si el inicio de sesión con dos factores y el cifrado están activados, sin acceso a secretos."
+      },
+      "auth_observe": {
+        "title": "Saber cuándo inicias sesión",
+        "body": "Recibir un aviso cuando inicias sesión, cambias de cuenta o se renueva tu sesión."
+      },
+      "auth_emit": {
+        "title": "Cerrar tu sesión",
+        "body": "Cerrar tu sesión en el webmail."
+      },
+      "account_read": {
+        "title": "Ver tus cuentas",
+        "body": "Ver las cuentas que añadiste, con sus direcciones y servidores."
+      },
+      "http_post": {
+        "title": "Usar el servidor del webmail por ti",
+        "body": "Llamar a estos endpoints del servidor con tu inicio de sesión:"
+      },
+      "http_fetch": {
+        "title": "Conectarse a otros sitios web",
+        "body": "Enviar solicitudes a estos sitios. Todo lo que el complemento pueda leer se puede enviar allí:"
+      },
+      "admin_config": {
+        "title": "Leer su configuración de tu administrador",
+        "body": "Leer la configuración que tu administrador guardó para este complemento."
+      },
+      "ui_observe": {
+        "title": "Seguir dónde estás en la aplicación",
+        "body": "Saber qué página está abierta y reaccionar a los enlaces en los que haces clic."
+      },
+      "ui_toolbar": {
+        "title": "Añadir botones a las barras de herramientas",
+        "body": "Mostrar sus propios botones en la barra de herramientas de mensajes, en un mensaje abierto y en la barra superior."
+      },
+      "ui_app_top_banner": {
+        "title": "Mostrar un banner arriba",
+        "body": "Mostrar un aviso a lo ancho de la parte superior de la aplicación."
+      },
+      "ui_email_banner": {
+        "title": "Mostrar avisos en los mensajes",
+        "body": "Mostrar sus propios avisos y resúmenes encima, dentro y entre las partes de un mensaje o una conversación abiertos."
+      },
+      "ui_email_footer": {
+        "title": "Añadir contenido debajo de los mensajes",
+        "body": "Mostrar su propio contenido debajo de un mensaje abierto."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "Mostrar las claves de cifrado de los contactos",
+        "body": "Mostrar y gestionar las claves de cifrado de un contacto."
+      },
+      "ui_email_details": {
+        "title": "Añadir paneles a los detalles del mensaje",
+        "body": "Mostrar su propio panel junto a un mensaje abierto o debajo de él."
+      },
+      "ui_download_file": {
+        "title": "Guardar archivos en tu dispositivo",
+        "body": "Ofrecer para descargar archivos que creó."
+      },
+      "ui_message_list_tabs": {
+        "title": "Añadir pestañas a tu bandeja de entrada",
+        "body": "Ordenar tu bandeja de entrada en pestañas como Novedades o Promociones."
+      },
+      "ui_composer_toolbar": {
+        "title": "Añadir al editor",
+        "body": "Mostrar sus propios botones, entradas de menú y secciones mientras escribes un mensaje."
+      },
+      "ui_composer_sidebar": {
+        "title": "Añadir un panel al editor",
+        "body": "Mostrar su propio panel junto al mensaje que escribes."
+      },
+      "ui_sidebar_widget": {
+        "title": "Añadir a la barra lateral",
+        "body": "Mostrar sus propios recuadros y secciones en la barra lateral del correo."
+      },
+      "ui_settings_section": {
+        "title": "Añadir una página de configuración",
+        "body": "Mostrar su propia página en Configuración."
+      },
+      "ui_context_menu": {
+        "title": "Añadir al menú del mensaje",
+        "body": "Añadir entradas al menú que se abre al hacer clic derecho en un mensaje."
+      },
+      "ui_navigation_rail": {
+        "title": "Añadir a la barra de navegación",
+        "body": "Mostrar su propio botón en la barra de navegación."
+      },
+      "ui_keyboard": {
+        "title": "Añadir atajos de teclado",
+        "body": "Reaccionar a los atajos de teclado que define."
+      },
+      "ui_calendar_action": {
+        "title": "Añadir a la vista de calendario",
+        "body": "Mostrar sus propios botones y secciones en los eventos, y etiquetas cortas y puntos en los días del calendario."
+      },
+      "ui_admin_page": {
+        "title": "Añadir una página de administración",
+        "body": "Mostrar su propia página en la configuración de administración."
+      },
+      "app_lifecycle": {
+        "title": "Saber cuándo se inicia y se cierra la aplicación",
+        "body": "Recibir un aviso cuando la aplicación se inicia, se queda sin conexión o cierras sesión."
+      },
+      "compose_open": {
+        "title": "Abrir el editor por ti",
+        "body": "Abrir un mensaje nuevo con los destinatarios, el texto o los adjuntos ya rellenados. Tú sigues decidiendo si se envía."
+      },
+      "compose_read": {
+        "title": "Leer el mensaje que escribes",
+        "body": "Leer el texto de un mensaje mientras lo escribes, cuando usas el complemento en el editor. No la firma ni el mensaje citado."
+      },
+      "compose_write": {
+        "title": "Cambiar el mensaje que escribes",
+        "body": "Sustituir o añadir texto en un mensaje mientras lo escribes, cuando usas el complemento en el editor. Puedes deshacer cada cambio y sigues decidiendo si lo envías."
+      },
+      "ui_notifications": {
+        "title": "Mostrar notificaciones",
+        "body": "Mostrar notificaciones en tu dispositivo, o dentro de la aplicación si no las has permitido. Cada una indica el nombre del complemento."
+      },
+      "ui_message_list": {
+        "title": "Añadir a la lista de mensajes",
+        "body": "Mostrar su propio contenido encima de la lista de mensajes, y botones en los mensajes y en la barra de los mensajes seleccionados."
+      },
+      "ui_contacts": {
+        "title": "Añadir a la vista de contactos",
+        "body": "Mostrar sus propias secciones en los detalles de un contacto y botones en la lista de contactos."
+      },
+      "ui_tasks": {
+        "title": "Añadir a la vista de tareas",
+        "body": "Mostrar sus propias secciones en los detalles de una tarea y botones en la lista de tareas."
+      },
+      "ui_files": {
+        "title": "Añadir a la vista de archivos",
+        "body": "Mostrar sus propias secciones en la vista previa de archivos y entradas en el menú de un archivo."
+      },
+      "ui_commands": {
+        "title": "Añadir comandos",
+        "body": "Añadir sus propias entradas a la paleta de comandos (Ctrl+K)."
+      },
+      "ui_app_page": {
+        "title": "Añadir páginas",
+        "body": "Añadir sus propias páginas a la aplicación, cada una con un botón en la barra de navegación."
+      },
+      "http_proxy": {
+        "title": "Usar las cuentas que conectes",
+        "body": "Enviar solicitudes a través del servidor de Bulwark con una cuenta o clave configurada por ti o por tu administrador. El complemento nunca ve la contraseña, pero puede hacer todo lo que esa cuenta puede hacer en su propio servidor."
+      }
+    },
+    "dialog": {
+      "from_plugin": "Del complemento {name}",
+      "ok": "Aceptar",
+      "submit": "Enviar",
+      "confirm": "Confirmar",
+      "cancel": "Cancelar",
+      "close": "Cerrar",
+      "turn_off": "Desactivar {name}",
+      "plugin_menu": "Opciones de {name}",
+      "password_note": "Este formulario viene del complemento {name}, no del correo web. Introduce una contraseña solo si confías en este complemento.",
+      "toast_auto_disabled": "{name} se desactivó porque fallaba una y otra vez."
+    },
+    "connect": {
+      "title": "Conectar {label}",
+      "intro_password": "{name} quiere usar tu cuenta de {label}. Bulwark guarda la contraseña en su servidor y solo la envía a {host}. El complemento nunca la ve.",
+      "intro_password_any": "{name} quiere usar tu cuenta de {label}. Bulwark guarda la contraseña en su servidor y solo la envía al servidor que indiques aquí. El complemento nunca la ve.",
+      "intro_signin": "{name} quiere iniciar sesión en tu cuenta de {label}. Indica aquí el servidor y luego inicia sesión en su propia página. Bulwark guarda en su servidor el acceso que obtiene; el complemento nunca lo ve.",
+      "server": "Dirección del servidor",
+      "server_hint": "cloud.example.com",
+      "username": "Nombre de usuario",
+      "secret": "Contraseña o clave",
+      "connect": "Conectar",
+      "continue": "Continuar",
+      "cancel": "Cancelar",
+      "saving": "Guardando…",
+      "error_server": "Indica la dirección del servidor, por ejemplo https://cloud.example.com",
+      "error_save": "No se pudo guardar: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "Selecciona un resultado para previsualizarlo",
     "open_full": "Abrir",
     "view_label": "Vista"
+  },
+  "top_bar": {
+    "more": "Más opciones"
+  },
+  "plugin_pages": {
+    "loading": "Cargando la página",
+    "not_available_title": "Esta página no está disponible",
+    "not_available_description": "El complemento que la añadió está desactivado o ya no está instalado.",
+    "back_to_mail": "Volver al correo",
+    "settings_group": "Complementos"
+  },
+  "command_palette": {
+    "title": "Paleta de comandos",
+    "open": "Abrir la paleta de comandos",
+    "placeholder": "Escribe un comando",
+    "no_results": "No hay comandos que coincidan",
+    "go_to": "Ir a {name}",
+    "compose": "Mensaje nuevo",
+    "search": "Buscar en el correo",
+    "theme_dark": "Cambiar al tema oscuro",
+    "theme_light": "Cambiar al tema claro",
+    "shortcuts": "Mostrar atajos de teclado",
+    "group_navigation": "Ir a",
+    "group_actions": "Acciones",
+    "group_plugins": "Complementos"
+  },
+  "notification_center": {
+    "title": "Notificaciones",
+    "mark_all_read": "Marcar todo como leído",
+    "clear": "Borrar",
+    "empty": "No hay notificaciones",
+    "close": "Cerrar",
+    "unread": "Sin leer",
+    "unread_count": "{count} sin leer",
+    "level_error": "Error",
+    "level_warning": "Advertencia"
   }
 }
diff --git a/locales/fa/common.json b/locales/fa/common.json
index 0e6a11a28..bf01060a4 100644
--- a/locales/fa/common.json
+++ b/locales/fa/common.json
@@ -620,7 +620,9 @@
       "copied": "کد کپی شد",
       "copy_failed": "کپی کد ممکن نشد"
     },
-    "mv_position": "{index} از {total}"
+    "mv_position": "{index} از {total}",
+    "plugin_panel_show": "نمایش پنل افزونه",
+    "plugin_panel_hide": "پنهان کردن پنل افزونه"
   },
   "email_composer": {
     "minimize": "کوچک کردن",
@@ -813,7 +815,8 @@
       "remove_background_color": "حذف رنگ پس‌زمینه"
     },
     "send_filing_warning": "ارسال شد - اما پاک‌سازی پس از ارسال ناموفق بود، ممکن است پیش‌نویس قدیمی باقی بماند.",
-    "pop_out": "باز کردن پاسخ در پنجره جدا"
+    "pop_out": "باز کردن پاسخ در پنجره جدا",
+    "send_guard_failed": "ارسال نشد - افزونه‌ای که پیام‌ها را پیش از ارسال بررسی می‌کند ناموفق بود یا پاسخ نداد."
   },
   "confirm_dialog": {
     "confirm": "تأیید",
@@ -3970,6 +3973,354 @@
       "failed_detail": "احراز هویت ناموفق بود: {error}",
       "missing_params": "کد احراز هویت یا حالت وجود ندارد.",
       "delivery_failed": "نتیجه احراز هویت به برگه برنامه ارسال نشد. لطفاً این پنجره را ببندید و دوباره تلاش کنید."
+    },
+    "settings": {
+      "title": "افزونه‌ها",
+      "description": "افزونه‌هایی که مدیر سیستم اضافه کرده است. آن‌ها را برای حساب خود روشن یا خاموش کنید.",
+      "description_uploads": "افزونه‌ها قابلیت‌هایی به ایمیل تحت وب اضافه می‌کنند. آن‌ها را برای حساب خود روشن یا خاموش کنید، یا افزونه خودتان را نصب کنید.",
+      "description_demo": "افزونه‌ها در نسخه آزمایشی در دسترس نیستند.",
+      "install_button": "نصب افزونه",
+      "install_hint": "یک فایل ZIP افزونه انتخاب کنید.",
+      "install_hint_approval": "یک فایل ZIP افزونه انتخاب کنید. پیش از آنکه بتوانید آن را روشن کنید، مدیر سیستم باید آن را تأیید کند.",
+      "install_uploads_off": "مدیر سیستم اجازه نصب افزونه را نمی‌دهد.",
+      "install_managed_id": "مدیر سیستم از قبل افزونه‌ای با این نام ارائه می‌دهد، بنابراین نمی‌توان آن را جایگزین کرد.",
+      "install_invalid": "این فایل افزونه‌ای قابل نصب نیست: {details}",
+      "toast_installed": "افزونه نصب شد. آن را در پایین روشن کنید.",
+      "toast_installed_pending": "افزونه نصب شد و برای تأیید به مدیر سیستم ارسال شد.",
+      "toast_enabled": "{name} روشن است",
+      "toast_disabled": "{name} خاموش است",
+      "toast_removed": "{name} حذف شد",
+      "toast_forced": "مدیر سیستم {name} را روشن نگه می‌دارد",
+      "toast_approval_requested": "{name} در انتظار تأیید مدیر سیستم است",
+      "empty_title": "هنوز افزونه‌ای وجود ندارد",
+      "empty_admin": "مدیر سیستم هیچ افزونه‌ای اضافه نکرده است.",
+      "empty_uploads": "برای شروع، یک افزونه را از فایل ZIP نصب کنید.",
+      "empty_demo": "افزونه‌ها به یک حساب واقعی نیاز دارند، بنابراین نسخه آزمایشی هیچ افزونه‌ای ندارد.",
+      "syncing": "در حال بررسی افزونه‌ها با سرور…",
+      "status_installed": "خاموش",
+      "status_enabled": "در حال راه‌اندازی",
+      "status_running": "روشن",
+      "status_disabled": "خاموش",
+      "status_error": "مشکل",
+      "badge_forced": "الزامی",
+      "badge_managed": "از طرف مدیر سیستم",
+      "badge_yours": "نصب‌شده توسط شما",
+      "badge_awaiting": "در انتظار تأیید",
+      "toggle_label": "روشن یا خاموش کردن {name}",
+      "forced_note": "مدیر سیستم این افزونه را الزامی کرده است، بنابراین نمی‌توان آن را خاموش کرد.",
+      "permissions": "چه کارهایی می‌تواند انجام دهد",
+      "permissions_managed": "چه کارهایی می‌تواند انجام دهد (تأییدشده توسط مدیر سیستم)",
+      "settings": "تنظیمات",
+      "remove": "حذف",
+      "remove_title": "{name} حذف شود؟",
+      "remove_message": "افزونه و هر چیزی که در این مرورگر ذخیره کرده است پاک می‌شود. بعداً می‌توانید دوباره آن را نصب کنید.",
+      "remove_confirm": "حذف",
+      "error_user_plugins_off": "مدیر سیستم افزونه‌هایی را که کاربران نصب می‌کنند خاموش کرده است، بنابراین این افزونه اجرا نمی‌شود.",
+      "error_approval_unavailable": "این افزونه پیش از الزامی شدن تأیید نصب شده است. آن را حذف و دوباره نصب کنید تا برای تأیید ارسال شود.",
+      "error_approval_denied": "مدیر سیستم این افزونه را تأیید نکرد.",
+      "error_approval_pending": "در انتظار تأیید این افزونه توسط مدیر سیستم.",
+      "error_auto_disabled": "به‌دلیل خطاهای پی‌درپی خاموش شد. برای تلاش دوباره آن را روشن کنید.",
+      "accounts_heading": "حساب‌های متصل",
+      "account_on": "{label} روی {host}",
+      "account_waiting": "{label} روی {host} (ورود کامل نشده)",
+      "disconnect": "قطع اتصال",
+      "disconnect_failed": "قطع اتصال {label} ممکن نشد"
+    },
+    "consent": {
+      "title": "به {name} اجازه این کار داده شود؟",
+      "intro": "این افزونه مجوزهای زیر را درخواست می‌کند. فقط در صورتی آن‌ها را دریافت می‌کند که شما اجازه دهید.",
+      "high_risk_note": "موارد علامت‌دار به افزونه اجازه دسترسی به محتوای ایمیل‌های شما یا ارسال داده به جای دیگر را می‌دهند. فقط برای افزونه‌هایی که به آن‌ها اعتماد دارید اجازه دهید.",
+      "revoke_hint": "هر زمان می‌توانید افزونه را در تنظیمات خاموش یا حذف کنید.",
+      "deny": "اجازه نده",
+      "allow": "اجازه بده"
+    },
+    "permissions": {
+      "none": "به هیچ مجوز خاصی نیاز ندارد.",
+      "high_risk": "نیازمند احتیاط",
+      "email_read": {
+        "title": "خواندن ایمیل‌های شما",
+        "body": "دیدن فرستندگان، گیرندگان، موضوع‌ها و متن کامل هر پیامی در حساب شما، و پوشه‌های شما."
+      },
+      "email_write": {
+        "title": "تغییر و سازمان‌دهی ایمیل‌های شما",
+        "body": "افزودن یا حذف برچسب‌ها، پرچم‌ها و کلیدواژه‌های دیگر روی پیام‌های شما، انتقال آن‌ها بین پوشه‌های شما و به بایگانی، و ذخیره پیش‌نویس‌ها."
+      },
+      "email_send": {
+        "title": "تغییر ایمیل پیش از ارسال",
+        "body": "خواندن و تغییر گیرندگان، موضوع، متن و پیوست‌های پیام‌هایی که می‌نویسید، و جلوگیری از ارسال یک پیام."
+      },
+      "crypto_full": {
+        "title": "دسترسی کامل به این برنامه",
+        "body": "با همان دسترسی‌های خود ایمیل تحت وب اجرا می‌شود. می‌تواند همه ایمیل‌ها و کلیدهای ذخیره‌شده شما را بخواند و از طرف شما عمل کند. فقط برای افزونه‌هایی که کاملاً به آن‌ها اعتماد دارید اجازه دهید."
+      },
+      "email_raw_send": {
+        "title": "ارسال پیام‌هایی که خودش ساخته است",
+        "body": "ارسال پیام‌های کامل، مثلاً امضاشده یا رمزنگاری‌شده، از حساب شما."
+      },
+      "email_blob_read": {
+        "title": "خواندن محتوای خام پیام‌ها",
+        "body": "خواندن داده‌های اصلی پیام‌ها و پیوست‌های شما، و هر فایلی که پیش از ارسال پیوست می‌کنید."
+      },
+      "email_blob_write": {
+        "title": "جایگزینی پیوست‌ها پیش از ارسال",
+        "body": "بارگذاری فایل در سرور ایمیل شما و جایگزینی فایلی که پیوست کرده‌اید با فایلی دیگر، پیش از ارسال پیام."
+      },
+      "email_render_takeover": {
+        "title": "تغییر نحوه نمایش پیام‌ها",
+        "body": "جایگزینی متن پیام‌هایی که باز می‌کنید و فهرست پیام‌ها، مثلاً برای نمایش محتوای رمزگشایی‌شده."
+      },
+      "calendar_read": {
+        "title": "خواندن تقویم شما",
+        "body": "دیدن تقویم‌ها و رویدادهای شما."
+      },
+      "calendar_write": {
+        "title": "تغییر تقویم شما",
+        "body": "ایجاد، تغییر و حذف رویدادها."
+      },
+      "contacts_read": {
+        "title": "خواندن مخاطبان شما",
+        "body": "جست‌وجو و خواندن دفترچه‌های آدرس شما."
+      },
+      "contacts_write": {
+        "title": "تغییر مخاطبان شما",
+        "body": "ایجاد، تغییر و حذف مخاطبان و دفترچه‌های آدرس."
+      },
+      "files_read": {
+        "title": "خواندن فایل‌های شما",
+        "body": "مرور و باز کردن فایل‌های ذخیره‌شده در حساب شما."
+      },
+      "files_write": {
+        "title": "تغییر فایل‌های شما",
+        "body": "بارگذاری، تغییر نام، جابه‌جایی و حذف فایل‌ها در حساب شما."
+      },
+      "identity_read": {
+        "title": "دیدن آدرس‌های فرستنده شما",
+        "body": "دیدن آدرس‌هایی که از آن‌ها ایمیل می‌فرستید و امضاهای آن‌ها."
+      },
+      "identity_write": {
+        "title": "تغییر آدرس‌های فرستنده شما",
+        "body": "ایجاد، تغییر و حذف آدرس‌های فرستنده و امضاها."
+      },
+      "filters_read": {
+        "title": "خواندن فیلترهای ایمیل شما",
+        "body": "دیدن قوانینی که ایمیل‌های ورودی شما را مرتب می‌کنند."
+      },
+      "filters_write": {
+        "title": "تغییر فیلترهای ایمیل شما",
+        "body": "افزودن قانون به فیلترهای سمت سرور. این قوانین می‌توانند ایمیل‌های ورودی را جابه‌جا، هدایت یا حذف کنند."
+      },
+      "tasks_read": {
+        "title": "خواندن کارهای شما",
+        "body": "دیدن فهرست‌های کار و کارهای شما."
+      },
+      "tasks_write": {
+        "title": "تغییر کارهای شما",
+        "body": "ایجاد، تغییر، تکمیل و حذف کارها."
+      },
+      "templates_read": {
+        "title": "خواندن قالب‌های شما",
+        "body": "دیدن قالب‌های پیام ذخیره‌شده شما."
+      },
+      "templates_write": {
+        "title": "تغییر قالب‌های شما",
+        "body": "ایجاد، تغییر و حذف قالب‌های پیام."
+      },
+      "smime_read": {
+        "title": "دیدن وضعیت S/MIME شما",
+        "body": "دیدن اینکه آیا کلیدها و گواهی‌های S/MIME دارید، بدون دسترسی به کلیدها."
+      },
+      "vacation_read": {
+        "title": "دیدن پاسخ خودکار شما",
+        "body": "دیدن اینکه آیا پاسخ خودکار شما روشن است و چه متنی دارد."
+      },
+      "vacation_write": {
+        "title": "تغییر پاسخ خودکار شما",
+        "body": "روشن یا خاموش کردن پاسخ خودکار و تغییر متن و تاریخ‌های آن."
+      },
+      "settings_read": {
+        "title": "خواندن تنظیمات شما",
+        "body": "دیدن ترجیحات و تعریف برچسب‌های شما."
+      },
+      "settings_write": {
+        "title": "تغییر تنظیمات شما",
+        "body": "افزودن و مرتب کردن برچسب‌ها و تغییر ترجیحات شما."
+      },
+      "security_read": {
+        "title": "دیدن امنیت حساب شما",
+        "body": "دیدن اینکه آیا احراز هویت دو مرحله‌ای و رمزنگاری روشن هستند، بدون دسترسی به اطلاعات محرمانه."
+      },
+      "auth_observe": {
+        "title": "باخبر شدن از ورود شما",
+        "body": "باخبر شدن وقتی وارد می‌شوید، حساب را عوض می‌کنید یا نشست شما تمدید می‌شود."
+      },
+      "auth_emit": {
+        "title": "خارج کردن شما از حساب",
+        "body": "خارج کردن شما از ایمیل تحت وب."
+      },
+      "account_read": {
+        "title": "دیدن حساب‌های شما",
+        "body": "دیدن حساب‌هایی که اضافه کرده‌اید، همراه با آدرس‌ها و سرورهای آن‌ها."
+      },
+      "http_post": {
+        "title": "استفاده از سرور ایمیل تحت وب از طرف شما",
+        "body": "فراخوانی این نقاط پایانی سرور با اطلاعات ورود شما:"
+      },
+      "http_fetch": {
+        "title": "اتصال به وب‌سایت‌های دیگر",
+        "body": "ارسال درخواست به این سایت‌ها. هر چیزی که افزونه بتواند بخواند ممکن است به آنجا ارسال شود:"
+      },
+      "admin_config": {
+        "title": "خواندن تنظیمات خود از مدیر سیستم",
+        "body": "خواندن تنظیماتی که مدیر سیستم برای این افزونه ذخیره کرده است."
+      },
+      "ui_observe": {
+        "title": "دنبال کردن جای شما در برنامه",
+        "body": "دانستن اینکه کدام صفحه باز است و واکنش به پیوندهایی که روی آن‌ها کلیک می‌کنید."
+      },
+      "ui_toolbar": {
+        "title": "افزودن دکمه به نوارهای ابزار",
+        "body": "نمایش دکمه‌های خودش در نوار ابزار پیام‌ها، روی پیام باز و در نوار بالا."
+      },
+      "ui_app_top_banner": {
+        "title": "نمایش بنر در بالا",
+        "body": "نمایش یک اطلاعیه در سراسر بالای برنامه."
+      },
+      "ui_email_banner": {
+        "title": "نمایش اطلاعیه روی پیام‌ها",
+        "body": "نمایش اطلاعیه‌ها و خلاصه‌های خودش بالا، داخل و بین بخش‌های پیام یا مکالمه باز."
+      },
+      "ui_email_footer": {
+        "title": "افزودن محتوا زیر پیام‌ها",
+        "body": "نمایش محتوای خودش زیر پیام باز."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "نمایش کلیدهای رمزنگاری مخاطبان",
+        "body": "نمایش و مدیریت کلیدهای رمزنگاری یک مخاطب."
+      },
+      "ui_email_details": {
+        "title": "افزودن پنل به جزئیات پیام",
+        "body": "نمایش پنل خودش کنار یا زیر پیام باز."
+      },
+      "ui_download_file": {
+        "title": "ذخیره فایل در دستگاه شما",
+        "body": "ارائه فایل‌هایی که خودش ساخته است برای دانلود."
+      },
+      "ui_message_list_tabs": {
+        "title": "افزودن برگه به صندوق ورودی",
+        "body": "مرتب کردن صندوق ورودی شما در برگه‌هایی مانند به‌روزرسانی‌ها یا تبلیغات."
+      },
+      "ui_composer_toolbar": {
+        "title": "افزودن به ویرایشگر",
+        "body": "نمایش دکمه‌ها، گزینه‌های منو و بخش‌های خودش هنگام نوشتن پیام."
+      },
+      "ui_composer_sidebar": {
+        "title": "افزودن پنل به ویرایشگر",
+        "body": "نمایش پنل خودش کنار پیامی که می‌نویسید."
+      },
+      "ui_sidebar_widget": {
+        "title": "افزودن به نوار کناری",
+        "body": "نمایش کادرها و بخش‌های خودش در نوار کناری ایمیل."
+      },
+      "ui_settings_section": {
+        "title": "افزودن صفحه تنظیمات",
+        "body": "نمایش صفحه خودش در تنظیمات."
+      },
+      "ui_context_menu": {
+        "title": "افزودن به منوی پیام",
+        "body": "افزودن گزینه به منویی که با کلیک راست روی پیام باز می‌شود."
+      },
+      "ui_navigation_rail": {
+        "title": "افزودن به نوار ناوبری",
+        "body": "نمایش دکمه خودش در نوار ناوبری."
+      },
+      "ui_keyboard": {
+        "title": "افزودن میانبرهای صفحه کلید",
+        "body": "واکنش به میانبرهای صفحه کلیدی که خودش تعریف می‌کند."
+      },
+      "ui_calendar_action": {
+        "title": "افزودن به نمای تقویم",
+        "body": "نمایش دکمه‌ها و بخش‌های خودش روی رویدادها، و برچسب‌های کوتاه و نقطه‌ها روی روزهای تقویم."
+      },
+      "ui_admin_page": {
+        "title": "افزودن صفحه مدیریت",
+        "body": "نمایش صفحه خودش در تنظیمات مدیریت."
+      },
+      "app_lifecycle": {
+        "title": "باخبر شدن از شروع و توقف برنامه",
+        "body": "باخبر شدن وقتی برنامه شروع می‌شود، آفلاین می‌شود یا از حساب خارج می‌شوید."
+      },
+      "compose_open": {
+        "title": "باز کردن ویرایشگر برای شما",
+        "body": "باز کردن پیامی تازه با گیرندگان، متن یا پیوست‌های ازپیش‌پرشده. تصمیم ارسال همچنان با شماست."
+      },
+      "compose_read": {
+        "title": "خواندن پیامی که می‌نویسید",
+        "body": "خواندن متن پیام هنگام نوشتن آن، وقتی افزونه را در ویرایشگر به کار می‌برید. امضا و پیام نقل‌شده را نمی‌خواند."
+      },
+      "compose_write": {
+        "title": "تغییر پیامی که می‌نویسید",
+        "body": "جایگزینی یا افزودن متن در پیام هنگام نوشتن آن، وقتی افزونه را در ویرایشگر به کار می‌برید. هر تغییر را می‌توانید برگردانید و تصمیم ارسال همچنان با شماست."
+      },
+      "ui_notifications": {
+        "title": "نمایش اعلان‌ها",
+        "body": "نمایش اعلان روی دستگاه شما، یا داخل برنامه اگر اجازه اعلان نداده‌اید. هر اعلان نام افزونه را نشان می‌دهد."
+      },
+      "ui_message_list": {
+        "title": "افزودن به فهرست پیام‌ها",
+        "body": "نمایش محتوای خودش بالای فهرست پیام‌ها، و دکمه‌ها روی پیام‌ها و در نوار ابزار پیام‌های انتخاب‌شده."
+      },
+      "ui_contacts": {
+        "title": "افزودن به نمای مخاطبین",
+        "body": "نمایش بخش‌های خودش در جزئیات مخاطب و دکمه‌ها در فهرست مخاطبین."
+      },
+      "ui_tasks": {
+        "title": "افزودن به نمای وظایف",
+        "body": "نمایش بخش‌های خودش در جزئیات وظیفه و دکمه‌ها در فهرست وظایف."
+      },
+      "ui_files": {
+        "title": "افزودن به نمای فایل‌ها",
+        "body": "نمایش بخش‌های خودش در پیش‌نمایش فایل و گزینه‌ها در منوی فایل."
+      },
+      "ui_commands": {
+        "title": "افزودن فرمان",
+        "body": "افزودن گزینه‌های خودش به پالت فرمان (Ctrl+K)."
+      },
+      "ui_app_page": {
+        "title": "افزودن صفحه",
+        "body": "افزودن صفحه‌های خودش به برنامه، هر کدام با یک دکمه در نوار ناوبری."
+      },
+      "http_proxy": {
+        "title": "استفاده از حساب‌هایی که متصل می‌کنید",
+        "body": "ارسال درخواست از طریق سرور Bulwark با حساب یا کلیدی که شما یا مدیرتان راه‌اندازی کرده‌اید. افزونه هرگز گذرواژه را نمی‌بیند، اما می‌تواند هر کاری را که آن حساب روی سرور خودش می‌تواند انجام دهد، انجام دهد."
+      }
+    },
+    "dialog": {
+      "from_plugin": "از افزونه {name}",
+      "ok": "تأیید",
+      "submit": "ارسال",
+      "confirm": "تأیید",
+      "cancel": "لغو",
+      "close": "بستن",
+      "turn_off": "خاموش کردن {name}",
+      "plugin_menu": "گزینه‌های {name}",
+      "password_note": "این فرم از افزونه {name} است، نه از وب‌میل. فقط اگر به این افزونه اعتماد دارید گذرواژه وارد کنید.",
+      "toast_auto_disabled": "{name} به‌دلیل خطاهای پی‌درپی خاموش شد."
+    },
+    "connect": {
+      "title": "اتصال {label}",
+      "intro_password": "{name} می‌خواهد از حساب {label} شما استفاده کند. Bulwark گذرواژه را روی سرور خودش نگه می‌دارد و فقط آن را به {host} می‌فرستد. افزونه هرگز آن را نمی‌بیند.",
+      "intro_password_any": "{name} می‌خواهد از حساب {label} شما استفاده کند. Bulwark گذرواژه را روی سرور خودش نگه می‌دارد و فقط آن را به سروری که اینجا وارد می‌کنید می‌فرستد. افزونه هرگز آن را نمی‌بیند.",
+      "intro_signin": "{name} می‌خواهد به حساب {label} شما وارد شود. سرور را اینجا وارد کنید، سپس در صفحهٔ خود آن سرور وارد شوید. Bulwark دسترسی‌ای را که می‌گیرد روی سرور خودش نگه می‌دارد؛ افزونه هرگز آن را نمی‌بیند.",
+      "server": "آدرس سرور",
+      "server_hint": "cloud.example.com",
+      "username": "نام کاربری",
+      "secret": "گذرواژه یا کلید",
+      "connect": "اتصال",
+      "continue": "ادامه",
+      "cancel": "انصراف",
+      "saving": "در حال ذخیره…",
+      "error_server": "آدرس سرور را وارد کنید، برای نمونه https://cloud.example.com",
+      "error_save": "ذخیره نشد: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "برای پیش‌نمایش یک نتیجه انتخاب کنید",
     "open_full": "باز کردن",
     "view_label": "نما"
+  },
+  "top_bar": {
+    "more": "گزینه‌های بیشتر"
+  },
+  "plugin_pages": {
+    "loading": "در حال بارگذاری صفحه",
+    "not_available_title": "این صفحه در دسترس نیست",
+    "not_available_description": "افزونه‌ای که آن را اضافه کرده خاموش است یا دیگر نصب نیست.",
+    "back_to_mail": "بازگشت به ایمیل",
+    "settings_group": "افزونه‌ها"
+  },
+  "command_palette": {
+    "title": "پالت فرمان",
+    "open": "باز کردن پالت فرمان",
+    "placeholder": "یک فرمان بنویسید",
+    "no_results": "فرمان منطبقی پیدا نشد",
+    "go_to": "رفتن به {name}",
+    "compose": "پیام جدید",
+    "search": "جستجو در ایمیل",
+    "theme_dark": "رفتن به پوسته تیره",
+    "theme_light": "رفتن به پوسته روشن",
+    "shortcuts": "نمایش میانبرهای صفحه کلید",
+    "group_navigation": "رفتن به",
+    "group_actions": "کارها",
+    "group_plugins": "افزونه‌ها"
+  },
+  "notification_center": {
+    "title": "اعلان‌ها",
+    "mark_all_read": "علامت‌گذاری همه به‌عنوان خوانده‌شده",
+    "clear": "پاک کردن",
+    "empty": "اعلانی نیست",
+    "close": "بستن",
+    "unread": "خوانده‌نشده",
+    "unread_count": "{count} خوانده‌نشده",
+    "level_error": "خطا",
+    "level_warning": "هشدار"
   }
 }
diff --git a/locales/fr/common.json b/locales/fr/common.json
index 1702d903c..4c64e430b 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -620,7 +620,9 @@
       "copied": "Code copié",
       "copy_failed": "Impossible de copier le code"
     },
-    "mv_position": "{index} sur {total}"
+    "mv_position": "{index} sur {total}",
+    "plugin_panel_show": "Afficher le panneau du plugin",
+    "plugin_panel_hide": "Masquer le panneau du plugin"
   },
   "email_composer": {
     "minimize": "Réduire",
@@ -813,7 +815,8 @@
       "remove_background_color": "Supprimer la couleur d'arrière-plan"
     },
     "send_filing_warning": "Envoyé - mais le nettoyage après envoi a échoué, un ancien brouillon peut subsister.",
-    "pop_out": "Ouvrir la réponse dans une fenêtre"
+    "pop_out": "Ouvrir la réponse dans une fenêtre",
+    "send_guard_failed": "Non envoyé - un plugin qui vérifie les messages avant l'envoi a échoué ou n'a pas répondu."
   },
   "confirm_dialog": {
     "confirm": "Confirmer",
@@ -3970,6 +3973,354 @@
       "failed_detail": "Échec de lautorisation : {error}",
       "missing_params": "Code dautorisation ou état manquant.",
       "delivery_failed": "Le résultat de lautorisation na pas pu être transmis à longlet de lapplication. Fermez cette fenêtre et réessayez."
+    },
+    "settings": {
+      "title": "Plugins",
+      "description": "Les plugins ajoutés par votre administrateur. Activez-les ou désactivez-les pour votre compte.",
+      "description_uploads": "Les plugins ajoutent des fonctionnalités au webmail. Activez-les ou désactivez-les pour votre compte, ou installez les vôtres.",
+      "description_demo": "Les plugins ne sont pas disponibles dans la démo.",
+      "install_button": "Installer un plugin",
+      "install_hint": "Choisissez le fichier ZIP d'un plugin.",
+      "install_hint_approval": "Choisissez le fichier ZIP d'un plugin. Un administrateur doit l'approuver avant que vous puissiez l'activer.",
+      "install_uploads_off": "Votre administrateur n'autorise pas l'installation de plugins.",
+      "install_managed_id": "Votre administrateur fournit déjà un plugin portant ce nom, il ne peut donc pas être remplacé.",
+      "install_invalid": "Ce fichier n'est pas un plugin installable : {details}",
+      "toast_installed": "Plugin installé. Activez-le ci-dessous.",
+      "toast_installed_pending": "Plugin installé et envoyé à votre administrateur pour approbation.",
+      "toast_enabled": "{name} est activé",
+      "toast_disabled": "{name} est désactivé",
+      "toast_removed": "{name} a été supprimé",
+      "toast_forced": "Votre administrateur maintient {name} activé",
+      "toast_approval_requested": "{name} attend l'approbation de votre administrateur",
+      "empty_title": "Aucun plugin pour l'instant",
+      "empty_admin": "Votre administrateur n'a ajouté aucun plugin.",
+      "empty_uploads": "Installez un plugin à partir d'un fichier ZIP pour commencer.",
+      "empty_demo": "Les plugins nécessitent un vrai compte, la démo n'en a donc aucun.",
+      "syncing": "Vérification des plugins auprès du serveur…",
+      "status_installed": "Désactivé",
+      "status_enabled": "Démarrage",
+      "status_running": "Activé",
+      "status_disabled": "Désactivé",
+      "status_error": "Problème",
+      "badge_forced": "Obligatoire",
+      "badge_managed": "De votre administrateur",
+      "badge_yours": "Installé par vous",
+      "badge_awaiting": "En attente d'approbation",
+      "toggle_label": "Activer ou désactiver {name}",
+      "forced_note": "Votre administrateur impose ce plugin, il ne peut donc pas être désactivé.",
+      "permissions": "Ce qu'il peut faire",
+      "permissions_managed": "Ce qu'il peut faire (approuvé par votre administrateur)",
+      "settings": "Paramètres",
+      "remove": "Supprimer",
+      "remove_title": "Supprimer {name} ?",
+      "remove_message": "Le plugin et tout ce qu'il a enregistré dans ce navigateur seront supprimés. Vous pourrez le réinstaller plus tard.",
+      "remove_confirm": "Supprimer",
+      "error_user_plugins_off": "Votre administrateur a désactivé les plugins installés par les utilisateurs, ce plugin ne s'exécute donc pas.",
+      "error_approval_unavailable": "Ce plugin a été installé avant que l'approbation soit requise. Supprimez-le et réinstallez-le pour l'envoyer en approbation.",
+      "error_approval_denied": "Votre administrateur n'a pas approuvé ce plugin.",
+      "error_approval_pending": "En attente de l'approbation de ce plugin par votre administrateur.",
+      "error_auto_disabled": "Désactivé parce qu'il échouait sans cesse. Réactivez-le pour réessayer.",
+      "accounts_heading": "Comptes connectés",
+      "account_on": "{label} sur {host}",
+      "account_waiting": "{label} sur {host} (connexion non terminée)",
+      "disconnect": "Déconnecter",
+      "disconnect_failed": "Impossible de déconnecter {label}"
+    },
+    "consent": {
+      "title": "Autoriser {name} à faire ceci ?",
+      "intro": "Le plugin demande les autorisations ci-dessous. Il ne les obtient que si vous les accordez.",
+      "high_risk_note": "Les éléments signalés donnent au plugin accès au contenu de vos e-mails ou lui permettent d'envoyer des données ailleurs. Ne les autorisez que pour des plugins de confiance.",
+      "revoke_hint": "Vous pouvez désactiver ou supprimer le plugin à tout moment dans les Paramètres.",
+      "deny": "Ne pas autoriser",
+      "allow": "Autoriser"
+    },
+    "permissions": {
+      "none": "Il n'a besoin d'aucune autorisation particulière.",
+      "high_risk": "Prudence",
+      "email_read": {
+        "title": "Lire vos e-mails",
+        "body": "Voir les expéditeurs, les destinataires, les objets et le texte complet de n'importe quel message de votre compte, ainsi que vos dossiers."
+      },
+      "email_write": {
+        "title": "Modifier et organiser vos e-mails",
+        "body": "Ajouter ou retirer des étiquettes, des indicateurs et d'autres mots-clés sur vos messages, les déplacer entre vos dossiers et vers les archives, et enregistrer des brouillons."
+      },
+      "email_send": {
+        "title": "Modifier les e-mails avant leur envoi",
+        "body": "Lire et modifier les destinataires, l'objet, le texte et les pièces jointes des messages que vous rédigez, et empêcher l'envoi d'un message."
+      },
+      "crypto_full": {
+        "title": "Accès complet à cette application",
+        "body": "S'exécute avec les mêmes droits que le webmail lui-même. Il peut lire tous vos e-mails et vos clés enregistrées, et agir en votre nom. N'autorisez ceci que pour des plugins en qui vous avez entièrement confiance."
+      },
+      "email_raw_send": {
+        "title": "Envoyer des messages qu'il a lui-même créés",
+        "body": "Envoyer des messages complets, par exemple signés ou chiffrés, depuis votre compte."
+      },
+      "email_blob_read": {
+        "title": "Lire le contenu brut des messages",
+        "body": "Lire les données d'origine de vos messages et pièces jointes, ainsi que de chaque fichier que vous joignez avant l'envoi."
+      },
+      "email_blob_write": {
+        "title": "Remplacer les pièces jointes avant l'envoi",
+        "body": "Téléverser des fichiers sur votre serveur de messagerie et remplacer un fichier joint par un autre avant l'envoi du message."
+      },
+      "email_render_takeover": {
+        "title": "Modifier l'affichage des messages",
+        "body": "Remplacer le texte des messages que vous ouvrez et de la liste des messages, par exemple pour afficher un contenu déchiffré."
+      },
+      "calendar_read": {
+        "title": "Lire votre calendrier",
+        "body": "Voir vos calendriers et leurs événements."
+      },
+      "calendar_write": {
+        "title": "Modifier votre calendrier",
+        "body": "Créer, modifier et supprimer des événements."
+      },
+      "contacts_read": {
+        "title": "Lire vos contacts",
+        "body": "Rechercher et lire vos carnets d'adresses."
+      },
+      "contacts_write": {
+        "title": "Modifier vos contacts",
+        "body": "Créer, modifier et supprimer des contacts et des carnets d'adresses."
+      },
+      "files_read": {
+        "title": "Lire vos fichiers",
+        "body": "Parcourir et ouvrir les fichiers stockés dans votre compte."
+      },
+      "files_write": {
+        "title": "Modifier vos fichiers",
+        "body": "Téléverser, renommer, déplacer et supprimer des fichiers dans votre compte."
+      },
+      "identity_read": {
+        "title": "Voir vos adresses d'expéditeur",
+        "body": "Voir les adresses depuis lesquelles vous envoyez et leurs signatures."
+      },
+      "identity_write": {
+        "title": "Modifier vos adresses d'expéditeur",
+        "body": "Créer, modifier et supprimer des adresses d'expéditeur et des signatures."
+      },
+      "filters_read": {
+        "title": "Lire vos filtres de messagerie",
+        "body": "Voir les règles qui trient vos e-mails entrants."
+      },
+      "filters_write": {
+        "title": "Modifier vos filtres de messagerie",
+        "body": "Ajouter des règles à vos filtres côté serveur. Ces règles peuvent déplacer, transférer ou supprimer les e-mails entrants."
+      },
+      "tasks_read": {
+        "title": "Lire vos tâches",
+        "body": "Voir vos listes de tâches et vos tâches."
+      },
+      "tasks_write": {
+        "title": "Modifier vos tâches",
+        "body": "Créer, modifier, terminer et supprimer des tâches."
+      },
+      "templates_read": {
+        "title": "Lire vos modèles",
+        "body": "Voir vos modèles de message enregistrés."
+      },
+      "templates_write": {
+        "title": "Modifier vos modèles",
+        "body": "Créer, modifier et supprimer des modèles de message."
+      },
+      "smime_read": {
+        "title": "Voir votre statut S/MIME",
+        "body": "Voir si vous avez des clés et certificats S/MIME, sans accès aux clés."
+      },
+      "vacation_read": {
+        "title": "Voir votre réponse d'absence",
+        "body": "Voir si votre réponse automatique est activée et ce qu'elle dit."
+      },
+      "vacation_write": {
+        "title": "Modifier votre réponse d'absence",
+        "body": "Activer ou désactiver votre réponse automatique et modifier son texte et ses dates."
+      },
+      "settings_read": {
+        "title": "Lire vos paramètres",
+        "body": "Voir vos préférences et la définition de vos étiquettes."
+      },
+      "settings_write": {
+        "title": "Modifier vos paramètres",
+        "body": "Ajouter et réordonner des étiquettes et modifier vos préférences."
+      },
+      "security_read": {
+        "title": "Voir la sécurité de votre compte",
+        "body": "Voir si la connexion à deux facteurs et le chiffrement sont activés, sans accès aux secrets."
+      },
+      "auth_observe": {
+        "title": "Savoir quand vous vous connectez",
+        "body": "Être averti lorsque vous vous connectez, changez de compte ou que votre session est renouvelée."
+      },
+      "auth_emit": {
+        "title": "Vous déconnecter",
+        "body": "Vous déconnecter du webmail."
+      },
+      "account_read": {
+        "title": "Voir vos comptes",
+        "body": "Voir les comptes que vous avez ajoutés, avec leurs adresses et leurs serveurs."
+      },
+      "http_post": {
+        "title": "Utiliser le serveur du webmail pour vous",
+        "body": "Appeler ces points de terminaison du serveur avec votre connexion :"
+      },
+      "http_fetch": {
+        "title": "Se connecter à d'autres sites web",
+        "body": "Envoyer des requêtes à ces sites. Tout ce que le plugin peut lire peut y être envoyé :"
+      },
+      "admin_config": {
+        "title": "Lire ses paramètres définis par votre administrateur",
+        "body": "Lire les paramètres que votre administrateur a enregistrés pour ce plugin."
+      },
+      "ui_observe": {
+        "title": "Suivre où vous êtes dans l'application",
+        "body": "Savoir quelle page est ouverte et réagir aux liens sur lesquels vous cliquez."
+      },
+      "ui_toolbar": {
+        "title": "Ajouter des boutons aux barres d'outils",
+        "body": "Afficher ses propres boutons dans la barre d'outils des messages, sur un message ouvert et dans la barre supérieure."
+      },
+      "ui_app_top_banner": {
+        "title": "Afficher une bannière en haut",
+        "body": "Afficher un avis sur toute la largeur en haut de l'application."
+      },
+      "ui_email_banner": {
+        "title": "Afficher des avis sur les messages",
+        "body": "Afficher ses propres avis et résumés au-dessus, à l'intérieur et entre les parties d'un message ou d'une conversation ouverts."
+      },
+      "ui_email_footer": {
+        "title": "Ajouter du contenu sous les messages",
+        "body": "Afficher son propre contenu sous un message ouvert."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "Afficher les clés de chiffrement des contacts",
+        "body": "Afficher et gérer les clés de chiffrement d'un contact."
+      },
+      "ui_email_details": {
+        "title": "Ajouter des panneaux aux détails des messages",
+        "body": "Afficher son propre panneau à côté ou en dessous d'un message ouvert."
+      },
+      "ui_download_file": {
+        "title": "Enregistrer des fichiers sur votre appareil",
+        "body": "Proposer au téléchargement des fichiers qu'il a créés."
+      },
+      "ui_message_list_tabs": {
+        "title": "Ajouter des onglets à votre boîte de réception",
+        "body": "Répartir votre boîte de réception en onglets comme Mises à jour ou Promotions."
+      },
+      "ui_composer_toolbar": {
+        "title": "Ajouter à l'éditeur",
+        "body": "Afficher ses propres boutons, entrées de menu et sections pendant que vous rédigez un message."
+      },
+      "ui_composer_sidebar": {
+        "title": "Ajouter un panneau à l'éditeur",
+        "body": "Afficher son propre panneau à côté du message que vous rédigez."
+      },
+      "ui_sidebar_widget": {
+        "title": "Ajouter à la barre latérale",
+        "body": "Afficher ses propres encadrés et sections dans la barre latérale de la messagerie."
+      },
+      "ui_settings_section": {
+        "title": "Ajouter une page de paramètres",
+        "body": "Afficher sa propre page dans les Paramètres."
+      },
+      "ui_context_menu": {
+        "title": "Ajouter au menu des messages",
+        "body": "Ajouter des entrées au menu qui s'ouvre lorsque vous faites un clic droit sur un message."
+      },
+      "ui_navigation_rail": {
+        "title": "Ajouter à la barre de navigation",
+        "body": "Afficher son propre bouton dans la barre de navigation."
+      },
+      "ui_keyboard": {
+        "title": "Ajouter des raccourcis clavier",
+        "body": "Réagir aux raccourcis clavier qu'il définit."
+      },
+      "ui_calendar_action": {
+        "title": "Ajouter à l'affichage du calendrier",
+        "body": "Afficher ses propres boutons et sections sur les événements, ainsi que de courtes étiquettes et des points sur les jours du calendrier."
+      },
+      "ui_admin_page": {
+        "title": "Ajouter une page d'administration",
+        "body": "Afficher sa propre page dans les paramètres d'administration."
+      },
+      "app_lifecycle": {
+        "title": "Savoir quand l'application démarre et s'arrête",
+        "body": "Être averti lorsque l'application démarre, passe hors ligne ou que vous vous déconnectez."
+      },
+      "compose_open": {
+        "title": "Ouvrir l'éditeur pour vous",
+        "body": "Ouvrir un nouveau message avec les destinataires, le texte ou les pièces jointes déjà remplis. C'est toujours vous qui décidez de l'envoyer."
+      },
+      "compose_read": {
+        "title": "Lire le message que vous écrivez",
+        "body": "Lire le texte d'un message pendant que vous l'écrivez, quand vous utilisez le plugin dans l'éditeur. Ni la signature ni le message cité."
+      },
+      "compose_write": {
+        "title": "Modifier le message que vous écrivez",
+        "body": "Remplacer ou ajouter du texte dans un message pendant que vous l'écrivez, quand vous utilisez le plugin dans l'éditeur. Chaque modification peut être annulée, et c'est toujours vous qui décidez de l'envoyer."
+      },
+      "ui_notifications": {
+        "title": "Afficher des notifications",
+        "body": "Afficher des notifications sur votre appareil, ou dans l'application si vous ne les avez pas autorisées. Chacune indique le nom du plugin."
+      },
+      "ui_message_list": {
+        "title": "Ajouter à la liste des messages",
+        "body": "Afficher son propre contenu au-dessus de la liste des messages, ainsi que des boutons sur les messages et dans la barre des messages sélectionnés."
+      },
+      "ui_contacts": {
+        "title": "Ajouter à l'affichage des contacts",
+        "body": "Afficher ses propres sections dans les détails d'un contact et des boutons dans la liste des contacts."
+      },
+      "ui_tasks": {
+        "title": "Ajouter à l'affichage des tâches",
+        "body": "Afficher ses propres sections dans les détails d'une tâche et des boutons dans la liste des tâches."
+      },
+      "ui_files": {
+        "title": "Ajouter à l'affichage des fichiers",
+        "body": "Afficher ses propres sections dans l'aperçu des fichiers et des entrées dans le menu d'un fichier."
+      },
+      "ui_commands": {
+        "title": "Ajouter des commandes",
+        "body": "Ajouter ses propres entrées à la palette de commandes (Ctrl+K)."
+      },
+      "ui_app_page": {
+        "title": "Ajouter des pages",
+        "body": "Ajouter ses propres pages à l'application, chacune avec un bouton dans la barre de navigation."
+      },
+      "http_proxy": {
+        "title": "Utiliser les comptes que vous connectez",
+        "body": "Envoyer des requêtes via le serveur de Bulwark avec un compte ou une clé configurés par vous ou votre administrateur. Le plugin ne voit jamais le mot de passe, mais il peut faire tout ce que ce compte peut faire sur son propre serveur."
+      }
+    },
+    "dialog": {
+      "from_plugin": "Du plugin {name}",
+      "ok": "OK",
+      "submit": "Envoyer",
+      "confirm": "Confirmer",
+      "cancel": "Annuler",
+      "close": "Fermer",
+      "turn_off": "Désactiver {name}",
+      "plugin_menu": "Options de {name}",
+      "password_note": "Ce formulaire provient du plugin {name}, pas du webmail. Ne saisissez un mot de passe que si vous faites confiance à ce plugin.",
+      "toast_auto_disabled": "{name} a été désactivé parce qu'il échouait sans cesse."
+    },
+    "connect": {
+      "title": "Connecter {label}",
+      "intro_password": "{name} souhaite utiliser votre compte {label}. Bulwark garde le mot de passe sur son serveur et ne l'envoie qu'à {host}. Le plugin ne le voit jamais.",
+      "intro_password_any": "{name} souhaite utiliser votre compte {label}. Bulwark garde le mot de passe sur son serveur et ne l'envoie qu'au serveur que vous saisissez ici. Le plugin ne le voit jamais.",
+      "intro_signin": "{name} souhaite se connecter à votre compte {label}. Saisissez le serveur ici, puis connectez-vous sur sa propre page. Bulwark garde l'accès obtenu sur son serveur ; le plugin ne le voit jamais.",
+      "server": "Adresse du serveur",
+      "server_hint": "cloud.example.com",
+      "username": "Nom d'utilisateur",
+      "secret": "Mot de passe ou clé",
+      "connect": "Connecter",
+      "continue": "Continuer",
+      "cancel": "Annuler",
+      "saving": "Enregistrement…",
+      "error_server": "Saisissez l'adresse du serveur, par exemple https://cloud.example.com",
+      "error_save": "Impossible d'enregistrer : {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "Sélectionnez un résultat pour l'aperçu",
     "open_full": "Ouvrir",
     "view_label": "Affichage"
+  },
+  "top_bar": {
+    "more": "Plus d'options"
+  },
+  "plugin_pages": {
+    "loading": "Chargement de la page",
+    "not_available_title": "Cette page n'est pas disponible",
+    "not_available_description": "Le plugin qui l'a ajoutée est désactivé ou n'est plus installé.",
+    "back_to_mail": "Retour à la messagerie",
+    "settings_group": "Plugins"
+  },
+  "command_palette": {
+    "title": "Palette de commandes",
+    "open": "Ouvrir la palette de commandes",
+    "placeholder": "Tapez une commande",
+    "no_results": "Aucune commande correspondante",
+    "go_to": "Aller à {name}",
+    "compose": "Nouveau message",
+    "search": "Rechercher dans la messagerie",
+    "theme_dark": "Passer au thème sombre",
+    "theme_light": "Passer au thème clair",
+    "shortcuts": "Afficher les raccourcis clavier",
+    "group_navigation": "Aller à",
+    "group_actions": "Actions",
+    "group_plugins": "Plugins"
+  },
+  "notification_center": {
+    "title": "Notifications",
+    "mark_all_read": "Tout marquer comme lu",
+    "clear": "Effacer",
+    "empty": "Aucune notification",
+    "close": "Fermer",
+    "unread": "Non lu",
+    "unread_count": "Non lues : {count}",
+    "level_error": "Erreur",
+    "level_warning": "Avertissement"
   }
 }
diff --git a/locales/he/common.json b/locales/he/common.json
index d2204f024..0053a6516 100644
--- a/locales/he/common.json
+++ b/locales/he/common.json
@@ -585,7 +585,9 @@
       "copied": "הקוד הועתק",
       "copy_failed": "לא ניתן להעתיק את הקוד"
     },
-    "mv_position": "{index} מתוך {total}"
+    "mv_position": "{index} מתוך {total}",
+    "plugin_panel_show": "הצגת חלונית התוסף",
+    "plugin_panel_hide": "הסתרת חלונית התוסף"
   },
   "email_composer": {
     "minimize": "מזעור",
@@ -778,7 +780,8 @@
       "remove_background_color": "הסר צבע רקע"
     },
     "send_filing_warning": "נשלח - אך הניקוי שלאחר השליחה נכשל, ייתכן שתישאר טיוטה ישנה.",
-    "pop_out": "פתיחת התשובה בחלון נפרד"
+    "pop_out": "פתיחת התשובה בחלון נפרד",
+    "send_guard_failed": "לא נשלח - תוסף שבודק הודעות לפני השליחה נכשל או לא הגיב."
   },
   "confirm_dialog": {
     "confirm": "אשר",
@@ -3971,6 +3974,354 @@
       "failed_detail": "האימות נכשל: {error}",
       "missing_params": "חסר קוד אימות או מצב.",
       "delivery_failed": "לא ניתן היה למסור את תוצאת האימות לכרטיסיית האפליקציה. סגרו חלון זה ונסו שוב."
+    },
+    "settings": {
+      "title": "תוספים",
+      "description": "תוספים שמנהל המערכת הוסיף. הפעילו או כבו אותם עבור החשבון שלכם.",
+      "description_uploads": "תוספים מוסיפים יכולות ל-Webmail. הפעילו או כבו אותם עבור החשבון שלכם, או התקינו תוספים משלכם.",
+      "description_demo": "תוספים אינם זמינים במצב הדגמה.",
+      "install_button": "התקנת תוסף",
+      "install_hint": "בחרו קובץ ZIP של תוסף.",
+      "install_hint_approval": "בחרו קובץ ZIP של תוסף. מנהל המערכת צריך לאשר אותו לפני שתוכלו להפעיל אותו.",
+      "install_uploads_off": "מנהל המערכת אינו מאפשר התקנת תוספים.",
+      "install_managed_id": "מנהל המערכת כבר מספק תוסף בשם הזה, ולכן אי אפשר להחליף אותו.",
+      "install_invalid": "הקובץ הזה אינו תוסף שניתן להתקין: {details}",
+      "toast_installed": "התוסף הותקן. הפעילו אותו למטה.",
+      "toast_installed_pending": "התוסף הותקן ונשלח לאישור מנהל המערכת.",
+      "toast_enabled": "{name} פועל",
+      "toast_disabled": "{name} כבוי",
+      "toast_removed": "{name} הוסר",
+      "toast_forced": "מנהל המערכת משאיר את {name} פועל",
+      "toast_approval_requested": "{name} ממתין לאישור מנהל המערכת",
+      "empty_title": "אין עדיין תוספים",
+      "empty_admin": "מנהל המערכת לא הוסיף תוספים.",
+      "empty_uploads": "כדי להתחיל, התקינו תוסף מקובץ ZIP.",
+      "empty_demo": "תוספים דורשים חשבון אמיתי, ולכן אין תוספים במצב הדגמה.",
+      "syncing": "בודק תוספים מול השרת…",
+      "status_installed": "כבוי",
+      "status_enabled": "בהפעלה",
+      "status_running": "פועל",
+      "status_disabled": "כבוי",
+      "status_error": "תקלה",
+      "badge_forced": "חובה",
+      "badge_managed": "ממנהל המערכת",
+      "badge_yours": "הותקן על ידיכם",
+      "badge_awaiting": "ממתין לאישור",
+      "toggle_label": "הפעלה או כיבוי של {name}",
+      "forced_note": "מנהל המערכת מחייב את התוסף הזה, ולכן אי אפשר לכבות אותו.",
+      "permissions": "מה הוא יכול לעשות",
+      "permissions_managed": "מה הוא יכול לעשות (באישור מנהל המערכת)",
+      "settings": "הגדרות",
+      "remove": "הסרה",
+      "remove_title": "להסיר את {name}?",
+      "remove_message": "התוסף וכל מה שהוא שמר בדפדפן הזה יימחקו. אפשר להתקין אותו שוב מאוחר יותר.",
+      "remove_confirm": "הסרה",
+      "error_user_plugins_off": "מנהל המערכת כיבה תוספים שמשתמשים התקינו, ולכן התוסף הזה לא פועל.",
+      "error_approval_unavailable": "התוסף הזה הותקן לפני שנדרש אישור. הסירו אותו והתקינו אותו מחדש כדי לשלוח אותו לאישור.",
+      "error_approval_denied": "מנהל המערכת לא אישר את התוסף הזה.",
+      "error_approval_pending": "ממתין לאישור התוסף הזה על ידי מנהל המערכת.",
+      "error_auto_disabled": "כובה כי נכשל שוב ושוב. הפעילו אותו מחדש כדי לנסות שוב.",
+      "accounts_heading": "חשבונות מחוברים",
+      "account_on": "{label} בשרת {host}",
+      "account_waiting": "{label} בשרת {host} (ההתחברות לא הושלמה)",
+      "disconnect": "ניתוק",
+      "disconnect_failed": "לא ניתן לנתק את {label}"
+    },
+    "consent": {
+      "title": "לאפשר ל-{name} לעשות זאת?",
+      "intro": "התוסף מבקש את ההרשאות שלהלן. הוא יקבל אותן רק אם תאפשרו זאת.",
+      "high_risk_note": "פריטים מסומנים נותנים לתוסף גישה לתוכן הדואר שלכם או מאפשרים לו לשלוח נתונים למקום אחר. אפשרו אותם רק לתוספים שאתם סומכים עליהם.",
+      "revoke_hint": "אפשר לכבות את התוסף או להסיר אותו בהגדרות בכל עת.",
+      "deny": "לא לאפשר",
+      "allow": "לאפשר"
+    },
+    "permissions": {
+      "none": "אינו צריך הרשאות מיוחדות.",
+      "high_risk": "דורש זהירות",
+      "email_read": {
+        "title": "קריאת הדואר שלכם",
+        "body": "צפייה בשולחים, בנמענים, בנושאים ובטקסט המלא של כל הודעה בחשבון שלכם, ובתיקיות שלכם."
+      },
+      "email_write": {
+        "title": "שינוי וארגון הדואר שלכם",
+        "body": "הוספה או הסרה של תגים, סימונים ומילות מפתח אחרות בהודעות שלכם, העברתן בין התיקיות שלכם ולארכיון, ושמירת טיוטות."
+      },
+      "email_send": {
+        "title": "שינוי דואר לפני שליחתו",
+        "body": "קריאה ושינוי של הנמענים, הנושא, הטקסט והקבצים המצורפים של הודעות שאתם כותבים, ומניעת שליחה של הודעה."
+      },
+      "crypto_full": {
+        "title": "גישה מלאה לאפליקציה הזו",
+        "body": "פועל עם אותן הרשאות כמו ה-Webmail עצמו. הוא יכול לקרוא את כל הדואר והמפתחות השמורים שלכם ולפעול בשמכם. אפשרו זאת רק לתוספים שאתם סומכים עליהם לגמרי."
+      },
+      "email_raw_send": {
+        "title": "שליחת הודעות שהוא בנה בעצמו",
+        "body": "שליחת הודעות שלמות, למשל חתומות או מוצפנות, מהחשבון שלכם."
+      },
+      "email_blob_read": {
+        "title": "קריאת התוכן הגולמי של הודעות",
+        "body": "קריאת הנתונים המקוריים של ההודעות והקבצים המצורפים שלכם, ושל כל קובץ שאתם מצרפים לפני שליחתו."
+      },
+      "email_blob_write": {
+        "title": "החלפת קבצים מצורפים לפני שליחה",
+        "body": "העלאת קבצים לשרת הדואר שלכם והחלפת קובץ שצירפתם בקובץ אחר לפני שההודעה נשלחת."
+      },
+      "email_render_takeover": {
+        "title": "שינוי אופן הצגת ההודעות",
+        "body": "החלפת הטקסט של הודעות שאתם פותחים ושל רשימת ההודעות, למשל כדי להציג תוכן מפוענח."
+      },
+      "calendar_read": {
+        "title": "קריאת היומן שלכם",
+        "body": "צפייה ביומנים שלכם ובאירועים שבהם."
+      },
+      "calendar_write": {
+        "title": "שינוי היומן שלכם",
+        "body": "יצירה, שינוי ומחיקה של אירועים."
+      },
+      "contacts_read": {
+        "title": "קריאת אנשי הקשר שלכם",
+        "body": "חיפוש וקריאה בספרי הכתובות שלכם."
+      },
+      "contacts_write": {
+        "title": "שינוי אנשי הקשר שלכם",
+        "body": "יצירה, שינוי ומחיקה של אנשי קשר וספרי כתובות."
+      },
+      "files_read": {
+        "title": "קריאת הקבצים שלכם",
+        "body": "עיון בקבצים השמורים בחשבון שלכם ופתיחתם."
+      },
+      "files_write": {
+        "title": "שינוי הקבצים שלכם",
+        "body": "העלאה, שינוי שם, העברה ומחיקה של קבצים בחשבון שלכם."
+      },
+      "identity_read": {
+        "title": "צפייה בכתובות השולח שלכם",
+        "body": "צפייה בכתובות שמהן אתם שולחים ובחתימות שלהן."
+      },
+      "identity_write": {
+        "title": "שינוי כתובות השולח שלכם",
+        "body": "יצירה, שינוי ומחיקה של כתובות שולח וחתימות."
+      },
+      "filters_read": {
+        "title": "קריאת מסנני הדואר שלכם",
+        "body": "צפייה בכללים שממיינים את הדואר הנכנס שלכם."
+      },
+      "filters_write": {
+        "title": "שינוי מסנני הדואר שלכם",
+        "body": "הוספת כללים למסננים בצד השרת. כללים כאלה יכולים להעביר לתיקייה, להעביר הלאה או למחוק דואר נכנס."
+      },
+      "tasks_read": {
+        "title": "קריאת המשימות שלכם",
+        "body": "צפייה ברשימות המשימות ובמשימות שלכם."
+      },
+      "tasks_write": {
+        "title": "שינוי המשימות שלכם",
+        "body": "יצירה, שינוי, השלמה ומחיקה של משימות."
+      },
+      "templates_read": {
+        "title": "קריאת התבניות שלכם",
+        "body": "צפייה בתבניות ההודעה השמורות שלכם."
+      },
+      "templates_write": {
+        "title": "שינוי התבניות שלכם",
+        "body": "יצירה, שינוי ומחיקה של תבניות הודעה."
+      },
+      "smime_read": {
+        "title": "צפייה במצב S/MIME שלכם",
+        "body": "בדיקה אם יש לכם מפתחות ואישורי S/MIME, ללא גישה למפתחות."
+      },
+      "vacation_read": {
+        "title": "צפייה בתשובת ההיעדרות שלכם",
+        "body": "בדיקה אם התשובה האוטומטית שלכם פעילה ומה כתוב בה."
+      },
+      "vacation_write": {
+        "title": "שינוי תשובת ההיעדרות שלכם",
+        "body": "הפעלה או כיבוי של התשובה האוטומטית ושינוי הטקסט והתאריכים שלה."
+      },
+      "settings_read": {
+        "title": "קריאת ההגדרות שלכם",
+        "body": "צפייה בהעדפות ובהגדרות התגים שלכם."
+      },
+      "settings_write": {
+        "title": "שינוי ההגדרות שלכם",
+        "body": "הוספה וסידור מחדש של תגים ושינוי ההעדפות שלכם."
+      },
+      "security_read": {
+        "title": "צפייה באבטחת החשבון שלכם",
+        "body": "בדיקה אם אימות דו-שלבי והצפנה פעילים, ללא גישה לסודות."
+      },
+      "auth_observe": {
+        "title": "לדעת מתי אתם נכנסים",
+        "body": "לקבל עדכון כשאתם נכנסים, מחליפים חשבון או כשההפעלה שלכם מתחדשת."
+      },
+      "auth_emit": {
+        "title": "ניתוק שלכם",
+        "body": "ניתוק שלכם מה-Webmail."
+      },
+      "account_read": {
+        "title": "צפייה בחשבונות שלכם",
+        "body": "צפייה בחשבונות שהוספתם, עם הכתובות והשרתים שלהם."
+      },
+      "http_post": {
+        "title": "שימוש בשרת ה-Webmail בשמכם",
+        "body": "פנייה לנקודות הקצה האלה בשרת עם פרטי ההתחברות שלכם:"
+      },
+      "http_fetch": {
+        "title": "התחברות לאתרים אחרים",
+        "body": "שליחת בקשות לאתרים האלה. כל מה שהתוסף יכול לקרוא עלול להישלח אליהם:"
+      },
+      "admin_config": {
+        "title": "קריאת ההגדרות שלו ממנהל המערכת",
+        "body": "קריאת ההגדרות שמנהל המערכת שמר עבור התוסף הזה."
+      },
+      "ui_observe": {
+        "title": "מעקב אחר המיקום שלכם באפליקציה",
+        "body": "לדעת איזה עמוד פתוח ולהגיב לקישורים שאתם לוחצים עליהם."
+      },
+      "ui_toolbar": {
+        "title": "הוספת כפתורים לסרגלי כלים",
+        "body": "הצגת כפתורים משלו בסרגל הכלים של ההודעות, על הודעה פתוחה ובסרגל העליון."
+      },
+      "ui_app_top_banner": {
+        "title": "הצגת באנר בחלק העליון",
+        "body": "הצגת הודעה לרוחב החלק העליון של האפליקציה."
+      },
+      "ui_email_banner": {
+        "title": "הצגת הודעות על גבי הודעות דואר",
+        "body": "הצגת הודעות וסיכומים משלו מעל החלקים של הודעה או שיחה פתוחה, בתוכם וביניהם."
+      },
+      "ui_email_footer": {
+        "title": "הוספת תוכן מתחת להודעות",
+        "body": "הצגת תוכן משלו מתחת להודעה פתוחה."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "הצגת מפתחות הצפנה של אנשי קשר",
+        "body": "הצגה וניהול של מפתחות ההצפנה של איש קשר."
+      },
+      "ui_email_details": {
+        "title": "הוספת חלוניות לפרטי ההודעה",
+        "body": "הצגת חלונית משלו לצד הודעה פתוחה או מתחתיה."
+      },
+      "ui_download_file": {
+        "title": "שמירת קבצים במכשיר שלכם",
+        "body": "הצעת קבצים שהוא יצר להורדה."
+      },
+      "ui_message_list_tabs": {
+        "title": "הוספת לשוניות לדואר הנכנס",
+        "body": "מיון הדואר הנכנס שלכם ללשוניות כמו עדכונים או קידומי מכירות."
+      },
+      "ui_composer_toolbar": {
+        "title": "הוספה לעורך",
+        "body": "הצגת כפתורים, פריטי תפריט ומקטעים משלו בזמן שאתם כותבים הודעה."
+      },
+      "ui_composer_sidebar": {
+        "title": "הוספת חלונית לעורך",
+        "body": "הצגת חלונית משלו לצד ההודעה שאתם כותבים."
+      },
+      "ui_sidebar_widget": {
+        "title": "הוספה לסרגל הצד",
+        "body": "הצגת תיבות ומקטעים משלו בסרגל הצד של הדואר."
+      },
+      "ui_settings_section": {
+        "title": "הוספת עמוד הגדרות",
+        "body": "הצגת עמוד משלו בהגדרות."
+      },
+      "ui_context_menu": {
+        "title": "הוספה לתפריט ההודעה",
+        "body": "הוספת פריטים לתפריט שנפתח בלחיצה ימנית על הודעה."
+      },
+      "ui_navigation_rail": {
+        "title": "הוספה לסרגל הניווט",
+        "body": "הצגת כפתור משלו בסרגל הניווט."
+      },
+      "ui_keyboard": {
+        "title": "הוספת קיצורי מקשים",
+        "body": "תגובה לקיצורי מקשים שהוא מגדיר."
+      },
+      "ui_calendar_action": {
+        "title": "הוספה לתצוגת לוח השנה",
+        "body": "הצגת כפתורים ומקטעים משלו על אירועים, ותוויות קצרות ונקודות על ימים בלוח השנה."
+      },
+      "ui_admin_page": {
+        "title": "הוספת עמוד ניהול",
+        "body": "הצגת עמוד משלו בהגדרות הניהול."
+      },
+      "app_lifecycle": {
+        "title": "לדעת מתי האפליקציה מופעלת ונעצרת",
+        "body": "לקבל עדכון כשהאפליקציה מופעלת, עוברת למצב לא מקוון או כשאתם מתנתקים."
+      },
+      "compose_open": {
+        "title": "פתיחת העורך עבורכם",
+        "body": "פתיחת הודעה חדשה עם נמענים, טקסט או קבצים מצורפים שכבר מולאו. ההחלטה אם לשלוח אותה נשארת שלכם."
+      },
+      "compose_read": {
+        "title": "קריאת ההודעה שאתם כותבים",
+        "body": "קריאת הטקסט של הודעה בזמן הכתיבה, כשמשתמשים בתוסף בעורך. לא החתימה ולא ההודעה המצוטטת."
+      },
+      "compose_write": {
+        "title": "שינוי ההודעה שאתם כותבים",
+        "body": "החלפה או הוספה של טקסט בהודעה בזמן הכתיבה, כשמשתמשים בתוסף בעורך. אפשר לבטל כל שינוי, וההחלטה אם לשלוח נשארת שלכם."
+      },
+      "ui_notifications": {
+        "title": "הצגת התראות",
+        "body": "הצגת התראות במכשיר שלכם, או בתוך האפליקציה אם לא אישרתם התראות. כל התראה מציינת את שם התוסף."
+      },
+      "ui_message_list": {
+        "title": "הוספה לרשימת ההודעות",
+        "body": "הצגת תוכן משלו מעל רשימת ההודעות, וכפתורים על הודעות ובסרגל הכלים של ההודעות שנבחרו."
+      },
+      "ui_contacts": {
+        "title": "הוספה לתצוגת אנשי הקשר",
+        "body": "הצגת מקטעים משלו בפרטים של איש קשר וכפתורים ברשימת אנשי הקשר."
+      },
+      "ui_tasks": {
+        "title": "הוספה לתצוגת המשימות",
+        "body": "הצגת מקטעים משלו בפרטים של משימה וכפתורים ברשימת המשימות."
+      },
+      "ui_files": {
+        "title": "הוספה לתצוגת הקבצים",
+        "body": "הצגת מקטעים משלו בתצוגה המקדימה של קבצים ופריטים בתפריט של קובץ."
+      },
+      "ui_commands": {
+        "title": "הוספת פקודות",
+        "body": "הוספת פריטים משלו ללוח הפקודות (Ctrl+K)."
+      },
+      "ui_app_page": {
+        "title": "הוספת עמודים",
+        "body": "הוספת עמודים משלו לאפליקציה, כל אחד עם כפתור בסרגל הניווט."
+      },
+      "http_proxy": {
+        "title": "שימוש בחשבונות שאתם מחברים",
+        "body": "שליחת בקשות דרך השרת של Bulwark עם חשבון או מפתח שהוגדרו על ידיכם או על ידי מנהל המערכת. התוסף אף פעם לא רואה את הסיסמה, אבל הוא יכול לעשות כל מה שהחשבון הזה יכול לעשות בשרת שלו."
+      }
+    },
+    "dialog": {
+      "from_plugin": "מהתוסף {name}",
+      "ok": "אישור",
+      "submit": "שליחה",
+      "confirm": "אישור",
+      "cancel": "ביטול",
+      "close": "סגירה",
+      "turn_off": "כיבוי {name}",
+      "plugin_menu": "אפשרויות עבור {name}",
+      "password_note": "הטופס הזה מגיע מהתוסף {name}, לא מהדואר האינטרנטי. הזינו סיסמה רק אם אתם סומכים על התוסף הזה.",
+      "toast_auto_disabled": "{name} כובה כי נכשל שוב ושוב."
+    },
+    "connect": {
+      "title": "חיבור {label}",
+      "intro_password": "{name} רוצה להשתמש בחשבון {label} שלכם. Bulwark שומר את הסיסמה בשרת שלו ושולח אותה רק אל {host}. התוסף אף פעם לא רואה אותה.",
+      "intro_password_any": "{name} רוצה להשתמש בחשבון {label} שלכם. Bulwark שומר את הסיסמה בשרת שלו ושולח אותה רק לשרת שתזינו כאן. התוסף אף פעם לא רואה אותה.",
+      "intro_signin": "{name} רוצה להתחבר לחשבון {label} שלכם. הזינו כאן את השרת, ואז התחברו בדף של השרת עצמו. Bulwark שומר בשרת שלו את הגישה שהוא מקבל; התוסף אף פעם לא רואה אותה.",
+      "server": "כתובת השרת",
+      "server_hint": "cloud.example.com",
+      "username": "שם משתמש",
+      "secret": "סיסמה או מפתח",
+      "connect": "חיבור",
+      "continue": "המשך",
+      "cancel": "ביטול",
+      "saving": "שומר…",
+      "error_server": "הזינו את כתובת השרת, למשל https://cloud.example.com",
+      "error_save": "השמירה נכשלה: {error}"
     }
   },
   "global_search": {
@@ -3999,5 +4350,41 @@
     "preview_empty": "בחרו תוצאה לתצוגה מקדימה",
     "open_full": "פתיחה",
     "view_label": "תצוגה"
+  },
+  "top_bar": {
+    "more": "אפשרויות נוספות"
+  },
+  "plugin_pages": {
+    "loading": "טוען את הדף",
+    "not_available_title": "הדף הזה אינו זמין",
+    "not_available_description": "התוסף שהוסיף אותו כבוי או שאינו מותקן עוד.",
+    "back_to_mail": "חזרה לדואר",
+    "settings_group": "תוספים"
+  },
+  "command_palette": {
+    "title": "לוח פקודות",
+    "open": "פתיחת לוח הפקודות",
+    "placeholder": "הקלידו פקודה",
+    "no_results": "אין פקודות תואמות",
+    "go_to": "מעבר אל {name}",
+    "compose": "הודעה חדשה",
+    "search": "חיפוש בדואר",
+    "theme_dark": "מעבר לערכת נושא כהה",
+    "theme_light": "מעבר לערכת נושא בהירה",
+    "shortcuts": "הצגת קיצורי מקשים",
+    "group_navigation": "מעבר אל",
+    "group_actions": "פעולות",
+    "group_plugins": "תוספים"
+  },
+  "notification_center": {
+    "title": "התראות",
+    "mark_all_read": "סימון הכול כנקרא",
+    "clear": "ניקוי",
+    "empty": "אין התראות",
+    "close": "סגירה",
+    "unread": "לא נקרא",
+    "unread_count": "לא נקראו: {count}",
+    "level_error": "שגיאה",
+    "level_warning": "אזהרה"
   }
 }
diff --git a/locales/hu/common.json b/locales/hu/common.json
index e9e424c24..e194011f2 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -620,7 +620,9 @@
       "copied": "Kód másolva",
       "copy_failed": "Nem sikerült másolni a kódot"
     },
-    "mv_position": "{index} / {total}"
+    "mv_position": "{index} / {total}",
+    "plugin_panel_show": "Bővítménypanel megjelenítése",
+    "plugin_panel_hide": "Bővítménypanel elrejtése"
   },
   "email_composer": {
     "minimize": "Kis méret",
@@ -813,7 +815,8 @@
       "remove_background_color": "Háttérszín eltávolítása"
     },
     "send_filing_warning": "Elküldve - de az utólagos rendrakás nem sikerült, egy elavult piszkozat megmaradhat.",
-    "pop_out": "Válasz megnyitása külön ablakban"
+    "pop_out": "Válasz megnyitása külön ablakban",
+    "send_guard_failed": "Nem lett elküldve - egy bővítmény, amely küldés előtt ellenőrzi az üzeneteket, hibát jelzett vagy nem válaszolt."
   },
   "confirm_dialog": {
     "confirm": "Megerősítés",
@@ -3970,6 +3973,354 @@
       "failed_detail": "A hitelesítés sikertelen: {error}",
       "missing_params": "Hiányzik a hitelesítési kód vagy az állapot.",
       "delivery_failed": "A hitelesítés eredményét nem sikerült átadni az alkalmazás lapjának. Zárja be ezt az ablakot, és próbálja újra."
+    },
+    "settings": {
+      "title": "Bővítmények",
+      "description": "A rendszergazda által hozzáadott bővítmények. A fiókodhoz be- vagy kikapcsolhatod őket.",
+      "description_uploads": "A bővítmények új funkciókat adnak a webmailhez. A fiókodhoz be- vagy kikapcsolhatod őket, vagy telepíthetsz sajátot.",
+      "description_demo": "A bővítmények nem érhetők el a demóban.",
+      "install_button": "Bővítmény telepítése",
+      "install_hint": "Válassz egy bővítményt tartalmazó ZIP-fájlt.",
+      "install_hint_approval": "Válassz egy bővítményt tartalmazó ZIP-fájlt. Bekapcsolás előtt a rendszergazdának jóvá kell hagynia.",
+      "install_uploads_off": "A rendszergazda nem engedélyezi bővítmények telepítését.",
+      "install_managed_id": "A rendszergazda már biztosít egy ilyen nevű bővítményt, ezért nem cserélhető le.",
+      "install_invalid": "Ez a fájl nem telepíthető bővítmény: {details}",
+      "toast_installed": "Bővítmény telepítve. Lent kapcsolhatod be.",
+      "toast_installed_pending": "Bővítmény telepítve, és jóváhagyásra elküldve a rendszergazdának.",
+      "toast_enabled": "Bővítmény bekapcsolva: {name}",
+      "toast_disabled": "Bővítmény kikapcsolva: {name}",
+      "toast_removed": "Bővítmény eltávolítva: {name}",
+      "toast_forced": "A rendszergazda bekapcsolva tartja ezt a bővítményt: {name}",
+      "toast_approval_requested": "Rendszergazdai jóváhagyásra vár: {name}",
+      "empty_title": "Még nincsenek bővítmények",
+      "empty_admin": "A rendszergazda még nem adott hozzá bővítményt.",
+      "empty_uploads": "Kezdésként telepíts egy bővítményt ZIP-fájlból.",
+      "empty_demo": "A bővítményekhez valódi fiók kell, ezért a demóban nincsenek.",
+      "syncing": "Bővítmények ellenőrzése a szerveren…",
+      "status_installed": "Ki",
+      "status_enabled": "Indítás",
+      "status_running": "Be",
+      "status_disabled": "Ki",
+      "status_error": "Hiba",
+      "badge_forced": "Kötelező",
+      "badge_managed": "A rendszergazdától",
+      "badge_yours": "Saját telepítés",
+      "badge_awaiting": "Jóváhagyásra vár",
+      "toggle_label": "Bővítmény be- vagy kikapcsolása: {name}",
+      "forced_note": "A rendszergazda előírja ezt a bővítményt, ezért nem kapcsolható ki.",
+      "permissions": "Mire képes",
+      "permissions_managed": "Mire képes (a rendszergazda jóváhagyta)",
+      "settings": "Beállítások",
+      "remove": "Eltávolítás",
+      "remove_title": "{name} eltávolítása?",
+      "remove_message": "A bővítmény és minden, amit ebben a böngészőben tárolt, törlődik. Később újra telepítheted.",
+      "remove_confirm": "Eltávolítás",
+      "error_user_plugins_off": "A rendszergazda kikapcsolta a felhasználók által telepített bővítményeket, ezért ez a bővítmény nem fut.",
+      "error_approval_unavailable": "Ezt a bővítményt még azelőtt telepítetted, hogy jóváhagyás kellett volna. Távolítsd el, majd telepítsd újra, hogy jóváhagyásra kerüljön.",
+      "error_approval_denied": "A rendszergazda nem hagyta jóvá ezt a bővítményt.",
+      "error_approval_pending": "Várakozás arra, hogy a rendszergazda jóváhagyja ezt a bővítményt.",
+      "error_auto_disabled": "Kikapcsolva, mert többször is hibát okozott. Kapcsolja be újra, ha ismét meg szeretné próbálni.",
+      "accounts_heading": "Csatlakoztatott fiókok",
+      "account_on": "{label} – {host}",
+      "account_waiting": "{label} – {host} (a bejelentkezés nincs befejezve)",
+      "disconnect": "Leválasztás",
+      "disconnect_failed": "Nem sikerült leválasztani: {label}"
+    },
+    "consent": {
+      "title": "{name}: engedélyezed ezeket a műveleteket?",
+      "intro": "A bővítmény az alábbi engedélyeket kéri. Csak akkor kapja meg őket, ha engedélyezed.",
+      "high_risk_note": "A megjelölt elemek hozzáférést adnak a bővítménynek a leveleid tartalmához, vagy lehetővé teszik, hogy adatokat küldjön máshová. Csak megbízható bővítményeknek engedélyezd őket.",
+      "revoke_hint": "A bővítményt bármikor kikapcsolhatod vagy eltávolíthatod a Beállításokban.",
+      "deny": "Nem engedélyezem",
+      "allow": "Engedélyezés"
+    },
+    "permissions": {
+      "none": "Nincs szüksége különleges engedélyre.",
+      "high_risk": "Óvatosan",
+      "email_read": {
+        "title": "Leveleid olvasása",
+        "body": "Látja a fiókod bármely üzenetének feladóját, címzettjeit, tárgyát és teljes szövegét, valamint a mappáidat."
+      },
+      "email_write": {
+        "title": "Leveleid módosítása és rendezése",
+        "body": "Címkéket, jelölőket és más kulcsszavakat ad hozzá az üzeneteidhez, vagy eltávolítja őket, áthelyezi az üzeneteket a mappáid között és az archívumba, és piszkozatokat ment."
+      },
+      "email_send": {
+        "title": "Levelek módosítása küldés előtt",
+        "body": "Olvassa és módosítja az általad írt üzenetek címzettjeit, tárgyát, szövegét és mellékleteit, és megakadályozhatja egy üzenet elküldését."
+      },
+      "crypto_full": {
+        "title": "Teljes hozzáférés az alkalmazáshoz",
+        "body": "Ugyanazokkal a jogokkal fut, mint maga a webmail. Olvashatja az összes leveledet és tárolt kulcsodat, és a nevedben járhat el. Csak olyan bővítménynek engedélyezd, amelyben teljesen megbízol."
+      },
+      "email_raw_send": {
+        "title": "Saját maga által összeállított üzenetek küldése",
+        "body": "Teljes üzeneteket küld a fiókodból, például aláírt vagy titkosított üzeneteket."
+      },
+      "email_blob_read": {
+        "title": "Üzenetek nyers tartalmának olvasása",
+        "body": "Olvassa az üzeneteid és mellékleteid eredeti adatait, valamint minden fájlét, amelyet küldés előtt csatolsz."
+      },
+      "email_blob_write": {
+        "title": "Mellékletek cseréje küldés előtt",
+        "body": "Fájlokat tölt fel a levelezőszerveredre, és az üzenet elküldése előtt egy csatolt fájlt másikra cserél."
+      },
+      "email_render_takeover": {
+        "title": "Üzenetek megjelenítésének módosítása",
+        "body": "Lecseréli a megnyitott üzenetek és az üzenetlista szövegét, például a visszafejtett tartalom megjelenítéséhez."
+      },
+      "calendar_read": {
+        "title": "Naptárad olvasása",
+        "body": "Látja a naptáraidat és azok eseményeit."
+      },
+      "calendar_write": {
+        "title": "Naptárad módosítása",
+        "body": "Eseményeket hoz létre, módosít és töröl."
+      },
+      "contacts_read": {
+        "title": "Névjegyeid olvasása",
+        "body": "Keres a címjegyzékeidben, és olvassa őket."
+      },
+      "contacts_write": {
+        "title": "Névjegyeid módosítása",
+        "body": "Névjegyeket és címjegyzékeket hoz létre, módosít és töröl."
+      },
+      "files_read": {
+        "title": "Fájljaid olvasása",
+        "body": "Böngészi és megnyitja a fiókodban tárolt fájlokat."
+      },
+      "files_write": {
+        "title": "Fájljaid módosítása",
+        "body": "Fájlokat tölt fel, nevez át, helyez át és töröl a fiókodban."
+      },
+      "identity_read": {
+        "title": "Küldő azonosságaid megtekintése",
+        "body": "Látja a címeket, amelyekről küldesz, és azok aláírásait."
+      },
+      "identity_write": {
+        "title": "Küldő azonosságaid módosítása",
+        "body": "Küldő azonosságokat és aláírásokat hoz létre, módosít és töröl."
+      },
+      "filters_read": {
+        "title": "Levélszűrőid olvasása",
+        "body": "Látja a szabályokat, amelyek a beérkező leveleidet rendezik."
+      },
+      "filters_write": {
+        "title": "Levélszűrőid módosítása",
+        "body": "Szabályokat ad a szerveroldali szűrőidhez. Az ilyen szabályok áthelyezhetik, továbbíthatják vagy törölhetik a beérkező leveleket."
+      },
+      "tasks_read": {
+        "title": "Feladataid olvasása",
+        "body": "Látja a feladatlistáidat és a feladataidat."
+      },
+      "tasks_write": {
+        "title": "Feladataid módosítása",
+        "body": "Feladatokat hoz létre, módosít, teljesít és töröl."
+      },
+      "templates_read": {
+        "title": "Sablonjaid olvasása",
+        "body": "Látja a mentett üzenetsablonjaidat."
+      },
+      "templates_write": {
+        "title": "Sablonjaid módosítása",
+        "body": "Üzenetsablonokat hoz létre, módosít és töröl."
+      },
+      "smime_read": {
+        "title": "S/MIME állapotod megtekintése",
+        "body": "Látja, hogy vannak-e S/MIME kulcsaid és tanúsítványaid, a kulcsokhoz való hozzáférés nélkül."
+      },
+      "vacation_read": {
+        "title": "Távolléti válaszod megtekintése",
+        "body": "Látja, hogy be van-e kapcsolva az automatikus válaszod, és mi a szövege."
+      },
+      "vacation_write": {
+        "title": "Távolléti válaszod módosítása",
+        "body": "Be- és kikapcsolja az automatikus válaszodat, és módosítja a szövegét és dátumait."
+      },
+      "settings_read": {
+        "title": "Beállításaid olvasása",
+        "body": "Látja a beállításaidat és a címkék meghatározásait."
+      },
+      "settings_write": {
+        "title": "Beállításaid módosítása",
+        "body": "Címkéket ad hozzá, átrendezi őket, és módosítja a beállításaidat."
+      },
+      "security_read": {
+        "title": "Fiókod biztonságának megtekintése",
+        "body": "Látja, hogy be van-e kapcsolva a kétfaktoros hitelesítés és a titkosítás, a titkos adatokhoz való hozzáférés nélkül."
+      },
+      "auth_observe": {
+        "title": "Tudomást szerez a bejelentkezésedről",
+        "body": "Értesül, amikor bejelentkezel, fiókot váltasz, vagy megújul a munkameneted."
+      },
+      "auth_emit": {
+        "title": "Kijelentkeztetés",
+        "body": "Kijelentkeztethet a webmailből."
+      },
+      "account_read": {
+        "title": "Fiókjaid megtekintése",
+        "body": "Látja a hozzáadott fiókjaidat a címükkel és szerverükkel együtt."
+      },
+      "http_post": {
+        "title": "A webmail szerverének használata a nevedben",
+        "body": "Meghívja ezeket a szervervégpontokat a bejelentkezéseddel:"
+      },
+      "http_fetch": {
+        "title": "Kapcsolódás más webhelyekhez",
+        "body": "Kéréseket küld ezekre a webhelyekre. Bármi, amit a bővítmény olvashat, ide is eljuthat:"
+      },
+      "admin_config": {
+        "title": "A rendszergazdától kapott beállítások olvasása",
+        "body": "Olvassa a beállításokat, amelyeket a rendszergazda mentett ehhez a bővítményhez."
+      },
+      "ui_observe": {
+        "title": "Követi, hol jársz az alkalmazásban",
+        "body": "Tudja, melyik oldal van megnyitva, és reagál a hivatkozásokra, amelyekre kattintasz."
+      },
+      "ui_toolbar": {
+        "title": "Gombok az eszköztárakon",
+        "body": "Saját gombokat jelenít meg az üzenetek eszköztárán, egy megnyitott üzeneten és a felső sávban."
+      },
+      "ui_app_top_banner": {
+        "title": "Szalag megjelenítése felül",
+        "body": "Értesítést jelenít meg az alkalmazás tetején."
+      },
+      "ui_email_banner": {
+        "title": "Értesítések az üzeneteken",
+        "body": "Saját értesítéseket és összefoglalókat jelenít meg egy megnyitott üzenet vagy beszélgetés részei felett, azokon belül és között."
+      },
+      "ui_email_footer": {
+        "title": "Tartalom az üzenetek alatt",
+        "body": "Saját tartalmat jelenít meg egy megnyitott üzenet alatt."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "Névjegyek titkosítási kulcsainak megjelenítése",
+        "body": "Megjeleníti és kezeli egy névjegy titkosítási kulcsait."
+      },
+      "ui_email_details": {
+        "title": "Panelek az üzenet részleteiben",
+        "body": "Saját panelt jelenít meg egy megnyitott üzenet mellett vagy alatt."
+      },
+      "ui_download_file": {
+        "title": "Fájlok mentése az eszközödre",
+        "body": "Letöltésre kínálja az általa létrehozott fájlokat."
+      },
+      "ui_message_list_tabs": {
+        "title": "Lapok a Beérkező levelekben",
+        "body": "Lapokra bontja a Beérkező leveleket, például Frissítések vagy Promóciók."
+      },
+      "ui_composer_toolbar": {
+        "title": "Tartalom a szerkesztőben",
+        "body": "Saját gombokat, menüpontokat és szakaszokat jelenít meg, miközben üzenetet írsz."
+      },
+      "ui_composer_sidebar": {
+        "title": "Panel a szerkesztőben",
+        "body": "Saját panelt jelenít meg az általad írt üzenet mellett."
+      },
+      "ui_sidebar_widget": {
+        "title": "Tartalom az oldalsávon",
+        "body": "Saját dobozokat és szakaszokat jelenít meg a levelezés oldalsávján."
+      },
+      "ui_settings_section": {
+        "title": "Beállítási oldal hozzáadása",
+        "body": "Saját oldalt jelenít meg a Beállításokban."
+      },
+      "ui_context_menu": {
+        "title": "Elemek az üzenet menüjében",
+        "body": "Elemeket ad ahhoz a menühöz, amely egy üzenetre jobb gombbal kattintva nyílik meg."
+      },
+      "ui_navigation_rail": {
+        "title": "Gomb a navigációs sávon",
+        "body": "Saját gombot jelenít meg a navigációs sávon."
+      },
+      "ui_keyboard": {
+        "title": "Billentyűparancsok hozzáadása",
+        "body": "Reagál az általa meghatározott billentyűparancsokra."
+      },
+      "ui_calendar_action": {
+        "title": "Tartalom a naptárnézetben",
+        "body": "Saját gombokat és szakaszokat jelenít meg az eseményeken, valamint rövid címkéket és pontokat a naptár napjain."
+      },
+      "ui_admin_page": {
+        "title": "Adminisztrációs oldal hozzáadása",
+        "body": "Saját oldalt jelenít meg az adminisztrációs beállításokban."
+      },
+      "app_lifecycle": {
+        "title": "Tudomást szerez az alkalmazás indulásáról és leállásáról",
+        "body": "Értesül, amikor az alkalmazás elindul, offline módba vált, vagy kijelentkezel."
+      },
+      "compose_open": {
+        "title": "A szerkesztő megnyitása",
+        "body": "Új üzenetet nyit meg kitöltött címzettekkel, szöveggel vagy mellékletekkel. Az elküldésről továbbra is te döntesz."
+      },
+      "compose_read": {
+        "title": "Az éppen írt üzeneted olvasása",
+        "body": "Az üzenet szövegének olvasása írás közben, amikor a bővítményt a szerkesztőben használod. Az aláírást és az idézett üzenetet nem."
+      },
+      "compose_write": {
+        "title": "Az éppen írt üzeneted módosítása",
+        "body": "Szöveg cseréje vagy hozzáadása az üzenetben írás közben, amikor a bővítményt a szerkesztőben használod. Minden módosítás visszavonható, és továbbra is te döntöd el, elküldöd-e."
+      },
+      "ui_notifications": {
+        "title": "Értesítések megjelenítése",
+        "body": "Értesítéseket jelenít meg az eszközödön, vagy az alkalmazásban, ha nem engedélyezted őket. Mindegyiken szerepel a bővítmény neve."
+      },
+      "ui_message_list": {
+        "title": "Tartalom az üzenetlistában",
+        "body": "Saját tartalmat jelenít meg az üzenetlista felett, valamint gombokat az üzeneteken és a kijelölt üzenetek eszköztárán."
+      },
+      "ui_contacts": {
+        "title": "Tartalom a névjegyek nézetében",
+        "body": "Saját szakaszokat jelenít meg egy névjegy részleteiben és gombokat a névjegylistában."
+      },
+      "ui_tasks": {
+        "title": "Tartalom a feladatok nézetében",
+        "body": "Saját szakaszokat jelenít meg egy feladat részleteiben és gombokat a feladatlistában."
+      },
+      "ui_files": {
+        "title": "Tartalom a fájlok nézetében",
+        "body": "Saját szakaszokat jelenít meg a fájlelőnézetben és menüpontokat egy fájl menüjében."
+      },
+      "ui_commands": {
+        "title": "Saját parancsok",
+        "body": "Saját elemeket ad a parancspalettához (Ctrl+K)."
+      },
+      "ui_app_page": {
+        "title": "Saját oldalak",
+        "body": "Saját oldalakat ad az alkalmazáshoz, mindegyiket egy gombbal a navigációs sávon."
+      },
+      "http_proxy": {
+        "title": "Az általad csatlakoztatott fiókok használata",
+        "body": "Kéréseket küld a Bulwark szerverén keresztül egy olyan fiókkal vagy kulccsal, amelyet te vagy a rendszergazdád állított be. A bővítmény soha nem látja a jelszót, de bármit megtehet, amit az a fiók a saját szerverén megtehet."
+      }
+    },
+    "dialog": {
+      "from_plugin": "A(z) {name} bővítménytől",
+      "ok": "OK",
+      "submit": "Küldés",
+      "confirm": "Megerősítés",
+      "cancel": "Mégse",
+      "close": "Bezárás",
+      "turn_off": "{name} kikapcsolása",
+      "plugin_menu": "{name} beállításai",
+      "password_note": "Ez az űrlap a(z) {name} bővítménytől származik, nem a webmailtől. Csak akkor adjon meg jelszót, ha megbízik ebben a bővítményben.",
+      "toast_auto_disabled": "{name} ki lett kapcsolva, mert többször is hibát okozott."
+    },
+    "connect": {
+      "title": "{label} csatlakoztatása",
+      "intro_password": "A(z) {name} bővítmény használni szeretné a(z) {label} fiókodat. A Bulwark a saját szerverén tárolja a jelszót, és csak ide küldi el: {host}. A bővítmény soha nem látja.",
+      "intro_password_any": "A(z) {name} bővítmény használni szeretné a(z) {label} fiókodat. A Bulwark a saját szerverén tárolja a jelszót, és csak az itt megadott szervernek küldi el. A bővítmény soha nem látja.",
+      "intro_signin": "A(z) {name} bővítmény be szeretne jelentkezni a(z) {label} fiókodba. Add meg itt a szervert, majd jelentkezz be a szerver saját oldalán. A Bulwark a saját szerverén tárolja a kapott hozzáférést; a bővítmény soha nem látja.",
+      "server": "Szervercím",
+      "server_hint": "cloud.example.com",
+      "username": "Felhasználónév",
+      "secret": "Jelszó vagy kulcs",
+      "connect": "Csatlakoztatás",
+      "continue": "Tovább",
+      "cancel": "Mégse",
+      "saving": "Mentés…",
+      "error_server": "Add meg a szerver címét, például https://cloud.example.com",
+      "error_save": "Nem sikerült menteni: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "Válasszon egy találatot az előnézethez",
     "open_full": "Megnyitás",
     "view_label": "Nézet"
+  },
+  "top_bar": {
+    "more": "További lehetőségek"
+  },
+  "plugin_pages": {
+    "loading": "Oldal betöltése",
+    "not_available_title": "Ez az oldal nem érhető el",
+    "not_available_description": "A bővítmény, amely hozzáadta, ki van kapcsolva, vagy már nincs telepítve.",
+    "back_to_mail": "Vissza a levelekhez",
+    "settings_group": "Bővítmények"
+  },
+  "command_palette": {
+    "title": "Parancspaletta",
+    "open": "Parancspaletta megnyitása",
+    "placeholder": "Írjon be egy parancsot",
+    "no_results": "Nincs egyező parancs",
+    "go_to": "Ugrás ide: {name}",
+    "compose": "Új levél",
+    "search": "Keresés a levelekben",
+    "theme_dark": "Váltás sötét témára",
+    "theme_light": "Váltás világos témára",
+    "shortcuts": "Billentyűparancsok megjelenítése",
+    "group_navigation": "Ugrás ide",
+    "group_actions": "Műveletek",
+    "group_plugins": "Bővítmények"
+  },
+  "notification_center": {
+    "title": "Értesítések",
+    "mark_all_read": "Összes megjelölése olvasottként",
+    "clear": "Törlés",
+    "empty": "Nincsenek értesítések",
+    "close": "Bezárás",
+    "unread": "Olvasatlan",
+    "unread_count": "{count} olvasatlan",
+    "level_error": "Hiba",
+    "level_warning": "Figyelmeztetés"
   }
 }
diff --git a/locales/it/common.json b/locales/it/common.json
index 87d86221c..d114bf833 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -620,7 +620,9 @@
       "copied": "Codice copiato",
       "copy_failed": "Impossibile copiare il codice"
     },
-    "mv_position": "{index} di {total}"
+    "mv_position": "{index} di {total}",
+    "plugin_panel_show": "Mostra il pannello del plugin",
+    "plugin_panel_hide": "Nascondi il pannello del plugin"
   },
   "email_composer": {
     "minimize": "Riduci a icona",
@@ -813,7 +815,8 @@
       "remove_background_color": "Rimuovi colore di sfondo"
     },
     "send_filing_warning": "Inviato - ma la pulizia successiva non è riuscita, potrebbe restare una bozza obsoleta.",
-    "pop_out": "Apri la risposta in una finestra"
+    "pop_out": "Apri la risposta in una finestra",
+    "send_guard_failed": "Non inviato - un plugin che controlla i messaggi prima dell'invio non è riuscito o non ha risposto."
   },
   "confirm_dialog": {
     "confirm": "Conferma",
@@ -3970,6 +3973,354 @@
       "failed_detail": "Autorizzazione non riuscita: {error}",
       "missing_params": "Codice di autorizzazione o stato mancante.",
       "delivery_failed": "Impossibile consegnare il risultato dellautorizzazione alla scheda dellapp. Chiudi questa finestra e riprova."
+    },
+    "settings": {
+      "title": "Plugin",
+      "description": "Plugin aggiunti dal tuo amministratore. Attivali o disattivali per il tuo account.",
+      "description_uploads": "I plugin aggiungono funzioni alla webmail. Attivali o disattivali per il tuo account, oppure installa i tuoi.",
+      "description_demo": "I plugin non sono disponibili nella demo.",
+      "install_button": "Installa plugin",
+      "install_hint": "Scegli il file ZIP di un plugin.",
+      "install_hint_approval": "Scegli il file ZIP di un plugin. Un amministratore deve approvarlo prima che tu possa attivarlo.",
+      "install_uploads_off": "Il tuo amministratore non consente di installare plugin.",
+      "install_managed_id": "Il tuo amministratore fornisce già un plugin con questo nome, quindi non può essere sostituito.",
+      "install_invalid": "Questo file non è un plugin installabile: {details}",
+      "toast_installed": "Plugin installato. Attivalo qui sotto.",
+      "toast_installed_pending": "Plugin installato e inviato al tuo amministratore per l'approvazione.",
+      "toast_enabled": "{name} è attivo",
+      "toast_disabled": "{name} è disattivato",
+      "toast_removed": "{name} è stato rimosso",
+      "toast_forced": "Il tuo amministratore mantiene attivo {name}",
+      "toast_approval_requested": "{name} è in attesa dell'approvazione del tuo amministratore",
+      "empty_title": "Ancora nessun plugin",
+      "empty_admin": "Il tuo amministratore non ha aggiunto alcun plugin.",
+      "empty_uploads": "Installa un plugin da un file ZIP per iniziare.",
+      "empty_demo": "I plugin richiedono un account reale, quindi la demo non ne ha.",
+      "syncing": "Verifica dei plugin con il server…",
+      "status_installed": "Disattivato",
+      "status_enabled": "Avvio in corso",
+      "status_running": "Attivo",
+      "status_disabled": "Disattivato",
+      "status_error": "Problema",
+      "badge_forced": "Obbligatorio",
+      "badge_managed": "Dal tuo amministratore",
+      "badge_yours": "Installato da te",
+      "badge_awaiting": "In attesa di approvazione",
+      "toggle_label": "Attiva o disattiva {name}",
+      "forced_note": "Il tuo amministratore richiede questo plugin, quindi non può essere disattivato.",
+      "permissions": "Cosa può fare",
+      "permissions_managed": "Cosa può fare (approvato dal tuo amministratore)",
+      "settings": "Impostazioni",
+      "remove": "Rimuovi",
+      "remove_title": "Rimuovere {name}?",
+      "remove_message": "Il plugin e tutto ciò che ha salvato in questo browser verranno eliminati. Potrai installarlo di nuovo in seguito.",
+      "remove_confirm": "Rimuovi",
+      "error_user_plugins_off": "Il tuo amministratore ha disattivato i plugin installati dagli utenti, quindi questo plugin non viene eseguito.",
+      "error_approval_unavailable": "Questo plugin è stato installato prima che fosse richiesta l'approvazione. Rimuovilo e installalo di nuovo per inviarlo in approvazione.",
+      "error_approval_denied": "Il tuo amministratore non ha approvato questo plugin.",
+      "error_approval_pending": "In attesa che il tuo amministratore approvi questo plugin.",
+      "error_auto_disabled": "Disattivato perché continuava a non funzionare. Riattivalo per riprovare.",
+      "accounts_heading": "Account collegati",
+      "account_on": "{label} su {host}",
+      "account_waiting": "{label} su {host} (accesso non completato)",
+      "disconnect": "Disconnetti",
+      "disconnect_failed": "Impossibile disconnettere {label}"
+    },
+    "consent": {
+      "title": "Consentire a {name} di fare questo?",
+      "intro": "Il plugin chiede le autorizzazioni qui sotto. Le ottiene solo se le concedi.",
+      "high_risk_note": "Le voci contrassegnate danno al plugin accesso al contenuto della tua posta o gli permettono di inviare dati altrove. Consentile solo ai plugin di cui ti fidi.",
+      "revoke_hint": "Puoi disattivare o rimuovere il plugin in Impostazioni in qualsiasi momento.",
+      "deny": "Non consentire",
+      "allow": "Consenti"
+    },
+    "permissions": {
+      "none": "Non richiede autorizzazioni particolari.",
+      "high_risk": "Con cautela",
+      "email_read": {
+        "title": "Leggere la tua posta",
+        "body": "Vedere mittenti, destinatari, oggetti e il testo completo di qualsiasi messaggio del tuo account, e le tue cartelle."
+      },
+      "email_write": {
+        "title": "Modificare e organizzare la tua posta",
+        "body": "Aggiungere o rimuovere etichette, contrassegni e altre parole chiave dai tuoi messaggi, spostarli tra le tue cartelle e nell'archivio, e salvare bozze."
+      },
+      "email_send": {
+        "title": "Modificare la posta prima dell'invio",
+        "body": "Leggere e modificare destinatari, oggetto, testo e allegati dei messaggi che scrivi, e impedire l'invio di un messaggio."
+      },
+      "crypto_full": {
+        "title": "Accesso completo a questa app",
+        "body": "Funziona con gli stessi diritti della webmail stessa. Può leggere tutta la tua posta e le chiavi salvate e agire per conto tuo. Consentilo solo ai plugin di cui ti fidi completamente."
+      },
+      "email_raw_send": {
+        "title": "Inviare messaggi creati da sé",
+        "body": "Inviare messaggi completi, ad esempio firmati o cifrati, dal tuo account."
+      },
+      "email_blob_read": {
+        "title": "Leggere il contenuto grezzo dei messaggi",
+        "body": "Leggere i dati originali dei tuoi messaggi e allegati, e di ogni file che alleghi prima dell'invio."
+      },
+      "email_blob_write": {
+        "title": "Sostituire gli allegati prima dell'invio",
+        "body": "Caricare file sul tuo server di posta e sostituire un file allegato con un altro prima che il messaggio venga inviato."
+      },
+      "email_render_takeover": {
+        "title": "Modificare come vengono mostrati i messaggi",
+        "body": "Sostituire il testo dei messaggi che apri e dell'elenco dei messaggi, ad esempio per mostrare contenuti decifrati."
+      },
+      "calendar_read": {
+        "title": "Leggere il tuo calendario",
+        "body": "Vedere i tuoi calendari e i relativi eventi."
+      },
+      "calendar_write": {
+        "title": "Modificare il tuo calendario",
+        "body": "Creare, modificare ed eliminare eventi."
+      },
+      "contacts_read": {
+        "title": "Leggere i tuoi contatti",
+        "body": "Cercare e leggere nelle tue rubriche."
+      },
+      "contacts_write": {
+        "title": "Modificare i tuoi contatti",
+        "body": "Creare, modificare ed eliminare contatti e rubriche."
+      },
+      "files_read": {
+        "title": "Leggere i tuoi file",
+        "body": "Sfogliare e aprire i file salvati nel tuo account."
+      },
+      "files_write": {
+        "title": "Modificare i tuoi file",
+        "body": "Caricare, rinominare, spostare ed eliminare file nel tuo account."
+      },
+      "identity_read": {
+        "title": "Vedere i tuoi indirizzi mittente",
+        "body": "Vedere gli indirizzi da cui invii e le relative firme."
+      },
+      "identity_write": {
+        "title": "Modificare i tuoi indirizzi mittente",
+        "body": "Creare, modificare ed eliminare indirizzi mittente e firme."
+      },
+      "filters_read": {
+        "title": "Leggere i tuoi filtri di posta",
+        "body": "Vedere le regole che ordinano la posta in arrivo."
+      },
+      "filters_write": {
+        "title": "Modificare i tuoi filtri di posta",
+        "body": "Aggiungere regole ai tuoi filtri sul server. Queste regole possono spostare, inoltrare o eliminare la posta in arrivo."
+      },
+      "tasks_read": {
+        "title": "Leggere le tue attività",
+        "body": "Vedere i tuoi elenchi di attività e le attività."
+      },
+      "tasks_write": {
+        "title": "Modificare le tue attività",
+        "body": "Creare, modificare, completare ed eliminare attività."
+      },
+      "templates_read": {
+        "title": "Leggere i tuoi modelli",
+        "body": "Vedere i tuoi modelli di messaggio salvati."
+      },
+      "templates_write": {
+        "title": "Modificare i tuoi modelli",
+        "body": "Creare, modificare ed eliminare modelli di messaggio."
+      },
+      "smime_read": {
+        "title": "Vedere il tuo stato S/MIME",
+        "body": "Vedere se hai chiavi e certificati S/MIME, senza accesso alle chiavi."
+      },
+      "vacation_read": {
+        "title": "Vedere la tua risposta automatica",
+        "body": "Vedere se la risposta automatica è attiva e cosa dice."
+      },
+      "vacation_write": {
+        "title": "Modificare la tua risposta automatica",
+        "body": "Attivare o disattivare la risposta automatica e modificarne testo e date."
+      },
+      "settings_read": {
+        "title": "Leggere le tue impostazioni",
+        "body": "Vedere le tue preferenze e le definizioni delle etichette."
+      },
+      "settings_write": {
+        "title": "Modificare le tue impostazioni",
+        "body": "Aggiungere e riordinare etichette e modificare le tue preferenze."
+      },
+      "security_read": {
+        "title": "Vedere la sicurezza del tuo account",
+        "body": "Vedere se l'accesso a due fattori e la cifratura sono attivi, senza accesso ai segreti."
+      },
+      "auth_observe": {
+        "title": "Sapere quando accedi",
+        "body": "Ricevere un avviso quando accedi, cambi account o la tua sessione viene rinnovata."
+      },
+      "auth_emit": {
+        "title": "Disconnetterti",
+        "body": "Disconnetterti dalla webmail."
+      },
+      "account_read": {
+        "title": "Vedere i tuoi account",
+        "body": "Vedere gli account che hai aggiunto, con i relativi indirizzi e server."
+      },
+      "http_post": {
+        "title": "Usare il server della webmail per te",
+        "body": "Chiamare questi endpoint del server con il tuo accesso:"
+      },
+      "http_fetch": {
+        "title": "Connettersi ad altri siti web",
+        "body": "Inviare richieste a questi siti. Tutto ciò che il plugin può leggere può essere inviato lì:"
+      },
+      "admin_config": {
+        "title": "Leggere le sue impostazioni dal tuo amministratore",
+        "body": "Leggere le impostazioni che il tuo amministratore ha salvato per questo plugin."
+      },
+      "ui_observe": {
+        "title": "Seguire dove ti trovi nell'app",
+        "body": "Sapere quale pagina è aperta e reagire ai link su cui fai clic."
+      },
+      "ui_toolbar": {
+        "title": "Aggiungere pulsanti alle barre degli strumenti",
+        "body": "Mostrare i propri pulsanti nella barra degli strumenti dei messaggi, su un messaggio aperto e nella barra superiore."
+      },
+      "ui_app_top_banner": {
+        "title": "Mostrare un banner in alto",
+        "body": "Mostrare un avviso lungo tutta la parte superiore dell'app."
+      },
+      "ui_email_banner": {
+        "title": "Mostrare avvisi sui messaggi",
+        "body": "Mostrare i propri avvisi e riepiloghi sopra, dentro e tra le parti di un messaggio o di una conversazione aperti."
+      },
+      "ui_email_footer": {
+        "title": "Aggiungere contenuti sotto i messaggi",
+        "body": "Mostrare i propri contenuti sotto un messaggio aperto."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "Mostrare le chiavi di cifratura dei contatti",
+        "body": "Mostrare e gestire le chiavi di cifratura di un contatto."
+      },
+      "ui_email_details": {
+        "title": "Aggiungere pannelli ai dettagli del messaggio",
+        "body": "Mostrare un proprio pannello accanto o sotto un messaggio aperto."
+      },
+      "ui_download_file": {
+        "title": "Salvare file sul tuo dispositivo",
+        "body": "Offrire in download i file che ha creato."
+      },
+      "ui_message_list_tabs": {
+        "title": "Aggiungere schede alla tua posta in arrivo",
+        "body": "Suddividere la posta in arrivo in schede come Aggiornamenti o Promozioni."
+      },
+      "ui_composer_toolbar": {
+        "title": "Aggiungere elementi all'editor",
+        "body": "Mostrare i propri pulsanti, voci di menu e sezioni mentre scrivi un messaggio."
+      },
+      "ui_composer_sidebar": {
+        "title": "Aggiungere un pannello all'editor",
+        "body": "Mostrare un proprio pannello accanto al messaggio che scrivi."
+      },
+      "ui_sidebar_widget": {
+        "title": "Aggiungere elementi alla barra laterale",
+        "body": "Mostrare i propri riquadri e sezioni nella barra laterale della posta."
+      },
+      "ui_settings_section": {
+        "title": "Aggiungere una pagina di impostazioni",
+        "body": "Mostrare una propria pagina in Impostazioni."
+      },
+      "ui_context_menu": {
+        "title": "Aggiungere voci al menu del messaggio",
+        "body": "Aggiungere voci al menu che si apre quando fai clic destro su un messaggio."
+      },
+      "ui_navigation_rail": {
+        "title": "Aggiungere alla barra di navigazione",
+        "body": "Mostrare un proprio pulsante nella barra di navigazione."
+      },
+      "ui_keyboard": {
+        "title": "Aggiungere scorciatoie da tastiera",
+        "body": "Reagire alle scorciatoie da tastiera che definisce."
+      },
+      "ui_calendar_action": {
+        "title": "Aggiungere elementi alla vista calendario",
+        "body": "Mostrare i propri pulsanti e sezioni sugli eventi, e brevi etichette e puntini sui giorni del calendario."
+      },
+      "ui_admin_page": {
+        "title": "Aggiungere una pagina di amministrazione",
+        "body": "Mostrare una propria pagina nelle impostazioni di amministrazione."
+      },
+      "app_lifecycle": {
+        "title": "Sapere quando l'app si avvia e si chiude",
+        "body": "Ricevere un avviso quando l'app si avvia, va offline o ti disconnetti."
+      },
+      "compose_open": {
+        "title": "Aprire l'editor per te",
+        "body": "Aprire un nuovo messaggio con destinatari, testo o allegati già compilati. Sei sempre tu a decidere se inviarlo."
+      },
+      "compose_read": {
+        "title": "Leggere il messaggio che stai scrivendo",
+        "body": "Leggere il testo di un messaggio mentre lo scrivi, quando usi il plugin nell'editor. Non la firma né il messaggio citato."
+      },
+      "compose_write": {
+        "title": "Modificare il messaggio che stai scrivendo",
+        "body": "Sostituire o aggiungere testo in un messaggio mentre lo scrivi, quando usi il plugin nell'editor. Puoi annullare ogni modifica e decidi sempre tu se inviarlo."
+      },
+      "ui_notifications": {
+        "title": "Mostrare notifiche",
+        "body": "Mostrare notifiche sul tuo dispositivo, o nell'app se non le hai consentite. Ognuna indica il nome del plugin."
+      },
+      "ui_message_list": {
+        "title": "Aggiungere elementi all'elenco dei messaggi",
+        "body": "Mostrare i propri contenuti sopra l'elenco dei messaggi, e pulsanti sui messaggi e nella barra dei messaggi selezionati."
+      },
+      "ui_contacts": {
+        "title": "Aggiungere elementi alla vista contatti",
+        "body": "Mostrare le proprie sezioni nei dettagli di un contatto e pulsanti nell'elenco dei contatti."
+      },
+      "ui_tasks": {
+        "title": "Aggiungere elementi alla vista attività",
+        "body": "Mostrare le proprie sezioni nei dettagli di un'attività e pulsanti nell'elenco delle attività."
+      },
+      "ui_files": {
+        "title": "Aggiungere elementi alla vista file",
+        "body": "Mostrare le proprie sezioni nell'anteprima dei file e voci nel menu di un file."
+      },
+      "ui_commands": {
+        "title": "Aggiungere comandi",
+        "body": "Aggiungere le proprie voci alla palette dei comandi (Ctrl+K)."
+      },
+      "ui_app_page": {
+        "title": "Aggiungere pagine",
+        "body": "Aggiungere le proprie pagine all'app, ognuna con un pulsante nella barra di navigazione."
+      },
+      "http_proxy": {
+        "title": "Usare gli account che colleghi",
+        "body": "Inviare richieste tramite il server di Bulwark con un account o una chiave configurati da te o dal tuo amministratore. Il plugin non vede mai la password, ma può fare tutto ciò che quell'account può fare sul proprio server."
+      }
+    },
+    "dialog": {
+      "from_plugin": "Dal plugin {name}",
+      "ok": "OK",
+      "submit": "Invia",
+      "confirm": "Conferma",
+      "cancel": "Annulla",
+      "close": "Chiudi",
+      "turn_off": "Disattiva {name}",
+      "plugin_menu": "Opzioni di {name}",
+      "password_note": "Questo modulo proviene dal plugin {name}, non dalla webmail. Inserisci una password solo se ti fidi di questo plugin.",
+      "toast_auto_disabled": "{name} è stato disattivato perché continuava a non funzionare."
+    },
+    "connect": {
+      "title": "Connetti {label}",
+      "intro_password": "{name} vuole usare il tuo account {label}. Bulwark conserva la password sul proprio server e la invia solo a {host}. Il plugin non la vede mai.",
+      "intro_password_any": "{name} vuole usare il tuo account {label}. Bulwark conserva la password sul proprio server e la invia solo al server che inserisci qui. Il plugin non la vede mai.",
+      "intro_signin": "{name} vuole accedere al tuo account {label}. Inserisci qui il server, poi accedi sulla sua pagina. Bulwark conserva sul proprio server l'accesso ottenuto; il plugin non lo vede mai.",
+      "server": "Indirizzo del server",
+      "server_hint": "cloud.example.com",
+      "username": "Nome utente",
+      "secret": "Password o chiave",
+      "connect": "Connetti",
+      "continue": "Continua",
+      "cancel": "Annulla",
+      "saving": "Salvataggio…",
+      "error_server": "Inserisci l'indirizzo del server, ad esempio https://cloud.example.com",
+      "error_save": "Impossibile salvare: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "Seleziona un risultato per l'anteprima",
     "open_full": "Apri",
     "view_label": "Vista"
+  },
+  "top_bar": {
+    "more": "Altre opzioni"
+  },
+  "plugin_pages": {
+    "loading": "Caricamento della pagina",
+    "not_available_title": "Questa pagina non è disponibile",
+    "not_available_description": "Il plugin che l'ha aggiunta è disattivato o non è più installato.",
+    "back_to_mail": "Torna alla posta",
+    "settings_group": "Plugin"
+  },
+  "command_palette": {
+    "title": "Tavolozza comandi",
+    "open": "Apri la tavolozza comandi",
+    "placeholder": "Digita un comando",
+    "no_results": "Nessun comando corrispondente",
+    "go_to": "Vai a {name}",
+    "compose": "Nuovo messaggio",
+    "search": "Cerca nella posta",
+    "theme_dark": "Passa al tema scuro",
+    "theme_light": "Passa al tema chiaro",
+    "shortcuts": "Mostra le scorciatoie da tastiera",
+    "group_navigation": "Vai a",
+    "group_actions": "Azioni",
+    "group_plugins": "Plugin"
+  },
+  "notification_center": {
+    "title": "Notifiche",
+    "mark_all_read": "Segna tutte come lette",
+    "clear": "Cancella",
+    "empty": "Nessuna notifica",
+    "close": "Chiudi",
+    "unread": "Non letta",
+    "unread_count": "{count} non lette",
+    "level_error": "Errore",
+    "level_warning": "Avviso"
   }
 }
diff --git a/locales/ja/common.json b/locales/ja/common.json
index 93fefc413..5a844c867 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -620,7 +620,9 @@
       "copied": "コードをコピーしました",
       "copy_failed": "コードをコピーできませんでした"
     },
-    "mv_position": "{index} / {total}"
+    "mv_position": "{index} / {total}",
+    "plugin_panel_show": "プラグインパネルを表示",
+    "plugin_panel_hide": "プラグインパネルを隠す"
   },
   "email_composer": {
     "minimize": "最小化",
@@ -813,7 +815,8 @@
       "remove_background_color": "背景色を削除"
     },
     "send_filing_warning": "送信されましたが、送信後の整理に失敗しました。古い下書きが残る場合があります。",
-    "pop_out": "返信を別ウィンドウで開く"
+    "pop_out": "返信を別ウィンドウで開く",
+    "send_guard_failed": "送信されませんでした - 送信前にメッセージを確認するプラグインが失敗したか、応答しませんでした。"
   },
   "confirm_dialog": {
     "confirm": "確認",
@@ -3970,6 +3973,354 @@
       "failed_detail": "認証に失敗しました: {error}",
       "missing_params": "認証コードまたはステートがありません。",
       "delivery_failed": "認証結果をアプリのタブに渡せませんでした。このウィンドウを閉じて、もう一度お試しください。"
+    },
+    "settings": {
+      "title": "プラグイン",
+      "description": "管理者が追加したプラグインです。アカウントごとにオンとオフを切り替えられます。",
+      "description_uploads": "プラグインでウェブメールに機能を追加できます。アカウントごとにオンとオフを切り替えたり、自分でインストールしたりできます。",
+      "description_demo": "デモではプラグインを利用できません。",
+      "install_button": "プラグインをインストール",
+      "install_hint": "プラグインの ZIP ファイルを選択してください。",
+      "install_hint_approval": "プラグインの ZIP ファイルを選択してください。オンにする前に管理者の承認が必要です。",
+      "install_uploads_off": "管理者がプラグインのインストールを許可していません。",
+      "install_managed_id": "同じ名前のプラグインが管理者から提供されているため、置き換えられません。",
+      "install_invalid": "このファイルはインストールできるプラグインではありません: {details}",
+      "toast_installed": "プラグインをインストールしました。下でオンにしてください。",
+      "toast_installed_pending": "プラグインをインストールし、管理者に承認を依頼しました。",
+      "toast_enabled": "{name} をオンにしました",
+      "toast_disabled": "{name} をオフにしました",
+      "toast_removed": "{name} を削除しました",
+      "toast_forced": "{name} は管理者によって常にオンになっています",
+      "toast_approval_requested": "{name} は管理者の承認を待っています",
+      "empty_title": "プラグインはまだありません",
+      "empty_admin": "管理者はまだプラグインを追加していません。",
+      "empty_uploads": "ZIP ファイルからプラグインをインストールして始めましょう。",
+      "empty_demo": "プラグインには実際のアカウントが必要なため、デモにはありません。",
+      "syncing": "サーバーとプラグインを確認しています…",
+      "status_installed": "オフ",
+      "status_enabled": "起動中",
+      "status_running": "オン",
+      "status_disabled": "オフ",
+      "status_error": "問題あり",
+      "badge_forced": "必須",
+      "badge_managed": "管理者から提供",
+      "badge_yours": "自分でインストール",
+      "badge_awaiting": "承認待ち",
+      "toggle_label": "{name} のオンとオフを切り替え",
+      "forced_note": "このプラグインは管理者によって必須とされているため、オフにできません。",
+      "permissions": "できること",
+      "permissions_managed": "できること（管理者が承認済み）",
+      "settings": "設定",
+      "remove": "削除",
+      "remove_title": "{name} を削除しますか？",
+      "remove_message": "プラグインと、このブラウザーに保存したデータがすべて削除されます。後でもう一度インストールできます。",
+      "remove_confirm": "削除",
+      "error_user_plugins_off": "管理者がユーザーによるプラグインを無効にしたため、このプラグインは動作しません。",
+      "error_approval_unavailable": "このプラグインは承認が必要になる前にインストールされました。承認を依頼するには、削除してもう一度インストールしてください。",
+      "error_approval_denied": "管理者はこのプラグインを承認しませんでした。",
+      "error_approval_pending": "管理者がこのプラグインを承認するのを待っています。",
+      "error_auto_disabled": "繰り返し失敗したためオフになりました。再試行するにはもう一度オンにしてください。",
+      "accounts_heading": "接続済みのアカウント",
+      "account_on": "{host} の {label}",
+      "account_waiting": "{host} の {label} (サインイン未完了)",
+      "disconnect": "接続を解除",
+      "disconnect_failed": "{label} の接続を解除できませんでした"
+    },
+    "consent": {
+      "title": "{name} にこの操作を許可しますか？",
+      "intro": "このプラグインは次の権限を求めています。許可した場合にのみ付与されます。",
+      "high_risk_note": "印の付いた項目は、プラグインにメールの内容へのアクセスや外部へのデータ送信を許可します。信頼できるプラグインにのみ許可してください。",
+      "revoke_hint": "プラグインはいつでも設定でオフにしたり削除したりできます。",
+      "deny": "許可しない",
+      "allow": "許可"
+    },
+    "permissions": {
+      "none": "特別な権限は必要ありません。",
+      "high_risk": "注意が必要",
+      "email_read": {
+        "title": "メールを読む",
+        "body": "アカウント内のすべてのメッセージの差出人、宛先、件名、本文全体と、フォルダを見ることができます。"
+      },
+      "email_write": {
+        "title": "メールの変更と整理",
+        "body": "メッセージにタグ、フラグ、その他のキーワードを追加したり削除したり、フォルダ間やアーカイブへ移動したり、下書きを保存したりできます。"
+      },
+      "email_send": {
+        "title": "送信前のメールを変更",
+        "body": "作成中のメッセージの宛先、件名、本文、添付ファイルを読んで変更したり、メッセージの送信を止めたりできます。"
+      },
+      "crypto_full": {
+        "title": "このアプリへのフルアクセス",
+        "body": "ウェブメール本体と同じ権限で動作します。すべてのメールと保存された鍵を読み、あなたに代わって操作できます。完全に信頼できるプラグインにのみ許可してください。"
+      },
+      "email_raw_send": {
+        "title": "自分で作成したメッセージを送信",
+        "body": "署名済みや暗号化済みのメッセージなど、完成したメッセージをあなたのアカウントから送信できます。"
+      },
+      "email_blob_read": {
+        "title": "メッセージの元データを読む",
+        "body": "メッセージと添付ファイルの元データ、および送信前に添付するすべてのファイルを読むことができます。"
+      },
+      "email_blob_write": {
+        "title": "送信前に添付ファイルを置き換え",
+        "body": "メールサーバーにファイルをアップロードし、送信前に添付したファイルを別のファイルに置き換えることができます。"
+      },
+      "email_render_takeover": {
+        "title": "メッセージの表示方法を変更",
+        "body": "開いたメッセージとメッセージ一覧の本文を置き換えることができます。たとえば復号した内容を表示するためです。"
+      },
+      "calendar_read": {
+        "title": "カレンダーを読む",
+        "body": "カレンダーとその予定を見ることができます。"
+      },
+      "calendar_write": {
+        "title": "カレンダーを変更",
+        "body": "予定を作成、変更、削除できます。"
+      },
+      "contacts_read": {
+        "title": "連絡先を読む",
+        "body": "アドレス帳を検索して読むことができます。"
+      },
+      "contacts_write": {
+        "title": "連絡先を変更",
+        "body": "連絡先とアドレス帳を作成、変更、削除できます。"
+      },
+      "files_read": {
+        "title": "ファイルを読む",
+        "body": "アカウントに保存されたファイルを閲覧して開くことができます。"
+      },
+      "files_write": {
+        "title": "ファイルを変更",
+        "body": "アカウント内のファイルをアップロード、名前変更、移動、削除できます。"
+      },
+      "identity_read": {
+        "title": "送信者情報を見る",
+        "body": "送信に使うアドレスとその署名を見ることができます。"
+      },
+      "identity_write": {
+        "title": "送信者情報を変更",
+        "body": "送信者情報と署名を作成、変更、削除できます。"
+      },
+      "filters_read": {
+        "title": "メールフィルターを読む",
+        "body": "受信メールを振り分けるルールを見ることができます。"
+      },
+      "filters_write": {
+        "title": "メールフィルターを変更",
+        "body": "サーバー側のフィルターにルールを追加できます。このルールは受信メールを移動、転送、削除できます。"
+      },
+      "tasks_read": {
+        "title": "タスクを読む",
+        "body": "タスクリストとタスクを見ることができます。"
+      },
+      "tasks_write": {
+        "title": "タスクを変更",
+        "body": "タスクを作成、変更、完了、削除できます。"
+      },
+      "templates_read": {
+        "title": "テンプレートを読む",
+        "body": "保存したメッセージのテンプレートを見ることができます。"
+      },
+      "templates_write": {
+        "title": "テンプレートを変更",
+        "body": "メッセージのテンプレートを作成、変更、削除できます。"
+      },
+      "smime_read": {
+        "title": "S/MIME の状態を見る",
+        "body": "S/MIME の鍵と証明書があるかどうかを見ることができます。鍵にはアクセスできません。"
+      },
+      "vacation_read": {
+        "title": "不在時の自動返信を見る",
+        "body": "自動返信がオンかどうかと、その内容を見ることができます。"
+      },
+      "vacation_write": {
+        "title": "不在時の自動返信を変更",
+        "body": "自動返信のオンとオフを切り替え、本文と期間を変更できます。"
+      },
+      "settings_read": {
+        "title": "設定を読む",
+        "body": "環境設定とタグの定義を見ることができます。"
+      },
+      "settings_write": {
+        "title": "設定を変更",
+        "body": "タグを追加して並べ替えたり、環境設定を変更したりできます。"
+      },
+      "security_read": {
+        "title": "アカウントのセキュリティを見る",
+        "body": "二要素認証と暗号化がオンかどうかを見ることができます。秘密情報にはアクセスできません。"
+      },
+      "auth_observe": {
+        "title": "サインインを知る",
+        "body": "サインインしたとき、アカウントを切り替えたとき、セッションが更新されたときに通知を受けます。"
+      },
+      "auth_emit": {
+        "title": "サインアウトさせる",
+        "body": "ウェブメールからサインアウトさせることができます。"
+      },
+      "account_read": {
+        "title": "アカウントを見る",
+        "body": "追加したアカウントと、そのアドレスとサーバーを見ることができます。"
+      },
+      "http_post": {
+        "title": "あなたの代わりにウェブメールサーバーを使う",
+        "body": "あなたのログイン情報で次のサーバーエンドポイントを呼び出せます:"
+      },
+      "http_fetch": {
+        "title": "他のウェブサイトに接続",
+        "body": "次のサイトにリクエストを送信できます。プラグインが読めるものはすべて送信される可能性があります:"
+      },
+      "admin_config": {
+        "title": "管理者が保存した設定を読む",
+        "body": "管理者がこのプラグイン用に保存した設定を読むことができます。"
+      },
+      "ui_observe": {
+        "title": "アプリ内の現在地を把握",
+        "body": "どのページが開いているかを知り、クリックしたリンクに反応できます。"
+      },
+      "ui_toolbar": {
+        "title": "ツールバーにボタンを追加",
+        "body": "メッセージのツールバー、開いたメッセージ、上部のバーに独自のボタンを表示します。"
+      },
+      "ui_app_top_banner": {
+        "title": "上部にバナーを表示",
+        "body": "アプリの上部にお知らせを表示します。"
+      },
+      "ui_email_banner": {
+        "title": "メッセージにお知らせを表示",
+        "body": "開いたメッセージや会話の各部分の上、中、間に独自のお知らせや要約を表示します。"
+      },
+      "ui_email_footer": {
+        "title": "メッセージの下に内容を追加",
+        "body": "開いたメッセージの下に独自の内容を表示します。"
+      },
+      "ui_contact_cryptokeys": {
+        "title": "連絡先の暗号鍵を表示",
+        "body": "連絡先の暗号鍵を表示して管理します。"
+      },
+      "ui_email_details": {
+        "title": "メッセージの詳細にパネルを追加",
+        "body": "開いたメッセージの横または下に独自のパネルを表示します。"
+      },
+      "ui_download_file": {
+        "title": "デバイスにファイルを保存",
+        "body": "作成したファイルをダウンロードできるようにします。"
+      },
+      "ui_message_list_tabs": {
+        "title": "受信トレイにタブを追加",
+        "body": "受信トレイを「更新」や「プロモーション」などのタブに分けます。"
+      },
+      "ui_composer_toolbar": {
+        "title": "作成画面に追加",
+        "body": "メッセージの作成中に独自のボタン、メニュー項目、セクションを表示します。"
+      },
+      "ui_composer_sidebar": {
+        "title": "作成画面にパネルを追加",
+        "body": "作成中のメッセージの横に独自のパネルを表示します。"
+      },
+      "ui_sidebar_widget": {
+        "title": "サイドバーに追加",
+        "body": "メールのサイドバーに独自のボックスやセクションを表示します。"
+      },
+      "ui_settings_section": {
+        "title": "設定ページを追加",
+        "body": "設定に独自のページを表示します。"
+      },
+      "ui_context_menu": {
+        "title": "メッセージのメニューに追加",
+        "body": "メッセージを右クリックしたときに開くメニューに項目を追加します。"
+      },
+      "ui_navigation_rail": {
+        "title": "ナビゲーションバーに追加",
+        "body": "ナビゲーションバーに独自のボタンを表示します。"
+      },
+      "ui_keyboard": {
+        "title": "キーボードショートカットを追加",
+        "body": "独自に定義したキーボードショートカットに反応します。"
+      },
+      "ui_calendar_action": {
+        "title": "カレンダー画面に追加",
+        "body": "予定に独自のボタンやセクションを表示し、カレンダーの日付に短いラベルや点を表示します。"
+      },
+      "ui_admin_page": {
+        "title": "管理ページを追加",
+        "body": "管理設定に独自のページを表示します。"
+      },
+      "app_lifecycle": {
+        "title": "アプリの起動と終了を知る",
+        "body": "アプリが起動したとき、オフラインになったとき、サインアウトしたときに通知を受けます。"
+      },
+      "compose_open": {
+        "title": "作成画面を開く",
+        "body": "宛先、本文、添付ファイルを入力した状態で新しいメッセージを開きます。送信するかどうかはあなたが決めます。"
+      },
+      "compose_read": {
+        "title": "作成中のメッセージを読む",
+        "body": "エディターでプラグインを使ったときに、作成中のメッセージの本文を読みます。署名と引用されたメッセージは含みません。"
+      },
+      "compose_write": {
+        "title": "作成中のメッセージを変更する",
+        "body": "エディターでプラグインを使ったときに、作成中のメッセージのテキストを置き換えたり追加したりします。変更はひとつずつ元に戻せ、送信するかどうかは引き続きあなたが決めます。"
+      },
+      "ui_notifications": {
+        "title": "通知を表示",
+        "body": "デバイスに通知を表示します。通知を許可していない場合はアプリ内に表示します。どの通知にもプラグイン名が入ります。"
+      },
+      "ui_message_list": {
+        "title": "メッセージ一覧に追加",
+        "body": "メッセージ一覧の上に独自の内容を表示し、各メッセージと選択中のメッセージ用のツールバーにボタンを表示します。"
+      },
+      "ui_contacts": {
+        "title": "連絡先画面に追加",
+        "body": "連絡先の詳細に独自のセクションを、連絡先一覧にボタンを表示します。"
+      },
+      "ui_tasks": {
+        "title": "タスク画面に追加",
+        "body": "タスクの詳細に独自のセクションを、タスク一覧にボタンを表示します。"
+      },
+      "ui_files": {
+        "title": "ファイル画面に追加",
+        "body": "ファイルのプレビューに独自のセクションを、ファイルのメニューに項目を表示します。"
+      },
+      "ui_commands": {
+        "title": "コマンドを追加",
+        "body": "コマンドパレット (Ctrl+K) に独自の項目を追加します。"
+      },
+      "ui_app_page": {
+        "title": "ページを追加",
+        "body": "アプリに独自のページを追加し、それぞれのボタンをナビゲーションバーに表示します。"
+      },
+      "http_proxy": {
+        "title": "接続したアカウントを使用",
+        "body": "あなたまたは管理者が設定したアカウントやキーを使って、Bulwark のサーバー経由でリクエストを送信します。プラグインがパスワードを見ることはありませんが、そのアカウントがそのサーバーでできることはすべて実行できます。"
+      }
+    },
+    "dialog": {
+      "from_plugin": "プラグイン {name} から",
+      "ok": "OK",
+      "submit": "送信",
+      "confirm": "確認",
+      "cancel": "キャンセル",
+      "close": "閉じる",
+      "turn_off": "{name} をオフにする",
+      "plugin_menu": "{name} のオプション",
+      "password_note": "このフォームはウェブメールではなく、プラグイン {name} が表示しています。このプラグインを信頼できる場合にのみパスワードを入力してください。",
+      "toast_auto_disabled": "{name} は繰り返し失敗したためオフになりました。"
+    },
+    "connect": {
+      "title": "{label} に接続",
+      "intro_password": "{name} が {label} アカウントを使おうとしています。Bulwark はパスワードを自身のサーバーに保存し、{host} にだけ送信します。プラグインがパスワードを見ることはありません。",
+      "intro_password_any": "{name} が {label} アカウントを使おうとしています。Bulwark はパスワードを自身のサーバーに保存し、ここで入力したサーバーにだけ送信します。プラグインがパスワードを見ることはありません。",
+      "intro_signin": "{name} が {label} アカウントにサインインしようとしています。ここでサーバーを入力し、そのサーバーのページでサインインしてください。Bulwark は取得したアクセス権を自身のサーバーに保存します。プラグインがそれを見ることはありません。",
+      "server": "サーバーのアドレス",
+      "server_hint": "cloud.example.com",
+      "username": "ユーザー名",
+      "secret": "パスワードまたはキー",
+      "connect": "接続",
+      "continue": "続行",
+      "cancel": "キャンセル",
+      "saving": "保存しています…",
+      "error_server": "サーバーのアドレスを入力してください (例: https://cloud.example.com)",
+      "error_save": "保存できませんでした: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "プレビューする結果を選択してください",
     "open_full": "開く",
     "view_label": "表示"
+  },
+  "top_bar": {
+    "more": "その他のオプション"
+  },
+  "plugin_pages": {
+    "loading": "ページを読み込んでいます",
+    "not_available_title": "このページは利用できません",
+    "not_available_description": "このページを追加したプラグインがオフになっているか、インストールされていません。",
+    "back_to_mail": "メールに戻る",
+    "settings_group": "プラグイン"
+  },
+  "command_palette": {
+    "title": "コマンドパレット",
+    "open": "コマンドパレットを開く",
+    "placeholder": "コマンドを入力",
+    "no_results": "一致するコマンドはありません",
+    "go_to": "{name}に移動",
+    "compose": "新規メッセージ",
+    "search": "メールを検索",
+    "theme_dark": "ダークテーマに切り替え",
+    "theme_light": "ライトテーマに切り替え",
+    "shortcuts": "キーボードショートカットを表示",
+    "group_navigation": "移動",
+    "group_actions": "操作",
+    "group_plugins": "プラグイン"
+  },
+  "notification_center": {
+    "title": "通知",
+    "mark_all_read": "すべて既読にする",
+    "clear": "クリア",
+    "empty": "通知はありません",
+    "close": "閉じる",
+    "unread": "未読",
+    "unread_count": "未読 {count} 件",
+    "level_error": "エラー",
+    "level_warning": "警告"
   }
 }
diff --git a/locales/ko/common.json b/locales/ko/common.json
index 32ab2e3f9..eb0f59305 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -620,7 +620,9 @@
       "copied": "코드를 복사했습니다",
       "copy_failed": "코드를 복사할 수 없습니다"
     },
-    "mv_position": "{index} / {total}"
+    "mv_position": "{index} / {total}",
+    "plugin_panel_show": "플러그인 패널 표시",
+    "plugin_panel_hide": "플러그인 패널 숨기기"
   },
   "email_composer": {
     "minimize": "최소화",
@@ -813,7 +815,8 @@
       "remove_background_color": "배경색 제거"
     },
     "send_filing_warning": "보냈지만 전송 후 정리에 실패했습니다. 오래된 임시 보관 메일이 남아 있을 수 있습니다.",
-    "pop_out": "답장을 별도 창에서 열기"
+    "pop_out": "답장을 별도 창에서 열기",
+    "send_guard_failed": "보내지 않았습니다 - 보내기 전에 메시지를 확인하는 플러그인이 실패했거나 응답하지 않았습니다."
   },
   "confirm_dialog": {
     "confirm": "확인",
@@ -3970,6 +3973,354 @@
       "failed_detail": "인증 실패: {error}",
       "missing_params": "인증 코드 또는 상태가 누락되었습니다.",
       "delivery_failed": "인증 결과를 앱 탭에 전달하지 못했습니다. 이 창을 닫고 다시 시도해 주세요."
+    },
+    "settings": {
+      "title": "플러그인",
+      "description": "관리자가 추가한 플러그인이에요. 내 계정에서 켜거나 끌 수 있어요.",
+      "description_uploads": "플러그인으로 웹메일에 기능을 더할 수 있어요. 내 계정에서 켜거나 끄고, 직접 설치할 수도 있어요.",
+      "description_demo": "데모에서는 플러그인을 사용할 수 없어요.",
+      "install_button": "플러그인 설치",
+      "install_hint": "플러그인 ZIP 파일을 선택하세요.",
+      "install_hint_approval": "플러그인 ZIP 파일을 선택하세요. 켜기 전에 관리자의 승인이 필요해요.",
+      "install_uploads_off": "관리자가 플러그인 설치를 허용하지 않아요.",
+      "install_managed_id": "관리자가 같은 이름의 플러그인을 이미 제공하고 있어 바꿀 수 없어요.",
+      "install_invalid": "이 파일은 설치할 수 있는 플러그인이 아니에요: {details}",
+      "toast_installed": "플러그인을 설치했어요. 아래에서 켜세요.",
+      "toast_installed_pending": "플러그인을 설치하고 관리자에게 승인을 요청했어요.",
+      "toast_enabled": "{name} 켜짐",
+      "toast_disabled": "{name} 꺼짐",
+      "toast_removed": "{name}을(를) 삭제했어요",
+      "toast_forced": "관리자가 {name}을(를) 항상 켜 두도록 설정했어요",
+      "toast_approval_requested": "{name}이(가) 관리자의 승인을 기다리고 있어요",
+      "empty_title": "아직 플러그인이 없어요",
+      "empty_admin": "관리자가 추가한 플러그인이 없어요.",
+      "empty_uploads": "ZIP 파일에서 플러그인을 설치해 시작해 보세요.",
+      "empty_demo": "플러그인은 실제 계정이 필요해서 데모에는 없어요.",
+      "syncing": "서버에서 플러그인을 확인하는 중…",
+      "status_installed": "꺼짐",
+      "status_enabled": "시작 중",
+      "status_running": "켜짐",
+      "status_disabled": "꺼짐",
+      "status_error": "문제 있음",
+      "badge_forced": "필수",
+      "badge_managed": "관리자 제공",
+      "badge_yours": "내가 설치함",
+      "badge_awaiting": "승인 대기 중",
+      "toggle_label": "{name} 켜기 또는 끄기",
+      "forced_note": "관리자가 이 플러그인을 필수로 지정해서 끌 수 없어요.",
+      "permissions": "할 수 있는 작업",
+      "permissions_managed": "할 수 있는 작업 (관리자가 승인함)",
+      "settings": "설정",
+      "remove": "삭제",
+      "remove_title": "{name}을(를) 삭제할까요?",
+      "remove_message": "플러그인과 플러그인이 이 브라우저에 저장한 모든 데이터가 삭제돼요. 나중에 다시 설치할 수 있어요.",
+      "remove_confirm": "삭제",
+      "error_user_plugins_off": "관리자가 사용자가 설치한 플러그인을 꺼 두어서 이 플러그인은 실행되지 않아요.",
+      "error_approval_unavailable": "이 플러그인은 승인이 필요해지기 전에 설치되었어요. 승인을 요청하려면 삭제한 뒤 다시 설치하세요.",
+      "error_approval_denied": "관리자가 이 플러그인을 승인하지 않았어요.",
+      "error_approval_pending": "관리자가 이 플러그인을 승인하기를 기다리고 있어요.",
+      "error_auto_disabled": "계속 실패해서 꺼졌습니다. 다시 시도하려면 다시 켜세요.",
+      "accounts_heading": "연결된 계정",
+      "account_on": "{host}의 {label}",
+      "account_waiting": "{host}의 {label} (로그인 미완료)",
+      "disconnect": "연결 해제",
+      "disconnect_failed": "{label} 연결을 해제하지 못했어요"
+    },
+    "consent": {
+      "title": "{name}에 이 권한을 허용할까요?",
+      "intro": "플러그인이 아래 권한을 요청해요. 허용한 경우에만 권한이 주어져요.",
+      "high_risk_note": "표시된 항목은 플러그인이 메일 내용에 접근하거나 데이터를 외부로 보낼 수 있게 해요. 신뢰하는 플러그인에만 허용하세요.",
+      "revoke_hint": "언제든지 설정에서 플러그인을 끄거나 삭제할 수 있어요.",
+      "deny": "허용 안 함",
+      "allow": "허용"
+    },
+    "permissions": {
+      "none": "특별한 권한이 필요하지 않아요.",
+      "high_risk": "주의 필요",
+      "email_read": {
+        "title": "메일 읽기",
+        "body": "계정에 있는 모든 메시지의 보낸 사람, 받는 사람, 제목, 전체 본문과 폴더를 볼 수 있어요."
+      },
+      "email_write": {
+        "title": "메일 변경 및 정리",
+        "body": "메시지에 태그, 플래그 및 기타 키워드를 추가하거나 제거하고, 메시지를 폴더 간에 또는 보관함으로 이동하고, 임시보관함에 메일을 저장할 수 있어요."
+      },
+      "email_send": {
+        "title": "보내기 전에 메일 변경",
+        "body": "작성 중인 메시지의 받는 사람, 제목, 본문, 첨부 파일을 읽고 바꾸거나, 메시지가 전송되지 않게 막을 수 있어요."
+      },
+      "crypto_full": {
+        "title": "이 앱에 대한 전체 접근 권한",
+        "body": "웹메일과 같은 권한으로 실행돼요. 모든 메일과 저장된 키를 읽고 사용자를 대신해 작업할 수 있어요. 완전히 신뢰하는 플러그인에만 허용하세요."
+      },
+      "email_raw_send": {
+        "title": "직접 만든 메시지 보내기",
+        "body": "서명되거나 암호화된 메시지 같은 완성된 메시지를 내 계정에서 보낼 수 있어요."
+      },
+      "email_blob_read": {
+        "title": "메시지 원본 읽기",
+        "body": "메시지와 첨부 파일의 원본 데이터, 그리고 보내기 전에 첨부하는 모든 파일을 읽을 수 있어요."
+      },
+      "email_blob_write": {
+        "title": "보내기 전에 첨부 파일 바꾸기",
+        "body": "메일 서버에 파일을 업로드하고, 메시지를 보내기 전에 첨부한 파일을 다른 파일로 바꿀 수 있어요."
+      },
+      "email_render_takeover": {
+        "title": "메시지 표시 방식 변경",
+        "body": "열어 본 메시지와 메시지 목록의 본문을 바꿀 수 있어요. 예를 들어 복호화된 내용을 보여 줄 때 사용해요."
+      },
+      "calendar_read": {
+        "title": "캘린더 읽기",
+        "body": "캘린더와 일정을 볼 수 있어요."
+      },
+      "calendar_write": {
+        "title": "캘린더 변경",
+        "body": "일정을 만들고, 바꾸고, 삭제할 수 있어요."
+      },
+      "contacts_read": {
+        "title": "연락처 읽기",
+        "body": "주소록을 검색하고 읽을 수 있어요."
+      },
+      "contacts_write": {
+        "title": "연락처 변경",
+        "body": "연락처와 주소록을 만들고, 바꾸고, 삭제할 수 있어요."
+      },
+      "files_read": {
+        "title": "파일 읽기",
+        "body": "계정에 저장된 파일을 둘러보고 열 수 있어요."
+      },
+      "files_write": {
+        "title": "파일 변경",
+        "body": "계정의 파일을 업로드하고, 이름을 바꾸고, 이동하고, 삭제할 수 있어요."
+      },
+      "identity_read": {
+        "title": "보내는 사람 주소 보기",
+        "body": "메일을 보낼 때 쓰는 주소와 서명을 볼 수 있어요."
+      },
+      "identity_write": {
+        "title": "보내는 사람 주소 변경",
+        "body": "보내는 사람 주소와 서명을 만들고, 바꾸고, 삭제할 수 있어요."
+      },
+      "filters_read": {
+        "title": "메일 필터 읽기",
+        "body": "받은 메일을 분류하는 규칙을 볼 수 있어요."
+      },
+      "filters_write": {
+        "title": "메일 필터 변경",
+        "body": "서버 측 필터에 규칙을 추가할 수 있어요. 이런 규칙은 받은 메일을 이동, 전달하거나 삭제할 수 있어요."
+      },
+      "tasks_read": {
+        "title": "할 일 읽기",
+        "body": "할 일 목록과 할 일을 볼 수 있어요."
+      },
+      "tasks_write": {
+        "title": "할 일 변경",
+        "body": "할 일을 만들고, 바꾸고, 완료하고, 삭제할 수 있어요."
+      },
+      "templates_read": {
+        "title": "템플릿 읽기",
+        "body": "저장된 메시지 템플릿을 볼 수 있어요."
+      },
+      "templates_write": {
+        "title": "템플릿 변경",
+        "body": "메시지 템플릿을 만들고, 바꾸고, 삭제할 수 있어요."
+      },
+      "smime_read": {
+        "title": "S/MIME 상태 보기",
+        "body": "S/MIME 키와 인증서가 있는지 볼 수 있어요. 키에는 접근할 수 없어요."
+      },
+      "vacation_read": {
+        "title": "부재중 자동 응답 보기",
+        "body": "자동 응답이 켜져 있는지와 그 내용을 볼 수 있어요."
+      },
+      "vacation_write": {
+        "title": "부재중 자동 응답 변경",
+        "body": "자동 응답을 켜거나 끄고, 내용과 날짜를 바꿀 수 있어요."
+      },
+      "settings_read": {
+        "title": "설정 읽기",
+        "body": "환경설정과 태그 정의를 볼 수 있어요."
+      },
+      "settings_write": {
+        "title": "설정 변경",
+        "body": "태그를 추가하고 순서를 바꾸며, 환경설정을 변경할 수 있어요."
+      },
+      "security_read": {
+        "title": "계정 보안 보기",
+        "body": "2단계 인증과 암호화가 켜져 있는지 볼 수 있어요. 비밀 정보에는 접근할 수 없어요."
+      },
+      "auth_observe": {
+        "title": "로그인 알림 받기",
+        "body": "로그인하거나, 계정을 전환하거나, 세션이 갱신될 때 알림을 받아요."
+      },
+      "auth_emit": {
+        "title": "로그아웃시키기",
+        "body": "웹메일에서 로그아웃시킬 수 있어요."
+      },
+      "account_read": {
+        "title": "계정 보기",
+        "body": "추가한 계정과 그 주소 및 서버를 볼 수 있어요."
+      },
+      "http_post": {
+        "title": "나 대신 웹메일 서버 사용",
+        "body": "내 로그인 정보로 다음 서버 엔드포인트를 호출할 수 있어요:"
+      },
+      "http_fetch": {
+        "title": "다른 웹사이트에 연결",
+        "body": "다음 사이트에 요청을 보낼 수 있어요. 플러그인이 읽을 수 있는 모든 내용이 그곳으로 전송될 수 있어요:"
+      },
+      "admin_config": {
+        "title": "관리자가 저장한 설정 읽기",
+        "body": "관리자가 이 플러그인용으로 저장한 설정을 읽을 수 있어요."
+      },
+      "ui_observe": {
+        "title": "앱에서 현재 위치 파악",
+        "body": "어떤 페이지가 열려 있는지 알고, 클릭한 링크에 반응할 수 있어요."
+      },
+      "ui_toolbar": {
+        "title": "도구 모음에 버튼 추가",
+        "body": "메시지 도구 모음, 열어 본 메시지, 상단 바에 자체 버튼을 표시해요."
+      },
+      "ui_app_top_banner": {
+        "title": "상단에 배너 표시",
+        "body": "앱 상단에 안내를 표시해요."
+      },
+      "ui_email_banner": {
+        "title": "메시지에 안내 표시",
+        "body": "열어 본 메시지나 대화의 각 부분 위, 안, 사이에 자체 안내와 요약을 표시해요."
+      },
+      "ui_email_footer": {
+        "title": "메시지 아래에 내용 추가",
+        "body": "열어 본 메시지 아래에 자체 내용을 표시해요."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "연락처의 암호화 키 표시",
+        "body": "연락처의 암호화 키를 표시하고 관리해요."
+      },
+      "ui_email_details": {
+        "title": "메시지 세부 정보에 패널 추가",
+        "body": "열어 본 메시지 옆이나 아래에 자체 패널을 표시해요."
+      },
+      "ui_download_file": {
+        "title": "기기에 파일 저장",
+        "body": "직접 만든 파일을 다운로드할 수 있게 제공해요."
+      },
+      "ui_message_list_tabs": {
+        "title": "받은편지함에 탭 추가",
+        "body": "받은편지함을 업데이트나 프로모션 같은 탭으로 나눠요."
+      },
+      "ui_composer_toolbar": {
+        "title": "작성 창에 추가",
+        "body": "메시지를 작성하는 동안 자체 버튼, 메뉴 항목, 섹션을 표시해요."
+      },
+      "ui_composer_sidebar": {
+        "title": "작성 창에 패널 추가",
+        "body": "작성 중인 메시지 옆에 자체 패널을 표시해요."
+      },
+      "ui_sidebar_widget": {
+        "title": "사이드바에 추가",
+        "body": "메일 사이드바에 자체 상자와 섹션을 표시해요."
+      },
+      "ui_settings_section": {
+        "title": "설정 페이지 추가",
+        "body": "설정에 자체 페이지를 표시해요."
+      },
+      "ui_context_menu": {
+        "title": "메시지 메뉴에 추가",
+        "body": "메시지를 마우스 오른쪽 버튼으로 클릭하면 열리는 메뉴에 항목을 추가해요."
+      },
+      "ui_navigation_rail": {
+        "title": "내비게이션 바에 추가",
+        "body": "내비게이션 바에 자체 버튼을 표시해요."
+      },
+      "ui_keyboard": {
+        "title": "단축키 추가",
+        "body": "직접 정의한 단축키에 반응해요."
+      },
+      "ui_calendar_action": {
+        "title": "캘린더 화면에 추가",
+        "body": "일정에 자체 버튼과 섹션을, 캘린더 날짜에 짧은 라벨과 점을 표시해요."
+      },
+      "ui_admin_page": {
+        "title": "관리자 페이지 추가",
+        "body": "관리자 설정에 자체 페이지를 표시해요."
+      },
+      "app_lifecycle": {
+        "title": "앱 시작과 종료 알림 받기",
+        "body": "앱이 시작되거나, 오프라인이 되거나, 로그아웃할 때 알림을 받아요."
+      },
+      "compose_open": {
+        "title": "작성 창 열기",
+        "body": "받는 사람, 본문, 첨부 파일이 채워진 새 메시지를 열어요. 보낼지는 직접 결정해요."
+      },
+      "compose_read": {
+        "title": "작성 중인 메시지 읽기",
+        "body": "편집기에서 플러그인을 사용할 때 작성 중인 메시지의 본문을 읽어요. 서명과 인용된 메시지는 읽지 않아요."
+      },
+      "compose_write": {
+        "title": "작성 중인 메시지 변경",
+        "body": "편집기에서 플러그인을 사용할 때 작성 중인 메시지의 텍스트를 바꾸거나 추가해요. 각 변경은 되돌릴 수 있고, 보낼지는 여전히 직접 결정해요."
+      },
+      "ui_notifications": {
+        "title": "알림 표시",
+        "body": "기기에 알림을 표시하고, 알림을 허용하지 않았다면 앱 안에 표시해요. 모든 알림에 플러그인 이름이 나와요."
+      },
+      "ui_message_list": {
+        "title": "메시지 목록에 추가",
+        "body": "메시지 목록 위에 자체 내용을 표시하고, 메시지와 선택한 메시지의 도구 모음에 버튼을 표시해요."
+      },
+      "ui_contacts": {
+        "title": "연락처 화면에 추가",
+        "body": "연락처 세부 정보에 자체 섹션을, 연락처 목록에 버튼을 표시해요."
+      },
+      "ui_tasks": {
+        "title": "할 일 화면에 추가",
+        "body": "할 일 세부 정보에 자체 섹션을, 할 일 목록에 버튼을 표시해요."
+      },
+      "ui_files": {
+        "title": "파일 화면에 추가",
+        "body": "파일 미리보기에 자체 섹션을, 파일 메뉴에 항목을 표시해요."
+      },
+      "ui_commands": {
+        "title": "명령 추가",
+        "body": "명령 팔레트(Ctrl+K)에 자체 항목을 추가해요."
+      },
+      "ui_app_page": {
+        "title": "페이지 추가",
+        "body": "앱에 자체 페이지를 추가하고, 각 페이지의 버튼을 내비게이션 바에 표시해요."
+      },
+      "http_proxy": {
+        "title": "연결한 계정 사용",
+        "body": "나 또는 관리자가 설정한 계정이나 키로 Bulwark 서버를 거쳐 요청을 보낼 수 있어요. 플러그인은 비밀번호를 볼 수 없지만, 해당 계정이 그 서버에서 할 수 있는 모든 작업을 할 수 있어요."
+      }
+    },
+    "dialog": {
+      "from_plugin": "플러그인 {name}에서",
+      "ok": "확인",
+      "submit": "제출",
+      "confirm": "확인",
+      "cancel": "취소",
+      "close": "닫기",
+      "turn_off": "{name} 끄기",
+      "plugin_menu": "{name} 옵션",
+      "password_note": "이 양식은 웹메일이 아니라 플러그인 {name}에서 표시한 것입니다. 이 플러그인을 신뢰할 때만 비밀번호를 입력하세요.",
+      "toast_auto_disabled": "{name}이(가) 계속 실패해서 꺼졌습니다."
+    },
+    "connect": {
+      "title": "{label} 연결",
+      "intro_password": "{name}이(가) {label} 계정을 사용하려고 해요. Bulwark는 비밀번호를 자체 서버에 보관하고 {host}에만 보내요. 플러그인은 비밀번호를 볼 수 없어요.",
+      "intro_password_any": "{name}이(가) {label} 계정을 사용하려고 해요. Bulwark는 비밀번호를 자체 서버에 보관하고 여기에 입력한 서버에만 보내요. 플러그인은 비밀번호를 볼 수 없어요.",
+      "intro_signin": "{name}이(가) {label} 계정에 로그인하려고 해요. 여기에 서버를 입력한 다음 해당 서버의 페이지에서 로그인하세요. Bulwark는 받은 접근 권한을 자체 서버에 보관하며, 플러그인은 이를 볼 수 없어요.",
+      "server": "서버 주소",
+      "server_hint": "cloud.example.com",
+      "username": "사용자 이름",
+      "secret": "비밀번호 또는 키",
+      "connect": "연결",
+      "continue": "계속",
+      "cancel": "취소",
+      "saving": "저장하는 중…",
+      "error_server": "서버 주소를 입력하세요. 예: https://cloud.example.com",
+      "error_save": "저장하지 못했어요: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "미리 볼 결과를 선택하세요",
     "open_full": "열기",
     "view_label": "보기"
+  },
+  "top_bar": {
+    "more": "추가 옵션"
+  },
+  "plugin_pages": {
+    "loading": "페이지를 불러오는 중",
+    "not_available_title": "이 페이지를 사용할 수 없습니다",
+    "not_available_description": "이 페이지를 추가한 플러그인이 꺼져 있거나 더 이상 설치되어 있지 않습니다.",
+    "back_to_mail": "메일로 돌아가기",
+    "settings_group": "플러그인"
+  },
+  "command_palette": {
+    "title": "명령 팔레트",
+    "open": "명령 팔레트 열기",
+    "placeholder": "명령을 입력하세요",
+    "no_results": "일치하는 명령이 없습니다",
+    "go_to": "{name}(으)로 이동",
+    "compose": "새 메일",
+    "search": "메일 검색",
+    "theme_dark": "어두운 테마로 전환",
+    "theme_light": "밝은 테마로 전환",
+    "shortcuts": "단축키 보기",
+    "group_navigation": "이동",
+    "group_actions": "작업",
+    "group_plugins": "플러그인"
+  },
+  "notification_center": {
+    "title": "알림",
+    "mark_all_read": "모두 읽음으로 표시",
+    "clear": "지우기",
+    "empty": "알림이 없습니다",
+    "close": "닫기",
+    "unread": "읽지 않음",
+    "unread_count": "읽지 않음 {count}개",
+    "level_error": "오류",
+    "level_warning": "경고"
   }
 }
diff --git a/locales/lv/common.json b/locales/lv/common.json
index 894999162..34ae3d488 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -620,7 +620,9 @@
       "copied": "Kods nokopēts",
       "copy_failed": "Neizdevās nokopēt kodu"
     },
-    "mv_position": "{index} no {total}"
+    "mv_position": "{index} no {total}",
+    "plugin_panel_show": "Rādīt spraudņa paneli",
+    "plugin_panel_hide": "Slēpt spraudņa paneli"
   },
   "email_composer": {
     "minimize": "Minimizēt",
@@ -813,7 +815,8 @@
       "remove_background_color": "Noņemt fona krāsu"
     },
     "send_filing_warning": "Nosūtīts - bet pēcapstrāde neizdevās, var palikt novecojis melnraksts.",
-    "pop_out": "Atvērt atbildi atsevišķā logā"
+    "pop_out": "Atvērt atbildi atsevišķā logā",
+    "send_guard_failed": "Nav nosūtīts - spraudnis, kas pārbauda ziņojumus pirms sūtīšanas, neizdevās vai neatbildēja."
   },
   "confirm_dialog": {
     "confirm": "Apstiprināt",
@@ -3970,6 +3973,354 @@
       "failed_detail": "Autorizācija neizdevās: {error}",
       "missing_params": "Trūkst autorizācijas kods vai stāvoklis.",
       "delivery_failed": "Autorizācijas rezultātu neizdevās nodot lietotnes cilnei. Aizveriet šo logu un mēģiniet vēlreiz."
+    },
+    "settings": {
+      "title": "Spraudņi",
+      "description": "Spraudņi, ko pievienojis jūsu administrators. Ieslēdziet vai izslēdziet tos savam kontam.",
+      "description_uploads": "Spraudņi papildina webmail ar jaunām funkcijām. Ieslēdziet vai izslēdziet tos savam kontam vai instalējiet savus.",
+      "description_demo": "Demo režīmā spraudņi nav pieejami.",
+      "install_button": "Instalēt spraudni",
+      "install_hint": "Izvēlieties spraudņa ZIP failu.",
+      "install_hint_approval": "Izvēlieties spraudņa ZIP failu. Pirms varat to ieslēgt, tas jāapstiprina administratoram.",
+      "install_uploads_off": "Jūsu administrators neļauj instalēt spraudņus.",
+      "install_managed_id": "Jūsu administrators jau nodrošina spraudni ar šādu nosaukumu, tāpēc to nevar aizstāt.",
+      "install_invalid": "Šis fails nav instalējams spraudnis: {details}",
+      "toast_installed": "Spraudnis instalēts. Ieslēdziet to zemāk.",
+      "toast_installed_pending": "Spraudnis instalēts un nosūtīts jūsu administratoram apstiprināšanai.",
+      "toast_enabled": "Spraudnis {name} ir ieslēgts",
+      "toast_disabled": "Spraudnis {name} ir izslēgts",
+      "toast_removed": "Spraudnis {name} ir noņemts",
+      "toast_forced": "Jūsu administrators patur spraudni {name} ieslēgtu",
+      "toast_approval_requested": "Spraudnis {name} gaida jūsu administratora apstiprinājumu",
+      "empty_title": "Vēl nav spraudņu",
+      "empty_admin": "Jūsu administrators nav pievienojis nevienu spraudni.",
+      "empty_uploads": "Lai sāktu, instalējiet spraudni no ZIP faila.",
+      "empty_demo": "Spraudņiem vajadzīgs īsts konts, tāpēc demo režīmā to nav.",
+      "syncing": "Pārbauda spraudņus serverī…",
+      "status_installed": "Izslēgts",
+      "status_enabled": "Tiek palaists",
+      "status_running": "Ieslēgts",
+      "status_disabled": "Izslēgts",
+      "status_error": "Problēma",
+      "badge_forced": "Obligāts",
+      "badge_managed": "No jūsu administratora",
+      "badge_yours": "Instalējāt jūs",
+      "badge_awaiting": "Gaida apstiprinājumu",
+      "toggle_label": "Ieslēgt vai izslēgt spraudni {name}",
+      "forced_note": "Jūsu administrators pieprasa šo spraudni, tāpēc to nevar izslēgt.",
+      "permissions": "Ko tas var darīt",
+      "permissions_managed": "Ko tas var darīt (apstiprinājis jūsu administrators)",
+      "settings": "Iestatījumi",
+      "remove": "Noņemt",
+      "remove_title": "Noņemt spraudni {name}?",
+      "remove_message": "Spraudnis un viss, ko tas saglabājis šajā pārlūkā, tiks dzēsts. Vēlāk to var instalēt atkal.",
+      "remove_confirm": "Noņemt",
+      "error_user_plugins_off": "Jūsu administrators ir izslēdzis lietotāju instalētos spraudņus, tāpēc šis spraudnis nedarbojas.",
+      "error_approval_unavailable": "Šis spraudnis tika instalēts, pirms bija vajadzīgs apstiprinājums. Noņemiet to un instalējiet vēlreiz, lai nosūtītu apstiprināšanai.",
+      "error_approval_denied": "Jūsu administrators neapstiprināja šo spraudni.",
+      "error_approval_pending": "Gaida, kad jūsu administrators apstiprinās šo spraudni.",
+      "error_auto_disabled": "Izslēgts, jo atkārtoti neizdevās. Ieslēdziet to vēlreiz, lai mēģinātu vēlreiz.",
+      "accounts_heading": "Savienotie konti",
+      "account_on": "{label} serverī {host}",
+      "account_waiting": "{label} serverī {host} (pierakstīšanās nav pabeigta)",
+      "disconnect": "Atvienot",
+      "disconnect_failed": "Neizdevās atvienot {label}"
+    },
+    "consent": {
+      "title": "Atļaut spraudnim {name} to darīt?",
+      "intro": "Spraudnis pieprasa tālāk norādītās atļaujas. Tas tās saņems tikai tad, ja jūs atļausiet.",
+      "high_risk_note": "Atzīmētie punkti dod spraudnim piekļuvi jūsu pasta saturam vai ļauj tam sūtīt datus citur. Atļaujiet tos tikai spraudņiem, kuriem uzticaties.",
+      "revoke_hint": "Spraudni jebkurā laikā varat izslēgt vai noņemt iestatījumos.",
+      "deny": "Neatļaut",
+      "allow": "Atļaut"
+    },
+    "permissions": {
+      "none": "Tam nav vajadzīgas īpašas atļaujas.",
+      "high_risk": "Nepieciešama piesardzība",
+      "email_read": {
+        "title": "Lasīt jūsu pastu",
+        "body": "Redzēt sūtītājus, adresātus, tēmas un visu tekstu jebkurai vēstulei jūsu kontā, kā arī jūsu mapes."
+      },
+      "email_write": {
+        "title": "Mainīt un kārtot jūsu pastu",
+        "body": "Pievienot vai noņemt tagus, karodziņus un citus atslēgvārdus jūsu vēstulēm, pārvietot tās starp jūsu mapēm un uz arhīvu un saglabāt melnrakstus."
+      },
+      "email_send": {
+        "title": "Mainīt vēstules pirms nosūtīšanas",
+        "body": "Lasīt un mainīt adresātus, tēmu, tekstu un pielikumus vēstulēm, ko rakstāt, un apturēt vēstules nosūtīšanu."
+      },
+      "crypto_full": {
+        "title": "Pilna piekļuve lietotnei",
+        "body": "Darbojas ar tādām pašām tiesībām kā pats webmail. Var lasīt visu jūsu pastu un saglabātās atslēgas un rīkoties jūsu vārdā. Atļaujiet to tikai spraudņiem, kuriem pilnībā uzticaties."
+      },
+      "email_raw_send": {
+        "title": "Sūtīt paša izveidotas vēstules",
+        "body": "Sūtīt no jūsu konta pilnīgas vēstules, piemēram, parakstītas vai šifrētas."
+      },
+      "email_blob_read": {
+        "title": "Lasīt vēstuļu neapstrādātos datus",
+        "body": "Lasīt jūsu vēstuļu un pielikumu sākotnējos datus, kā arī katru failu, ko pievienojat, pirms tas tiek nosūtīts."
+      },
+      "email_blob_write": {
+        "title": "Aizstāt pielikumus pirms nosūtīšanas",
+        "body": "Augšupielādēt failus jūsu pasta serverī un aizstāt pievienoto failu ar citu, pirms vēstule tiek nosūtīta."
+      },
+      "email_render_takeover": {
+        "title": "Mainīt vēstuļu attēlojumu",
+        "body": "Aizstāt tekstu vēstulēm, ko atverat, un vēstulēm sarakstā, piemēram, lai parādītu atšifrētu saturu."
+      },
+      "calendar_read": {
+        "title": "Lasīt jūsu kalendāru",
+        "body": "Redzēt jūsu kalendārus un to notikumus."
+      },
+      "calendar_write": {
+        "title": "Mainīt jūsu kalendāru",
+        "body": "Izveidot, mainīt un dzēst notikumus."
+      },
+      "contacts_read": {
+        "title": "Lasīt jūsu kontaktus",
+        "body": "Meklēt un lasīt jūsu adrešu grāmatās."
+      },
+      "contacts_write": {
+        "title": "Mainīt jūsu kontaktus",
+        "body": "Izveidot, mainīt un dzēst kontaktus un adrešu grāmatas."
+      },
+      "files_read": {
+        "title": "Lasīt jūsu failus",
+        "body": "Pārlūkot un atvērt jūsu kontā glabātos failus."
+      },
+      "files_write": {
+        "title": "Mainīt jūsu failus",
+        "body": "Augšupielādēt, pārdēvēt, pārvietot un dzēst failus jūsu kontā."
+      },
+      "identity_read": {
+        "title": "Redzēt jūsu sūtītāja adreses",
+        "body": "Redzēt adreses, no kurām sūtāt, un to parakstus."
+      },
+      "identity_write": {
+        "title": "Mainīt jūsu sūtītāja adreses",
+        "body": "Izveidot, mainīt un dzēst sūtītāja adreses un parakstus."
+      },
+      "filters_read": {
+        "title": "Lasīt jūsu pasta filtrus",
+        "body": "Redzēt noteikumus, kas šķiro jūsu ienākošo pastu."
+      },
+      "filters_write": {
+        "title": "Mainīt jūsu pasta filtrus",
+        "body": "Pievienot noteikumus jūsu servera filtriem. Šādi noteikumi var pārvietot, pārsūtīt vai dzēst ienākošo pastu."
+      },
+      "tasks_read": {
+        "title": "Lasīt jūsu uzdevumus",
+        "body": "Redzēt jūsu uzdevumu sarakstus un uzdevumus."
+      },
+      "tasks_write": {
+        "title": "Mainīt jūsu uzdevumus",
+        "body": "Izveidot, mainīt, pabeigt un dzēst uzdevumus."
+      },
+      "templates_read": {
+        "title": "Lasīt jūsu veidnes",
+        "body": "Redzēt jūsu saglabātās vēstuļu veidnes."
+      },
+      "templates_write": {
+        "title": "Mainīt jūsu veidnes",
+        "body": "Izveidot, mainīt un dzēst vēstuļu veidnes."
+      },
+      "smime_read": {
+        "title": "Redzēt jūsu S/MIME statusu",
+        "body": "Redzēt, vai jums ir S/MIME atslēgas un sertifikāti, bez piekļuves atslēgām."
+      },
+      "vacation_read": {
+        "title": "Redzēt jūsu prombūtnes atbildi",
+        "body": "Redzēt, vai automātiskā atbilde ir ieslēgta un kas tajā rakstīts."
+      },
+      "vacation_write": {
+        "title": "Mainīt jūsu prombūtnes atbildi",
+        "body": "Ieslēgt vai izslēgt automātisko atbildi un mainīt tās tekstu un datumus."
+      },
+      "settings_read": {
+        "title": "Lasīt jūsu iestatījumus",
+        "body": "Redzēt jūsu preferences un tagu definīcijas."
+      },
+      "settings_write": {
+        "title": "Mainīt jūsu iestatījumus",
+        "body": "Pievienot tagus, mainīt to secību un mainīt jūsu preferences."
+      },
+      "security_read": {
+        "title": "Redzēt jūsu konta drošību",
+        "body": "Redzēt, vai divfaktoru autentifikācija un šifrēšana ir ieslēgtas, bez piekļuves noslēpumiem."
+      },
+      "auth_observe": {
+        "title": "Zināt, kad pierakstāties",
+        "body": "Saņemt ziņu, kad pierakstāties, pārslēdzat kontu vai jūsu sesija tiek atjaunota."
+      },
+      "auth_emit": {
+        "title": "Izrakstīt jūs",
+        "body": "Izrakstīt jūs no webmail."
+      },
+      "account_read": {
+        "title": "Redzēt jūsu kontus",
+        "body": "Redzēt jūsu pievienotos kontus ar to adresēm un serveriem."
+      },
+      "http_post": {
+        "title": "Izmantot webmail serveri jūsu vārdā",
+        "body": "Izsaukt šos servera galapunktus ar jūsu pieteikšanās datiem:"
+      },
+      "http_fetch": {
+        "title": "Savienoties ar citām vietnēm",
+        "body": "Sūtīt pieprasījumus uz šīm vietnēm. Uz turieni var nosūtīt visu, ko spraudnis var nolasīt:"
+      },
+      "admin_config": {
+        "title": "Lasīt savus iestatījumus no administratora",
+        "body": "Lasīt iestatījumus, ko jūsu administrators saglabājis šim spraudnim."
+      },
+      "ui_observe": {
+        "title": "Sekot, kur atrodaties lietotnē",
+        "body": "Zināt, kura lapa ir atvērta, un reaģēt uz saitēm, uz kurām noklikšķināt."
+      },
+      "ui_toolbar": {
+        "title": "Pievienot pogas rīkjoslām",
+        "body": "Rādīt savas pogas vēstuļu rīkjoslā, atvērtā vēstulē un augšējā joslā."
+      },
+      "ui_app_top_banner": {
+        "title": "Rādīt reklāmkarogu augšā",
+        "body": "Rādīt paziņojumu pāri lietotnes augšdaļai."
+      },
+      "ui_email_banner": {
+        "title": "Rādīt paziņojumus vēstulēs",
+        "body": "Rādīt savus paziņojumus un kopsavilkumus virs atvērtas vēstules vai sarunas daļām, to iekšpusē un starp tām."
+      },
+      "ui_email_footer": {
+        "title": "Pievienot saturu zem vēstulēm",
+        "body": "Rādīt savu saturu zem atvērtas vēstules."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "Rādīt kontaktu šifrēšanas atslēgas",
+        "body": "Rādīt un pārvaldīt kontakta šifrēšanas atslēgas."
+      },
+      "ui_email_details": {
+        "title": "Pievienot paneļus vēstules informācijai",
+        "body": "Rādīt savu paneli blakus atvērtai vēstulei vai zem tās."
+      },
+      "ui_download_file": {
+        "title": "Saglabāt failus jūsu ierīcē",
+        "body": "Piedāvāt lejupielādei paša izveidotus failus."
+      },
+      "ui_message_list_tabs": {
+        "title": "Pievienot cilnes iesūtnei",
+        "body": "Sadalīt jūsu iesūtni cilnēs, piemēram, Jaunumi vai Akcijas."
+      },
+      "ui_composer_toolbar": {
+        "title": "Papildināt redaktoru",
+        "body": "Rādīt savas pogas, izvēlnes ierakstus un sadaļas, kamēr rakstāt vēstuli."
+      },
+      "ui_composer_sidebar": {
+        "title": "Pievienot paneli redaktoram",
+        "body": "Rādīt savu paneli blakus vēstulei, ko rakstāt."
+      },
+      "ui_sidebar_widget": {
+        "title": "Papildināt sānjoslu",
+        "body": "Rādīt savus blokus un sadaļas pasta sānjoslā."
+      },
+      "ui_settings_section": {
+        "title": "Pievienot iestatījumu lapu",
+        "body": "Rādīt savu lapu iestatījumos."
+      },
+      "ui_context_menu": {
+        "title": "Papildināt vēstules izvēlni",
+        "body": "Pievienot ierakstus izvēlnei, kas atveras, ar peles labo pogu noklikšķinot uz vēstules."
+      },
+      "ui_navigation_rail": {
+        "title": "Papildināt navigācijas joslu",
+        "body": "Rādīt savu pogu navigācijas joslā."
+      },
+      "ui_keyboard": {
+        "title": "Pievienot īsinājumtaustiņus",
+        "body": "Reaģēt uz paša definētiem īsinājumtaustiņiem."
+      },
+      "ui_calendar_action": {
+        "title": "Papildināt kalendāra skatu",
+        "body": "Rādīt savas pogas un sadaļas pie notikumiem un īsas birkas un punktus kalendāra dienās."
+      },
+      "ui_admin_page": {
+        "title": "Pievienot administrēšanas lapu",
+        "body": "Rādīt savu lapu administratora iestatījumos."
+      },
+      "app_lifecycle": {
+        "title": "Zināt, kad lietotne startē un apstājas",
+        "body": "Saņemt ziņu, kad lietotne startē, pāriet bezsaistē vai jūs izrakstāties."
+      },
+      "compose_open": {
+        "title": "Atvērt redaktoru jūsu vietā",
+        "body": "Atvērt jaunu vēstuli ar jau aizpildītiem adresātiem, tekstu vai pielikumiem. Vai to nosūtīt, joprojām izlemjat jūs."
+      },
+      "compose_read": {
+        "title": "Lasīt ziņojumu, ko rakstāt",
+        "body": "Lasīt ziņojuma tekstu rakstīšanas laikā, kad izmantojat spraudni redaktorā. Ne parakstu, ne citēto ziņojumu."
+      },
+      "compose_write": {
+        "title": "Mainīt ziņojumu, ko rakstāt",
+        "body": "Aizstāt vai pievienot tekstu ziņojumā rakstīšanas laikā, kad izmantojat spraudni redaktorā. Katru izmaiņu var atsaukt, un jūs joprojām izlemjat, vai sūtīt."
+      },
+      "ui_notifications": {
+        "title": "Rādīt paziņojumus",
+        "body": "Rādīt paziņojumus jūsu ierīcē vai lietotnē, ja neesat tos atļāvis. Katrā ir spraudņa nosaukums."
+      },
+      "ui_message_list": {
+        "title": "Papildināt vēstuļu sarakstu",
+        "body": "Rādīt savu saturu virs vēstuļu saraksta un pogas pie vēstulēm un atlasīto vēstuļu rīkjoslā."
+      },
+      "ui_contacts": {
+        "title": "Papildināt kontaktu skatu",
+        "body": "Rādīt savas sadaļas kontakta informācijā un pogas kontaktu sarakstā."
+      },
+      "ui_tasks": {
+        "title": "Papildināt uzdevumu skatu",
+        "body": "Rādīt savas sadaļas uzdevuma informācijā un pogas uzdevumu sarakstā."
+      },
+      "ui_files": {
+        "title": "Papildināt failu skatu",
+        "body": "Rādīt savas sadaļas failu priekšskatījumā un ierakstus faila izvēlnē."
+      },
+      "ui_commands": {
+        "title": "Pievienot komandas",
+        "body": "Pievienot savus ierakstus komandu paletei (Ctrl+K)."
+      },
+      "ui_app_page": {
+        "title": "Pievienot lapas",
+        "body": "Pievienot lietotnei savas lapas, katru ar pogu navigācijas joslā."
+      },
+      "http_proxy": {
+        "title": "Izmantot jūsu savienotos kontus",
+        "body": "Sūtīt pieprasījumus caur Bulwark serveri ar kontu vai atslēgu, ko iestatījāt jūs vai jūsu administrators. Spraudnis nekad neredz paroli, taču tas var darīt visu, ko šis konts var darīt savā serverī."
+      }
+    },
+    "dialog": {
+      "from_plugin": "No spraudņa {name}",
+      "ok": "Labi",
+      "submit": "Nosūtīt",
+      "confirm": "Apstiprināt",
+      "cancel": "Atcelt",
+      "close": "Aizvērt",
+      "turn_off": "Izslēgt {name}",
+      "plugin_menu": "{name} opcijas",
+      "password_note": "Šī veidlapa nāk no spraudņa {name}, nevis no tīmekļa pasta. Ievadiet paroli tikai tad, ja uzticaties šim spraudnim.",
+      "toast_auto_disabled": "{name} tika izslēgts, jo atkārtoti neizdevās."
+    },
+    "connect": {
+      "title": "Savienot {label}",
+      "intro_password": "{name} vēlas izmantot jūsu {label} kontu. Bulwark glabā paroli savā serverī un sūta to tikai uz {host}. Spraudnis to nekad neredz.",
+      "intro_password_any": "{name} vēlas izmantot jūsu {label} kontu. Bulwark glabā paroli savā serverī un sūta to tikai uz serveri, ko šeit ievadāt. Spraudnis to nekad neredz.",
+      "intro_signin": "{name} vēlas pierakstīties jūsu {label} kontā. Ievadiet šeit serveri un pēc tam pierakstieties šī servera lapā. Bulwark glabā iegūto piekļuvi savā serverī; spraudnis to nekad neredz.",
+      "server": "Servera adrese",
+      "server_hint": "cloud.example.com",
+      "username": "Lietotājvārds",
+      "secret": "Parole vai atslēga",
+      "connect": "Savienot",
+      "continue": "Turpināt",
+      "cancel": "Atcelt",
+      "saving": "Saglabā…",
+      "error_server": "Ievadiet servera adresi, piemēram, https://cloud.example.com",
+      "error_save": "Neizdevās saglabāt: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "Izvēlieties rezultātu, lai to priekšskatītu",
     "open_full": "Atvērt",
     "view_label": "Skats"
+  },
+  "top_bar": {
+    "more": "Citas iespējas"
+  },
+  "plugin_pages": {
+    "loading": "Ielādē lapu",
+    "not_available_title": "Šī lapa nav pieejama",
+    "not_available_description": "Spraudnis, kas to pievienoja, ir izslēgts vai vairs nav instalēts.",
+    "back_to_mail": "Atpakaļ uz pastu",
+    "settings_group": "Spraudņi"
+  },
+  "command_palette": {
+    "title": "Komandu palete",
+    "open": "Atvērt komandu paleti",
+    "placeholder": "Ierakstiet komandu",
+    "no_results": "Nav atbilstošu komandu",
+    "go_to": "Pāriet uz: {name}",
+    "compose": "Jauna vēstule",
+    "search": "Meklēt pastā",
+    "theme_dark": "Pārslēgt uz tumšo motīvu",
+    "theme_light": "Pārslēgt uz gaišo motīvu",
+    "shortcuts": "Rādīt tastatūras īsinājumtaustiņus",
+    "group_navigation": "Pāriet uz",
+    "group_actions": "Darbības",
+    "group_plugins": "Spraudņi"
+  },
+  "notification_center": {
+    "title": "Paziņojumi",
+    "mark_all_read": "Atzīmēt visus kā lasītus",
+    "clear": "Notīrīt",
+    "empty": "Nav paziņojumu",
+    "close": "Aizvērt",
+    "unread": "Nelasīts",
+    "unread_count": "Nelasīti: {count}",
+    "level_error": "Kļūda",
+    "level_warning": "Brīdinājums"
   }
 }
diff --git a/locales/mn/common.json b/locales/mn/common.json
index 93e8f670d..a00f00815 100644
--- a/locales/mn/common.json
+++ b/locales/mn/common.json
@@ -620,7 +620,9 @@
       "copied": "Код хуулагдлаа",
       "copy_failed": "Кодыг хуулж чадсангүй"
     },
-    "mv_position": "{total}-с {index}"
+    "mv_position": "{total}-с {index}",
+    "plugin_panel_show": "Залгаасын самбарыг харуулах",
+    "plugin_panel_hide": "Залгаасын самбарыг нуух"
   },
   "email_composer": {
     "minimize": "Багасгах",
@@ -813,7 +815,8 @@
       "remove_background_color": "Дэвсгэр өнгийг арилгах"
     },
     "send_filing_warning": "Илгээсэн - гэхдээ илгээсний дараах цэвэрлэгээ амжилтгүй болсон тул хуучирсан ноорог үлдэж болзошгүй.",
-    "pop_out": "Хариуг тусдаа цонхонд нээх"
+    "pop_out": "Хариуг тусдаа цонхонд нээх",
+    "send_guard_failed": "Илгээгдсэнгүй - илгээхийн өмнө мессежийг шалгадаг залгаас алдаа гаргасан эсвэл хариу өгсөнгүй."
   },
   "confirm_dialog": {
     "confirm": "Баталгаажуулах",
@@ -3970,6 +3973,354 @@
       "failed_detail": "Зөвшөөрөл амжилтгүй болсон: {error}",
       "missing_params": "Зөвшөөрлийн код эсвэл төлөв байхгүй байна.",
       "delivery_failed": "Зөвшөөрлийн үр дүнг аппын таб руу дамжуулж чадсангүй. Энэ цонхыг хаагаад дахин оролдоно уу."
+    },
+    "settings": {
+      "title": "Залгаасууд",
+      "description": "Таны администраторын нэмсэн залгаасууд. Өөрийн бүртгэлд асааж эсвэл унтрааж болно.",
+      "description_uploads": "Залгаасууд webmail-д шинэ боломж нэмдэг. Өөрийн бүртгэлд асааж, унтрааж эсвэл өөрийнхөө залгаасыг суулгаж болно.",
+      "description_demo": "Демо горимд залгаас ашиглах боломжгүй.",
+      "install_button": "Залгаас суулгах",
+      "install_hint": "Залгаасын ZIP файлыг сонгоно уу.",
+      "install_hint_approval": "Залгаасын ZIP файлыг сонгоно уу. Асаахаас өмнө администратор үүнийг зөвшөөрөх ёстой.",
+      "install_uploads_off": "Таны администратор залгаас суулгахыг зөвшөөрөөгүй байна.",
+      "install_managed_id": "Таны администратор ийм нэртэй залгаасыг аль хэдийн олгосон тул үүнийг солих боломжгүй.",
+      "install_invalid": "Энэ файл суулгаж болох залгаас биш байна: {details}",
+      "toast_installed": "Залгаас суулгалаа. Доороос асаана уу.",
+      "toast_installed_pending": "Залгаас суулгаж, зөвшөөрөл авахаар таны администратор руу илгээлээ.",
+      "toast_enabled": "{name} залгаас асаалттай",
+      "toast_disabled": "{name} залгаас унтарсан",
+      "toast_removed": "{name} залгаасыг устгалаа",
+      "toast_forced": "Таны администратор {name} залгаасыг асаалттай байлгахыг шаарддаг",
+      "toast_approval_requested": "{name} залгаас таны администраторын зөвшөөрлийг хүлээж байна",
+      "empty_title": "Одоогоор залгаас алга",
+      "empty_admin": "Таны администратор ямар ч залгаас нэмээгүй байна.",
+      "empty_uploads": "Эхлэхийн тулд ZIP файлаас залгаас суулгана уу.",
+      "empty_demo": "Залгаасуудад жинхэнэ бүртгэл хэрэгтэй тул демо горимд байхгүй.",
+      "syncing": "Залгаасуудыг сервертэй тулгаж байна…",
+      "status_installed": "Унтарсан",
+      "status_enabled": "Эхэлж байна",
+      "status_running": "Асаалттай",
+      "status_disabled": "Унтарсан",
+      "status_error": "Асуудалтай",
+      "badge_forced": "Заавал",
+      "badge_managed": "Таны администратороос",
+      "badge_yours": "Та суулгасан",
+      "badge_awaiting": "Зөвшөөрөл хүлээж байна",
+      "toggle_label": "{name} залгаасыг асаах эсвэл унтраах",
+      "forced_note": "Таны администратор энэ залгаасыг шаарддаг тул унтраах боломжгүй.",
+      "permissions": "Юу хийж чадах вэ",
+      "permissions_managed": "Юу хийж чадах вэ (таны администратор зөвшөөрсөн)",
+      "settings": "Тохиргоо",
+      "remove": "Устгах",
+      "remove_title": "{name} залгаасыг устгах уу?",
+      "remove_message": "Залгаас болон түүний энэ хөтөчид хадгалсан бүх зүйл устна. Дараа нь дахин суулгаж болно.",
+      "remove_confirm": "Устгах",
+      "error_user_plugins_off": "Таны администратор хэрэглэгчийн суулгасан залгаасуудыг унтраасан тул энэ залгаас ажиллахгүй.",
+      "error_approval_unavailable": "Энэ залгаасыг зөвшөөрөл шаарддаг болохоос өмнө суулгасан. Зөвшөөрөлд илгээхийн тулд устгаад дахин суулгана уу.",
+      "error_approval_denied": "Таны администратор энэ залгаасыг зөвшөөрөөгүй.",
+      "error_approval_pending": "Таны администратор энэ залгаасыг зөвшөөрөхийг хүлээж байна.",
+      "error_auto_disabled": "Дахин дахин алдаа гаргасан тул унтраасан. Дахин оролдохын тулд асаана уу.",
+      "accounts_heading": "Холбогдсон бүртгэлүүд",
+      "account_on": "{host} дээрх {label}",
+      "account_waiting": "{host} дээрх {label} (нэвтрэлт дуусаагүй)",
+      "disconnect": "Салгах",
+      "disconnect_failed": "{label} салгаж чадсангүй"
+    },
+    "consent": {
+      "title": "{name} залгаасад үүнийг зөвшөөрөх үү?",
+      "intro": "Залгаас доорх зөвшөөрлүүдийг хүсэж байна. Та зөвшөөрсөн тохиолдолд л авна.",
+      "high_risk_note": "Тэмдэглэсэн зүйлс нь залгаасад таны имэйлийн агуулгыг харах эсвэл өгөгдлийг өөр газар илгээх боломж олгоно. Зөвхөн итгэдэг залгаасдаа зөвшөөрнө үү.",
+      "revoke_hint": "Та хүссэн үедээ Тохиргоо хэсэгт залгаасыг унтрааж эсвэл устгаж болно.",
+      "deny": "Зөвшөөрөхгүй",
+      "allow": "Зөвшөөрөх"
+    },
+    "permissions": {
+      "none": "Тусгай зөвшөөрөл шаардлагагүй.",
+      "high_risk": "Болгоомжтой хандах",
+      "email_read": {
+        "title": "Таны имэйлийг унших",
+        "body": "Таны бүртгэл дэх аль ч имэйлийн илгээгч, хүлээн авагч, гарчиг, бүрэн текст болон таны хавтаснуудыг харах."
+      },
+      "email_write": {
+        "title": "Таны имэйлийг өөрчлөх, цэгцлэх",
+        "body": "Таны имэйлүүдэд таг, туг болон бусад түлхүүр үг нэмэх эсвэл хасах, тэдгээрийг таны хавтаснуудын хооронд болон архив руу зөөх, мөн ноорог хадгалах."
+      },
+      "email_send": {
+        "title": "Илгээхээс өмнө имэйлийг өөрчлөх",
+        "body": "Таны бичиж буй имэйлийн хүлээн авагч, гарчиг, текст, хавсралтыг унших, өөрчлөх, мөн имэйл илгээхийг зогсоох."
+      },
+      "crypto_full": {
+        "title": "Аппад бүрэн хандах",
+        "body": "Webmail-тэй адил эрхээр ажиллана. Таны бүх имэйл болон хадгалсан түлхүүрүүдийг уншиж, таны нэрийн өмнөөс үйлдэл хийж чадна. Зөвхөн бүрэн итгэдэг залгаасдаа үүнийг зөвшөөрнө үү."
+      },
+      "email_raw_send": {
+        "title": "Өөрөө бэлтгэсэн имэйл илгээх",
+        "body": "Таны бүртгэлээс бүрэн бэлэн имэйл, жишээ нь гарын үсэг зурсан эсвэл шифрлэсэн имэйл илгээх."
+      },
+      "email_blob_read": {
+        "title": "Имэйлийн түүхий агуулгыг унших",
+        "body": "Таны имэйл, хавсралтуудын эх өгөгдөл болон илгээхээс өмнө хавсаргасан файл бүрийг унших."
+      },
+      "email_blob_write": {
+        "title": "Илгээхээс өмнө хавсралтыг солих",
+        "body": "Таны мэйл сервер рүү файл байршуулж, имэйл илгээгдэхээс өмнө хавсаргасан файлыг өөр файлаар солих."
+      },
+      "email_render_takeover": {
+        "title": "Имэйлийг харуулах байдлыг өөрчлөх",
+        "body": "Таны нээсэн имэйлүүд болон имэйлийн жагсаалтын текстийг солих, жишээ нь тайлсан агуулгыг харуулах."
+      },
+      "calendar_read": {
+        "title": "Таны календарийг унших",
+        "body": "Таны календарь болон тэдгээрийн үйл явдлуудыг харах."
+      },
+      "calendar_write": {
+        "title": "Таны календарийг өөрчлөх",
+        "body": "Үйл явдал үүсгэх, өөрчлөх, устгах."
+      },
+      "contacts_read": {
+        "title": "Таны харилцагчдыг унших",
+        "body": "Таны хаягийн дэвтрүүдээс хайх, унших."
+      },
+      "contacts_write": {
+        "title": "Таны харилцагчдыг өөрчлөх",
+        "body": "Харилцагч болон хаягийн дэвтэр үүсгэх, өөрчлөх, устгах."
+      },
+      "files_read": {
+        "title": "Таны файлуудыг унших",
+        "body": "Таны бүртгэлд хадгалсан файлуудыг үзэх, нээх."
+      },
+      "files_write": {
+        "title": "Таны файлуудыг өөрчлөх",
+        "body": "Таны бүртгэл дэх файлуудыг байршуулах, нэрийг өөрчлөх, зөөх, устгах."
+      },
+      "identity_read": {
+        "title": "Таны илгээгчийн хаягуудыг харах",
+        "body": "Таны илгээдэг хаягууд болон тэдгээрийн гарын үсгийг харах."
+      },
+      "identity_write": {
+        "title": "Таны илгээгчийн хаягуудыг өөрчлөх",
+        "body": "Илгээгчийн хаяг болон гарын үсэг үүсгэх, өөрчлөх, устгах."
+      },
+      "filters_read": {
+        "title": "Таны имэйл шүүлтүүрийг унших",
+        "body": "Ирж буй имэйлийг ангилдаг дүрмүүдийг харах."
+      },
+      "filters_write": {
+        "title": "Таны имэйл шүүлтүүрийг өөрчлөх",
+        "body": "Сервер дээрх шүүлтүүрт дүрэм нэмэх. Ийм дүрэм ирж буй имэйлийг зөөх, дамжуулах эсвэл устгах боломжтой."
+      },
+      "tasks_read": {
+        "title": "Таны даалгавруудыг унших",
+        "body": "Таны даалгаврын жагсаалт болон даалгавруудыг харах."
+      },
+      "tasks_write": {
+        "title": "Таны даалгавруудыг өөрчлөх",
+        "body": "Даалгавар үүсгэх, өөрчлөх, дуусгах, устгах."
+      },
+      "templates_read": {
+        "title": "Таны загваруудыг унших",
+        "body": "Таны хадгалсан имэйлийн загваруудыг харах."
+      },
+      "templates_write": {
+        "title": "Таны загваруудыг өөрчлөх",
+        "body": "Имэйлийн загвар үүсгэх, өөрчлөх, устгах."
+      },
+      "smime_read": {
+        "title": "Таны S/MIME төлөвийг харах",
+        "body": "Танд S/MIME түлхүүр, гэрчилгээ байгаа эсэхийг түлхүүрт хандахгүйгээр харах."
+      },
+      "vacation_read": {
+        "title": "Таны эзгүй үеийн хариуг харах",
+        "body": "Автомат хариу асаалттай эсэх, юу бичсэнийг харах."
+      },
+      "vacation_write": {
+        "title": "Таны эзгүй үеийн хариуг өөрчлөх",
+        "body": "Автомат хариуг асаах, унтраах, текст болон огноог нь өөрчлөх."
+      },
+      "settings_read": {
+        "title": "Таны тохиргоог унших",
+        "body": "Таны тохиргоо болон тагуудын тодорхойлолтыг харах."
+      },
+      "settings_write": {
+        "title": "Таны тохиргоог өөрчлөх",
+        "body": "Таг нэмэх, дарааллыг нь өөрчлөх, таны тохиргоог өөрчлөх."
+      },
+      "security_read": {
+        "title": "Бүртгэлийн аюулгүй байдлыг харах",
+        "body": "Хоёр хүчин зүйлийн баталгаажуулалт болон шифрлэлт асаалттай эсэхийг нууц мэдээлэлд хандахгүйгээр харах."
+      },
+      "auth_observe": {
+        "title": "Таныг нэвтрэхийг мэдэх",
+        "body": "Таныг нэвтрэх, бүртгэл солих эсвэл сесс сунгагдах үед мэдэгдэл авах."
+      },
+      "auth_emit": {
+        "title": "Таныг гаргах",
+        "body": "Таныг webmail-ээс гаргах."
+      },
+      "account_read": {
+        "title": "Таны бүртгэлүүдийг харах",
+        "body": "Таны нэмсэн бүртгэлүүдийг хаяг, серверийн хамт харах."
+      },
+      "http_post": {
+        "title": "Таны өмнөөс webmail серверийг ашиглах",
+        "body": "Эдгээр серверийн хаяг руу таны нэвтрэх мэдээллээр хандах:"
+      },
+      "http_fetch": {
+        "title": "Бусад вэбсайттай холбогдох",
+        "body": "Эдгээр сайт руу хүсэлт илгээх. Залгаасын уншиж чадах бүх зүйлийг тийш илгээж болзошгүй:"
+      },
+      "admin_config": {
+        "title": "Администраторын тохиргоог унших",
+        "body": "Таны администраторын энэ залгаасад хадгалсан тохиргоог унших."
+      },
+      "ui_observe": {
+        "title": "Апп дотор хаана байгааг дагах",
+        "body": "Аль хуудас нээлттэй байгааг мэдэх, таны дарсан холбоосод хариу үйлдэл үзүүлэх."
+      },
+      "ui_toolbar": {
+        "title": "Хэрэгслийн мөрөнд товч нэмэх",
+        "body": "Имэйлийн хэрэгслийн мөр, нээлттэй имэйл болон дээд мөрөнд өөрийн товчуудыг харуулах."
+      },
+      "ui_app_top_banner": {
+        "title": "Дээд хэсэгт баннер харуулах",
+        "body": "Аппын дээд хэсэгт мэдэгдэл харуулах."
+      },
+      "ui_email_banner": {
+        "title": "Имэйл дээр мэдэгдэл харуулах",
+        "body": "Нээлттэй имэйл эсвэл ярилцлагын хэсгүүдийн дээр, дотор болон хооронд өөрийн мэдэгдэл, хураангуйг харуулах."
+      },
+      "ui_email_footer": {
+        "title": "Имэйлийн доор агуулга нэмэх",
+        "body": "Нээлттэй имэйлийн доор өөрийн агуулгыг харуулах."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "Харилцагчийн шифрлэлтийн түлхүүрийг харуулах",
+        "body": "Харилцагчийн шифрлэлтийн түлхүүрүүдийг харуулах, удирдах."
+      },
+      "ui_email_details": {
+        "title": "Имэйлийн дэлгэрэнгүйд самбар нэмэх",
+        "body": "Нээлттэй имэйлийн хажууд эсвэл доор өөрийн самбарыг харуулах."
+      },
+      "ui_download_file": {
+        "title": "Файлыг таны төхөөрөмжид хадгалах",
+        "body": "Өөрийн үүсгэсэн файлуудыг татаж авахыг санал болгох."
+      },
+      "ui_message_list_tabs": {
+        "title": "Ирсэн имэйлд таб нэмэх",
+        "body": "Ирсэн имэйлийг Шинэчлэлт, Сурталчилгаа зэрэг табуудад ангилах."
+      },
+      "ui_composer_toolbar": {
+        "title": "Имэйл бичих цонхонд нэмэх",
+        "body": "Таныг имэйл бичих үед өөрийн товч, цэсийн зүйл, хэсгүүдийг харуулах."
+      },
+      "ui_composer_sidebar": {
+        "title": "Имэйл бичих цонхонд самбар нэмэх",
+        "body": "Таны бичиж буй имэйлийн хажууд өөрийн самбарыг харуулах."
+      },
+      "ui_sidebar_widget": {
+        "title": "Хажуугийн самбарт нэмэх",
+        "body": "Имэйлийн хажуугийн самбарт өөрийн хайрцаг, хэсгүүдийг харуулах."
+      },
+      "ui_settings_section": {
+        "title": "Тохиргооны хуудас нэмэх",
+        "body": "Тохиргоо хэсэгт өөрийн хуудсыг харуулах."
+      },
+      "ui_context_menu": {
+        "title": "Имэйлийн цэсэнд нэмэх",
+        "body": "Имэйл дээр баруун товшиход нээгддэг цэсэнд зүйл нэмэх."
+      },
+      "ui_navigation_rail": {
+        "title": "Навигацын мөрөнд нэмэх",
+        "body": "Навигацын мөрөнд өөрийн товчийг харуулах."
+      },
+      "ui_keyboard": {
+        "title": "Товчлуурын товчлол нэмэх",
+        "body": "Өөрийн тодорхойлсон товчлуурын товчлолд хариу үйлдэл үзүүлэх."
+      },
+      "ui_calendar_action": {
+        "title": "Хуанлийн харагдацад нэмэх",
+        "body": "Үйл явдал дээр өөрийн товч, хэсгүүдийг, хуанлийн өдрүүд дээр богино шошго, цэгүүдийг харуулах."
+      },
+      "ui_admin_page": {
+        "title": "Админ хуудас нэмэх",
+        "body": "Админы тохиргоонд өөрийн хуудсыг харуулах."
+      },
+      "app_lifecycle": {
+        "title": "Апп эхлэх, зогсохыг мэдэх",
+        "body": "Апп эхлэх, офлайн болох эсвэл таныг гарах үед мэдэгдэл авах."
+      },
+      "compose_open": {
+        "title": "Имэйл бичих цонх нээх",
+        "body": "Хүлээн авагч, текст эсвэл хавсралтыг нь бөглөсөн шинэ имэйл нээх. Илгээх эсэхийг та өөрөө шийднэ."
+      },
+      "compose_read": {
+        "title": "Бичиж буй захидлаа унших",
+        "body": "Засварлагч дээр плагиныг ашиглах үед бичиж буй захидлын текстийг уншина. Гарын үсэг болон иш татсан захидлыг уншихгүй."
+      },
+      "compose_write": {
+        "title": "Бичиж буй захидлаа өөрчлөх",
+        "body": "Засварлагч дээр плагиныг ашиглах үед бичиж буй захидлын текстийг солих эсвэл нэмэх. Өөрчлөлт бүрийг буцааж болох бөгөөд илгээх эсэхийг та өөрөө шийднэ."
+      },
+      "ui_notifications": {
+        "title": "Мэдэгдэл харуулах",
+        "body": "Таны төхөөрөмж дээр мэдэгдэл харуулах, эсвэл мэдэгдлийг зөвшөөрөөгүй бол аппын дотор харуулах. Мэдэгдэл бүр залгаасын нэрийг заана."
+      },
+      "ui_message_list": {
+        "title": "Имэйлийн жагсаалтад нэмэх",
+        "body": "Имэйлийн жагсаалтын дээр өөрийн агуулгыг, имэйлүүд дээр болон сонгосон имэйлийн хэрэгслийн мөрөнд товчуудыг харуулах."
+      },
+      "ui_contacts": {
+        "title": "Харилцагчдын харагдацад нэмэх",
+        "body": "Харилцагчийн дэлгэрэнгүйд өөрийн хэсгүүдийг, харилцагчдын жагсаалтад товчуудыг харуулах."
+      },
+      "ui_tasks": {
+        "title": "Даалгаврын харагдацад нэмэх",
+        "body": "Даалгаврын дэлгэрэнгүйд өөрийн хэсгүүдийг, даалгаврын жагсаалтад товчуудыг харуулах."
+      },
+      "ui_files": {
+        "title": "Файлын харагдацад нэмэх",
+        "body": "Файлын урьдчилан харахад өөрийн хэсгүүдийг, файлын цэсэнд зүйлсийг харуулах."
+      },
+      "ui_commands": {
+        "title": "Тушаал нэмэх",
+        "body": "Тушаалын самбарт (Ctrl+K) өөрийн зүйлсийг нэмэх."
+      },
+      "ui_app_page": {
+        "title": "Хуудас нэмэх",
+        "body": "Аппад өөрийн хуудсуудыг нэмэх, тус бүр навигацын мөрөнд товчтой."
+      },
+      "http_proxy": {
+        "title": "Таны холбосон бүртгэлүүдийг ашиглах",
+        "body": "Таны эсвэл администраторын тохируулсан бүртгэл эсвэл түлхүүрээр Bulwark-ийн серверээр дамжуулан хүсэлт илгээх. Залгаас нууц үгийг хэзээ ч харахгүй, гэхдээ тухайн бүртгэлийн өөрийн сервер дээр хийж чадах бүх зүйлийг хийж чадна."
+      }
+    },
+    "dialog": {
+      "from_plugin": "{name} залгаасаас",
+      "ok": "OK",
+      "submit": "Илгээх",
+      "confirm": "Баталгаажуулах",
+      "cancel": "Цуцлах",
+      "close": "Хаах",
+      "turn_off": "{name}-г унтраах",
+      "plugin_menu": "{name}-ийн тохиргоо",
+      "password_note": "Энэ маягт вэб шуудангаас биш, {name} залгаасаас ирсэн. Энэ залгаасанд итгэдэг бол л нууц үгээ оруулна уу.",
+      "toast_auto_disabled": "{name} дахин дахин алдаа гаргасан тул унтраагдлаа."
+    },
+    "connect": {
+      "title": "{label} холбох",
+      "intro_password": "{name} таны {label} бүртгэлийг ашиглахыг хүсэж байна. Bulwark нууц үгийг өөрийн сервер дээр хадгалж, зөвхөн {host} руу илгээнэ. Залгаас үүнийг хэзээ ч харахгүй.",
+      "intro_password_any": "{name} таны {label} бүртгэлийг ашиглахыг хүсэж байна. Bulwark нууц үгийг өөрийн сервер дээр хадгалж, зөвхөн таны энд оруулсан сервер рүү илгээнэ. Залгаас үүнийг хэзээ ч харахгүй.",
+      "intro_signin": "{name} таны {label} бүртгэлд нэвтрэхийг хүсэж байна. Серверийг энд оруулаад, дараа нь тухайн серверийн өөрийн хуудсанд нэвтэрнэ үү. Bulwark олж авсан хандалтаа өөрийн сервер дээр хадгална; залгаас үүнийг хэзээ ч харахгүй.",
+      "server": "Серверийн хаяг",
+      "server_hint": "cloud.example.com",
+      "username": "Хэрэглэгчийн нэр",
+      "secret": "Нууц үг эсвэл түлхүүр",
+      "connect": "Холбох",
+      "continue": "Үргэлжлүүлэх",
+      "cancel": "Цуцлах",
+      "saving": "Хадгалж байна…",
+      "error_server": "Серверийн хаягийг оруулна уу, жишээ нь https://cloud.example.com",
+      "error_save": "Хадгалж чадсангүй: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "Урьдчилан харах үр дүнгээ сонгоно уу",
     "open_full": "Нээх",
     "view_label": "Харагдац"
+  },
+  "top_bar": {
+    "more": "Бусад сонголт"
+  },
+  "plugin_pages": {
+    "loading": "Хуудсыг ачаалж байна",
+    "not_available_title": "Энэ хуудас боломжгүй байна",
+    "not_available_description": "Үүнийг нэмсэн залгаас унтарсан эсвэл суулгаагүй болсон байна.",
+    "back_to_mail": "Мэйл рүү буцах",
+    "settings_group": "Залгаасууд"
+  },
+  "command_palette": {
+    "title": "Командын самбар",
+    "open": "Командын самбарыг нээх",
+    "placeholder": "Команд бичнэ үү",
+    "no_results": "Тохирох команд алга",
+    "go_to": "{name} руу очих",
+    "compose": "Шинэ захидал",
+    "search": "Мэйлээс хайх",
+    "theme_dark": "Бараан загвар руу шилжих",
+    "theme_light": "Цайвар загвар руу шилжих",
+    "shortcuts": "Гарын товчлолыг харуулах",
+    "group_navigation": "Очих",
+    "group_actions": "Үйлдлүүд",
+    "group_plugins": "Залгаасууд"
+  },
+  "notification_center": {
+    "title": "Мэдэгдэл",
+    "mark_all_read": "Бүгдийг уншсан болгох",
+    "clear": "Цэвэрлэх",
+    "empty": "Мэдэгдэл алга",
+    "close": "Хаах",
+    "unread": "Уншаагүй",
+    "unread_count": "Уншаагүй: {count}",
+    "level_error": "Алдаа",
+    "level_warning": "Анхааруулга"
   }
 }
diff --git a/locales/nb/common.json b/locales/nb/common.json
index c7127ca02..4b4258b96 100644
--- a/locales/nb/common.json
+++ b/locales/nb/common.json
@@ -620,7 +620,9 @@
       "copied": "Kode kopiert",
       "copy_failed": "Kunne ikke kopiere koden"
     },
-    "mv_position": "{index} av {total}"
+    "mv_position": "{index} av {total}",
+    "plugin_panel_show": "Vis tilleggspanel",
+    "plugin_panel_hide": "Skjul tilleggspanel"
   },
   "email_composer": {
     "minimize": "Minimer",
@@ -813,7 +815,8 @@
       "remove_background_color": "Fjern bakgrunnsfarge"
     },
     "send_filing_warning": "Meldingen ble sendt, men oppryddingen etterpå mislyktes. Et gammelt utkast kan bli liggende.",
-    "pop_out": "Åpne svaret i et eget vindu"
+    "pop_out": "Åpne svaret i et eget vindu",
+    "send_guard_failed": "Ikke sendt - et tillegg som sjekker meldinger før sending, feilet eller svarte ikke."
   },
   "confirm_dialog": {
     "confirm": "Bekreft",
@@ -3970,6 +3973,354 @@
       "failed_detail": "Autorisering mislyktes: {error}",
       "missing_params": "Mangler autorisasjonskode eller tilstand.",
       "delivery_failed": "Autoriseringsresultatet kunne ikke leveres til app-fanen. Lukk dette vinduet og prøv igjen."
+    },
+    "settings": {
+      "title": "Tillegg",
+      "description": "Tillegg som administratoren din har lagt til. Slå dem på eller av for kontoen din.",
+      "description_uploads": "Tillegg gir webmailen flere funksjoner. Slå dem på eller av for kontoen din, eller installer dine egne.",
+      "description_demo": "Tillegg er ikke tilgjengelige i demoen.",
+      "install_button": "Installer tillegg",
+      "install_hint": "Velg en ZIP-fil med et tillegg.",
+      "install_hint_approval": "Velg en ZIP-fil med et tillegg. En administrator må godkjenne det før du kan slå det på.",
+      "install_uploads_off": "Administratoren din tillater ikke at du installerer tillegg.",
+      "install_managed_id": "Administratoren din tilbyr allerede et tillegg med dette navnet, så det kan ikke erstattes.",
+      "install_invalid": "Denne filen er ikke et tillegg som kan installeres: {details}",
+      "toast_installed": "Tillegget er installert. Slå det på nedenfor.",
+      "toast_installed_pending": "Tillegget er installert og sendt til administratoren din for godkjenning.",
+      "toast_enabled": "{name} er på",
+      "toast_disabled": "{name} er av",
+      "toast_removed": "{name} er fjernet",
+      "toast_forced": "Administratoren din holder {name} slått på",
+      "toast_approval_requested": "{name} venter på godkjenning fra administratoren din",
+      "empty_title": "Ingen tillegg ennå",
+      "empty_admin": "Administratoren din har ikke lagt til noen tillegg.",
+      "empty_uploads": "Installer et tillegg fra en ZIP-fil for å komme i gang.",
+      "empty_demo": "Tillegg krever en ekte konto, så demoen har ingen.",
+      "syncing": "Sjekker tilleggene mot serveren…",
+      "status_installed": "Av",
+      "status_enabled": "Starter",
+      "status_running": "På",
+      "status_disabled": "Av",
+      "status_error": "Problem",
+      "badge_forced": "Påkrevd",
+      "badge_managed": "Fra administratoren din",
+      "badge_yours": "Installert av deg",
+      "badge_awaiting": "Venter på godkjenning",
+      "toggle_label": "Slå {name} på eller av",
+      "forced_note": "Administratoren din krever dette tillegget, så det kan ikke slås av.",
+      "permissions": "Hva det kan gjøre",
+      "permissions_managed": "Hva det kan gjøre (godkjent av administratoren din)",
+      "settings": "Innstillinger",
+      "remove": "Fjern",
+      "remove_title": "Vil du fjerne {name}?",
+      "remove_message": "Tillegget og alt det har lagret i denne nettleseren, blir slettet. Du kan installere det på nytt senere.",
+      "remove_confirm": "Fjern",
+      "error_user_plugins_off": "Administratoren din har slått av tillegg som brukere har installert, så dette tillegget kjører ikke.",
+      "error_approval_unavailable": "Dette tillegget ble installert før godkjenning ble påkrevd. Fjern det og installer det på nytt for å sende det til godkjenning.",
+      "error_approval_denied": "Administratoren din godkjente ikke dette tillegget.",
+      "error_approval_pending": "Venter på at administratoren din skal godkjenne dette tillegget.",
+      "error_auto_disabled": "Slått av fordi det feilet gjentatte ganger. Slå det på igjen for å prøve på nytt.",
+      "accounts_heading": "Tilkoblede kontoer",
+      "account_on": "{label} på {host}",
+      "account_waiting": "{label} på {host} (pålogging ikke fullført)",
+      "disconnect": "Koble fra",
+      "disconnect_failed": "Kunne ikke koble fra {label}"
+    },
+    "consent": {
+      "title": "Vil du la {name} gjøre dette?",
+      "intro": "Tillegget ber om tillatelsene nedenfor. Det får dem bare hvis du tillater det.",
+      "high_risk_note": "Merkede punkter gir tillegget tilgang til innholdet i e-posten din eller lar det sende data andre steder. Tillat dem bare for tillegg du stoler på.",
+      "revoke_hint": "Du kan når som helst slå av eller fjerne tillegget under Innstillinger.",
+      "deny": "Ikke tillat",
+      "allow": "Tillat"
+    },
+    "permissions": {
+      "none": "Det trenger ingen spesielle tillatelser.",
+      "high_risk": "Krever varsomhet",
+      "email_read": {
+        "title": "Lese e-posten din",
+        "body": "Se avsendere, mottakere, emner og hele teksten i alle meldinger på kontoen din, og mappene dine."
+      },
+      "email_write": {
+        "title": "Endre og organisere e-posten din",
+        "body": "Legge til eller fjerne etiketter, flagg og andre nøkkelord på meldingene dine, flytte dem mellom mappene dine og til arkivet, og lagre utkast."
+      },
+      "email_send": {
+        "title": "Endre e-post før den sendes",
+        "body": "Lese og endre mottakere, emne, tekst og vedlegg i meldingene du skriver, og stoppe en melding fra å bli sendt."
+      },
+      "crypto_full": {
+        "title": "Full tilgang til denne appen",
+        "body": "Kjører med de samme rettighetene som selve webmailen. Det kan lese all e-posten din og lagrede nøkler og handle på dine vegne. Tillat dette bare for tillegg du stoler fullt på."
+      },
+      "email_raw_send": {
+        "title": "Sende meldinger det har laget selv",
+        "body": "Sende ferdige meldinger, for eksempel signerte eller krypterte, fra kontoen din."
+      },
+      "email_blob_read": {
+        "title": "Lese råinnholdet i meldinger",
+        "body": "Lese de opprinnelige dataene i meldingene og vedleggene dine, og i hver fil du legger ved før den sendes."
+      },
+      "email_blob_write": {
+        "title": "Erstatte vedlegg før sending",
+        "body": "Laste opp filer til e-postserveren din og erstatte et vedlegg med en annen fil før meldingen sendes."
+      },
+      "email_render_takeover": {
+        "title": "Endre hvordan meldinger vises",
+        "body": "Erstatte teksten i meldingene du åpner og i meldingslisten, for eksempel for å vise dekryptert innhold."
+      },
+      "calendar_read": {
+        "title": "Lese kalenderen din",
+        "body": "Se kalenderne dine og hendelsene i dem."
+      },
+      "calendar_write": {
+        "title": "Endre kalenderen din",
+        "body": "Opprette, endre og slette hendelser."
+      },
+      "contacts_read": {
+        "title": "Lese kontaktene dine",
+        "body": "Søke i og lese adressebøkene dine."
+      },
+      "contacts_write": {
+        "title": "Endre kontaktene dine",
+        "body": "Opprette, endre og slette kontakter og adressebøker."
+      },
+      "files_read": {
+        "title": "Lese filene dine",
+        "body": "Bla gjennom og åpne filene som er lagret på kontoen din."
+      },
+      "files_write": {
+        "title": "Endre filene dine",
+        "body": "Laste opp, gi nytt navn til, flytte og slette filer på kontoen din."
+      },
+      "identity_read": {
+        "title": "Se avsenderidentitetene dine",
+        "body": "Se adressene du sender fra, og signaturene deres."
+      },
+      "identity_write": {
+        "title": "Endre avsenderidentitetene dine",
+        "body": "Opprette, endre og slette avsenderidentiteter og signaturer."
+      },
+      "filters_read": {
+        "title": "Lese e-postfiltrene dine",
+        "body": "Se reglene som sorterer innkommende e-post."
+      },
+      "filters_write": {
+        "title": "Endre e-postfiltrene dine",
+        "body": "Legge til regler i filtrene dine på serveren. Slike regler kan flytte, videresende eller slette innkommende e-post."
+      },
+      "tasks_read": {
+        "title": "Lese oppgavene dine",
+        "body": "Se oppgavelistene og oppgavene dine."
+      },
+      "tasks_write": {
+        "title": "Endre oppgavene dine",
+        "body": "Opprette, endre, fullføre og slette oppgaver."
+      },
+      "templates_read": {
+        "title": "Lese malene dine",
+        "body": "Se de lagrede meldingsmalene dine."
+      },
+      "templates_write": {
+        "title": "Endre malene dine",
+        "body": "Opprette, endre og slette meldingsmaler."
+      },
+      "smime_read": {
+        "title": "Se S/MIME-statusen din",
+        "body": "Se om du har S/MIME-nøkler og -sertifikater, uten tilgang til nøklene."
+      },
+      "vacation_read": {
+        "title": "Se fraværssvaret ditt",
+        "body": "Se om det automatiske svaret ditt er på, og hva det sier."
+      },
+      "vacation_write": {
+        "title": "Endre fraværssvaret ditt",
+        "body": "Slå det automatiske svaret på eller av og endre teksten og datoene."
+      },
+      "settings_read": {
+        "title": "Lese innstillingene dine",
+        "body": "Se innstillingene og etikettdefinisjonene dine."
+      },
+      "settings_write": {
+        "title": "Endre innstillingene dine",
+        "body": "Legge til og endre rekkefølgen på etiketter og endre innstillingene dine."
+      },
+      "security_read": {
+        "title": "Se kontosikkerheten din",
+        "body": "Se om tofaktorautentisering og kryptering er slått på, uten tilgang til hemmeligheter."
+      },
+      "auth_observe": {
+        "title": "Vite når du logger på",
+        "body": "Få beskjed når du logger på, bytter konto eller økten din fornyes."
+      },
+      "auth_emit": {
+        "title": "Logge deg ut",
+        "body": "Logge deg ut av webmailen."
+      },
+      "account_read": {
+        "title": "Se kontoene dine",
+        "body": "Se kontoene du har lagt til, med adressene og serverne deres."
+      },
+      "http_post": {
+        "title": "Bruke webmailserveren for deg",
+        "body": "Kalle disse serverendepunktene med påloggingen din:"
+      },
+      "http_fetch": {
+        "title": "Koble til andre nettsteder",
+        "body": "Sende forespørsler til disse nettstedene. Alt tillegget kan lese, kan bli sendt dit:"
+      },
+      "admin_config": {
+        "title": "Lese innstillingene sine fra administratoren din",
+        "body": "Lese innstillingene administratoren din har lagret for dette tillegget."
+      },
+      "ui_observe": {
+        "title": "Følge med på hvor du er i appen",
+        "body": "Vite hvilken side som er åpen, og reagere på lenker du klikker på."
+      },
+      "ui_toolbar": {
+        "title": "Legge til knapper i verktøylinjer",
+        "body": "Vise egne knapper i meldingsverktøylinjen, på en åpen melding og i topplinjen."
+      },
+      "ui_app_top_banner": {
+        "title": "Vise et banner øverst",
+        "body": "Vise et varsel over hele toppen av appen."
+      },
+      "ui_email_banner": {
+        "title": "Vise varsler på meldinger",
+        "body": "Vise egne varsler og sammendrag over, i og mellom delene av en åpen melding eller samtale."
+      },
+      "ui_email_footer": {
+        "title": "Legge til innhold under meldinger",
+        "body": "Vise eget innhold under en åpen melding."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "Vise krypteringsnøklene til kontakter",
+        "body": "Vise og administrere krypteringsnøklene på en kontakt."
+      },
+      "ui_email_details": {
+        "title": "Legge til paneler i meldingsdetaljene",
+        "body": "Vise et eget panel ved siden av eller under en åpen melding."
+      },
+      "ui_download_file": {
+        "title": "Lagre filer på enheten din",
+        "body": "Tilby filer det har laget, for nedlasting."
+      },
+      "ui_message_list_tabs": {
+        "title": "Legge til faner i innboksen din",
+        "body": "Sortere innboksen din i faner som Oppdateringer eller Kampanjer."
+      },
+      "ui_composer_toolbar": {
+        "title": "Legge til i meldingsvinduet",
+        "body": "Vise egne knapper, menyvalg og seksjoner mens du skriver en melding."
+      },
+      "ui_composer_sidebar": {
+        "title": "Legge til et panel i meldingsvinduet",
+        "body": "Vise et eget panel ved siden av meldingen du skriver."
+      },
+      "ui_sidebar_widget": {
+        "title": "Legge til i sidefeltet",
+        "body": "Vise egne bokser og seksjoner i sidefeltet for e-post."
+      },
+      "ui_settings_section": {
+        "title": "Legge til en innstillingsside",
+        "body": "Vise en egen side under Innstillinger."
+      },
+      "ui_context_menu": {
+        "title": "Legge til i meldingsmenyen",
+        "body": "Legge til valg i menyen som åpnes når du høyreklikker på en melding."
+      },
+      "ui_navigation_rail": {
+        "title": "Legge til i navigasjonsfeltet",
+        "body": "Vise en egen knapp i navigasjonsfeltet."
+      },
+      "ui_keyboard": {
+        "title": "Legge til tastatursnarveier",
+        "body": "Reagere på tastatursnarveier det definerer selv."
+      },
+      "ui_calendar_action": {
+        "title": "Legge til i kalendervisningen",
+        "body": "Vise egne knapper og seksjoner på hendelser, og korte etiketter og prikker på kalenderdager."
+      },
+      "ui_admin_page": {
+        "title": "Legge til en administrasjonsside",
+        "body": "Vise en egen side i administrasjonsinnstillingene."
+      },
+      "app_lifecycle": {
+        "title": "Vite når appen starter og stopper",
+        "body": "Få beskjed når appen starter, går frakoblet eller du logger ut."
+      },
+      "compose_open": {
+        "title": "Åpne meldingsvinduet for deg",
+        "body": "Åpne en ny melding med mottakere, tekst eller vedlegg fylt ut. Du bestemmer fortsatt om den skal sendes."
+      },
+      "compose_read": {
+        "title": "Lese meldingen du skriver",
+        "body": "Lese teksten i en melding mens du skriver den, når du bruker tillegget i redigeringsvinduet. Ikke signaturen eller den siterte meldingen."
+      },
+      "compose_write": {
+        "title": "Endre meldingen du skriver",
+        "body": "Erstatte eller legge til tekst i en melding mens du skriver den, når du bruker tillegget i redigeringsvinduet. Du kan angre hver endring, og du bestemmer fortsatt om den skal sendes."
+      },
+      "ui_notifications": {
+        "title": "Vise varsler",
+        "body": "Vise varsler på enheten din, eller i appen hvis du ikke har tillatt dem. Hvert varsel viser navnet på tillegget."
+      },
+      "ui_message_list": {
+        "title": "Legge til i meldingslisten",
+        "body": "Vise eget innhold over meldingslisten, og knapper på meldinger og i verktøylinjen for valgte meldinger."
+      },
+      "ui_contacts": {
+        "title": "Legge til i kontaktvisningen",
+        "body": "Vise egne seksjoner i detaljene for en kontakt og knapper i kontaktlisten."
+      },
+      "ui_tasks": {
+        "title": "Legge til i oppgavevisningen",
+        "body": "Vise egne seksjoner i detaljene for en oppgave og knapper i oppgavelisten."
+      },
+      "ui_files": {
+        "title": "Legge til i filvisningen",
+        "body": "Vise egne seksjoner i forhåndsvisningen av filer og valg i menyen for en fil."
+      },
+      "ui_commands": {
+        "title": "Legge til kommandoer",
+        "body": "Legge til egne valg i kommandopaletten (Ctrl+K)."
+      },
+      "ui_app_page": {
+        "title": "Legge til sider",
+        "body": "Legge til egne sider i appen, hver med en knapp i navigasjonsfeltet."
+      },
+      "http_proxy": {
+        "title": "Bruke kontoer du kobler til",
+        "body": "Sende forespørsler via Bulwarks server med en konto eller nøkkel som du eller administratoren din har satt opp. Tillegget ser aldri passordet, men det kan gjøre alt den kontoen kan gjøre på sin egen server."
+      }
+    },
+    "dialog": {
+      "from_plugin": "Fra tillegget {name}",
+      "ok": "OK",
+      "submit": "Send",
+      "confirm": "Bekreft",
+      "cancel": "Avbryt",
+      "close": "Lukk",
+      "turn_off": "Slå av {name}",
+      "plugin_menu": "Alternativer for {name}",
+      "password_note": "Dette skjemaet kommer fra tillegget {name}, ikke fra webmailen. Skriv bare inn et passord hvis du stoler på dette tillegget.",
+      "toast_auto_disabled": "{name} ble slått av fordi det feilet gjentatte ganger."
+    },
+    "connect": {
+      "title": "Koble til {label}",
+      "intro_password": "{name} vil bruke kontoen din hos {label}. Bulwark lagrer passordet på sin server og sender det bare til {host}. Tillegget ser det aldri.",
+      "intro_password_any": "{name} vil bruke kontoen din hos {label}. Bulwark lagrer passordet på sin server og sender det bare til serveren du skriver inn her. Tillegget ser det aldri.",
+      "intro_signin": "{name} vil logge på kontoen din hos {label}. Skriv inn serveren her, og logg deretter på via serverens egen side. Bulwark lagrer tilgangen det får, på sin server; tillegget ser den aldri.",
+      "server": "Serveradresse",
+      "server_hint": "cloud.example.com",
+      "username": "Brukernavn",
+      "secret": "Passord eller nøkkel",
+      "connect": "Koble til",
+      "continue": "Fortsett",
+      "cancel": "Avbryt",
+      "saving": "Lagrer…",
+      "error_server": "Skriv inn adressen til serveren, for eksempel https://cloud.example.com",
+      "error_save": "Kunne ikke lagre: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "Velg et resultat for å forhåndsvise det",
     "open_full": "Åpne",
     "view_label": "Visning"
+  },
+  "top_bar": {
+    "more": "Flere alternativer"
+  },
+  "plugin_pages": {
+    "loading": "Laster inn siden",
+    "not_available_title": "Denne siden er ikke tilgjengelig",
+    "not_available_description": "Tillegget som la den til, er slått av eller ikke lenger installert.",
+    "back_to_mail": "Tilbake til e-post",
+    "settings_group": "Tillegg"
+  },
+  "command_palette": {
+    "title": "Kommandopalett",
+    "open": "Åpne kommandopaletten",
+    "placeholder": "Skriv en kommando",
+    "no_results": "Ingen samsvarende kommandoer",
+    "go_to": "Gå til {name}",
+    "compose": "Ny melding",
+    "search": "Søk i e-post",
+    "theme_dark": "Bytt til mørkt tema",
+    "theme_light": "Bytt til lyst tema",
+    "shortcuts": "Vis tastatursnarveier",
+    "group_navigation": "Gå til",
+    "group_actions": "Handlinger",
+    "group_plugins": "Tillegg"
+  },
+  "notification_center": {
+    "title": "Varsler",
+    "mark_all_read": "Merk alle som lest",
+    "clear": "Tøm",
+    "empty": "Ingen varsler",
+    "close": "Lukk",
+    "unread": "Ulest",
+    "unread_count": "{count} uleste",
+    "level_error": "Feil",
+    "level_warning": "Advarsel"
   }
 }
diff --git a/locales/nl/common.json b/locales/nl/common.json
index 1be74af98..ed1464ca1 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -620,7 +620,9 @@
       "copied": "Code gekopieerd",
       "copy_failed": "Kan de code niet kopiëren"
     },
-    "mv_position": "{index} van {total}"
+    "mv_position": "{index} van {total}",
+    "plugin_panel_show": "Plug-inpaneel tonen",
+    "plugin_panel_hide": "Plug-inpaneel verbergen"
   },
   "email_composer": {
     "minimize": "Minimaliseren",
@@ -813,7 +815,8 @@
       "remove_background_color": "Achtergrondkleur verwijderen"
     },
     "send_filing_warning": "Verzonden - maar het opruimen daarna is mislukt, mogelijk blijft een oud concept staan.",
-    "pop_out": "Antwoord in een apart venster openen"
+    "pop_out": "Antwoord in een apart venster openen",
+    "send_guard_failed": "Niet verzonden - een plug-in die berichten controleert voor het verzenden is mislukt of reageerde niet."
   },
   "confirm_dialog": {
     "confirm": "Bevestigen",
@@ -3970,6 +3973,354 @@
       "failed_detail": "Autorisatie mislukt: {error}",
       "missing_params": "Autorisatiecode of status ontbreekt.",
       "delivery_failed": "Het autorisatieresultaat kon niet worden afgeleverd bij het app-tabblad. Sluit dit venster en probeer het opnieuw."
+    },
+    "settings": {
+      "title": "Plug-ins",
+      "description": "Plug-ins die je beheerder heeft toegevoegd. Zet ze aan of uit voor je account.",
+      "description_uploads": "Plug-ins voegen functies toe aan de webmail. Zet ze aan of uit voor je account, of installeer je eigen plug-ins.",
+      "description_demo": "Plug-ins zijn niet beschikbaar in de demo.",
+      "install_button": "Plug-in installeren",
+      "install_hint": "Kies een ZIP-bestand met een plug-in.",
+      "install_hint_approval": "Kies een ZIP-bestand met een plug-in. Een beheerder moet de plug-in goedkeuren voordat je hem kunt aanzetten.",
+      "install_uploads_off": "Je beheerder staat het installeren van plug-ins niet toe.",
+      "install_managed_id": "Je beheerder biedt al een plug-in met deze naam aan, dus die kan niet worden vervangen.",
+      "install_invalid": "Dit bestand is geen plug-in die kan worden geïnstalleerd: {details}",
+      "toast_installed": "Plug-in geïnstalleerd. Zet hem hieronder aan.",
+      "toast_installed_pending": "Plug-in geïnstalleerd en ter goedkeuring naar je beheerder gestuurd.",
+      "toast_enabled": "{name} staat aan",
+      "toast_disabled": "{name} staat uit",
+      "toast_removed": "{name} is verwijderd",
+      "toast_forced": "Je beheerder houdt {name} aan",
+      "toast_approval_requested": "{name} wacht op goedkeuring door je beheerder",
+      "empty_title": "Nog geen plug-ins",
+      "empty_admin": "Je beheerder heeft geen plug-ins toegevoegd.",
+      "empty_uploads": "Installeer een plug-in vanuit een ZIP-bestand om te beginnen.",
+      "empty_demo": "Plug-ins hebben een echt account nodig, dus de demo heeft er geen.",
+      "syncing": "Plug-ins controleren bij de server…",
+      "status_installed": "Uit",
+      "status_enabled": "Wordt gestart",
+      "status_running": "Aan",
+      "status_disabled": "Uit",
+      "status_error": "Probleem",
+      "badge_forced": "Verplicht",
+      "badge_managed": "Van je beheerder",
+      "badge_yours": "Door jou geïnstalleerd",
+      "badge_awaiting": "Wacht op goedkeuring",
+      "toggle_label": "{name} aan- of uitzetten",
+      "forced_note": "Je beheerder vereist deze plug-in, dus hij kan niet worden uitgezet.",
+      "permissions": "Wat hij kan doen",
+      "permissions_managed": "Wat hij kan doen (goedgekeurd door je beheerder)",
+      "settings": "Instellingen",
+      "remove": "Verwijderen",
+      "remove_title": "{name} verwijderen?",
+      "remove_message": "De plug-in en alles wat hij in deze browser heeft opgeslagen, worden verwijderd. Je kunt hem later opnieuw installeren.",
+      "remove_confirm": "Verwijderen",
+      "error_user_plugins_off": "Je beheerder heeft plug-ins die door gebruikers zijn geïnstalleerd uitgezet, dus deze plug-in draait niet.",
+      "error_approval_unavailable": "Deze plug-in is geïnstalleerd voordat goedkeuring verplicht was. Verwijder hem en installeer hem opnieuw om hem ter goedkeuring te sturen.",
+      "error_approval_denied": "Je beheerder heeft deze plug-in niet goedgekeurd.",
+      "error_approval_pending": "Wacht tot je beheerder deze plug-in goedkeurt.",
+      "error_auto_disabled": "Uitgezet omdat het steeds misging. Zet het weer aan om het opnieuw te proberen.",
+      "accounts_heading": "Gekoppelde accounts",
+      "account_on": "{label} op {host}",
+      "account_waiting": "{label} op {host} (inloggen niet afgerond)",
+      "disconnect": "Ontkoppelen",
+      "disconnect_failed": "Kan {label} niet ontkoppelen"
+    },
+    "consent": {
+      "title": "{name} dit toestaan?",
+      "intro": "De plug-in vraagt de onderstaande rechten. Hij krijgt ze alleen als je ze toestaat.",
+      "high_risk_note": "Gemarkeerde items geven de plug-in toegang tot de inhoud van je e-mail of laten hem gegevens elders naartoe sturen. Sta ze alleen toe voor plug-ins die je vertrouwt.",
+      "revoke_hint": "Je kunt de plug-in op elk moment uitzetten of verwijderen in Instellingen.",
+      "deny": "Niet toestaan",
+      "allow": "Toestaan"
+    },
+    "permissions": {
+      "none": "Hij heeft geen speciale rechten nodig.",
+      "high_risk": "Let op",
+      "email_read": {
+        "title": "Je e-mail lezen",
+        "body": "Afzenders, ontvangers, onderwerpen en de volledige tekst zien van elk bericht in je account, en je mappen."
+      },
+      "email_write": {
+        "title": "Je e-mail wijzigen en ordenen",
+        "body": "Labels, markeringen en andere trefwoorden aan je berichten toevoegen of ervan verwijderen, berichten tussen je mappen en naar het archief verplaatsen, en concepten opslaan."
+      },
+      "email_send": {
+        "title": "E-mail wijzigen voordat die wordt verzonden",
+        "body": "De ontvangers, het onderwerp, de tekst en de bijlagen lezen en wijzigen van berichten die je schrijft, en het verzenden van een bericht tegenhouden."
+      },
+      "crypto_full": {
+        "title": "Volledige toegang tot deze app",
+        "body": "Draait met dezelfde rechten als de webmail zelf. Hij kan al je e-mail en opgeslagen sleutels lezen en namens jou handelen. Sta dit alleen toe voor plug-ins die je volledig vertrouwt."
+      },
+      "email_raw_send": {
+        "title": "Zelf samengestelde berichten verzenden",
+        "body": "Volledige berichten, bijvoorbeeld ondertekende of versleutelde, vanaf je account verzenden."
+      },
+      "email_blob_read": {
+        "title": "De ruwe inhoud van berichten lezen",
+        "body": "De oorspronkelijke gegevens van je berichten en bijlagen lezen, en van elk bestand dat je bijvoegt voordat het wordt verzonden."
+      },
+      "email_blob_write": {
+        "title": "Bijlagen vervangen vóór het verzenden",
+        "body": "Bestanden naar je mailserver uploaden en een bijgevoegd bestand door een ander vervangen voordat het bericht wordt verzonden."
+      },
+      "email_render_takeover": {
+        "title": "Wijzigen hoe berichten worden weergegeven",
+        "body": "De tekst vervangen van berichten die je opent en van de berichtenlijst, bijvoorbeeld om ontsleutelde inhoud te tonen."
+      },
+      "calendar_read": {
+        "title": "Je agenda lezen",
+        "body": "Je agenda's en hun afspraken zien."
+      },
+      "calendar_write": {
+        "title": "Je agenda wijzigen",
+        "body": "Afspraken aanmaken, wijzigen en verwijderen."
+      },
+      "contacts_read": {
+        "title": "Je contacten lezen",
+        "body": "Je adresboeken doorzoeken en lezen."
+      },
+      "contacts_write": {
+        "title": "Je contacten wijzigen",
+        "body": "Contacten en adresboeken aanmaken, wijzigen en verwijderen."
+      },
+      "files_read": {
+        "title": "Je bestanden lezen",
+        "body": "De bestanden in je account bekijken en openen."
+      },
+      "files_write": {
+        "title": "Je bestanden wijzigen",
+        "body": "Bestanden in je account uploaden, hernoemen, verplaatsen en verwijderen."
+      },
+      "identity_read": {
+        "title": "Je afzenderadressen zien",
+        "body": "De adressen waarvandaan je verzendt en hun handtekeningen zien."
+      },
+      "identity_write": {
+        "title": "Je afzenderadressen wijzigen",
+        "body": "Afzenderadressen en handtekeningen aanmaken, wijzigen en verwijderen."
+      },
+      "filters_read": {
+        "title": "Je mailfilters lezen",
+        "body": "De regels zien die je binnenkomende e-mail sorteren."
+      },
+      "filters_write": {
+        "title": "Je mailfilters wijzigen",
+        "body": "Regels toevoegen aan je filters op de server. Zulke regels kunnen binnenkomende e-mail verplaatsen, doorsturen of verwijderen."
+      },
+      "tasks_read": {
+        "title": "Je taken lezen",
+        "body": "Je takenlijsten en taken zien."
+      },
+      "tasks_write": {
+        "title": "Je taken wijzigen",
+        "body": "Taken aanmaken, wijzigen, afronden en verwijderen."
+      },
+      "templates_read": {
+        "title": "Je sjablonen lezen",
+        "body": "Je opgeslagen berichtsjablonen zien."
+      },
+      "templates_write": {
+        "title": "Je sjablonen wijzigen",
+        "body": "Berichtsjablonen aanmaken, wijzigen en verwijderen."
+      },
+      "smime_read": {
+        "title": "Je S/MIME-status zien",
+        "body": "Zien of je S/MIME-sleutels en -certificaten hebt, zonder toegang tot de sleutels."
+      },
+      "vacation_read": {
+        "title": "Je afwezigheidsmelding zien",
+        "body": "Zien of je automatisch antwoord aanstaat en wat erin staat."
+      },
+      "vacation_write": {
+        "title": "Je afwezigheidsmelding wijzigen",
+        "body": "Je automatisch antwoord aan- of uitzetten en de tekst en datums ervan wijzigen."
+      },
+      "settings_read": {
+        "title": "Je instellingen lezen",
+        "body": "Je voorkeuren en labeldefinities zien."
+      },
+      "settings_write": {
+        "title": "Je instellingen wijzigen",
+        "body": "Labels toevoegen en herschikken en je voorkeuren wijzigen."
+      },
+      "security_read": {
+        "title": "De beveiliging van je account zien",
+        "body": "Zien of tweefactoraanmelding en versleuteling aanstaan, zonder toegang tot geheimen."
+      },
+      "auth_observe": {
+        "title": "Weten wanneer je je aanmeldt",
+        "body": "Een melding krijgen wanneer je je aanmeldt, van account wisselt of je sessie wordt vernieuwd."
+      },
+      "auth_emit": {
+        "title": "Je afmelden",
+        "body": "Je afmelden bij de webmail."
+      },
+      "account_read": {
+        "title": "Je accounts zien",
+        "body": "De accounts zien die je hebt toegevoegd, met hun adressen en servers."
+      },
+      "http_post": {
+        "title": "De webmailserver voor je gebruiken",
+        "body": "Deze servereindpunten aanroepen met je aanmelding:"
+      },
+      "http_fetch": {
+        "title": "Verbinding maken met andere websites",
+        "body": "Verzoeken naar deze sites sturen. Alles wat de plug-in kan lezen, kan daarheen worden gestuurd:"
+      },
+      "admin_config": {
+        "title": "Zijn instellingen van je beheerder lezen",
+        "body": "De instellingen lezen die je beheerder voor deze plug-in heeft opgeslagen."
+      },
+      "ui_observe": {
+        "title": "Volgen waar je bent in de app",
+        "body": "Weten welke pagina open is en reageren op links waarop je klikt."
+      },
+      "ui_toolbar": {
+        "title": "Knoppen toevoegen aan werkbalken",
+        "body": "Eigen knoppen tonen in de berichtwerkbalk, bij een geopend bericht en in de bovenbalk."
+      },
+      "ui_app_top_banner": {
+        "title": "Een banner bovenaan tonen",
+        "body": "Een melding tonen over de hele bovenkant van de app."
+      },
+      "ui_email_banner": {
+        "title": "Meldingen bij berichten tonen",
+        "body": "Eigen meldingen en samenvattingen tonen boven, in en tussen de delen van een geopend bericht of gesprek."
+      },
+      "ui_email_footer": {
+        "title": "Inhoud onder berichten toevoegen",
+        "body": "Eigen inhoud tonen onder een geopend bericht."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "Versleutelingssleutels van contacten tonen",
+        "body": "De versleutelingssleutels van een contact tonen en beheren."
+      },
+      "ui_email_details": {
+        "title": "Panelen toevoegen aan berichtdetails",
+        "body": "Een eigen paneel tonen naast of onder een geopend bericht."
+      },
+      "ui_download_file": {
+        "title": "Bestanden op je apparaat opslaan",
+        "body": "Bestanden die hij heeft gemaakt aanbieden om te downloaden."
+      },
+      "ui_message_list_tabs": {
+        "title": "Tabbladen toevoegen aan je Postvak IN",
+        "body": "Je Postvak IN in tabbladen indelen, zoals Updates of Promoties."
+      },
+      "ui_composer_toolbar": {
+        "title": "Toevoegen aan de opsteller",
+        "body": "Eigen knoppen, menu-items en secties tonen terwijl je een bericht schrijft."
+      },
+      "ui_composer_sidebar": {
+        "title": "Een paneel toevoegen aan de opsteller",
+        "body": "Een eigen paneel tonen naast het bericht dat je schrijft."
+      },
+      "ui_sidebar_widget": {
+        "title": "Toevoegen aan de zijbalk",
+        "body": "Eigen vakken en secties tonen in de zijbalk van de mail."
+      },
+      "ui_settings_section": {
+        "title": "Een instellingenpagina toevoegen",
+        "body": "Een eigen pagina tonen in Instellingen."
+      },
+      "ui_context_menu": {
+        "title": "Toevoegen aan het berichtmenu",
+        "body": "Items toevoegen aan het menu dat opent als je met de rechtermuisknop op een bericht klikt."
+      },
+      "ui_navigation_rail": {
+        "title": "Toevoegen aan de navigatiebalk",
+        "body": "Een eigen knop tonen in de navigatiebalk."
+      },
+      "ui_keyboard": {
+        "title": "Sneltoetsen toevoegen",
+        "body": "Reageren op sneltoetsen die hij zelf vastlegt."
+      },
+      "ui_calendar_action": {
+        "title": "Toevoegen aan de agendaweergave",
+        "body": "Eigen knoppen en secties tonen bij afspraken, en korte labels en stippen bij dagen in de agenda."
+      },
+      "ui_admin_page": {
+        "title": "Een beheerpagina toevoegen",
+        "body": "Een eigen pagina tonen in de beheerinstellingen."
+      },
+      "app_lifecycle": {
+        "title": "Weten wanneer de app start en stopt",
+        "body": "Een melding krijgen wanneer de app start, offline gaat of je je afmeldt."
+      },
+      "compose_open": {
+        "title": "De opsteller voor je openen",
+        "body": "Een nieuw bericht openen met ontvangers, tekst of bijlagen al ingevuld. Jij beslist nog steeds of het wordt verzonden."
+      },
+      "compose_read": {
+        "title": "Het bericht lezen dat je schrijft",
+        "body": "De tekst van een bericht lezen terwijl je het schrijft, als je de plug-in in de editor gebruikt. Niet de handtekening of het geciteerde bericht."
+      },
+      "compose_write": {
+        "title": "Het bericht wijzigen dat je schrijft",
+        "body": "Tekst in een bericht vervangen of toevoegen terwijl je het schrijft, als je de plug-in in de editor gebruikt. Je kunt elke wijziging ongedaan maken en je beslist nog steeds zelf of je het verstuurt."
+      },
+      "ui_notifications": {
+        "title": "Meldingen tonen",
+        "body": "Meldingen op je apparaat tonen, of in de app als je ze niet hebt toegestaan. Elke melding noemt de naam van de plug-in."
+      },
+      "ui_message_list": {
+        "title": "Toevoegen aan de berichtenlijst",
+        "body": "Eigen inhoud tonen boven de berichtenlijst, en knoppen bij berichten en in de werkbalk voor geselecteerde berichten."
+      },
+      "ui_contacts": {
+        "title": "Toevoegen aan de contactenweergave",
+        "body": "Eigen secties tonen in de details van een contact en knoppen in de contactenlijst."
+      },
+      "ui_tasks": {
+        "title": "Toevoegen aan de takenweergave",
+        "body": "Eigen secties tonen in de details van een taak en knoppen in de takenlijst."
+      },
+      "ui_files": {
+        "title": "Toevoegen aan de bestandenweergave",
+        "body": "Eigen secties tonen in het bestandsvoorbeeld en items in het menu van een bestand."
+      },
+      "ui_commands": {
+        "title": "Opdrachten toevoegen",
+        "body": "Eigen items toevoegen aan het opdrachtenpalet (Ctrl+K)."
+      },
+      "ui_app_page": {
+        "title": "Pagina's toevoegen",
+        "body": "Eigen pagina's toevoegen aan de app, elk met een knop in de navigatiebalk."
+      },
+      "http_proxy": {
+        "title": "Accounts gebruiken die je koppelt",
+        "body": "Verzoeken via de server van Bulwark sturen met een account of sleutel die jij of je beheerder heeft ingesteld. De plug-in ziet het wachtwoord nooit, maar kan alles doen wat dat account op zijn eigen server mag."
+      }
+    },
+    "dialog": {
+      "from_plugin": "Van de plug-in {name}",
+      "ok": "OK",
+      "submit": "Versturen",
+      "confirm": "Bevestigen",
+      "cancel": "Annuleren",
+      "close": "Sluiten",
+      "turn_off": "{name} uitzetten",
+      "plugin_menu": "Opties voor {name}",
+      "password_note": "Dit formulier komt van de plug-in {name}, niet van de webmail. Vul alleen een wachtwoord in als je deze plug-in vertrouwt.",
+      "toast_auto_disabled": "{name} is uitgezet omdat het steeds misging."
+    },
+    "connect": {
+      "title": "{label} koppelen",
+      "intro_password": "{name} wil je account bij {label} gebruiken. Bulwark bewaart het wachtwoord op zijn eigen server en stuurt het alleen naar {host}. De plug-in ziet het nooit.",
+      "intro_password_any": "{name} wil je account bij {label} gebruiken. Bulwark bewaart het wachtwoord op zijn eigen server en stuurt het alleen naar de server die je hier invult. De plug-in ziet het nooit.",
+      "intro_signin": "{name} wil inloggen op je account bij {label}. Vul hier de server in en log daarna in op de eigen pagina van die server. Bulwark bewaart de toegang die het krijgt op zijn eigen server; de plug-in ziet die nooit.",
+      "server": "Serveradres",
+      "server_hint": "cloud.example.com",
+      "username": "Gebruikersnaam",
+      "secret": "Wachtwoord of sleutel",
+      "connect": "Koppelen",
+      "continue": "Doorgaan",
+      "cancel": "Annuleren",
+      "saving": "Opslaan…",
+      "error_server": "Vul het adres van de server in, bijvoorbeeld https://cloud.example.com",
+      "error_save": "Opslaan mislukt: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "Selecteer een resultaat voor een voorbeeld",
     "open_full": "Openen",
     "view_label": "Weergave"
+  },
+  "top_bar": {
+    "more": "Meer opties"
+  },
+  "plugin_pages": {
+    "loading": "Pagina laden",
+    "not_available_title": "Deze pagina is niet beschikbaar",
+    "not_available_description": "De plug-in die hem heeft toegevoegd, staat uit of is niet meer geïnstalleerd.",
+    "back_to_mail": "Terug naar e-mail",
+    "settings_group": "Plug-ins"
+  },
+  "command_palette": {
+    "title": "Opdrachtenpalet",
+    "open": "Opdrachtenpalet openen",
+    "placeholder": "Typ een opdracht",
+    "no_results": "Geen overeenkomende opdrachten",
+    "go_to": "Naar {name}",
+    "compose": "Nieuw bericht",
+    "search": "E-mail doorzoeken",
+    "theme_dark": "Donker thema gebruiken",
+    "theme_light": "Licht thema gebruiken",
+    "shortcuts": "Sneltoetsen tonen",
+    "group_navigation": "Naar",
+    "group_actions": "Acties",
+    "group_plugins": "Plug-ins"
+  },
+  "notification_center": {
+    "title": "Meldingen",
+    "mark_all_read": "Alles als gelezen markeren",
+    "clear": "Wissen",
+    "empty": "Geen meldingen",
+    "close": "Sluiten",
+    "unread": "Ongelezen",
+    "unread_count": "{count} ongelezen",
+    "level_error": "Fout",
+    "level_warning": "Waarschuwing"
   }
 }
diff --git a/locales/pl/common.json b/locales/pl/common.json
index e9c7e01ce..e65a28bad 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -620,7 +620,9 @@
       "copied": "Skopiowano kod",
       "copy_failed": "Nie udało się skopiować kodu"
     },
-    "mv_position": "{index} z {total}"
+    "mv_position": "{index} z {total}",
+    "plugin_panel_show": "Pokaż panel wtyczki",
+    "plugin_panel_hide": "Ukryj panel wtyczki"
   },
   "email_composer": {
     "minimize": "Minimalizuj",
@@ -813,7 +815,8 @@
       "remove_background_color": "Usuń kolor tła"
     },
     "send_filing_warning": "Wysłano - ale późniejsze porządkowanie nie powiodło się, może pozostać nieaktualna wersja robocza.",
-    "pop_out": "Otwórz odpowiedź w oknie"
+    "pop_out": "Otwórz odpowiedź w oknie",
+    "send_guard_failed": "Nie wysłano - wtyczka sprawdzająca wiadomości przed wysłaniem zawiodła lub nie odpowiedziała."
   },
   "confirm_dialog": {
     "confirm": "Potwierdź",
@@ -3970,6 +3973,354 @@
       "failed_detail": "Autoryzacja nie powiodła się: {error}",
       "missing_params": "Brak kodu autoryzacji lub stanu.",
       "delivery_failed": "Nie udało się przekazać wyniku autoryzacji do karty aplikacji. Zamknij to okno i spróbuj ponownie."
+    },
+    "settings": {
+      "title": "Wtyczki",
+      "description": "Wtyczki dodane przez administratora. Włączaj je i wyłączaj dla swojego konta.",
+      "description_uploads": "Wtyczki dodają funkcje do webmaila. Włączaj je i wyłączaj dla swojego konta albo instaluj własne.",
+      "description_demo": "Wtyczki nie są dostępne w wersji demo.",
+      "install_button": "Zainstaluj wtyczkę",
+      "install_hint": "Wybierz plik ZIP z wtyczką.",
+      "install_hint_approval": "Wybierz plik ZIP z wtyczką. Zanim będzie można ją włączyć, administrator musi ją zatwierdzić.",
+      "install_uploads_off": "Administrator nie pozwala na instalowanie wtyczek.",
+      "install_managed_id": "Administrator udostępnia już wtyczkę o tej nazwie, więc nie można jej zastąpić.",
+      "install_invalid": "Tego pliku nie można zainstalować jako wtyczki: {details}",
+      "toast_installed": "Wtyczka zainstalowana. Włącz ją poniżej.",
+      "toast_installed_pending": "Wtyczka zainstalowana i wysłana do zatwierdzenia przez administratora.",
+      "toast_enabled": "Wtyczka {name} jest włączona",
+      "toast_disabled": "Wtyczka {name} jest wyłączona",
+      "toast_removed": "Usunięto wtyczkę {name}",
+      "toast_forced": "Administrator utrzymuje wtyczkę {name} włączoną",
+      "toast_approval_requested": "Wtyczka {name} czeka na zatwierdzenie przez administratora",
+      "empty_title": "Brak wtyczek",
+      "empty_admin": "Administrator nie dodał jeszcze żadnych wtyczek.",
+      "empty_uploads": "Na początek zainstaluj wtyczkę z pliku ZIP.",
+      "empty_demo": "Wtyczki wymagają prawdziwego konta, więc w wersji demo ich nie ma.",
+      "syncing": "Sprawdzanie wtyczek na serwerze…",
+      "status_installed": "Wyłączona",
+      "status_enabled": "Uruchamianie",
+      "status_running": "Włączona",
+      "status_disabled": "Wyłączona",
+      "status_error": "Problem",
+      "badge_forced": "Wymagana",
+      "badge_managed": "Od administratora",
+      "badge_yours": "Zainstalowana przez Ciebie",
+      "badge_awaiting": "Czeka na zatwierdzenie",
+      "toggle_label": "Włącz lub wyłącz wtyczkę {name}",
+      "forced_note": "Administrator wymaga tej wtyczki, więc nie można jej wyłączyć.",
+      "permissions": "Co może robić",
+      "permissions_managed": "Co może robić (zatwierdzone przez administratora)",
+      "settings": "Ustawienia",
+      "remove": "Usuń",
+      "remove_title": "Usunąć wtyczkę {name}?",
+      "remove_message": "Wtyczka i wszystko, co zapisała w tej przeglądarce, zostaną usunięte. Możesz ją później zainstalować ponownie.",
+      "remove_confirm": "Usuń",
+      "error_user_plugins_off": "Administrator wyłączył wtyczki instalowane przez użytkowników, więc ta wtyczka nie działa.",
+      "error_approval_unavailable": "Ta wtyczka została zainstalowana, zanim wprowadzono zatwierdzanie. Usuń ją i zainstaluj ponownie, aby wysłać ją do zatwierdzenia.",
+      "error_approval_denied": "Administrator nie zatwierdził tej wtyczki.",
+      "error_approval_pending": "Czeka na zatwierdzenie przez administratora.",
+      "error_auto_disabled": "Wyłączono, bo wielokrotnie zawodziło. Włącz ponownie, aby spróbować jeszcze raz.",
+      "accounts_heading": "Połączone konta",
+      "account_on": "{label} na {host}",
+      "account_waiting": "{label} na {host} (logowanie niedokończone)",
+      "disconnect": "Rozłącz",
+      "disconnect_failed": "Nie udało się rozłączyć {label}"
+    },
+    "consent": {
+      "title": "Zezwolić wtyczce {name} na te działania?",
+      "intro": "Wtyczka prosi o poniższe uprawnienia. Otrzyma je tylko wtedy, gdy na to zezwolisz.",
+      "high_risk_note": "Oznaczone pozycje dają wtyczce dostęp do treści Twojej poczty lub pozwalają jej wysyłać dane gdzie indziej. Zezwalaj na nie tylko zaufanym wtyczkom.",
+      "revoke_hint": "W każdej chwili możesz wyłączyć lub usunąć wtyczkę w Ustawieniach.",
+      "deny": "Nie zezwalaj",
+      "allow": "Zezwól"
+    },
+    "permissions": {
+      "none": "Nie potrzebuje specjalnych uprawnień.",
+      "high_risk": "Wymaga ostrożności",
+      "email_read": {
+        "title": "Czytanie poczty",
+        "body": "Widzi nadawców, odbiorców, tematy i pełną treść każdej wiadomości na Twoim koncie oraz Twoje foldery."
+      },
+      "email_write": {
+        "title": "Zmiana i porządkowanie poczty",
+        "body": "Dodaje i usuwa etykiety, flagi i inne słowa kluczowe w Twoich wiadomościach, przenosi je między Twoimi folderami i do archiwum oraz zapisuje szkice."
+      },
+      "email_send": {
+        "title": "Zmiana poczty przed wysłaniem",
+        "body": "Odczytuje i zmienia odbiorców, temat, treść i załączniki pisanych wiadomości oraz może wstrzymać wysłanie wiadomości."
+      },
+      "crypto_full": {
+        "title": "Pełny dostęp do aplikacji",
+        "body": "Działa z tymi samymi uprawnieniami co sam webmail. Może czytać całą Twoją pocztę i zapisane klucze oraz działać w Twoim imieniu. Zezwalaj na to tylko wtyczkom, którym w pełni ufasz."
+      },
+      "email_raw_send": {
+        "title": "Wysyłanie wiadomości utworzonych przez wtyczkę",
+        "body": "Wysyła z Twojego konta kompletne wiadomości, na przykład podpisane lub zaszyfrowane."
+      },
+      "email_blob_read": {
+        "title": "Odczyt surowej treści wiadomości",
+        "body": "Odczytuje oryginalne dane Twoich wiadomości i załączników oraz każdego pliku, który załączysz przed wysłaniem."
+      },
+      "email_blob_write": {
+        "title": "Zastępowanie załączników przed wysłaniem",
+        "body": "Przesyła pliki na Twój serwer poczty i zastępuje załączony plik innym, zanim wiadomość zostanie wysłana."
+      },
+      "email_render_takeover": {
+        "title": "Zmiana sposobu wyświetlania wiadomości",
+        "body": "Zastępuje treść otwieranych wiadomości i listy wiadomości, na przykład aby pokazać odszyfrowaną zawartość."
+      },
+      "calendar_read": {
+        "title": "Odczyt kalendarza",
+        "body": "Widzi Twoje kalendarze i ich wydarzenia."
+      },
+      "calendar_write": {
+        "title": "Zmiana kalendarza",
+        "body": "Tworzy, zmienia i usuwa wydarzenia."
+      },
+      "contacts_read": {
+        "title": "Odczyt kontaktów",
+        "body": "Przeszukuje i odczytuje Twoje książki adresowe."
+      },
+      "contacts_write": {
+        "title": "Zmiana kontaktów",
+        "body": "Tworzy, zmienia i usuwa kontakty i książki adresowe."
+      },
+      "files_read": {
+        "title": "Odczyt plików",
+        "body": "Przegląda i otwiera pliki zapisane na Twoim koncie."
+      },
+      "files_write": {
+        "title": "Zmiana plików",
+        "body": "Przesyła, zmienia nazwy, przenosi i usuwa pliki na Twoim koncie."
+      },
+      "identity_read": {
+        "title": "Podgląd tożsamości nadawcy",
+        "body": "Widzi adresy, z których wysyłasz wiadomości, i ich podpisy."
+      },
+      "identity_write": {
+        "title": "Zmiana tożsamości nadawcy",
+        "body": "Tworzy, zmienia i usuwa tożsamości nadawcy i podpisy."
+      },
+      "filters_read": {
+        "title": "Odczyt filtrów poczty",
+        "body": "Widzi reguły, które sortują Twoją przychodzącą pocztę."
+      },
+      "filters_write": {
+        "title": "Zmiana filtrów poczty",
+        "body": "Dodaje reguły do filtrów na serwerze. Takie reguły mogą przenosić, przekazywać dalej lub usuwać przychodzącą pocztę."
+      },
+      "tasks_read": {
+        "title": "Odczyt zadań",
+        "body": "Widzi Twoje listy zadań i zadania."
+      },
+      "tasks_write": {
+        "title": "Zmiana zadań",
+        "body": "Tworzy, zmienia, kończy i usuwa zadania."
+      },
+      "templates_read": {
+        "title": "Odczyt szablonów",
+        "body": "Widzi Twoje zapisane szablony wiadomości."
+      },
+      "templates_write": {
+        "title": "Zmiana szablonów",
+        "body": "Tworzy, zmienia i usuwa szablony wiadomości."
+      },
+      "smime_read": {
+        "title": "Podgląd stanu S/MIME",
+        "body": "Widzi, czy masz klucze i certyfikaty S/MIME, bez dostępu do kluczy."
+      },
+      "vacation_read": {
+        "title": "Podgląd odpowiedzi o nieobecności",
+        "body": "Widzi, czy automatyczna odpowiedź jest włączona i jaka jest jej treść."
+      },
+      "vacation_write": {
+        "title": "Zmiana odpowiedzi o nieobecności",
+        "body": "Włącza i wyłącza automatyczną odpowiedź oraz zmienia jej treść i daty."
+      },
+      "settings_read": {
+        "title": "Odczyt ustawień",
+        "body": "Widzi Twoje preferencje i definicje etykiet."
+      },
+      "settings_write": {
+        "title": "Zmiana ustawień",
+        "body": "Dodaje etykiety, zmienia ich kolejność i zmienia Twoje preferencje."
+      },
+      "security_read": {
+        "title": "Podgląd zabezpieczeń konta",
+        "body": "Widzi, czy uwierzytelnianie dwuskładnikowe i szyfrowanie są włączone, bez dostępu do sekretów."
+      },
+      "auth_observe": {
+        "title": "Informacja o logowaniu",
+        "body": "Otrzymuje informację, gdy się logujesz, przełączasz konta lub Twoja sesja zostaje odnowiona."
+      },
+      "auth_emit": {
+        "title": "Wylogowywanie",
+        "body": "Może wylogować Cię z webmaila."
+      },
+      "account_read": {
+        "title": "Podgląd kont",
+        "body": "Widzi dodane przez Ciebie konta wraz z ich adresami i serwerami."
+      },
+      "http_post": {
+        "title": "Korzystanie z serwera webmaila w Twoim imieniu",
+        "body": "Wywołuje te punkty końcowe serwera z Twoimi danymi logowania:"
+      },
+      "http_fetch": {
+        "title": "Łączenie z innymi witrynami",
+        "body": "Wysyła żądania do tych witryn. Wszystko, co wtyczka może odczytać, może tam zostać wysłane:"
+      },
+      "admin_config": {
+        "title": "Odczyt ustawień od administratora",
+        "body": "Odczytuje ustawienia, które administrator zapisał dla tej wtyczki."
+      },
+      "ui_observe": {
+        "title": "Śledzenie, gdzie jesteś w aplikacji",
+        "body": "Wie, która strona jest otwarta, i reaguje na klikane linki."
+      },
+      "ui_toolbar": {
+        "title": "Przyciski na paskach narzędzi",
+        "body": "Pokazuje własne przyciski na pasku narzędzi wiadomości, przy otwartej wiadomości i na górnym pasku."
+      },
+      "ui_app_top_banner": {
+        "title": "Baner u góry",
+        "body": "Pokazuje komunikat na górze aplikacji."
+      },
+      "ui_email_banner": {
+        "title": "Komunikaty przy wiadomościach",
+        "body": "Pokazuje własne komunikaty i podsumowania nad częściami otwartej wiadomości lub konwersacji, w nich i między nimi."
+      },
+      "ui_email_footer": {
+        "title": "Treść pod wiadomościami",
+        "body": "Pokazuje własną treść pod otwartą wiadomością."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "Klucze szyfrowania kontaktów",
+        "body": "Pokazuje klucze szyfrowania kontaktu i pozwala nimi zarządzać."
+      },
+      "ui_email_details": {
+        "title": "Panele w szczegółach wiadomości",
+        "body": "Pokazuje własny panel obok lub pod otwartą wiadomością."
+      },
+      "ui_download_file": {
+        "title": "Zapisywanie plików na urządzeniu",
+        "body": "Udostępnia do pobrania utworzone przez siebie pliki."
+      },
+      "ui_message_list_tabs": {
+        "title": "Karty w Odebranych",
+        "body": "Dzieli Odebrane na karty, takie jak Aktualizacje czy Oferty."
+      },
+      "ui_composer_toolbar": {
+        "title": "Elementy w edytorze wiadomości",
+        "body": "Pokazuje własne przyciski, pozycje menu i sekcje podczas pisania wiadomości."
+      },
+      "ui_composer_sidebar": {
+        "title": "Panel w edytorze wiadomości",
+        "body": "Pokazuje własny panel obok pisanej wiadomości."
+      },
+      "ui_sidebar_widget": {
+        "title": "Elementy na pasku bocznym",
+        "body": "Pokazuje własne pola i sekcje na pasku bocznym poczty."
+      },
+      "ui_settings_section": {
+        "title": "Strona ustawień",
+        "body": "Pokazuje własną stronę w Ustawieniach."
+      },
+      "ui_context_menu": {
+        "title": "Pozycje w menu wiadomości",
+        "body": "Dodaje pozycje do menu otwieranego kliknięciem wiadomości prawym przyciskiem myszy."
+      },
+      "ui_navigation_rail": {
+        "title": "Przycisk na pasku nawigacyjnym",
+        "body": "Pokazuje własny przycisk na pasku nawigacyjnym."
+      },
+      "ui_keyboard": {
+        "title": "Skróty klawiszowe",
+        "body": "Reaguje na zdefiniowane przez siebie skróty klawiszowe."
+      },
+      "ui_calendar_action": {
+        "title": "Elementy w widoku kalendarza",
+        "body": "Pokazuje własne przyciski i sekcje przy wydarzeniach oraz krótkie etykiety i kropki przy dniach w kalendarzu."
+      },
+      "ui_admin_page": {
+        "title": "Strona administracyjna",
+        "body": "Pokazuje własną stronę w ustawieniach administracyjnych."
+      },
+      "app_lifecycle": {
+        "title": "Informacja o uruchomieniu i zamknięciu aplikacji",
+        "body": "Otrzymuje informację, gdy aplikacja się uruchamia, przechodzi w tryb offline lub gdy się wylogowujesz."
+      },
+      "compose_open": {
+        "title": "Otwieranie edytora wiadomości",
+        "body": "Otwiera nową wiadomość z wypełnionymi odbiorcami, treścią lub załącznikami. O wysłaniu nadal decydujesz Ty."
+      },
+      "compose_read": {
+        "title": "Czytanie pisanej wiadomości",
+        "body": "Czytanie tekstu wiadomości podczas pisania, gdy używasz wtyczki w edytorze. Bez podpisu i cytowanej wiadomości."
+      },
+      "compose_write": {
+        "title": "Zmiana pisanej wiadomości",
+        "body": "Zastępowanie lub dodawanie tekstu w wiadomości podczas pisania, gdy używasz wtyczki w edytorze. Każdą zmianę możesz cofnąć, a o wysłaniu nadal decydujesz Ty."
+      },
+      "ui_notifications": {
+        "title": "Wyświetlanie powiadomień",
+        "body": "Wyświetla powiadomienia na urządzeniu lub w aplikacji, jeśli ich nie zezwolono. Każde podaje nazwę wtyczki."
+      },
+      "ui_message_list": {
+        "title": "Elementy na liście wiadomości",
+        "body": "Pokazuje własną treść nad listą wiadomości oraz przyciski przy wiadomościach i na pasku narzędzi zaznaczonych wiadomości."
+      },
+      "ui_contacts": {
+        "title": "Elementy w widoku kontaktów",
+        "body": "Pokazuje własne sekcje w szczegółach kontaktu i przyciski na liście kontaktów."
+      },
+      "ui_tasks": {
+        "title": "Elementy w widoku zadań",
+        "body": "Pokazuje własne sekcje w szczegółach zadania i przyciski na liście zadań."
+      },
+      "ui_files": {
+        "title": "Elementy w widoku plików",
+        "body": "Pokazuje własne sekcje w podglądzie pliku i pozycje w menu pliku."
+      },
+      "ui_commands": {
+        "title": "Własne polecenia",
+        "body": "Dodaje własne pozycje do palety poleceń (Ctrl+K)."
+      },
+      "ui_app_page": {
+        "title": "Własne strony",
+        "body": "Dodaje do aplikacji własne strony, każdą z przyciskiem na pasku nawigacyjnym."
+      },
+      "http_proxy": {
+        "title": "Korzystanie z połączonych przez Ciebie kont",
+        "body": "Wysyła żądania przez serwer Bulwark z użyciem konta lub klucza skonfigurowanego przez Ciebie lub Twojego administratora. Wtyczka nigdy nie widzi hasła, ale może zrobić na tym serwerze wszystko, co może to konto."
+      }
+    },
+    "dialog": {
+      "from_plugin": "Od wtyczki {name}",
+      "ok": "OK",
+      "submit": "Wyślij",
+      "confirm": "Potwierdź",
+      "cancel": "Anuluj",
+      "close": "Zamknij",
+      "turn_off": "Wyłącz {name}",
+      "plugin_menu": "Opcje dla {name}",
+      "password_note": "Ten formularz pochodzi z wtyczki {name}, a nie z poczty. Wpisz hasło tylko wtedy, gdy ufasz tej wtyczce.",
+      "toast_auto_disabled": "{name} wyłączono, bo wielokrotnie zawodziło."
+    },
+    "connect": {
+      "title": "Połącz z {label}",
+      "intro_password": "{name} chce używać Twojego konta {label}. Bulwark przechowuje hasło na swoim serwerze i wysyła je tylko do {host}. Wtyczka nigdy go nie widzi.",
+      "intro_password_any": "{name} chce używać Twojego konta {label}. Bulwark przechowuje hasło na swoim serwerze i wysyła je tylko do serwera, który tu wpiszesz. Wtyczka nigdy go nie widzi.",
+      "intro_signin": "{name} chce zalogować się na Twoje konto {label}. Wpisz tu serwer, a potem zaloguj się na jego stronie. Bulwark przechowuje uzyskany dostęp na swoim serwerze; wtyczka nigdy go nie widzi.",
+      "server": "Adres serwera",
+      "server_hint": "cloud.example.com",
+      "username": "Nazwa użytkownika",
+      "secret": "Hasło lub klucz",
+      "connect": "Połącz",
+      "continue": "Dalej",
+      "cancel": "Anuluj",
+      "saving": "Zapisywanie…",
+      "error_server": "Wpisz adres serwera, na przykład https://cloud.example.com",
+      "error_save": "Nie udało się zapisać: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "Wybierz wynik, aby zobaczyć podgląd",
     "open_full": "Otwórz",
     "view_label": "Widok"
+  },
+  "top_bar": {
+    "more": "Więcej opcji"
+  },
+  "plugin_pages": {
+    "loading": "Wczytywanie strony",
+    "not_available_title": "Ta strona jest niedostępna",
+    "not_available_description": "Wtyczka, która ją dodała, jest wyłączona lub nie jest już zainstalowana.",
+    "back_to_mail": "Wróć do poczty",
+    "settings_group": "Wtyczki"
+  },
+  "command_palette": {
+    "title": "Paleta poleceń",
+    "open": "Otwórz paletę poleceń",
+    "placeholder": "Wpisz polecenie",
+    "no_results": "Brak pasujących poleceń",
+    "go_to": "Przejdź do: {name}",
+    "compose": "Nowa wiadomość",
+    "search": "Szukaj w poczcie",
+    "theme_dark": "Przełącz na ciemny motyw",
+    "theme_light": "Przełącz na jasny motyw",
+    "shortcuts": "Pokaż skróty klawiszowe",
+    "group_navigation": "Przejdź do",
+    "group_actions": "Działania",
+    "group_plugins": "Wtyczki"
+  },
+  "notification_center": {
+    "title": "Powiadomienia",
+    "mark_all_read": "Oznacz wszystkie jako przeczytane",
+    "clear": "Wyczyść",
+    "empty": "Brak powiadomień",
+    "close": "Zamknij",
+    "unread": "Nieprzeczytane",
+    "unread_count": "Nieprzeczytane: {count}",
+    "level_error": "Błąd",
+    "level_warning": "Ostrzeżenie"
   }
 }
diff --git a/locales/pt/common.json b/locales/pt/common.json
index c7c935ba2..bae77cd9d 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -620,7 +620,9 @@
       "copied": "Código copiado",
       "copy_failed": "Não foi possível copiar o código"
     },
-    "mv_position": "{index} de {total}"
+    "mv_position": "{index} de {total}",
+    "plugin_panel_show": "Mostrar o painel do plugin",
+    "plugin_panel_hide": "Ocultar o painel do plugin"
   },
   "email_composer": {
     "minimize": "Minimizar",
@@ -813,7 +815,8 @@
       "remove_background_color": "Remover cor de fundo"
     },
     "send_filing_warning": "Enviado - mas a limpeza posterior falhou, um rascunho antigo pode permanecer.",
-    "pop_out": "Abrir a resposta numa janela"
+    "pop_out": "Abrir a resposta numa janela",
+    "send_guard_failed": "Não enviado - um plugin que verifica as mensagens antes do envio falhou ou não respondeu."
   },
   "confirm_dialog": {
     "confirm": "Confirmar",
@@ -3970,6 +3973,354 @@
       "failed_detail": "Falha na autorização: {error}",
       "missing_params": "Falta o código de autorização ou o estado.",
       "delivery_failed": "Não foi possível entregar o resultado da autorização ao separador da aplicação. Feche esta janela e tente novamente."
+    },
+    "settings": {
+      "title": "Plugins",
+      "description": "Plugins adicionados pelo seu administrador. Ative ou desative-os na sua conta.",
+      "description_uploads": "Os plugins adicionam funções ao webmail. Ative ou desative-os na sua conta, ou instale os seus próprios.",
+      "description_demo": "Os plugins não estão disponíveis na demo.",
+      "install_button": "Instalar plugin",
+      "install_hint": "Escolha um arquivo ZIP de plugin.",
+      "install_hint_approval": "Escolha um arquivo ZIP de plugin. Um administrador precisa aprová-lo antes que você possa ativá-lo.",
+      "install_uploads_off": "Seu administrador não permite instalar plugins.",
+      "install_managed_id": "Seu administrador já fornece um plugin com este nome, por isso ele não pode ser substituído.",
+      "install_invalid": "Este arquivo não é um plugin que possa ser instalado: {details}",
+      "toast_installed": "Plugin instalado. Ative-o abaixo.",
+      "toast_installed_pending": "Plugin instalado e enviado ao seu administrador para aprovação.",
+      "toast_enabled": "{name} está ativado",
+      "toast_disabled": "{name} está desativado",
+      "toast_removed": "{name} foi removido",
+      "toast_forced": "Seu administrador mantém {name} ativado",
+      "toast_approval_requested": "{name} está aguardando a aprovação do seu administrador",
+      "empty_title": "Nenhum plugin ainda",
+      "empty_admin": "Seu administrador não adicionou nenhum plugin.",
+      "empty_uploads": "Instale um plugin a partir de um arquivo ZIP para começar.",
+      "empty_demo": "Os plugins precisam de uma conta real, por isso a demo não tem nenhum.",
+      "syncing": "Verificando plugins com o servidor…",
+      "status_installed": "Desativado",
+      "status_enabled": "Iniciando",
+      "status_running": "Ativado",
+      "status_disabled": "Desativado",
+      "status_error": "Problema",
+      "badge_forced": "Obrigatório",
+      "badge_managed": "Do seu administrador",
+      "badge_yours": "Instalado por você",
+      "badge_awaiting": "Aguardando aprovação",
+      "toggle_label": "Ativar ou desativar {name}",
+      "forced_note": "Seu administrador exige este plugin, por isso ele não pode ser desativado.",
+      "permissions": "O que ele pode fazer",
+      "permissions_managed": "O que ele pode fazer (aprovado pelo seu administrador)",
+      "settings": "Configurações",
+      "remove": "Remover",
+      "remove_title": "Remover {name}?",
+      "remove_message": "O plugin e tudo o que ele armazenou neste navegador serão excluídos. Você pode instalá-lo novamente depois.",
+      "remove_confirm": "Remover",
+      "error_user_plugins_off": "Seu administrador desativou os plugins instalados por usuários, por isso este plugin não é executado.",
+      "error_approval_unavailable": "Este plugin foi instalado antes de as aprovações serem exigidas. Remova-o e instale-o novamente para enviá-lo para aprovação.",
+      "error_approval_denied": "Seu administrador não aprovou este plugin.",
+      "error_approval_pending": "Aguardando o seu administrador aprovar este plugin.",
+      "error_auto_disabled": "Desativado porque falhava repetidamente. Ative-o de novo para tentar outra vez.",
+      "accounts_heading": "Contas conectadas",
+      "account_on": "{label} em {host}",
+      "account_waiting": "{label} em {host} (login não concluído)",
+      "disconnect": "Desconectar",
+      "disconnect_failed": "Não foi possível desconectar {label}"
+    },
+    "consent": {
+      "title": "Permitir que {name} faça isto?",
+      "intro": "O plugin pede as permissões abaixo. Ele só as recebe se você permitir.",
+      "high_risk_note": "Os itens marcados dão ao plugin acesso ao conteúdo dos seus e-mails ou permitem que ele envie dados para outro lugar. Só os permita para plugins em que você confia.",
+      "revoke_hint": "Você pode desativar ou remover o plugin em Configurações a qualquer momento.",
+      "deny": "Não permitir",
+      "allow": "Permitir"
+    },
+    "permissions": {
+      "none": "Não precisa de permissões especiais.",
+      "high_risk": "Requer atenção",
+      "email_read": {
+        "title": "Ler seus e-mails",
+        "body": "Ver remetentes, destinatários, assuntos e o texto completo de qualquer mensagem da sua conta, e suas pastas."
+      },
+      "email_write": {
+        "title": "Alterar e organizar seus e-mails",
+        "body": "Adicionar ou remover etiquetas, marcações e outras palavras-chave nas suas mensagens, movê-las entre suas pastas e para o arquivo, e salvar rascunhos."
+      },
+      "email_send": {
+        "title": "Alterar e-mails antes do envio",
+        "body": "Ler e alterar os destinatários, o assunto, o texto e os anexos das mensagens que você escreve, e impedir o envio de uma mensagem."
+      },
+      "crypto_full": {
+        "title": "Acesso total a este aplicativo",
+        "body": "É executado com os mesmos direitos do próprio webmail. Pode ler todos os seus e-mails e chaves armazenadas e agir em seu nome. Só permita isto para plugins em que você confia totalmente."
+      },
+      "email_raw_send": {
+        "title": "Enviar mensagens criadas por ele mesmo",
+        "body": "Enviar mensagens completas, por exemplo assinadas ou criptografadas, a partir da sua conta."
+      },
+      "email_blob_read": {
+        "title": "Ler o conteúdo bruto das mensagens",
+        "body": "Ler os dados originais das suas mensagens e anexos, e de cada arquivo que você anexa antes do envio."
+      },
+      "email_blob_write": {
+        "title": "Substituir anexos antes do envio",
+        "body": "Enviar arquivos para o seu servidor de e-mail e substituir um arquivo anexado por outro antes de a mensagem ser enviada."
+      },
+      "email_render_takeover": {
+        "title": "Alterar como as mensagens são exibidas",
+        "body": "Substituir o texto das mensagens que você abre e da lista de mensagens, por exemplo para mostrar conteúdo descriptografado."
+      },
+      "calendar_read": {
+        "title": "Ler seu calendário",
+        "body": "Ver seus calendários e os eventos deles."
+      },
+      "calendar_write": {
+        "title": "Alterar seu calendário",
+        "body": "Criar, alterar e excluir eventos."
+      },
+      "contacts_read": {
+        "title": "Ler seus contatos",
+        "body": "Pesquisar e ler seus catálogos de endereços."
+      },
+      "contacts_write": {
+        "title": "Alterar seus contatos",
+        "body": "Criar, alterar e excluir contatos e catálogos de endereços."
+      },
+      "files_read": {
+        "title": "Ler seus arquivos",
+        "body": "Navegar e abrir os arquivos armazenados na sua conta."
+      },
+      "files_write": {
+        "title": "Alterar seus arquivos",
+        "body": "Enviar, renomear, mover e excluir arquivos na sua conta."
+      },
+      "identity_read": {
+        "title": "Ver suas identidades de envio",
+        "body": "Ver os endereços dos quais você envia e as assinaturas deles."
+      },
+      "identity_write": {
+        "title": "Alterar suas identidades de envio",
+        "body": "Criar, alterar e excluir identidades de envio e assinaturas."
+      },
+      "filters_read": {
+        "title": "Ler seus filtros de e-mail",
+        "body": "Ver as regras que organizam seus e-mails recebidos."
+      },
+      "filters_write": {
+        "title": "Alterar seus filtros de e-mail",
+        "body": "Adicionar regras aos filtros do servidor. Essas regras podem mover, encaminhar ou excluir e-mails recebidos."
+      },
+      "tasks_read": {
+        "title": "Ler suas tarefas",
+        "body": "Ver suas listas de tarefas e tarefas."
+      },
+      "tasks_write": {
+        "title": "Alterar suas tarefas",
+        "body": "Criar, alterar, concluir e excluir tarefas."
+      },
+      "templates_read": {
+        "title": "Ler seus modelos",
+        "body": "Ver seus modelos de mensagem salvos."
+      },
+      "templates_write": {
+        "title": "Alterar seus modelos",
+        "body": "Criar, alterar e excluir modelos de mensagem."
+      },
+      "smime_read": {
+        "title": "Ver seu status S/MIME",
+        "body": "Ver se você tem chaves e certificados S/MIME, sem acesso às chaves."
+      },
+      "vacation_read": {
+        "title": "Ver sua resposta automática",
+        "body": "Ver se sua resposta automática está ativada e o que ela diz."
+      },
+      "vacation_write": {
+        "title": "Alterar sua resposta automática",
+        "body": "Ativar ou desativar sua resposta automática e alterar o texto e as datas."
+      },
+      "settings_read": {
+        "title": "Ler suas configurações",
+        "body": "Ver suas preferências e definições de etiquetas."
+      },
+      "settings_write": {
+        "title": "Alterar suas configurações",
+        "body": "Adicionar e reordenar etiquetas e alterar suas preferências."
+      },
+      "security_read": {
+        "title": "Ver a segurança da sua conta",
+        "body": "Ver se a autenticação de dois fatores e a criptografia estão ativadas, sem acesso a segredos."
+      },
+      "auth_observe": {
+        "title": "Saber quando você entra",
+        "body": "Ser avisado quando você entra, troca de conta ou sua sessão é renovada."
+      },
+      "auth_emit": {
+        "title": "Encerrar sua sessão",
+        "body": "Encerrar sua sessão no webmail."
+      },
+      "account_read": {
+        "title": "Ver suas contas",
+        "body": "Ver as contas que você adicionou, com os endereços e servidores delas."
+      },
+      "http_post": {
+        "title": "Usar o servidor do webmail por você",
+        "body": "Chamar estes endpoints do servidor com o seu login:"
+      },
+      "http_fetch": {
+        "title": "Conectar-se a outros sites",
+        "body": "Enviar solicitações a estes sites. Tudo o que o plugin pode ler pode ser enviado para lá:"
+      },
+      "admin_config": {
+        "title": "Ler as configurações do seu administrador",
+        "body": "Ler as configurações que seu administrador salvou para este plugin."
+      },
+      "ui_observe": {
+        "title": "Acompanhar onde você está no aplicativo",
+        "body": "Saber qual página está aberta e reagir aos links em que você clica."
+      },
+      "ui_toolbar": {
+        "title": "Adicionar botões às barras de ferramentas",
+        "body": "Mostrar os próprios botões na barra de ferramentas das mensagens, em uma mensagem aberta e na barra superior."
+      },
+      "ui_app_top_banner": {
+        "title": "Mostrar um banner no topo",
+        "body": "Mostrar um aviso no topo do aplicativo."
+      },
+      "ui_email_banner": {
+        "title": "Mostrar avisos nas mensagens",
+        "body": "Mostrar os próprios avisos e resumos acima, dentro e entre as partes de uma mensagem ou conversa aberta."
+      },
+      "ui_email_footer": {
+        "title": "Adicionar conteúdo abaixo das mensagens",
+        "body": "Mostrar o próprio conteúdo abaixo de uma mensagem aberta."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "Mostrar chaves de criptografia dos contatos",
+        "body": "Mostrar e gerenciar as chaves de criptografia de um contato."
+      },
+      "ui_email_details": {
+        "title": "Adicionar painéis aos detalhes da mensagem",
+        "body": "Mostrar o próprio painel ao lado ou abaixo de uma mensagem aberta."
+      },
+      "ui_download_file": {
+        "title": "Salvar arquivos no seu dispositivo",
+        "body": "Oferecer para download arquivos que ele criou."
+      },
+      "ui_message_list_tabs": {
+        "title": "Adicionar abas à sua caixa de entrada",
+        "body": "Organizar sua caixa de entrada em abas como Atualizações ou Promoções."
+      },
+      "ui_composer_toolbar": {
+        "title": "Adicionar ao editor",
+        "body": "Mostrar os próprios botões, itens de menu e seções enquanto você escreve uma mensagem."
+      },
+      "ui_composer_sidebar": {
+        "title": "Adicionar um painel ao editor",
+        "body": "Mostrar o próprio painel ao lado da mensagem que você escreve."
+      },
+      "ui_sidebar_widget": {
+        "title": "Adicionar à barra lateral",
+        "body": "Mostrar as próprias caixas e seções na barra lateral do e-mail."
+      },
+      "ui_settings_section": {
+        "title": "Adicionar uma página de configurações",
+        "body": "Mostrar a própria página em Configurações."
+      },
+      "ui_context_menu": {
+        "title": "Adicionar itens ao menu da mensagem",
+        "body": "Adicionar itens ao menu que abre quando você clica com o botão direito em uma mensagem."
+      },
+      "ui_navigation_rail": {
+        "title": "Adicionar à barra de navegação",
+        "body": "Mostrar o próprio botão na barra de navegação."
+      },
+      "ui_keyboard": {
+        "title": "Adicionar atalhos de teclado",
+        "body": "Reagir aos atalhos de teclado que ele define."
+      },
+      "ui_calendar_action": {
+        "title": "Adicionar à visualização do calendário",
+        "body": "Mostrar os próprios botões e seções nos eventos, e rótulos curtos e pontos nos dias do calendário."
+      },
+      "ui_admin_page": {
+        "title": "Adicionar uma página de administração",
+        "body": "Mostrar a própria página nas configurações de administração."
+      },
+      "app_lifecycle": {
+        "title": "Saber quando o aplicativo inicia e para",
+        "body": "Ser avisado quando o aplicativo inicia, fica offline ou você sai."
+      },
+      "compose_open": {
+        "title": "Abrir o editor para você",
+        "body": "Abrir uma nova mensagem com destinatários, texto ou anexos já preenchidos. Você continua decidindo se ela é enviada."
+      },
+      "compose_read": {
+        "title": "Ler a mensagem que você está escrevendo",
+        "body": "Ler o texto de uma mensagem enquanto você a escreve, quando usa o plugin no editor. Não a assinatura nem a mensagem citada."
+      },
+      "compose_write": {
+        "title": "Alterar a mensagem que você está escrevendo",
+        "body": "Substituir ou adicionar texto em uma mensagem enquanto você a escreve, quando usa o plugin no editor. Você pode desfazer cada alteração e continua decidindo se envia."
+      },
+      "ui_notifications": {
+        "title": "Mostrar notificações",
+        "body": "Mostrar notificações no seu dispositivo, ou dentro do aplicativo se você não as permitiu. Cada uma indica o nome do plugin."
+      },
+      "ui_message_list": {
+        "title": "Adicionar à lista de mensagens",
+        "body": "Mostrar o próprio conteúdo acima da lista de mensagens, e botões nas mensagens e na barra das mensagens selecionadas."
+      },
+      "ui_contacts": {
+        "title": "Adicionar à visualização de contatos",
+        "body": "Mostrar as próprias seções nos detalhes de um contato e botões na lista de contatos."
+      },
+      "ui_tasks": {
+        "title": "Adicionar à visualização de tarefas",
+        "body": "Mostrar as próprias seções nos detalhes de uma tarefa e botões na lista de tarefas."
+      },
+      "ui_files": {
+        "title": "Adicionar à visualização de arquivos",
+        "body": "Mostrar as próprias seções na pré-visualização de arquivos e itens no menu de um arquivo."
+      },
+      "ui_commands": {
+        "title": "Adicionar comandos",
+        "body": "Adicionar os próprios itens à paleta de comandos (Ctrl+K)."
+      },
+      "ui_app_page": {
+        "title": "Adicionar páginas",
+        "body": "Adicionar as próprias páginas ao aplicativo, cada uma com um botão na barra de navegação."
+      },
+      "http_proxy": {
+        "title": "Usar contas que você conecta",
+        "body": "Enviar solicitações pelo servidor do Bulwark com uma conta ou chave configurada por você ou pelo seu administrador. O plugin nunca vê a senha, mas pode fazer tudo o que essa conta pode fazer no próprio servidor."
+      }
+    },
+    "dialog": {
+      "from_plugin": "Do plugin {name}",
+      "ok": "OK",
+      "submit": "Enviar",
+      "confirm": "Confirmar",
+      "cancel": "Cancelar",
+      "close": "Fechar",
+      "turn_off": "Desativar {name}",
+      "plugin_menu": "Opções de {name}",
+      "password_note": "Este formulário vem do plugin {name}, não do webmail. Só introduza uma palavra-passe se confiar neste plugin.",
+      "toast_auto_disabled": "{name} foi desativado porque falhava repetidamente."
+    },
+    "connect": {
+      "title": "Conectar {label}",
+      "intro_password": "{name} quer usar sua conta {label}. O Bulwark guarda a senha no servidor dele e só a envia para {host}. O plugin nunca a vê.",
+      "intro_password_any": "{name} quer usar sua conta {label}. O Bulwark guarda a senha no servidor dele e só a envia para o servidor que você informar aqui. O plugin nunca a vê.",
+      "intro_signin": "{name} quer entrar na sua conta {label}. Informe o servidor aqui e depois entre na página dele. O Bulwark guarda no servidor dele o acesso que recebe; o plugin nunca o vê.",
+      "server": "Endereço do servidor",
+      "server_hint": "cloud.example.com",
+      "username": "Nome de usuário",
+      "secret": "Senha ou chave",
+      "connect": "Conectar",
+      "continue": "Continuar",
+      "cancel": "Cancelar",
+      "saving": "Salvando…",
+      "error_server": "Informe o endereço do servidor, por exemplo https://cloud.example.com",
+      "error_save": "Não foi possível salvar: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "Selecione um resultado para pré-visualizar",
     "open_full": "Abrir",
     "view_label": "Vista"
+  },
+  "top_bar": {
+    "more": "Mais opções"
+  },
+  "plugin_pages": {
+    "loading": "Carregando a página",
+    "not_available_title": "Esta página não está disponível",
+    "not_available_description": "O plugin que a adicionou está desativado ou não está mais instalado.",
+    "back_to_mail": "Voltar ao e-mail",
+    "settings_group": "Plugins"
+  },
+  "command_palette": {
+    "title": "Paleta de comandos",
+    "open": "Abrir a paleta de comandos",
+    "placeholder": "Digite um comando",
+    "no_results": "Nenhum comando correspondente",
+    "go_to": "Ir para {name}",
+    "compose": "Nova mensagem",
+    "search": "Pesquisar no e-mail",
+    "theme_dark": "Mudar para o tema escuro",
+    "theme_light": "Mudar para o tema claro",
+    "shortcuts": "Mostrar atalhos de teclado",
+    "group_navigation": "Ir para",
+    "group_actions": "Ações",
+    "group_plugins": "Plugins"
+  },
+  "notification_center": {
+    "title": "Notificações",
+    "mark_all_read": "Marcar todas como lidas",
+    "clear": "Limpar",
+    "empty": "Nenhuma notificação",
+    "close": "Fechar",
+    "unread": "Não lida",
+    "unread_count": "{count} não lidas",
+    "level_error": "Erro",
+    "level_warning": "Aviso"
   }
 }
diff --git a/locales/ro/common.json b/locales/ro/common.json
index f49207dd9..f1eb05888 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -620,7 +620,9 @@
       "copied": "Cod copiat",
       "copy_failed": "Codul nu a putut fi copiat"
     },
-    "mv_position": "{index} din {total}"
+    "mv_position": "{index} din {total}",
+    "plugin_panel_show": "Afișează panoul pluginului",
+    "plugin_panel_hide": "Ascunde panoul pluginului"
   },
   "email_composer": {
     "minimize": "Minimizează",
@@ -813,7 +815,8 @@
       "remove_background_color": "Elimină culoarea fundalului"
     },
     "send_filing_warning": "Trimis - dar curățarea ulterioară a eșuat, poate rămâne o ciornă veche.",
-    "pop_out": "Deschide răspunsul într-o fereastră"
+    "pop_out": "Deschide răspunsul într-o fereastră",
+    "send_guard_failed": "Nu s-a trimis - un plugin care verifică mesajele înainte de trimitere a eșuat sau nu a răspuns."
   },
   "confirm_dialog": {
     "confirm": "Confirmare",
@@ -3970,6 +3973,354 @@
       "failed_detail": "Autorizarea a eșuat: {error}",
       "missing_params": "Lipsește codul de autorizare sau starea.",
       "delivery_failed": "Rezultatul autorizării nu a putut fi transmis filei aplicației. Închideți această fereastră și încercați din nou."
+    },
+    "settings": {
+      "title": "Pluginuri",
+      "description": "Pluginuri adăugate de administrator. Activați-le sau dezactivați-le pentru contul dvs.",
+      "description_uploads": "Pluginurile adaugă funcții în webmail. Activați-le sau dezactivați-le pentru contul dvs. sau instalați-vă propriile pluginuri.",
+      "description_demo": "Pluginurile nu sunt disponibile în demo.",
+      "install_button": "Instalați un plugin",
+      "install_hint": "Alegeți un fișier ZIP cu un plugin.",
+      "install_hint_approval": "Alegeți un fișier ZIP cu un plugin. Un administrator trebuie să-l aprobe înainte să-l puteți activa.",
+      "install_uploads_off": "Administratorul dvs. nu permite instalarea pluginurilor.",
+      "install_managed_id": "Administratorul dvs. oferă deja un plugin cu acest nume, așa că nu poate fi înlocuit.",
+      "install_invalid": "Acest fișier nu este un plugin care poate fi instalat: {details}",
+      "toast_installed": "Pluginul a fost instalat. Activați-l mai jos.",
+      "toast_installed_pending": "Pluginul a fost instalat și trimis administratorului spre aprobare.",
+      "toast_enabled": "{name} este activat",
+      "toast_disabled": "{name} este dezactivat",
+      "toast_removed": "{name} a fost eliminat",
+      "toast_forced": "Administratorul dvs. menține {name} activat",
+      "toast_approval_requested": "{name} așteaptă aprobarea administratorului",
+      "empty_title": "Niciun plugin încă",
+      "empty_admin": "Administratorul dvs. nu a adăugat niciun plugin.",
+      "empty_uploads": "Pentru a începe, instalați un plugin dintr-un fișier ZIP.",
+      "empty_demo": "Pluginurile au nevoie de un cont real, așa că demo-ul nu are niciunul.",
+      "syncing": "Se verifică pluginurile cu serverul…",
+      "status_installed": "Dezactivat",
+      "status_enabled": "Se pornește",
+      "status_running": "Activat",
+      "status_disabled": "Dezactivat",
+      "status_error": "Problemă",
+      "badge_forced": "Obligatoriu",
+      "badge_managed": "De la administrator",
+      "badge_yours": "Instalat de dvs.",
+      "badge_awaiting": "Așteaptă aprobarea",
+      "toggle_label": "Activați sau dezactivați {name}",
+      "forced_note": "Administratorul dvs. impune acest plugin, așa că nu poate fi dezactivat.",
+      "permissions": "Ce poate face",
+      "permissions_managed": "Ce poate face (aprobat de administrator)",
+      "settings": "Setări",
+      "remove": "Eliminați",
+      "remove_title": "Eliminați {name}?",
+      "remove_message": "Pluginul și tot ce a stocat în acest browser vor fi șterse. Îl puteți instala din nou mai târziu.",
+      "remove_confirm": "Eliminați",
+      "error_user_plugins_off": "Administratorul dvs. a dezactivat pluginurile instalate de utilizatori, așa că acest plugin nu rulează.",
+      "error_approval_unavailable": "Acest plugin a fost instalat înainte ca aprobările să fie obligatorii. Eliminați-l și instalați-l din nou pentru a-l trimite spre aprobare.",
+      "error_approval_denied": "Administratorul dvs. nu a aprobat acest plugin.",
+      "error_approval_pending": "Se așteaptă ca administratorul să aprobe acest plugin.",
+      "error_auto_disabled": "Dezactivat pentru că a eșuat în mod repetat. Activați-l din nou pentru a reîncerca.",
+      "accounts_heading": "Conturi conectate",
+      "account_on": "{label} pe {host}",
+      "account_waiting": "{label} pe {host} (conectare neterminată)",
+      "disconnect": "Deconectați",
+      "disconnect_failed": "{label} nu a putut fi deconectat"
+    },
+    "consent": {
+      "title": "Permiteți ca {name} să facă acest lucru?",
+      "intro": "Pluginul cere permisiunile de mai jos. Le primește doar dacă le permiteți.",
+      "high_risk_note": "Elementele marcate oferă pluginului acces la conținutul e-mailurilor dvs. sau îi permit să trimită date în altă parte. Permiteți-le doar pluginurilor în care aveți încredere.",
+      "revoke_hint": "Puteți dezactiva sau elimina pluginul oricând din Setări.",
+      "deny": "Nu permiteți",
+      "allow": "Permiteți"
+    },
+    "permissions": {
+      "none": "Nu are nevoie de permisiuni speciale.",
+      "high_risk": "Necesită atenție",
+      "email_read": {
+        "title": "Citirea e-mailurilor",
+        "body": "Vede expeditorii, destinatarii, subiectele și textul complet al oricărui mesaj din contul dvs., precum și dosarele dvs."
+      },
+      "email_write": {
+        "title": "Modificarea și organizarea e-mailurilor",
+        "body": "Adaugă sau elimină etichete, marcaje și alte cuvinte cheie din mesajele dvs., le mută între dosarele dvs. și în arhivă și salvează ciorne."
+      },
+      "email_send": {
+        "title": "Modificarea e-mailurilor înainte de trimitere",
+        "body": "Citește și modifică destinatarii, subiectul, textul și atașamentele mesajelor pe care le scrieți și poate opri trimiterea unui mesaj."
+      },
+      "crypto_full": {
+        "title": "Acces complet la această aplicație",
+        "body": "Rulează cu aceleași drepturi ca webmailul însuși. Poate citi toate e-mailurile și cheile stocate și poate acționa în numele dvs. Permiteți acest lucru doar pluginurilor în care aveți încredere deplină."
+      },
+      "email_raw_send": {
+        "title": "Trimiterea mesajelor create de el însuși",
+        "body": "Trimite mesaje complete, de exemplu semnate sau criptate, din contul dvs."
+      },
+      "email_blob_read": {
+        "title": "Citirea conținutului brut al mesajelor",
+        "body": "Citește datele originale ale mesajelor și atașamentelor dvs. și ale fiecărui fișier pe care îl atașați înainte de trimitere."
+      },
+      "email_blob_write": {
+        "title": "Înlocuirea atașamentelor înainte de trimitere",
+        "body": "Încarcă fișiere pe serverul dvs. de e-mail și înlocuiește un fișier atașat cu altul înainte ca mesajul să fie trimis."
+      },
+      "email_render_takeover": {
+        "title": "Modificarea modului în care sunt afișate mesajele",
+        "body": "Înlocuiește textul mesajelor pe care le deschideți și al listei de mesaje, de exemplu pentru a afișa conținut decriptat."
+      },
+      "calendar_read": {
+        "title": "Citirea calendarului",
+        "body": "Vede calendarele dvs. și evenimentele lor."
+      },
+      "calendar_write": {
+        "title": "Modificarea calendarului",
+        "body": "Creează, modifică și șterge evenimente."
+      },
+      "contacts_read": {
+        "title": "Citirea contactelor",
+        "body": "Caută în agendele dvs. și le citește."
+      },
+      "contacts_write": {
+        "title": "Modificarea contactelor",
+        "body": "Creează, modifică și șterge contacte și agende."
+      },
+      "files_read": {
+        "title": "Citirea fișierelor",
+        "body": "Răsfoiește și deschide fișierele stocate în contul dvs."
+      },
+      "files_write": {
+        "title": "Modificarea fișierelor",
+        "body": "Încarcă, redenumește, mută și șterge fișiere din contul dvs."
+      },
+      "identity_read": {
+        "title": "Vizualizarea identităților de expediere",
+        "body": "Vede adresele de pe care trimiteți și semnăturile lor."
+      },
+      "identity_write": {
+        "title": "Modificarea identităților de expediere",
+        "body": "Creează, modifică și șterge identități de expediere și semnături."
+      },
+      "filters_read": {
+        "title": "Citirea filtrelor de e-mail",
+        "body": "Vede regulile care sortează e-mailurile primite."
+      },
+      "filters_write": {
+        "title": "Modificarea filtrelor de e-mail",
+        "body": "Adaugă reguli în filtrele de pe server. Aceste reguli pot muta, redirecționa sau șterge e-mailurile primite."
+      },
+      "tasks_read": {
+        "title": "Citirea sarcinilor",
+        "body": "Vede listele de sarcini și sarcinile dvs."
+      },
+      "tasks_write": {
+        "title": "Modificarea sarcinilor",
+        "body": "Creează, modifică, finalizează și șterge sarcini."
+      },
+      "templates_read": {
+        "title": "Citirea șabloanelor",
+        "body": "Vede șabloanele de mesaje salvate."
+      },
+      "templates_write": {
+        "title": "Modificarea șabloanelor",
+        "body": "Creează, modifică și șterge șabloane de mesaje."
+      },
+      "smime_read": {
+        "title": "Vizualizarea stării S/MIME",
+        "body": "Vede dacă aveți chei și certificate S/MIME, fără acces la chei."
+      },
+      "vacation_read": {
+        "title": "Vizualizarea răspunsului automat",
+        "body": "Vede dacă răspunsul automat este activat și ce conține."
+      },
+      "vacation_write": {
+        "title": "Modificarea răspunsului automat",
+        "body": "Activează sau dezactivează răspunsul automat și îi modifică textul și datele."
+      },
+      "settings_read": {
+        "title": "Citirea setărilor",
+        "body": "Vede preferințele dvs. și definițiile etichetelor."
+      },
+      "settings_write": {
+        "title": "Modificarea setărilor",
+        "body": "Adaugă și reordonează etichete și modifică preferințele dvs."
+      },
+      "security_read": {
+        "title": "Vizualizarea securității contului",
+        "body": "Vede dacă autentificarea în doi pași și criptarea sunt activate, fără acces la secrete."
+      },
+      "auth_observe": {
+        "title": "Aflarea momentului autentificării",
+        "body": "Este anunțat când vă autentificați, schimbați contul sau sesiunea este reînnoită."
+      },
+      "auth_emit": {
+        "title": "Deconectarea dvs.",
+        "body": "Vă deconectează din webmail."
+      },
+      "account_read": {
+        "title": "Vizualizarea conturilor",
+        "body": "Vede conturile pe care le-ați adăugat, cu adresele și serverele lor."
+      },
+      "http_post": {
+        "title": "Folosirea serverului webmail în numele dvs.",
+        "body": "Apelează aceste endpointuri ale serverului cu datele dvs. de autentificare:"
+      },
+      "http_fetch": {
+        "title": "Conectarea la alte site-uri",
+        "body": "Trimite cereri către aceste site-uri. Orice poate citi pluginul poate fi trimis acolo:"
+      },
+      "admin_config": {
+        "title": "Citirea setărilor de la administrator",
+        "body": "Citește setările pe care administratorul le-a salvat pentru acest plugin."
+      },
+      "ui_observe": {
+        "title": "Urmărirea locului în care vă aflați în aplicație",
+        "body": "Știe ce pagină este deschisă și reacționează la linkurile pe care faceți clic."
+      },
+      "ui_toolbar": {
+        "title": "Adăugarea de butoane în barele de instrumente",
+        "body": "Afișează butoane proprii în bara de instrumente a mesajelor, pe un mesaj deschis și în bara de sus."
+      },
+      "ui_app_top_banner": {
+        "title": "Afișarea unui banner în partea de sus",
+        "body": "Afișează o notificare în partea de sus a aplicației."
+      },
+      "ui_email_banner": {
+        "title": "Afișarea de notificări pe mesaje",
+        "body": "Afișează notificări și rezumate proprii deasupra, în interiorul și între părțile unui mesaj sau ale unei conversații deschise."
+      },
+      "ui_email_footer": {
+        "title": "Adăugarea de conținut sub mesaje",
+        "body": "Afișează conținut propriu sub un mesaj deschis."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "Afișarea cheilor de criptare ale contactelor",
+        "body": "Afișează și gestionează cheile de criptare ale unui contact."
+      },
+      "ui_email_details": {
+        "title": "Adăugarea de panouri la detaliile mesajului",
+        "body": "Afișează un panou propriu lângă sau sub un mesaj deschis."
+      },
+      "ui_download_file": {
+        "title": "Salvarea fișierelor pe dispozitiv",
+        "body": "Oferă spre descărcare fișierele create de el."
+      },
+      "ui_message_list_tabs": {
+        "title": "Adăugarea de file în Primite",
+        "body": "Sortează mesajele primite în file precum Actualizări sau Promoții."
+      },
+      "ui_composer_toolbar": {
+        "title": "Adăugarea în fereastra de redactare",
+        "body": "Afișează butoane, opțiuni de meniu și secțiuni proprii în timp ce scrieți un mesaj."
+      },
+      "ui_composer_sidebar": {
+        "title": "Adăugarea unui panou în fereastra de redactare",
+        "body": "Afișează un panou propriu lângă mesajul pe care îl scrieți."
+      },
+      "ui_sidebar_widget": {
+        "title": "Adăugarea în bara laterală",
+        "body": "Afișează casete și secțiuni proprii în bara laterală a e-mailului."
+      },
+      "ui_settings_section": {
+        "title": "Adăugarea unei pagini de setări",
+        "body": "Afișează o pagină proprie în Setări."
+      },
+      "ui_context_menu": {
+        "title": "Adăugarea de opțiuni în meniul mesajului",
+        "body": "Adaugă opțiuni în meniul care se deschide când faceți clic dreapta pe un mesaj."
+      },
+      "ui_navigation_rail": {
+        "title": "Adăugarea în bara de navigare",
+        "body": "Afișează un buton propriu în bara de navigare."
+      },
+      "ui_keyboard": {
+        "title": "Adăugarea de comenzi rapide de la tastatură",
+        "body": "Reacționează la comenzile rapide de la tastatură pe care le definește."
+      },
+      "ui_calendar_action": {
+        "title": "Adăugarea în vizualizarea calendarului",
+        "body": "Afișează butoane și secțiuni proprii la evenimente, precum și etichete scurte și puncte la zilele din calendar."
+      },
+      "ui_admin_page": {
+        "title": "Adăugarea unei pagini de administrare",
+        "body": "Afișează o pagină proprie în setările de administrare."
+      },
+      "app_lifecycle": {
+        "title": "Aflarea momentului pornirii și opririi aplicației",
+        "body": "Este anunțat când aplicația pornește, trece offline sau vă deconectați."
+      },
+      "compose_open": {
+        "title": "Deschiderea ferestrei de redactare",
+        "body": "Deschide un mesaj nou cu destinatarii, textul sau atașamentele deja completate. Dvs. decideți în continuare dacă îl trimiteți."
+      },
+      "compose_read": {
+        "title": "Citirea mesajului pe care îl scrieți",
+        "body": "Citirea textului unui mesaj în timp ce îl scrieți, când folosiți pluginul în editor. Nu și semnătura sau mesajul citat."
+      },
+      "compose_write": {
+        "title": "Modificarea mesajului pe care îl scrieți",
+        "body": "Înlocuirea sau adăugarea de text într-un mesaj în timp ce îl scrieți, când folosiți pluginul în editor. Puteți anula fiecare modificare și decideți în continuare dacă îl trimiteți."
+      },
+      "ui_notifications": {
+        "title": "Afișarea notificărilor",
+        "body": "Afișează notificări pe dispozitiv sau în aplicație, dacă nu le-ați permis. Fiecare indică numele pluginului."
+      },
+      "ui_message_list": {
+        "title": "Adăugarea în lista de mesaje",
+        "body": "Afișează conținut propriu deasupra listei de mesaje, precum și butoane pe mesaje și în bara mesajelor selectate."
+      },
+      "ui_contacts": {
+        "title": "Adăugarea în vizualizarea contactelor",
+        "body": "Afișează secțiuni proprii în detaliile unui contact și butoane în lista de contacte."
+      },
+      "ui_tasks": {
+        "title": "Adăugarea în vizualizarea sarcinilor",
+        "body": "Afișează secțiuni proprii în detaliile unei sarcini și butoane în lista de sarcini."
+      },
+      "ui_files": {
+        "title": "Adăugarea în vizualizarea fișierelor",
+        "body": "Afișează secțiuni proprii în previzualizarea fișierelor și opțiuni în meniul unui fișier."
+      },
+      "ui_commands": {
+        "title": "Adăugarea de comenzi",
+        "body": "Adaugă opțiuni proprii în paleta de comenzi (Ctrl+K)."
+      },
+      "ui_app_page": {
+        "title": "Adăugarea de pagini",
+        "body": "Adaugă pagini proprii în aplicație, fiecare cu un buton în bara de navigare."
+      },
+      "http_proxy": {
+        "title": "Folosirea conturilor pe care le conectați",
+        "body": "Trimite cereri prin serverul Bulwark cu un cont sau o cheie configurate de dvs. sau de administratorul dvs. Pluginul nu vede niciodată parola, dar poate face tot ce poate face acel cont pe serverul său."
+      }
+    },
+    "dialog": {
+      "from_plugin": "De la pluginul {name}",
+      "ok": "OK",
+      "submit": "Trimite",
+      "confirm": "Confirmă",
+      "cancel": "Anulează",
+      "close": "Închide",
+      "turn_off": "Dezactivează {name}",
+      "plugin_menu": "Opțiuni pentru {name}",
+      "password_note": "Acest formular vine de la pluginul {name}, nu de la webmail. Introduceți o parolă doar dacă aveți încredere în acest plugin.",
+      "toast_auto_disabled": "{name} a fost dezactivat pentru că a eșuat în mod repetat."
+    },
+    "connect": {
+      "title": "Conectați {label}",
+      "intro_password": "{name} vrea să folosească contul dvs. {label}. Bulwark păstrează parola pe serverul său și o trimite doar către {host}. Pluginul nu o vede niciodată.",
+      "intro_password_any": "{name} vrea să folosească contul dvs. {label}. Bulwark păstrează parola pe serverul său și o trimite doar către serverul pe care îl introduceți aici. Pluginul nu o vede niciodată.",
+      "intro_signin": "{name} vrea să se conecteze la contul dvs. {label}. Introduceți aici serverul, apoi conectați-vă pe pagina acestuia. Bulwark păstrează pe serverul său accesul obținut; pluginul nu îl vede niciodată.",
+      "server": "Adresa serverului",
+      "server_hint": "cloud.example.com",
+      "username": "Nume de utilizator",
+      "secret": "Parolă sau cheie",
+      "connect": "Conectați",
+      "continue": "Continuați",
+      "cancel": "Anulați",
+      "saving": "Se salvează…",
+      "error_server": "Introduceți adresa serverului, de exemplu https://cloud.example.com",
+      "error_save": "Nu s-a putut salva: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "Selectează un rezultat pentru previzualizare",
     "open_full": "Deschide",
     "view_label": "Vizualizare"
+  },
+  "top_bar": {
+    "more": "Mai multe opțiuni"
+  },
+  "plugin_pages": {
+    "loading": "Se încarcă pagina",
+    "not_available_title": "Această pagină nu este disponibilă",
+    "not_available_description": "Pluginul care a adăugat-o este dezactivat sau nu mai este instalat.",
+    "back_to_mail": "Înapoi la e-mail",
+    "settings_group": "Pluginuri"
+  },
+  "command_palette": {
+    "title": "Paleta de comenzi",
+    "open": "Deschide paleta de comenzi",
+    "placeholder": "Tastați o comandă",
+    "no_results": "Nicio comandă potrivită",
+    "go_to": "Mergi la {name}",
+    "compose": "Mesaj nou",
+    "search": "Caută în e-mail",
+    "theme_dark": "Comută la tema întunecată",
+    "theme_light": "Comută la tema luminoasă",
+    "shortcuts": "Afișează comenzile rapide de la tastatură",
+    "group_navigation": "Mergi la",
+    "group_actions": "Acțiuni",
+    "group_plugins": "Pluginuri"
+  },
+  "notification_center": {
+    "title": "Notificări",
+    "mark_all_read": "Marchează toate ca citite",
+    "clear": "Golește",
+    "empty": "Nicio notificare",
+    "close": "Închide",
+    "unread": "Necitită",
+    "unread_count": "Necitite: {count}",
+    "level_error": "Eroare",
+    "level_warning": "Avertisment"
   }
 }
diff --git a/locales/ru/common.json b/locales/ru/common.json
index 0a9011a90..51fc6cb43 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -620,7 +620,9 @@
       "copied": "Код скопирован",
       "copy_failed": "Не удалось скопировать код"
     },
-    "mv_position": "{index} из {total}"
+    "mv_position": "{index} из {total}",
+    "plugin_panel_show": "Показать панель плагина",
+    "plugin_panel_hide": "Скрыть панель плагина"
   },
   "email_composer": {
     "minimize": "Свернуть",
@@ -813,7 +815,8 @@
       "remove_background_color": "Убрать цвет фона"
     },
     "send_filing_warning": "Отправлено - но последующая очистка не удалась, может остаться устаревший черновик.",
-    "pop_out": "Открыть ответ в отдельном окне"
+    "pop_out": "Открыть ответ в отдельном окне",
+    "send_guard_failed": "Не отправлено: плагин, проверяющий письма перед отправкой, завершился с ошибкой или не ответил."
   },
   "confirm_dialog": {
     "confirm": "Подтвердить",
@@ -3970,6 +3973,354 @@
       "failed_detail": "Ошибка авторизации: {error}",
       "missing_params": "Отсутствует код авторизации или состояние.",
       "delivery_failed": "Не удалось передать результат авторизации на вкладку приложения. Закройте это окно и попробуйте снова."
+    },
+    "settings": {
+      "title": "Плагины",
+      "description": "Плагины, добавленные администратором. Включайте и выключайте их для своего аккаунта.",
+      "description_uploads": "Плагины добавляют в webmail новые функции. Включайте и выключайте их для своего аккаунта или устанавливайте свои.",
+      "description_demo": "В демо-режиме плагины недоступны.",
+      "install_button": "Установить плагин",
+      "install_hint": "Выберите ZIP-файл плагина.",
+      "install_hint_approval": "Выберите ZIP-файл плагина. Прежде чем вы сможете его включить, его должен одобрить администратор.",
+      "install_uploads_off": "Администратор не разрешает устанавливать плагины.",
+      "install_managed_id": "Администратор уже предоставляет плагин с таким именем, поэтому его нельзя заменить.",
+      "install_invalid": "Этот файл не является плагином, который можно установить: {details}",
+      "toast_installed": "Плагин установлен. Включите его ниже.",
+      "toast_installed_pending": "Плагин установлен и отправлен администратору на одобрение.",
+      "toast_enabled": "Плагин {name} включён",
+      "toast_disabled": "Плагин {name} выключен",
+      "toast_removed": "Плагин {name} удалён",
+      "toast_forced": "Администратор требует, чтобы плагин {name} оставался включённым",
+      "toast_approval_requested": "Плагин {name} ожидает одобрения администратором",
+      "empty_title": "Плагинов пока нет",
+      "empty_admin": "Администратор не добавил ни одного плагина.",
+      "empty_uploads": "Чтобы начать, установите плагин из ZIP-файла.",
+      "empty_demo": "Плагинам нужен настоящий аккаунт, поэтому в демо-режиме их нет.",
+      "syncing": "Проверка плагинов на сервере…",
+      "status_installed": "Выключен",
+      "status_enabled": "Запускается",
+      "status_running": "Включён",
+      "status_disabled": "Выключен",
+      "status_error": "Ошибка",
+      "badge_forced": "Обязательный",
+      "badge_managed": "От администратора",
+      "badge_yours": "Установлен вами",
+      "badge_awaiting": "Ожидает одобрения",
+      "toggle_label": "Включить или выключить плагин {name}",
+      "forced_note": "Администратор требует этот плагин, поэтому его нельзя выключить.",
+      "permissions": "Что он может делать",
+      "permissions_managed": "Что он может делать (одобрено администратором)",
+      "settings": "Настройки",
+      "remove": "Удалить",
+      "remove_title": "Удалить плагин {name}?",
+      "remove_message": "Плагин и все данные, которые он сохранил в этом браузере, будут удалены. Позже его можно установить снова.",
+      "remove_confirm": "Удалить",
+      "error_user_plugins_off": "Администратор отключил плагины, установленные пользователями, поэтому этот плагин не работает.",
+      "error_approval_unavailable": "Этот плагин был установлен до того, как появилось одобрение. Удалите и установите его снова, чтобы отправить на одобрение.",
+      "error_approval_denied": "Администратор не одобрил этот плагин.",
+      "error_approval_pending": "Ожидается одобрение этого плагина администратором.",
+      "error_auto_disabled": "Отключён, потому что постоянно выдавал ошибки. Включите его снова, чтобы попробовать ещё раз.",
+      "accounts_heading": "Подключённые аккаунты",
+      "account_on": "{label} на {host}",
+      "account_waiting": "{label} на {host} (вход не завершён)",
+      "disconnect": "Отключить",
+      "disconnect_failed": "Не удалось отключить {label}"
+    },
+    "consent": {
+      "title": "Разрешить плагину {name} это?",
+      "intro": "Плагин запрашивает разрешения, перечисленные ниже. Он получит их, только если вы разрешите.",
+      "high_risk_note": "Отмеченные пункты дают плагину доступ к содержимому вашей почты или позволяют ему передавать данные на сторону. Разрешайте их только плагинам, которым доверяете.",
+      "revoke_hint": "Вы в любой момент можете выключить или удалить плагин в настройках.",
+      "deny": "Не разрешать",
+      "allow": "Разрешить"
+    },
+    "permissions": {
+      "none": "Ему не нужны особые разрешения.",
+      "high_risk": "Требует осторожности",
+      "email_read": {
+        "title": "Читать вашу почту",
+        "body": "Видеть отправителей, получателей, темы и полный текст любого письма в вашей учётной записи, а также ваши папки."
+      },
+      "email_write": {
+        "title": "Менять и упорядочивать вашу почту",
+        "body": "Добавлять и удалять теги, флажки и другие ключевые слова у ваших писем, перемещать их между вашими папками и в архив, а также сохранять черновики."
+      },
+      "email_send": {
+        "title": "Менять письма перед отправкой",
+        "body": "Читать и менять получателей, тему, текст и вложения писем, которые вы пишете, а также останавливать отправку письма."
+      },
+      "crypto_full": {
+        "title": "Полный доступ к приложению",
+        "body": "Работает с теми же правами, что и сам webmail. Может читать всю вашу почту и сохранённые ключи и действовать от вашего имени. Разрешайте это только плагинам, которым полностью доверяете."
+      },
+      "email_raw_send": {
+        "title": "Отправлять собственные письма",
+        "body": "Отправлять с вашего аккаунта готовые письма, например подписанные или зашифрованные."
+      },
+      "email_blob_read": {
+        "title": "Читать исходные данные писем",
+        "body": "Читать исходные данные ваших писем и вложений, а также каждого файла, который вы прикрепляете, до отправки."
+      },
+      "email_blob_write": {
+        "title": "Заменять вложения перед отправкой",
+        "body": "Загружать файлы на ваш почтовый сервер и заменять прикреплённый файл другим до отправки письма."
+      },
+      "email_render_takeover": {
+        "title": "Менять отображение писем",
+        "body": "Заменять текст открытых писем и писем в списке сообщений, например чтобы показать расшифрованное содержимое."
+      },
+      "calendar_read": {
+        "title": "Читать ваш календарь",
+        "body": "Видеть ваши календари и их события."
+      },
+      "calendar_write": {
+        "title": "Менять ваш календарь",
+        "body": "Создавать, менять и удалять события."
+      },
+      "contacts_read": {
+        "title": "Читать ваши контакты",
+        "body": "Искать в ваших адресных книгах и читать их."
+      },
+      "contacts_write": {
+        "title": "Менять ваши контакты",
+        "body": "Создавать, менять и удалять контакты и адресные книги."
+      },
+      "files_read": {
+        "title": "Читать ваши файлы",
+        "body": "Просматривать и открывать файлы, хранящиеся в вашем аккаунте."
+      },
+      "files_write": {
+        "title": "Менять ваши файлы",
+        "body": "Загружать, переименовывать, перемещать и удалять файлы в вашем аккаунте."
+      },
+      "identity_read": {
+        "title": "Видеть ваши адреса отправителя",
+        "body": "Видеть адреса, с которых вы отправляете письма, и их подписи."
+      },
+      "identity_write": {
+        "title": "Менять ваши адреса отправителя",
+        "body": "Создавать, менять и удалять адреса отправителя и подписи."
+      },
+      "filters_read": {
+        "title": "Читать ваши фильтры почты",
+        "body": "Видеть правила, которые сортируют входящую почту."
+      },
+      "filters_write": {
+        "title": "Менять ваши фильтры почты",
+        "body": "Добавлять правила в фильтры на сервере. Такие правила могут перемещать, пересылать или удалять входящую почту."
+      },
+      "tasks_read": {
+        "title": "Читать ваши задачи",
+        "body": "Видеть ваши списки задач и задачи."
+      },
+      "tasks_write": {
+        "title": "Менять ваши задачи",
+        "body": "Создавать, менять, завершать и удалять задачи."
+      },
+      "templates_read": {
+        "title": "Читать ваши шаблоны",
+        "body": "Видеть сохранённые шаблоны писем."
+      },
+      "templates_write": {
+        "title": "Менять ваши шаблоны",
+        "body": "Создавать, менять и удалять шаблоны писем."
+      },
+      "smime_read": {
+        "title": "Видеть ваш статус S/MIME",
+        "body": "Видеть, есть ли у вас ключи и сертификаты S/MIME, без доступа к самим ключам."
+      },
+      "vacation_read": {
+        "title": "Видеть ваш автоответ",
+        "body": "Видеть, включён ли автоответ и что в нём написано."
+      },
+      "vacation_write": {
+        "title": "Менять ваш автоответ",
+        "body": "Включать и выключать автоответ, менять его текст и даты."
+      },
+      "settings_read": {
+        "title": "Читать ваши настройки",
+        "body": "Видеть ваши параметры и определения тегов."
+      },
+      "settings_write": {
+        "title": "Менять ваши настройки",
+        "body": "Добавлять теги, менять их порядок и менять ваши параметры."
+      },
+      "security_read": {
+        "title": "Видеть безопасность аккаунта",
+        "body": "Видеть, включены ли двухфакторная аутентификация и шифрование, без доступа к секретам."
+      },
+      "auth_observe": {
+        "title": "Узнавать о вашем входе",
+        "body": "Получать уведомления, когда вы входите, переключаете аккаунт или ваш сеанс продлевается."
+      },
+      "auth_emit": {
+        "title": "Выполнять выход",
+        "body": "Выполнять ваш выход из webmail."
+      },
+      "account_read": {
+        "title": "Видеть ваши аккаунты",
+        "body": "Видеть добавленные вами аккаунты, их адреса и серверы."
+      },
+      "http_post": {
+        "title": "Обращаться к серверу webmail от вашего имени",
+        "body": "Вызывать эти адреса сервера с вашими учётными данными:"
+      },
+      "http_fetch": {
+        "title": "Подключаться к другим сайтам",
+        "body": "Отправлять запросы на эти сайты. Туда может быть отправлено всё, что плагин может прочитать:"
+      },
+      "admin_config": {
+        "title": "Читать свои настройки от администратора",
+        "body": "Читать настройки, которые администратор сохранил для этого плагина."
+      },
+      "ui_observe": {
+        "title": "Следить за тем, где вы в приложении",
+        "body": "Знать, какая страница открыта, и реагировать на ссылки, по которым вы нажимаете."
+      },
+      "ui_toolbar": {
+        "title": "Добавлять кнопки на панели инструментов",
+        "body": "Показывать свои кнопки на панели инструментов писем, в открытом письме и на верхней панели."
+      },
+      "ui_app_top_banner": {
+        "title": "Показывать баннер сверху",
+        "body": "Показывать уведомление в верхней части приложения."
+      },
+      "ui_email_banner": {
+        "title": "Показывать уведомления в письмах",
+        "body": "Показывать свои уведомления и сводки над частями открытого письма или беседы, внутри них и между ними."
+      },
+      "ui_email_footer": {
+        "title": "Добавлять содержимое под письмами",
+        "body": "Показывать своё содержимое под открытым письмом."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "Показывать ключи шифрования контактов",
+        "body": "Показывать ключи шифрования контакта и управлять ими."
+      },
+      "ui_email_details": {
+        "title": "Добавлять панели к письму",
+        "body": "Показывать свою панель рядом с открытым письмом или под ним."
+      },
+      "ui_download_file": {
+        "title": "Сохранять файлы на ваше устройство",
+        "body": "Предлагать для скачивания созданные им файлы."
+      },
+      "ui_message_list_tabs": {
+        "title": "Добавлять вкладки во «Входящие»",
+        "body": "Распределять входящие письма по вкладкам, например «Обновления» или «Промоакции»."
+      },
+      "ui_composer_toolbar": {
+        "title": "Добавлять элементы в редактор",
+        "body": "Показывать свои кнопки, пункты меню и разделы, пока вы пишете письмо."
+      },
+      "ui_composer_sidebar": {
+        "title": "Добавлять панель в редактор",
+        "body": "Показывать свою панель рядом с письмом, которое вы пишете."
+      },
+      "ui_sidebar_widget": {
+        "title": "Добавлять элементы на боковую панель",
+        "body": "Показывать свои блоки и разделы на боковой панели почты."
+      },
+      "ui_settings_section": {
+        "title": "Добавлять страницу настроек",
+        "body": "Показывать свою страницу в настройках."
+      },
+      "ui_context_menu": {
+        "title": "Добавлять пункты в меню письма",
+        "body": "Добавлять пункты в меню, которое открывается по правому щелчку на письме."
+      },
+      "ui_navigation_rail": {
+        "title": "Добавлять кнопку на панель навигации",
+        "body": "Показывать свою кнопку на панели навигации."
+      },
+      "ui_keyboard": {
+        "title": "Добавлять сочетания клавиш",
+        "body": "Реагировать на заданные им сочетания клавиш."
+      },
+      "ui_calendar_action": {
+        "title": "Добавлять элементы в интерфейс календаря",
+        "body": "Показывать свои кнопки и разделы в событиях, а также короткие метки и точки на днях календаря."
+      },
+      "ui_admin_page": {
+        "title": "Добавлять страницу администрирования",
+        "body": "Показывать свою страницу в настройках администратора."
+      },
+      "app_lifecycle": {
+        "title": "Узнавать о запуске и остановке приложения",
+        "body": "Получать уведомления, когда приложение запускается, теряет связь или вы выходите."
+      },
+      "compose_open": {
+        "title": "Открывать редактор письма",
+        "body": "Открывать новое письмо с уже заполненными получателями, текстом или вложениями. Отправлять ли его, по-прежнему решаете вы."
+      },
+      "compose_read": {
+        "title": "Читать письмо, которое вы пишете",
+        "body": "Читать текст письма, пока вы его пишете, когда вы используете плагин в редакторе. Без подписи и цитируемого письма."
+      },
+      "compose_write": {
+        "title": "Изменять письмо, которое вы пишете",
+        "body": "Заменять или добавлять текст в письме, пока вы его пишете, когда вы используете плагин в редакторе. Каждое изменение можно отменить, а отправлять ли письмо, решаете вы."
+      },
+      "ui_notifications": {
+        "title": "Показывать уведомления",
+        "body": "Показывать уведомления на вашем устройстве или в приложении, если вы их не разрешили. В каждом указано название плагина."
+      },
+      "ui_message_list": {
+        "title": "Добавлять элементы в список сообщений",
+        "body": "Показывать своё содержимое над списком сообщений, а также кнопки на письмах и на панели выбранных писем."
+      },
+      "ui_contacts": {
+        "title": "Добавлять элементы в интерфейс контактов",
+        "body": "Показывать свои разделы в карточке контакта и кнопки в списке контактов."
+      },
+      "ui_tasks": {
+        "title": "Добавлять элементы в интерфейс задач",
+        "body": "Показывать свои разделы в сведениях о задаче и кнопки в списке задач."
+      },
+      "ui_files": {
+        "title": "Добавлять элементы в интерфейс файлов",
+        "body": "Показывать свои разделы в предпросмотре файла и пункты в меню файла."
+      },
+      "ui_commands": {
+        "title": "Добавлять команды",
+        "body": "Добавлять свои пункты в палитру команд (Ctrl+K)."
+      },
+      "ui_app_page": {
+        "title": "Добавлять страницы",
+        "body": "Добавлять в приложение свои страницы, каждую с кнопкой на панели навигации."
+      },
+      "http_proxy": {
+        "title": "Использовать подключённые вами аккаунты",
+        "body": "Отправлять запросы через сервер Bulwark с аккаунтом или ключом, который настроили вы или ваш администратор. Плагин никогда не видит пароль, но может делать на этом сервере всё, что может этот аккаунт."
+      }
+    },
+    "dialog": {
+      "from_plugin": "От плагина {name}",
+      "ok": "ОК",
+      "submit": "Отправить",
+      "confirm": "Подтвердить",
+      "cancel": "Отмена",
+      "close": "Закрыть",
+      "turn_off": "Отключить {name}",
+      "plugin_menu": "Параметры {name}",
+      "password_note": "Эта форма от плагина {name}, а не от веб-почты. Вводите пароль, только если доверяете этому плагину.",
+      "toast_auto_disabled": "{name} отключён, потому что постоянно выдавал ошибки."
+    },
+    "connect": {
+      "title": "Подключить {label}",
+      "intro_password": "{name} хочет использовать ваш аккаунт {label}. Bulwark хранит пароль на своём сервере и отправляет его только на {host}. Плагин его никогда не видит.",
+      "intro_password_any": "{name} хочет использовать ваш аккаунт {label}. Bulwark хранит пароль на своём сервере и отправляет его только на сервер, который вы укажете здесь. Плагин его никогда не видит.",
+      "intro_signin": "{name} хочет войти в ваш аккаунт {label}. Укажите здесь сервер, затем войдите на его собственной странице. Bulwark хранит полученный доступ на своём сервере; плагин его никогда не видит.",
+      "server": "Адрес сервера",
+      "server_hint": "cloud.example.com",
+      "username": "Имя пользователя",
+      "secret": "Пароль или ключ",
+      "connect": "Подключить",
+      "continue": "Продолжить",
+      "cancel": "Отмена",
+      "saving": "Сохранение…",
+      "error_server": "Укажите адрес сервера, например https://cloud.example.com",
+      "error_save": "Не удалось сохранить: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "Выберите результат для предпросмотра",
     "open_full": "Открыть",
     "view_label": "Вид"
+  },
+  "top_bar": {
+    "more": "Другие действия"
+  },
+  "plugin_pages": {
+    "loading": "Загрузка страницы",
+    "not_available_title": "Эта страница недоступна",
+    "not_available_description": "Плагин, который её добавил, выключен или больше не установлен.",
+    "back_to_mail": "Вернуться к почте",
+    "settings_group": "Плагины"
+  },
+  "command_palette": {
+    "title": "Палитра команд",
+    "open": "Открыть палитру команд",
+    "placeholder": "Введите команду",
+    "no_results": "Нет подходящих команд",
+    "go_to": "Перейти: {name}",
+    "compose": "Новое письмо",
+    "search": "Искать в почте",
+    "theme_dark": "Включить тёмную тему",
+    "theme_light": "Включить светлую тему",
+    "shortcuts": "Показать сочетания клавиш",
+    "group_navigation": "Перейти",
+    "group_actions": "Действия",
+    "group_plugins": "Плагины"
+  },
+  "notification_center": {
+    "title": "Уведомления",
+    "mark_all_read": "Отметить все как прочитанные",
+    "clear": "Очистить",
+    "empty": "Нет уведомлений",
+    "close": "Закрыть",
+    "unread": "Непрочитанное",
+    "unread_count": "Непрочитанных: {count}",
+    "level_error": "Ошибка",
+    "level_warning": "Предупреждение"
   }
 }
diff --git a/locales/sk/common.json b/locales/sk/common.json
index 088f7da76..bf789b23d 100644
--- a/locales/sk/common.json
+++ b/locales/sk/common.json
@@ -620,7 +620,9 @@
       "copied": "Kód skopírovaný",
       "copy_failed": "Kód sa nepodarilo skopírovať"
     },
-    "mv_position": "{index} z {total}"
+    "mv_position": "{index} z {total}",
+    "plugin_panel_show": "Zobraziť panel doplnku",
+    "plugin_panel_hide": "Skryť panel doplnku"
   },
   "email_composer": {
     "minimize": "Minimalizovať",
@@ -813,7 +815,8 @@
       "remove_background_color": "Odstrániť farbu pozadia"
     },
     "send_filing_warning": "Odoslané - ale následné upratovanie zlyhalo, môže zostať zastaraný koncept.",
-    "pop_out": "Otvoriť odpoveď v okne"
+    "pop_out": "Otvoriť odpoveď v okne",
+    "send_guard_failed": "Neodoslané - doplnok, ktorý kontroluje správy pred odoslaním, zlyhal alebo neodpovedal."
   },
   "confirm_dialog": {
     "confirm": "Potvrdiť",
@@ -3970,6 +3973,354 @@
       "failed_detail": "Autorizácia zlyhala: {error}",
       "missing_params": "Chýba autorizačný kód alebo stav.",
       "delivery_failed": "Výsledok autorizácie sa nepodarilo odovzdať karte aplikácie. Zavrite toto okno a skúste to znova."
+    },
+    "settings": {
+      "title": "Doplnky",
+      "description": "Doplnky pridané vaším správcom. Pre svoj účet ich môžete zapnúť alebo vypnúť.",
+      "description_uploads": "Doplnky pridávajú do webmailu ďalšie funkcie. Pre svoj účet ich môžete zapnúť alebo vypnúť, prípadne nainštalovať vlastné.",
+      "description_demo": "Doplnky nie sú v ukážkovej verzii k dispozícii.",
+      "install_button": "Nainštalovať doplnok",
+      "install_hint": "Vyberte súbor ZIP s doplnkom.",
+      "install_hint_approval": "Vyberte súbor ZIP s doplnkom. Skôr než ho budete môcť zapnúť, musí ho schváliť správca.",
+      "install_uploads_off": "Váš správca nepovoľuje inštaláciu doplnkov.",
+      "install_managed_id": "Váš správca už poskytuje doplnok s týmto názvom, preto ho nemožno nahradiť.",
+      "install_invalid": "Tento súbor nie je doplnok, ktorý možno nainštalovať: {details}",
+      "toast_installed": "Doplnok je nainštalovaný. Zapnite ho nižšie.",
+      "toast_installed_pending": "Doplnok je nainštalovaný a odoslaný správcovi na schválenie.",
+      "toast_enabled": "Doplnok {name} je zapnutý",
+      "toast_disabled": "Doplnok {name} je vypnutý",
+      "toast_removed": "Doplnok {name} bol odstránený",
+      "toast_forced": "Váš správca ponecháva doplnok {name} zapnutý",
+      "toast_approval_requested": "Doplnok {name} čaká na schválenie správcom",
+      "empty_title": "Zatiaľ žiadne doplnky",
+      "empty_admin": "Váš správca zatiaľ nepridal žiadne doplnky.",
+      "empty_uploads": "Začnite inštaláciou doplnku zo súboru ZIP.",
+      "empty_demo": "Doplnky vyžadujú skutočný účet, preto ich ukážková verzia nemá.",
+      "syncing": "Kontrola doplnkov na serveri…",
+      "status_installed": "Vypnuté",
+      "status_enabled": "Spúšťa sa",
+      "status_running": "Zapnuté",
+      "status_disabled": "Vypnuté",
+      "status_error": "Problém",
+      "badge_forced": "Povinný",
+      "badge_managed": "Od správcu",
+      "badge_yours": "Nainštalované vami",
+      "badge_awaiting": "Čaká na schválenie",
+      "toggle_label": "Zapnúť alebo vypnúť doplnok {name}",
+      "forced_note": "Váš správca tento doplnok vyžaduje, preto ho nemožno vypnúť.",
+      "permissions": "Čo môže robiť",
+      "permissions_managed": "Čo môže robiť (schválené správcom)",
+      "settings": "Nastavenia",
+      "remove": "Odstrániť",
+      "remove_title": "Odstrániť doplnok {name}?",
+      "remove_message": "Doplnok aj všetko, čo uložil v tomto prehliadači, sa vymaže. Neskôr ho môžete nainštalovať znova.",
+      "remove_confirm": "Odstrániť",
+      "error_user_plugins_off": "Váš správca vypol doplnky inštalované používateľmi, preto tento doplnok nebeží.",
+      "error_approval_unavailable": "Tento doplnok bol nainštalovaný skôr, než sa vyžadovalo schválenie. Odstráňte ho a nainštalujte znova, aby sa odoslal na schválenie.",
+      "error_approval_denied": "Váš správca tento doplnok neschválil.",
+      "error_approval_pending": "Čaká sa, kým správca tento doplnok schváli.",
+      "error_auto_disabled": "Vypnuté, pretože opakovane zlyhávalo. Zapnite ho znova a skúste to znova.",
+      "accounts_heading": "Pripojené účty",
+      "account_on": "{label} na {host}",
+      "account_waiting": "{label} na {host} (prihlásenie nedokončené)",
+      "disconnect": "Odpojiť",
+      "disconnect_failed": "{label} sa nepodarilo odpojiť"
+    },
+    "consent": {
+      "title": "Povoliť doplnku {name} tieto akcie?",
+      "intro": "Doplnok žiada o nižšie uvedené oprávnenia. Dostane ich, len ak ich povolíte.",
+      "high_risk_note": "Označené položky dávajú doplnku prístup k obsahu vašej pošty alebo mu umožňujú posielať údaje inam. Povoľte ich len doplnkom, ktorým dôverujete.",
+      "revoke_hint": "Doplnok môžete kedykoľvek vypnúť alebo odstrániť v Nastaveniach.",
+      "deny": "Nepovoliť",
+      "allow": "Povoliť"
+    },
+    "permissions": {
+      "none": "Nepotrebuje žiadne zvláštne oprávnenia.",
+      "high_risk": "Vyžaduje opatrnosť",
+      "email_read": {
+        "title": "Čítať vašu poštu",
+        "body": "Vidí odosielateľov, príjemcov, predmety a celý text ktorejkoľvek správy vo vašom účte aj vaše priečinky."
+      },
+      "email_write": {
+        "title": "Meniť a triediť vašu poštu",
+        "body": "Pridáva alebo odstraňuje štítky, príznaky a ďalšie kľúčové slová pri vašich správach, presúva ich medzi vašimi priečinkami a do archívu a ukladá koncepty."
+      },
+      "email_send": {
+        "title": "Meniť poštu pred odoslaním",
+        "body": "Číta a mení príjemcov, predmet, text a prílohy správ, ktoré píšete, a môže zastaviť odoslanie správy."
+      },
+      "crypto_full": {
+        "title": "Úplný prístup k tejto aplikácii",
+        "body": "Beží s rovnakými právami ako samotný webmail. Môže čítať všetku vašu poštu a uložené kľúče a konať vo vašom mene. Povoľte to len doplnkom, ktorým úplne dôverujete."
+      },
+      "email_raw_send": {
+        "title": "Odosielať správy, ktoré sám vytvoril",
+        "body": "Odosiela z vášho účtu kompletné správy, napríklad podpísané alebo šifrované."
+      },
+      "email_blob_read": {
+        "title": "Čítať nespracovaný obsah správ",
+        "body": "Číta pôvodné údaje vašich správ a príloh aj každého súboru, ktorý priložíte pred odoslaním."
+      },
+      "email_blob_write": {
+        "title": "Nahrádzať prílohy pred odoslaním",
+        "body": "Nahráva súbory na váš poštový server a pred odoslaním správy nahradí priložený súbor iným."
+      },
+      "email_render_takeover": {
+        "title": "Meniť zobrazenie správ",
+        "body": "Nahrádza text správ, ktoré otvoríte, aj zoznamu správ, napríklad aby zobrazil dešifrovaný obsah."
+      },
+      "calendar_read": {
+        "title": "Čítať váš kalendár",
+        "body": "Vidí vaše kalendáre a ich udalosti."
+      },
+      "calendar_write": {
+        "title": "Meniť váš kalendár",
+        "body": "Vytvára, mení a odstraňuje udalosti."
+      },
+      "contacts_read": {
+        "title": "Čítať vaše kontakty",
+        "body": "Prehľadáva a číta vaše adresáre."
+      },
+      "contacts_write": {
+        "title": "Meniť vaše kontakty",
+        "body": "Vytvára, mení a odstraňuje kontakty a adresáre."
+      },
+      "files_read": {
+        "title": "Čítať vaše súbory",
+        "body": "Prechádza a otvára súbory uložené vo vašom účte."
+      },
+      "files_write": {
+        "title": "Meniť vaše súbory",
+        "body": "Nahráva, premenúva, presúva a odstraňuje súbory vo vašom účte."
+      },
+      "identity_read": {
+        "title": "Vidieť vaše identity odosielateľa",
+        "body": "Vidí adresy, z ktorých odosielate, a ich podpisy."
+      },
+      "identity_write": {
+        "title": "Meniť vaše identity odosielateľa",
+        "body": "Vytvára, mení a odstraňuje identity odosielateľa a podpisy."
+      },
+      "filters_read": {
+        "title": "Čítať vaše filtre pošty",
+        "body": "Vidí pravidlá, ktoré triedia vašu prichádzajúcu poštu."
+      },
+      "filters_write": {
+        "title": "Meniť vaše filtre pošty",
+        "body": "Pridáva pravidlá do filtrov na serveri. Takéto pravidlá môžu prichádzajúcu poštu presúvať, preposielať alebo odstraňovať."
+      },
+      "tasks_read": {
+        "title": "Čítať vaše úlohy",
+        "body": "Vidí vaše zoznamy úloh a úlohy."
+      },
+      "tasks_write": {
+        "title": "Meniť vaše úlohy",
+        "body": "Vytvára, mení, dokončuje a odstraňuje úlohy."
+      },
+      "templates_read": {
+        "title": "Čítať vaše šablóny",
+        "body": "Vidí vaše uložené šablóny správ."
+      },
+      "templates_write": {
+        "title": "Meniť vaše šablóny",
+        "body": "Vytvára, mení a odstraňuje šablóny správ."
+      },
+      "smime_read": {
+        "title": "Vidieť stav S/MIME",
+        "body": "Vidí, či máte kľúče a certifikáty S/MIME, bez prístupu ku kľúčom."
+      },
+      "vacation_read": {
+        "title": "Vidieť automatickú odpoveď v neprítomnosti",
+        "body": "Vidí, či je automatická odpoveď zapnutá a čo obsahuje."
+      },
+      "vacation_write": {
+        "title": "Meniť automatickú odpoveď v neprítomnosti",
+        "body": "Zapína a vypína automatickú odpoveď a mení jej text a dátumy."
+      },
+      "settings_read": {
+        "title": "Čítať vaše nastavenia",
+        "body": "Vidí vaše predvoľby a definície štítkov."
+      },
+      "settings_write": {
+        "title": "Meniť vaše nastavenia",
+        "body": "Pridáva štítky, mení ich poradie a mení vaše predvoľby."
+      },
+      "security_read": {
+        "title": "Vidieť zabezpečenie účtu",
+        "body": "Vidí, či je zapnuté dvojfaktorové overenie a šifrovanie, bez prístupu k tajným údajom."
+      },
+      "auth_observe": {
+        "title": "Vedieť, kedy sa prihlásite",
+        "body": "Dostáva správu, keď sa prihlásite, prepnete účet alebo sa obnoví vaša relácia."
+      },
+      "auth_emit": {
+        "title": "Odhlásiť vás",
+        "body": "Môže vás odhlásiť z webmailu."
+      },
+      "account_read": {
+        "title": "Vidieť vaše účty",
+        "body": "Vidí účty, ktoré ste pridali, vrátane ich adries a serverov."
+      },
+      "http_post": {
+        "title": "Používať server webmailu vo vašom mene",
+        "body": "Volá tieto koncové body servera s vaším prihlásením:"
+      },
+      "http_fetch": {
+        "title": "Pripájať sa k iným webom",
+        "body": "Odosiela požiadavky na tieto weby. Čokoľvek, čo doplnok môže čítať, tam môže byť odoslané:"
+      },
+      "admin_config": {
+        "title": "Čítať nastavenia od správcu",
+        "body": "Číta nastavenia, ktoré pre tento doplnok uložil váš správca."
+      },
+      "ui_observe": {
+        "title": "Sledovať, kde sa v aplikácii nachádzate",
+        "body": "Vie, ktorá stránka je otvorená, a reaguje na odkazy, na ktoré kliknete."
+      },
+      "ui_toolbar": {
+        "title": "Pridávať tlačidlá na panely nástrojov",
+        "body": "Zobrazuje vlastné tlačidlá na paneli nástrojov správ, pri otvorenej správe a v hornej lište."
+      },
+      "ui_app_top_banner": {
+        "title": "Zobrazovať banner hore",
+        "body": "Zobrazuje oznámenie cez hornú časť aplikácie."
+      },
+      "ui_email_banner": {
+        "title": "Zobrazovať oznámenia pri správach",
+        "body": "Zobrazuje vlastné oznámenia a zhrnutia nad časťami otvorenej správy alebo konverzácie, v nich a medzi nimi."
+      },
+      "ui_email_footer": {
+        "title": "Pridávať obsah pod správy",
+        "body": "Zobrazuje vlastný obsah pod otvorenou správou."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "Zobrazovať šifrovacie kľúče kontaktov",
+        "body": "Zobrazuje a spravuje šifrovacie kľúče pri kontakte."
+      },
+      "ui_email_details": {
+        "title": "Pridávať panely do podrobností správy",
+        "body": "Zobrazuje vlastný panel vedľa otvorenej správy alebo pod ňou."
+      },
+      "ui_download_file": {
+        "title": "Ukladať súbory do zariadenia",
+        "body": "Ponúka na stiahnutie súbory, ktoré vytvoril."
+      },
+      "ui_message_list_tabs": {
+        "title": "Pridávať karty do Doručených",
+        "body": "Rozdeľuje Doručené do kariet, napríklad Aktualizácie alebo Akcie."
+      },
+      "ui_composer_toolbar": {
+        "title": "Pridávať obsah do editora správy",
+        "body": "Zobrazuje vlastné tlačidlá, položky ponuky a sekcie, keď píšete správu."
+      },
+      "ui_composer_sidebar": {
+        "title": "Pridávať panel do editora správy",
+        "body": "Zobrazuje vlastný panel vedľa správy, ktorú píšete."
+      },
+      "ui_sidebar_widget": {
+        "title": "Pridávať obsah do postranného panela",
+        "body": "Zobrazuje vlastné polia a sekcie v postrannom paneli pošty."
+      },
+      "ui_settings_section": {
+        "title": "Pridávať stránku nastavení",
+        "body": "Zobrazuje vlastnú stránku v Nastaveniach."
+      },
+      "ui_context_menu": {
+        "title": "Pridávať položky do ponuky správy",
+        "body": "Pridáva položky do ponuky, ktorá sa otvorí po kliknutí pravým tlačidlom na správu."
+      },
+      "ui_navigation_rail": {
+        "title": "Pridávať tlačidlo na navigačnú lištu",
+        "body": "Zobrazuje vlastné tlačidlo na navigačnej lište."
+      },
+      "ui_keyboard": {
+        "title": "Pridávať klávesové skratky",
+        "body": "Reaguje na klávesové skratky, ktoré sám definuje."
+      },
+      "ui_calendar_action": {
+        "title": "Pridávať obsah do sekcie Kalendár",
+        "body": "Zobrazuje vlastné tlačidlá a sekcie pri udalostiach a krátke štítky a bodky pri dňoch v kalendári."
+      },
+      "ui_admin_page": {
+        "title": "Pridávať stránku administrácie",
+        "body": "Zobrazuje vlastnú stránku v nastaveniach administrácie."
+      },
+      "app_lifecycle": {
+        "title": "Vedieť, kedy sa aplikácia spúšťa a ukončuje",
+        "body": "Dostáva správu, keď sa aplikácia spustí, prejde do režimu offline alebo keď sa odhlásite."
+      },
+      "compose_open": {
+        "title": "Otvárať editor správy",
+        "body": "Otvorí novú správu s vyplnenými príjemcami, textom alebo prílohami. O odoslaní stále rozhodujete vy."
+      },
+      "compose_read": {
+        "title": "Čítať správu, ktorú píšete",
+        "body": "Čítať text správy počas písania, keď doplnok použijete v editore. Nie podpis ani citovanú správu."
+      },
+      "compose_write": {
+        "title": "Meniť správu, ktorú píšete",
+        "body": "Nahrádzať alebo pridávať text v správe počas písania, keď doplnok použijete v editore. Každú zmenu môžete vrátiť a o odoslaní stále rozhodujete vy."
+      },
+      "ui_notifications": {
+        "title": "Zobrazovať upozornenia",
+        "body": "Zobrazuje upozornenia vo vašom zariadení alebo v aplikácii, ak ste ich nepovolili. Každé uvádza názov doplnku."
+      },
+      "ui_message_list": {
+        "title": "Pridávať obsah do zoznamu správ",
+        "body": "Zobrazuje vlastný obsah nad zoznamom správ a tlačidlá pri správach a na paneli nástrojov pre vybrané správy."
+      },
+      "ui_contacts": {
+        "title": "Pridávať obsah do sekcie Kontakty",
+        "body": "Zobrazuje vlastné sekcie v podrobnostiach kontaktu a tlačidlá v zozname kontaktov."
+      },
+      "ui_tasks": {
+        "title": "Pridávať obsah do sekcie Úlohy",
+        "body": "Zobrazuje vlastné sekcie v podrobnostiach úlohy a tlačidlá v zozname úloh."
+      },
+      "ui_files": {
+        "title": "Pridávať obsah do sekcie Súbory",
+        "body": "Zobrazuje vlastné sekcie v náhľade súboru a položky v ponuke súboru."
+      },
+      "ui_commands": {
+        "title": "Pridávať príkazy",
+        "body": "Pridáva vlastné položky do palety príkazov (Ctrl+K)."
+      },
+      "ui_app_page": {
+        "title": "Pridávať stránky",
+        "body": "Pridáva do aplikácie vlastné stránky, každú s tlačidlom na navigačnej lište."
+      },
+      "http_proxy": {
+        "title": "Používať účty, ktoré pripojíte",
+        "body": "Odosiela požiadavky cez server Bulwarku pomocou účtu alebo kľúča, ktorý ste nastavili vy alebo váš správca. Doplnok nikdy nevidí heslo, ale môže na príslušnom serveri robiť čokoľvek, čo môže tento účet."
+      }
+    },
+    "dialog": {
+      "from_plugin": "Od doplnku {name}",
+      "ok": "OK",
+      "submit": "Odoslať",
+      "confirm": "Potvrdiť",
+      "cancel": "Zrušiť",
+      "close": "Zavrieť",
+      "turn_off": "Vypnúť {name}",
+      "plugin_menu": "Možnosti pre {name}",
+      "password_note": "Tento formulár pochádza z doplnku {name}, nie z webmailu. Heslo zadajte, len ak tomuto doplnku dôverujete.",
+      "toast_auto_disabled": "{name} bol vypnutý, pretože opakovane zlyhával."
+    },
+    "connect": {
+      "title": "Pripojiť {label}",
+      "intro_password": "{name} chce používať váš účet {label}. Bulwark uchováva heslo na svojom serveri a posiela ho len na {host}. Doplnok ho nikdy nevidí.",
+      "intro_password_any": "{name} chce používať váš účet {label}. Bulwark uchováva heslo na svojom serveri a posiela ho len na server, ktorý tu zadáte. Doplnok ho nikdy nevidí.",
+      "intro_signin": "{name} sa chce prihlásiť do vášho účtu {label}. Zadajte tu server a potom sa prihláste na jeho vlastnej stránke. Bulwark uchováva získaný prístup na svojom serveri; doplnok ho nikdy nevidí.",
+      "server": "Adresa servera",
+      "server_hint": "cloud.example.com",
+      "username": "Používateľské meno",
+      "secret": "Heslo alebo kľúč",
+      "connect": "Pripojiť",
+      "continue": "Pokračovať",
+      "cancel": "Zrušiť",
+      "saving": "Ukladá sa…",
+      "error_server": "Zadajte adresu servera, napríklad https://cloud.example.com",
+      "error_save": "Uloženie zlyhalo: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "Vyberte výsledok pre náhľad",
     "open_full": "Otvoriť",
     "view_label": "Zobrazenie"
+  },
+  "top_bar": {
+    "more": "Ďalšie možnosti"
+  },
+  "plugin_pages": {
+    "loading": "Načítava sa stránka",
+    "not_available_title": "Táto stránka nie je k dispozícii",
+    "not_available_description": "Doplnok, ktorý ju pridal, je vypnutý alebo už nie je nainštalovaný.",
+    "back_to_mail": "Späť na poštu",
+    "settings_group": "Doplnky"
+  },
+  "command_palette": {
+    "title": "Paleta príkazov",
+    "open": "Otvoriť paletu príkazov",
+    "placeholder": "Zadajte príkaz",
+    "no_results": "Žiadne zodpovedajúce príkazy",
+    "go_to": "Prejsť na {name}",
+    "compose": "Nová správa",
+    "search": "Hľadať v pošte",
+    "theme_dark": "Prepnúť na tmavý motív",
+    "theme_light": "Prepnúť na svetlý motív",
+    "shortcuts": "Zobraziť klávesové skratky",
+    "group_navigation": "Prejsť na",
+    "group_actions": "Akcie",
+    "group_plugins": "Doplnky"
+  },
+  "notification_center": {
+    "title": "Oznámenia",
+    "mark_all_read": "Označiť všetko ako prečítané",
+    "clear": "Vymazať",
+    "empty": "Žiadne oznámenia",
+    "close": "Zavrieť",
+    "unread": "Neprečítané",
+    "unread_count": "Neprečítané: {count}",
+    "level_error": "Chyba",
+    "level_warning": "Varovanie"
   }
 }
diff --git a/locales/tr/common.json b/locales/tr/common.json
index 15cdec57a..4b84a8b42 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -620,7 +620,9 @@
       "copied": "Kod kopyalandı",
       "copy_failed": "Kod kopyalanamadı"
     },
-    "mv_position": "{index} / {total}"
+    "mv_position": "{index} / {total}",
+    "plugin_panel_show": "Eklenti panelini göster",
+    "plugin_panel_hide": "Eklenti panelini gizle"
   },
   "email_composer": {
     "minimize": "Simge durumuna küçült",
@@ -813,7 +815,8 @@
       "remove_background_color": "Arka plan rengini kaldır"
     },
     "send_filing_warning": "Gönderildi - ancak sonrasındaki temizleme başarısız oldu, eski bir taslak kalabilir.",
-    "pop_out": "Yanıtı ayrı pencerede aç"
+    "pop_out": "Yanıtı ayrı pencerede aç",
+    "send_guard_failed": "Gönderilmedi - iletileri göndermeden önce denetleyen bir eklenti başarısız oldu veya yanıt vermedi."
   },
   "confirm_dialog": {
     "confirm": "Onayla",
@@ -3970,6 +3973,354 @@
       "failed_detail": "Yetkilendirme başarısız oldu: {error}",
       "missing_params": "Yetkilendirme kodu veya durum eksik.",
       "delivery_failed": "Yetkilendirme sonucu uygulama sekmesine iletilemedi. Lütfen bu pencereyi kapatıp tekrar deneyin."
+    },
+    "settings": {
+      "title": "Eklentiler",
+      "description": "Yöneticinizin eklediği eklentiler. Hesabınız için açıp kapatabilirsiniz.",
+      "description_uploads": "Eklentiler webmail'e yeni özellikler katar. Hesabınız için açıp kapatabilir veya kendi eklentilerinizi yükleyebilirsiniz.",
+      "description_demo": "Eklentiler demoda kullanılamaz.",
+      "install_button": "Eklenti yükle",
+      "install_hint": "Bir eklenti ZIP dosyası seçin.",
+      "install_hint_approval": "Bir eklenti ZIP dosyası seçin. Açabilmeniz için önce bir yöneticinin onaylaması gerekir.",
+      "install_uploads_off": "Yöneticiniz eklenti yüklemeye izin vermiyor.",
+      "install_managed_id": "Yöneticiniz bu adda bir eklentiyi zaten sağlıyor, bu yüzden değiştirilemez.",
+      "install_invalid": "Bu dosya yüklenebilir bir eklenti değil: {details}",
+      "toast_installed": "Eklenti yüklendi. Aşağıdan açabilirsiniz.",
+      "toast_installed_pending": "Eklenti yüklendi ve onay için yöneticinize gönderildi.",
+      "toast_enabled": "{name} eklentisi açıldı",
+      "toast_disabled": "{name} eklentisi kapatıldı",
+      "toast_removed": "{name} eklentisi kaldırıldı",
+      "toast_forced": "Yöneticiniz {name} eklentisini açık tutuyor",
+      "toast_approval_requested": "{name} eklentisi yöneticinizin onayını bekliyor",
+      "empty_title": "Henüz eklenti yok",
+      "empty_admin": "Yöneticiniz henüz eklenti eklemedi.",
+      "empty_uploads": "Başlamak için bir ZIP dosyasından eklenti yükleyin.",
+      "empty_demo": "Eklentiler gerçek bir hesap gerektirir, bu yüzden demoda eklenti yok.",
+      "syncing": "Eklentiler sunucuyla denetleniyor…",
+      "status_installed": "Kapalı",
+      "status_enabled": "Başlatılıyor",
+      "status_running": "Açık",
+      "status_disabled": "Kapalı",
+      "status_error": "Sorun var",
+      "badge_forced": "Zorunlu",
+      "badge_managed": "Yöneticinizden",
+      "badge_yours": "Sizin yüklediğiniz",
+      "badge_awaiting": "Onay bekliyor",
+      "toggle_label": "{name} eklentisini aç veya kapat",
+      "forced_note": "Yöneticiniz bu eklentiyi zorunlu tuttuğu için kapatılamaz.",
+      "permissions": "Neler yapabilir",
+      "permissions_managed": "Neler yapabilir (yöneticiniz onayladı)",
+      "settings": "Ayarlar",
+      "remove": "Kaldır",
+      "remove_title": "{name} eklentisi kaldırılsın mı?",
+      "remove_message": "Eklenti ve bu tarayıcıda kaydettiği her şey silinir. Daha sonra yeniden yükleyebilirsiniz.",
+      "remove_confirm": "Kaldır",
+      "error_user_plugins_off": "Yöneticiniz kullanıcıların yüklediği eklentileri kapattı, bu yüzden bu eklenti çalışmıyor.",
+      "error_approval_unavailable": "Bu eklenti, onay zorunlu olmadan önce yüklendi. Onaya göndermek için kaldırıp yeniden yükleyin.",
+      "error_approval_denied": "Yöneticiniz bu eklentiyi onaylamadı.",
+      "error_approval_pending": "Bu eklentinin yöneticiniz tarafından onaylanması bekleniyor.",
+      "error_auto_disabled": "Sürekli hata verdiği için kapatıldı. Yeniden denemek için tekrar açın.",
+      "accounts_heading": "Bağlı hesaplar",
+      "account_on": "{host} üzerinde {label}",
+      "account_waiting": "{host} üzerinde {label} (giriş tamamlanmadı)",
+      "disconnect": "Bağlantıyı kes",
+      "disconnect_failed": "{label} bağlantısı kesilemedi"
+    },
+    "consent": {
+      "title": "{name} eklentisine bu izin verilsin mi?",
+      "intro": "Eklenti aşağıdaki izinleri istiyor. Bu izinleri yalnızca siz izin verirseniz alır.",
+      "high_risk_note": "İşaretli öğeler eklentiye e-postalarınızın içeriğine erişim verir veya verileri başka yerlere göndermesine izin verir. Bunlara yalnızca güvendiğiniz eklentiler için izin verin.",
+      "revoke_hint": "Eklentiyi istediğiniz zaman Ayarlar'dan kapatabilir veya kaldırabilirsiniz.",
+      "deny": "İzin verme",
+      "allow": "İzin ver"
+    },
+    "permissions": {
+      "none": "Özel bir izne ihtiyacı yok.",
+      "high_risk": "Dikkat gerektirir",
+      "email_read": {
+        "title": "E-postalarınızı okuma",
+        "body": "Hesabınızdaki herhangi bir iletinin gönderenlerini, alıcılarını, konusunu ve tam metnini, ayrıca klasörlerinizi görme."
+      },
+      "email_write": {
+        "title": "E-postalarınızı değiştirme ve düzenleme",
+        "body": "İletilerinize etiket, bayrak ve diğer anahtar sözcükleri ekleme veya kaldırma, iletileri klasörleriniz arasında ve arşive taşıma ve taslak kaydetme."
+      },
+      "email_send": {
+        "title": "Gönderilmeden önce iletileri değiştirme",
+        "body": "Yazdığınız iletilerin alıcılarını, konusunu, metnini ve eklerini okuma ve değiştirme, bir iletinin gönderilmesini durdurma."
+      },
+      "crypto_full": {
+        "title": "Bu uygulamaya tam erişim",
+        "body": "Webmail'in kendisiyle aynı haklarla çalışır. Tüm e-postalarınızı ve kayıtlı anahtarlarınızı okuyabilir, sizin adınıza işlem yapabilir. Buna yalnızca tamamen güvendiğiniz eklentiler için izin verin."
+      },
+      "email_raw_send": {
+        "title": "Kendi oluşturduğu iletileri gönderme",
+        "body": "Hesabınızdan imzalı veya şifreli iletiler gibi eksiksiz iletiler gönderme."
+      },
+      "email_blob_read": {
+        "title": "İletilerin ham içeriğini okuma",
+        "body": "İletilerinizin ve eklerinizin özgün verilerini ve eklediğiniz her dosyayı gönderilmeden önce okuma."
+      },
+      "email_blob_write": {
+        "title": "Göndermeden önce ekleri değiştirme",
+        "body": "Posta sunucunuza dosya yükleme ve ileti gönderilmeden önce eklediğiniz bir dosyayı başkasıyla değiştirme."
+      },
+      "email_render_takeover": {
+        "title": "İletilerin gösterilme biçimini değiştirme",
+        "body": "Açtığınız iletilerin ve ileti listesindekilerin metnini değiştirme, örneğin şifresi çözülmüş içeriği göstermek için."
+      },
+      "calendar_read": {
+        "title": "Takviminizi okuma",
+        "body": "Takvimlerinizi ve etkinliklerini görme."
+      },
+      "calendar_write": {
+        "title": "Takviminizi değiştirme",
+        "body": "Etkinlik oluşturma, değiştirme ve silme."
+      },
+      "contacts_read": {
+        "title": "Kişilerinizi okuma",
+        "body": "Adres defterlerinizde arama yapma ve onları okuma."
+      },
+      "contacts_write": {
+        "title": "Kişilerinizi değiştirme",
+        "body": "Kişi ve adres defteri oluşturma, değiştirme ve silme."
+      },
+      "files_read": {
+        "title": "Dosyalarınızı okuma",
+        "body": "Hesabınızda saklanan dosyalara göz atma ve onları açma."
+      },
+      "files_write": {
+        "title": "Dosyalarınızı değiştirme",
+        "body": "Hesabınızdaki dosyaları yükleme, yeniden adlandırma, taşıma ve silme."
+      },
+      "identity_read": {
+        "title": "Gönderen adreslerinizi görme",
+        "body": "Gönderim yaptığınız adresleri ve imzalarını görme."
+      },
+      "identity_write": {
+        "title": "Gönderen adreslerinizi değiştirme",
+        "body": "Gönderen adresi ve imza oluşturma, değiştirme ve silme."
+      },
+      "filters_read": {
+        "title": "Posta filtrelerinizi okuma",
+        "body": "Gelen postalarınızı sıralayan kuralları görme."
+      },
+      "filters_write": {
+        "title": "Posta filtrelerinizi değiştirme",
+        "body": "Sunucudaki filtrelerinize kural ekleme. Bu kurallar gelen postaları taşıyabilir, iletebilir veya silebilir."
+      },
+      "tasks_read": {
+        "title": "Görevlerinizi okuma",
+        "body": "Görev listelerinizi ve görevlerinizi görme."
+      },
+      "tasks_write": {
+        "title": "Görevlerinizi değiştirme",
+        "body": "Görev oluşturma, değiştirme, tamamlama ve silme."
+      },
+      "templates_read": {
+        "title": "Şablonlarınızı okuma",
+        "body": "Kayıtlı ileti şablonlarınızı görme."
+      },
+      "templates_write": {
+        "title": "Şablonlarınızı değiştirme",
+        "body": "İleti şablonu oluşturma, değiştirme ve silme."
+      },
+      "smime_read": {
+        "title": "S/MIME durumunuzu görme",
+        "body": "Anahtarlara erişmeden S/MIME anahtarlarınızın ve sertifikalarınızın olup olmadığını görme."
+      },
+      "vacation_read": {
+        "title": "Ofis dışı yanıtınızı görme",
+        "body": "Otomatik yanıtınızın açık olup olmadığını ve ne yazdığını görme."
+      },
+      "vacation_write": {
+        "title": "Ofis dışı yanıtınızı değiştirme",
+        "body": "Otomatik yanıtınızı açıp kapatma, metnini ve tarihlerini değiştirme."
+      },
+      "settings_read": {
+        "title": "Ayarlarınızı okuma",
+        "body": "Tercihlerinizi ve etiket tanımlarınızı görme."
+      },
+      "settings_write": {
+        "title": "Ayarlarınızı değiştirme",
+        "body": "Etiket ekleme, sıralarını değiştirme ve tercihlerinizi değiştirme."
+      },
+      "security_read": {
+        "title": "Hesap güvenliğinizi görme",
+        "body": "Gizli bilgilere erişmeden iki faktörlü kimlik doğrulamanın ve şifrelemenin açık olup olmadığını görme."
+      },
+      "auth_observe": {
+        "title": "Giriş yaptığınızı bilme",
+        "body": "Giriş yaptığınızda, hesap değiştirdiğinizde veya oturumunuz yenilendiğinde haber alma."
+      },
+      "auth_emit": {
+        "title": "Oturumunuzu kapatma",
+        "body": "Webmail'den çıkış yapmanızı sağlama."
+      },
+      "account_read": {
+        "title": "Hesaplarınızı görme",
+        "body": "Eklediğiniz hesapları adresleri ve sunucularıyla birlikte görme."
+      },
+      "http_post": {
+        "title": "Sizin adınıza webmail sunucusunu kullanma",
+        "body": "Şu sunucu uç noktalarını oturum bilgilerinizle çağırma:"
+      },
+      "http_fetch": {
+        "title": "Başka web sitelerine bağlanma",
+        "body": "Şu sitelere istek gönderme. Eklentinin okuyabildiği her şey oraya gönderilebilir:"
+      },
+      "admin_config": {
+        "title": "Yöneticinizin ayarlarını okuma",
+        "body": "Yöneticinizin bu eklenti için kaydettiği ayarları okuma."
+      },
+      "ui_observe": {
+        "title": "Uygulamada nerede olduğunuzu izleme",
+        "body": "Hangi sayfanın açık olduğunu bilme ve tıkladığınız bağlantılara tepki verme."
+      },
+      "ui_toolbar": {
+        "title": "Araç çubuklarına düğme ekleme",
+        "body": "İleti araç çubuğunda, açık bir iletide ve üst çubukta kendi düğmelerini gösterme."
+      },
+      "ui_app_top_banner": {
+        "title": "Üstte bir başlık bandı gösterme",
+        "body": "Uygulamanın üst kısmında bir bildirim gösterme."
+      },
+      "ui_email_banner": {
+        "title": "İletilerde bildirim gösterme",
+        "body": "Açık bir iletinin veya konuşmanın bölümlerinin üstünde, içinde ve arasında kendi bildirimlerini ve özetlerini gösterme."
+      },
+      "ui_email_footer": {
+        "title": "İletilerin altına içerik ekleme",
+        "body": "Açık bir iletinin altında kendi içeriğini gösterme."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "Kişilerin şifreleme anahtarlarını gösterme",
+        "body": "Bir kişinin şifreleme anahtarlarını gösterme ve yönetme."
+      },
+      "ui_email_details": {
+        "title": "İleti ayrıntılarına panel ekleme",
+        "body": "Açık bir iletinin yanında veya altında kendi panelini gösterme."
+      },
+      "ui_download_file": {
+        "title": "Dosyaları cihazınıza kaydetme",
+        "body": "Oluşturduğu dosyaları indirmeniz için sunma."
+      },
+      "ui_message_list_tabs": {
+        "title": "Gelen Kutusu'na sekme ekleme",
+        "body": "Gelen kutunuzu Güncellemeler veya Promosyonlar gibi sekmelere ayırma."
+      },
+      "ui_composer_toolbar": {
+        "title": "İleti düzenleyiciye öğe ekleme",
+        "body": "Siz ileti yazarken kendi düğmelerini, menü öğelerini ve bölümlerini gösterme."
+      },
+      "ui_composer_sidebar": {
+        "title": "İleti düzenleyiciye panel ekleme",
+        "body": "Yazdığınız iletinin yanında kendi panelini gösterme."
+      },
+      "ui_sidebar_widget": {
+        "title": "Kenar çubuğuna öğe ekleme",
+        "body": "Posta kenar çubuğunda kendi kutularını ve bölümlerini gösterme."
+      },
+      "ui_settings_section": {
+        "title": "Ayarlar sayfası ekleme",
+        "body": "Ayarlar'da kendi sayfasını gösterme."
+      },
+      "ui_context_menu": {
+        "title": "İleti menüsüne öğe ekleme",
+        "body": "Bir iletiye sağ tıkladığınızda açılan menüye öğe ekleme."
+      },
+      "ui_navigation_rail": {
+        "title": "Gezinme çubuğuna öğe ekleme",
+        "body": "Gezinme çubuğunda kendi düğmesini gösterme."
+      },
+      "ui_keyboard": {
+        "title": "Klavye kısayolları ekleme",
+        "body": "Tanımladığı klavye kısayollarına tepki verme."
+      },
+      "ui_calendar_action": {
+        "title": "Takvim görünümüne öğe ekleme",
+        "body": "Etkinliklerde kendi düğmelerini ve bölümlerini, takvim günlerinde kısa etiketler ve noktalar gösterme."
+      },
+      "ui_admin_page": {
+        "title": "Yönetim sayfası ekleme",
+        "body": "Yönetim ayarlarında kendi sayfasını gösterme."
+      },
+      "app_lifecycle": {
+        "title": "Uygulamanın başladığını ve durduğunu bilme",
+        "body": "Uygulama başladığında, çevrimdışı olduğunda veya çıkış yaptığınızda haber alma."
+      },
+      "compose_open": {
+        "title": "İleti düzenleyiciyi açma",
+        "body": "Alıcıları, metni veya ekleri doldurulmuş yeni bir ileti açma. Gönderip göndermemeye yine siz karar verirsiniz."
+      },
+      "compose_read": {
+        "title": "Yazdığınız iletiyi okuma",
+        "body": "Eklentiyi düzenleyicide kullandığınızda, yazarken iletinin metnini okur. İmzayı ve alıntılanan iletiyi okumaz."
+      },
+      "compose_write": {
+        "title": "Yazdığınız iletiyi değiştirme",
+        "body": "Eklentiyi düzenleyicide kullandığınızda, yazarken iletide metni değiştirir veya ekler. Her değişikliği geri alabilirsiniz ve göndermeye yine siz karar verirsiniz."
+      },
+      "ui_notifications": {
+        "title": "Bildirim gösterme",
+        "body": "Cihazınızda bildirim gösterme ya da bildirimlere izin vermediyseniz uygulama içinde gösterme. Her bildirimde eklentinin adı yer alır."
+      },
+      "ui_message_list": {
+        "title": "İleti listesine öğe ekleme",
+        "body": "İleti listesinin üstünde kendi içeriğini, iletilerde ve seçili iletilerin araç çubuğunda düğmeler gösterme."
+      },
+      "ui_contacts": {
+        "title": "Kişiler görünümüne öğe ekleme",
+        "body": "Bir kişinin ayrıntılarında kendi bölümlerini, kişi listesinde düğmeler gösterme."
+      },
+      "ui_tasks": {
+        "title": "Görevler görünümüne öğe ekleme",
+        "body": "Bir görevin ayrıntılarında kendi bölümlerini, görev listesinde düğmeler gösterme."
+      },
+      "ui_files": {
+        "title": "Dosyalar görünümüne öğe ekleme",
+        "body": "Dosya önizlemesinde kendi bölümlerini, bir dosyanın menüsünde öğeler gösterme."
+      },
+      "ui_commands": {
+        "title": "Komut ekleme",
+        "body": "Komut paletine (Ctrl+K) kendi öğelerini ekleme."
+      },
+      "ui_app_page": {
+        "title": "Sayfa ekleme",
+        "body": "Uygulamaya kendi sayfalarını ekleme, her biri için gezinme çubuğunda bir düğmeyle."
+      },
+      "http_proxy": {
+        "title": "Bağladığınız hesapları kullanma",
+        "body": "Sizin veya yöneticinizin ayarladığı bir hesap ya da anahtarla Bulwark sunucusu üzerinden istek gönderme. Eklenti parolayı hiçbir zaman görmez, ancak o hesabın kendi sunucusunda yapabildiği her şeyi yapabilir."
+      }
+    },
+    "dialog": {
+      "from_plugin": "{name} eklentisinden",
+      "ok": "Tamam",
+      "submit": "Gönder",
+      "confirm": "Onayla",
+      "cancel": "İptal",
+      "close": "Kapat",
+      "turn_off": "{name} eklentisini kapat",
+      "plugin_menu": "{name} seçenekleri",
+      "password_note": "Bu form web postasından değil, {name} eklentisinden geliyor. Yalnızca bu eklentiye güveniyorsanız parola girin.",
+      "toast_auto_disabled": "{name} sürekli hata verdiği için kapatıldı."
+    },
+    "connect": {
+      "title": "{label} hesabını bağla",
+      "intro_password": "{name}, {label} hesabınızı kullanmak istiyor. Bulwark parolayı kendi sunucusunda saklar ve yalnızca {host} adresine gönderir. Eklenti parolayı hiçbir zaman görmez.",
+      "intro_password_any": "{name}, {label} hesabınızı kullanmak istiyor. Bulwark parolayı kendi sunucusunda saklar ve yalnızca burada girdiğiniz sunucuya gönderir. Eklenti parolayı hiçbir zaman görmez.",
+      "intro_signin": "{name}, {label} hesabınıza giriş yapmak istiyor. Sunucuyu buraya girin, ardından sunucunun kendi sayfasında giriş yapın. Bulwark aldığı erişimi kendi sunucusunda saklar; eklenti bunu hiçbir zaman görmez.",
+      "server": "Sunucu adresi",
+      "server_hint": "cloud.example.com",
+      "username": "Kullanıcı adı",
+      "secret": "Parola veya anahtar",
+      "connect": "Bağla",
+      "continue": "Devam",
+      "cancel": "İptal",
+      "saving": "Kaydediliyor…",
+      "error_server": "Sunucunun adresini girin, örneğin https://cloud.example.com",
+      "error_save": "Kaydedilemedi: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "Önizlemek için bir sonuç seçin",
     "open_full": "Aç",
     "view_label": "Görünüm"
+  },
+  "top_bar": {
+    "more": "Diğer seçenekler"
+  },
+  "plugin_pages": {
+    "loading": "Sayfa yükleniyor",
+    "not_available_title": "Bu sayfa kullanılamıyor",
+    "not_available_description": "Bu sayfayı ekleyen eklenti kapalı veya artık yüklü değil.",
+    "back_to_mail": "Postaya dön",
+    "settings_group": "Eklentiler"
+  },
+  "command_palette": {
+    "title": "Komut paleti",
+    "open": "Komut paletini aç",
+    "placeholder": "Bir komut yazın",
+    "no_results": "Eşleşen komut yok",
+    "go_to": "{name} bölümüne git",
+    "compose": "Yeni ileti",
+    "search": "Postada ara",
+    "theme_dark": "Koyu temaya geç",
+    "theme_light": "Açık temaya geç",
+    "shortcuts": "Klavye kısayollarını göster",
+    "group_navigation": "Git",
+    "group_actions": "Eylemler",
+    "group_plugins": "Eklentiler"
+  },
+  "notification_center": {
+    "title": "Bildirimler",
+    "mark_all_read": "Tümünü okundu işaretle",
+    "clear": "Temizle",
+    "empty": "Bildirim yok",
+    "close": "Kapat",
+    "unread": "Okunmamış",
+    "unread_count": "{count} okunmamış",
+    "level_error": "Hata",
+    "level_warning": "Uyarı"
   }
 }
diff --git a/locales/uk/common.json b/locales/uk/common.json
index 2838cae53..178b5ab87 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -620,7 +620,9 @@
       "copied": "Код скопійовано",
       "copy_failed": "Не вдалося скопіювати код"
     },
-    "mv_position": "{index} з {total}"
+    "mv_position": "{index} з {total}",
+    "plugin_panel_show": "Показати панель плагіна",
+    "plugin_panel_hide": "Сховати панель плагіна"
   },
   "email_composer": {
     "minimize": "Згорнути",
@@ -813,7 +815,8 @@
       "remove_background_color": "Прибрати колір фону"
     },
     "send_filing_warning": "Надіслано - але подальше очищення не вдалося, може залишитися застаріла чернетка.",
-    "pop_out": "Відкрити відповідь в окремому вікні"
+    "pop_out": "Відкрити відповідь в окремому вікні",
+    "send_guard_failed": "Не надіслано: плагін, що перевіряє листи перед надсиланням, завершився з помилкою або не відповів."
   },
   "confirm_dialog": {
     "confirm": "Підтвердити",
@@ -3970,6 +3973,354 @@
       "failed_detail": "Не вдалося виконати авторизацію: {error}",
       "missing_params": "Відсутній код авторизації або стан.",
       "delivery_failed": "Не вдалося передати результат авторизації на вкладку програми. Закрийте це вікно та спробуйте ще раз."
+    },
+    "settings": {
+      "title": "Плагіни",
+      "description": "Плагіни, які додав ваш адміністратор. Вмикайте й вимикайте їх для свого облікового запису.",
+      "description_uploads": "Плагіни додають у webmail нові функції. Вмикайте й вимикайте їх для свого облікового запису або встановлюйте власні.",
+      "description_demo": "У демо-режимі плагіни недоступні.",
+      "install_button": "Встановити плагін",
+      "install_hint": "Виберіть ZIP-файл плагіна.",
+      "install_hint_approval": "Виберіть ZIP-файл плагіна. Перш ніж ви зможете його ввімкнути, його має схвалити адміністратор.",
+      "install_uploads_off": "Ваш адміністратор не дозволяє встановлювати плагіни.",
+      "install_managed_id": "Ваш адміністратор уже надає плагін із такою назвою, тому його не можна замінити.",
+      "install_invalid": "Цей файл не є плагіном, який можна встановити: {details}",
+      "toast_installed": "Плагін встановлено. Увімкніть його нижче.",
+      "toast_installed_pending": "Плагін встановлено й надіслано вашому адміністратору на схвалення.",
+      "toast_enabled": "Плагін {name} увімкнено",
+      "toast_disabled": "Плагін {name} вимкнено",
+      "toast_removed": "Плагін {name} видалено",
+      "toast_forced": "Ваш адміністратор вимагає, щоб плагін {name} залишався ввімкненим",
+      "toast_approval_requested": "Плагін {name} чекає на схвалення вашим адміністратором",
+      "empty_title": "Плагінів поки немає",
+      "empty_admin": "Ваш адміністратор не додав жодного плагіна.",
+      "empty_uploads": "Щоб почати, встановіть плагін із ZIP-файлу.",
+      "empty_demo": "Плагінам потрібен справжній обліковий запис, тому в демо-режимі їх немає.",
+      "syncing": "Перевірка плагінів на сервері…",
+      "status_installed": "Вимкнено",
+      "status_enabled": "Запускається",
+      "status_running": "Увімкнено",
+      "status_disabled": "Вимкнено",
+      "status_error": "Помилка",
+      "badge_forced": "Обов'язковий",
+      "badge_managed": "Від вашого адміністратора",
+      "badge_yours": "Встановлено вами",
+      "badge_awaiting": "Чекає на схвалення",
+      "toggle_label": "Увімкнути або вимкнути плагін {name}",
+      "forced_note": "Ваш адміністратор вимагає цей плагін, тому його не можна вимкнути.",
+      "permissions": "Що він може робити",
+      "permissions_managed": "Що він може робити (схвалено вашим адміністратором)",
+      "settings": "Налаштування",
+      "remove": "Видалити",
+      "remove_title": "Видалити плагін {name}?",
+      "remove_message": "Плагін і все, що він зберіг у цьому браузері, буде видалено. Пізніше його можна встановити знову.",
+      "remove_confirm": "Видалити",
+      "error_user_plugins_off": "Ваш адміністратор вимкнув плагіни, встановлені користувачами, тому цей плагін не працює.",
+      "error_approval_unavailable": "Цей плагін встановлено ще до того, як з'явилося схвалення. Видаліть і встановіть його знову, щоб надіслати на схвалення.",
+      "error_approval_denied": "Ваш адміністратор не схвалив цей плагін.",
+      "error_approval_pending": "Очікується, що ваш адміністратор схвалить цей плагін.",
+      "error_auto_disabled": "Вимкнено, бо постійно виникали помилки. Увімкніть його знову, щоб спробувати ще раз.",
+      "accounts_heading": "Підключені облікові записи",
+      "account_on": "{label} на {host}",
+      "account_waiting": "{label} на {host} (вхід не завершено)",
+      "disconnect": "Відключити",
+      "disconnect_failed": "Не вдалося відключити {label}"
+    },
+    "consent": {
+      "title": "Дозволити плагіну {name} це?",
+      "intro": "Плагін запитує дозволи, наведені нижче. Він отримає їх, лише якщо ви дозволите.",
+      "high_risk_note": "Позначені пункти дають плагіну доступ до вмісту вашої пошти або дозволяють йому передавати дані деінде. Дозволяйте їх лише плагінам, яким довіряєте.",
+      "revoke_hint": "Ви будь-коли можете вимкнути або видалити плагін у налаштуваннях.",
+      "deny": "Не дозволяти",
+      "allow": "Дозволити"
+    },
+    "permissions": {
+      "none": "Йому не потрібні особливі дозволи.",
+      "high_risk": "Потребує обережності",
+      "email_read": {
+        "title": "Читати вашу пошту",
+        "body": "Бачити відправників, одержувачів, теми й повний текст будь-якого листа у вашому обліковому записі, а також ваші папки."
+      },
+      "email_write": {
+        "title": "Змінювати й упорядковувати вашу пошту",
+        "body": "Додавати й прибирати теги, позначки та інші ключові слова у ваших листах, переміщувати їх між вашими папками та в архів, а також зберігати чернетки."
+      },
+      "email_send": {
+        "title": "Змінювати листи перед надсиланням",
+        "body": "Читати й змінювати одержувачів, тему, текст і вкладення листів, які ви пишете, а також зупиняти надсилання листа."
+      },
+      "crypto_full": {
+        "title": "Повний доступ до програми",
+        "body": "Працює з тими самими правами, що й сам webmail. Може читати всю вашу пошту та збережені ключі й діяти від вашого імені. Дозволяйте це лише плагінам, яким повністю довіряєте."
+      },
+      "email_raw_send": {
+        "title": "Надсилати власні листи",
+        "body": "Надсилати з вашого облікового запису готові листи, наприклад підписані або зашифровані."
+      },
+      "email_blob_read": {
+        "title": "Читати вихідні дані листів",
+        "body": "Читати вихідні дані ваших листів і вкладень, а також кожного файлу, який ви прикріплюєте, до надсилання."
+      },
+      "email_blob_write": {
+        "title": "Замінювати вкладення перед надсиланням",
+        "body": "Завантажувати файли на ваш поштовий сервер і замінювати прикріплений файл іншим до надсилання листа."
+      },
+      "email_render_takeover": {
+        "title": "Змінювати показ листів",
+        "body": "Замінювати текст відкритих листів і листів у списку повідомлень, наприклад щоб показати розшифрований вміст."
+      },
+      "calendar_read": {
+        "title": "Читати ваш календар",
+        "body": "Бачити ваші календарі та їхні події."
+      },
+      "calendar_write": {
+        "title": "Змінювати ваш календар",
+        "body": "Створювати, змінювати й видаляти події."
+      },
+      "contacts_read": {
+        "title": "Читати ваші контакти",
+        "body": "Шукати у ваших адресних книгах і читати їх."
+      },
+      "contacts_write": {
+        "title": "Змінювати ваші контакти",
+        "body": "Створювати, змінювати й видаляти контакти та адресні книги."
+      },
+      "files_read": {
+        "title": "Читати ваші файли",
+        "body": "Переглядати й відкривати файли, що зберігаються у вашому обліковому записі."
+      },
+      "files_write": {
+        "title": "Змінювати ваші файли",
+        "body": "Завантажувати, перейменовувати, переміщувати й видаляти файли у вашому обліковому записі."
+      },
+      "identity_read": {
+        "title": "Бачити ваші адреси відправника",
+        "body": "Бачити адреси, з яких ви надсилаєте листи, та їхні підписи."
+      },
+      "identity_write": {
+        "title": "Змінювати ваші адреси відправника",
+        "body": "Створювати, змінювати й видаляти адреси відправника та підписи."
+      },
+      "filters_read": {
+        "title": "Читати ваші фільтри пошти",
+        "body": "Бачити правила, які сортують вхідну пошту."
+      },
+      "filters_write": {
+        "title": "Змінювати ваші фільтри пошти",
+        "body": "Додавати правила до фільтрів на сервері. Такі правила можуть переміщувати, пересилати або видаляти вхідну пошту."
+      },
+      "tasks_read": {
+        "title": "Читати ваші завдання",
+        "body": "Бачити ваші списки завдань і завдання."
+      },
+      "tasks_write": {
+        "title": "Змінювати ваші завдання",
+        "body": "Створювати, змінювати, завершувати й видаляти завдання."
+      },
+      "templates_read": {
+        "title": "Читати ваші шаблони",
+        "body": "Бачити збережені шаблони листів."
+      },
+      "templates_write": {
+        "title": "Змінювати ваші шаблони",
+        "body": "Створювати, змінювати й видаляти шаблони листів."
+      },
+      "smime_read": {
+        "title": "Бачити ваш стан S/MIME",
+        "body": "Бачити, чи маєте ви ключі та сертифікати S/MIME, без доступу до самих ключів."
+      },
+      "vacation_read": {
+        "title": "Бачити вашу автовідповідь",
+        "body": "Бачити, чи ввімкнено автовідповідь і що в ній написано."
+      },
+      "vacation_write": {
+        "title": "Змінювати вашу автовідповідь",
+        "body": "Вмикати й вимикати автовідповідь, змінювати її текст і дати."
+      },
+      "settings_read": {
+        "title": "Читати ваші налаштування",
+        "body": "Бачити ваші параметри та визначення тегів."
+      },
+      "settings_write": {
+        "title": "Змінювати ваші налаштування",
+        "body": "Додавати теги, змінювати їхній порядок і змінювати ваші параметри."
+      },
+      "security_read": {
+        "title": "Бачити безпеку облікового запису",
+        "body": "Бачити, чи ввімкнено двофакторну автентифікацію та шифрування, без доступу до секретів."
+      },
+      "auth_observe": {
+        "title": "Знати, коли ви входите",
+        "body": "Отримувати сповіщення, коли ви входите, перемикаєте обліковий запис або ваш сеанс подовжується."
+      },
+      "auth_emit": {
+        "title": "Виконувати вихід",
+        "body": "Виконувати ваш вихід із webmail."
+      },
+      "account_read": {
+        "title": "Бачити ваші облікові записи",
+        "body": "Бачити додані вами облікові записи, їхні адреси та сервери."
+      },
+      "http_post": {
+        "title": "Звертатися до сервера webmail від вашого імені",
+        "body": "Викликати ці адреси сервера з вашими обліковими даними:"
+      },
+      "http_fetch": {
+        "title": "Підключатися до інших сайтів",
+        "body": "Надсилати запити на ці сайти. Туди може потрапити все, що плагін може прочитати:"
+      },
+      "admin_config": {
+        "title": "Читати свої налаштування від адміністратора",
+        "body": "Читати налаштування, які ваш адміністратор зберіг для цього плагіна."
+      },
+      "ui_observe": {
+        "title": "Стежити, де ви в програмі",
+        "body": "Знати, яку сторінку відкрито, і реагувати на посилання, які ви натискаєте."
+      },
+      "ui_toolbar": {
+        "title": "Додавати кнопки на панелі інструментів",
+        "body": "Показувати власні кнопки на панелі інструментів листів, у відкритому листі та на верхній панелі."
+      },
+      "ui_app_top_banner": {
+        "title": "Показувати банер угорі",
+        "body": "Показувати сповіщення у верхній частині програми."
+      },
+      "ui_email_banner": {
+        "title": "Показувати сповіщення в листах",
+        "body": "Показувати власні сповіщення та підсумки над частинами відкритого листа або розмови, усередині них і між ними."
+      },
+      "ui_email_footer": {
+        "title": "Додавати вміст під листами",
+        "body": "Показувати власний вміст під відкритим листом."
+      },
+      "ui_contact_cryptokeys": {
+        "title": "Показувати ключі шифрування контактів",
+        "body": "Показувати ключі шифрування контакту й керувати ними."
+      },
+      "ui_email_details": {
+        "title": "Додавати панелі до листа",
+        "body": "Показувати власну панель поруч із відкритим листом або під ним."
+      },
+      "ui_download_file": {
+        "title": "Зберігати файли на ваш пристрій",
+        "body": "Пропонувати для завантаження створені ним файли."
+      },
+      "ui_message_list_tabs": {
+        "title": "Додавати вкладки у «Вхідні»",
+        "body": "Розподіляти вхідні листи за вкладками, наприклад «Оновлення» або «Акції»."
+      },
+      "ui_composer_toolbar": {
+        "title": "Додавати елементи в редактор листа",
+        "body": "Показувати власні кнопки, пункти меню й розділи, поки ви пишете лист."
+      },
+      "ui_composer_sidebar": {
+        "title": "Додавати панель у редактор листа",
+        "body": "Показувати власну панель поруч із листом, який ви пишете."
+      },
+      "ui_sidebar_widget": {
+        "title": "Додавати елементи на бічну панель",
+        "body": "Показувати власні блоки й розділи на бічній панелі пошти."
+      },
+      "ui_settings_section": {
+        "title": "Додавати сторінку налаштувань",
+        "body": "Показувати власну сторінку в налаштуваннях."
+      },
+      "ui_context_menu": {
+        "title": "Додавати пункти в меню листа",
+        "body": "Додавати пункти в меню, яке відкривається, коли ви клацаєте лист правою кнопкою."
+      },
+      "ui_navigation_rail": {
+        "title": "Додавати кнопку на панель навігації",
+        "body": "Показувати власну кнопку на панелі навігації."
+      },
+      "ui_keyboard": {
+        "title": "Додавати сполучення клавіш",
+        "body": "Реагувати на сполучення клавіш, які він визначає."
+      },
+      "ui_calendar_action": {
+        "title": "Додавати елементи в інтерфейс календаря",
+        "body": "Показувати власні кнопки й розділи в подіях, а також короткі мітки й крапки на днях календаря."
+      },
+      "ui_admin_page": {
+        "title": "Додавати сторінку адміністрування",
+        "body": "Показувати власну сторінку в налаштуваннях адміністратора."
+      },
+      "app_lifecycle": {
+        "title": "Знати, коли програма запускається й зупиняється",
+        "body": "Отримувати сповіщення, коли програма запускається, втрачає зв'язок або ви виходите."
+      },
+      "compose_open": {
+        "title": "Відкривати редактор листа",
+        "body": "Відкривати новий лист із уже заповненими одержувачами, текстом або вкладеннями. Надсилати його чи ні, як і раніше, вирішуєте ви."
+      },
+      "compose_read": {
+        "title": "Читати лист, який ви пишете",
+        "body": "Читати текст листа, поки ви його пишете, коли ви користуєтеся плагіном у редакторі. Без підпису та цитованого листа."
+      },
+      "compose_write": {
+        "title": "Змінювати лист, який ви пишете",
+        "body": "Замінювати або додавати текст у листі, поки ви його пишете, коли ви користуєтеся плагіном у редакторі. Кожну зміну можна скасувати, а надсилати чи ні, вирішуєте ви."
+      },
+      "ui_notifications": {
+        "title": "Показувати сповіщення",
+        "body": "Показувати сповіщення на вашому пристрої або в програмі, якщо ви їх не дозволили. У кожному вказано назву плагіна."
+      },
+      "ui_message_list": {
+        "title": "Додавати елементи до списку повідомлень",
+        "body": "Показувати власний вміст над списком повідомлень, а також кнопки на листах і на панелі вибраних листів."
+      },
+      "ui_contacts": {
+        "title": "Додавати елементи в інтерфейс контактів",
+        "body": "Показувати власні розділи в картці контакту й кнопки в списку контактів."
+      },
+      "ui_tasks": {
+        "title": "Додавати елементи в інтерфейс завдань",
+        "body": "Показувати власні розділи в подробицях завдання й кнопки в списку завдань."
+      },
+      "ui_files": {
+        "title": "Додавати елементи в інтерфейс файлів",
+        "body": "Показувати власні розділи в попередньому перегляді файлу й пункти в меню файлу."
+      },
+      "ui_commands": {
+        "title": "Додавати команди",
+        "body": "Додавати власні пункти до палітри команд (Ctrl+K)."
+      },
+      "ui_app_page": {
+        "title": "Додавати сторінки",
+        "body": "Додавати до програми власні сторінки, кожну з кнопкою на панелі навігації."
+      },
+      "http_proxy": {
+        "title": "Використовувати підключені вами облікові записи",
+        "body": "Надсилати запити через сервер Bulwark з обліковим записом або ключем, який налаштували ви або ваш адміністратор. Плагін ніколи не бачить пароль, але може робити на цьому сервері все, що може цей обліковий запис."
+      }
+    },
+    "dialog": {
+      "from_plugin": "Від плагіна {name}",
+      "ok": "OK",
+      "submit": "Надіслати",
+      "confirm": "Підтвердити",
+      "cancel": "Скасувати",
+      "close": "Закрити",
+      "turn_off": "Вимкнути {name}",
+      "plugin_menu": "Параметри {name}",
+      "password_note": "Ця форма від плагіна {name}, а не від вебпошти. Вводьте пароль, лише якщо довіряєте цьому плагіну.",
+      "toast_auto_disabled": "{name} вимкнено, бо постійно виникали помилки."
+    },
+    "connect": {
+      "title": "Підключити {label}",
+      "intro_password": "{name} хоче використовувати ваш обліковий запис {label}. Bulwark зберігає пароль на своєму сервері й надсилає його лише на {host}. Плагін ніколи його не бачить.",
+      "intro_password_any": "{name} хоче використовувати ваш обліковий запис {label}. Bulwark зберігає пароль на своєму сервері й надсилає його лише на сервер, який ви вкажете тут. Плагін ніколи його не бачить.",
+      "intro_signin": "{name} хоче увійти до вашого облікового запису {label}. Вкажіть тут сервер, а потім увійдіть на його власній сторінці. Bulwark зберігає отриманий доступ на своєму сервері; плагін ніколи його не бачить.",
+      "server": "Адреса сервера",
+      "server_hint": "cloud.example.com",
+      "username": "Ім'я користувача",
+      "secret": "Пароль або ключ",
+      "connect": "Підключити",
+      "continue": "Продовжити",
+      "cancel": "Скасувати",
+      "saving": "Збереження…",
+      "error_server": "Вкажіть адресу сервера, наприклад https://cloud.example.com",
+      "error_save": "Не вдалося зберегти: {error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "Виберіть результат для перегляду",
     "open_full": "Відкрити",
     "view_label": "Вигляд"
+  },
+  "top_bar": {
+    "more": "Інші дії"
+  },
+  "plugin_pages": {
+    "loading": "Завантаження сторінки",
+    "not_available_title": "Ця сторінка недоступна",
+    "not_available_description": "Плагін, який її додав, вимкнено або більше не встановлено.",
+    "back_to_mail": "Повернутися до пошти",
+    "settings_group": "Плагіни"
+  },
+  "command_palette": {
+    "title": "Палітра команд",
+    "open": "Відкрити палітру команд",
+    "placeholder": "Введіть команду",
+    "no_results": "Немає відповідних команд",
+    "go_to": "Перейти: {name}",
+    "compose": "Новий лист",
+    "search": "Шукати в пошті",
+    "theme_dark": "Увімкнути темну тему",
+    "theme_light": "Увімкнути світлу тему",
+    "shortcuts": "Показати комбінації клавіш",
+    "group_navigation": "Перейти",
+    "group_actions": "Дії",
+    "group_plugins": "Плагіни"
+  },
+  "notification_center": {
+    "title": "Сповіщення",
+    "mark_all_read": "Позначити всі як прочитані",
+    "clear": "Очистити",
+    "empty": "Немає сповіщень",
+    "close": "Закрити",
+    "unread": "Непрочитане",
+    "unread_count": "Непрочитаних: {count}",
+    "level_error": "Помилка",
+    "level_warning": "Попередження"
   }
 }
diff --git a/locales/zh-TW/common.json b/locales/zh-TW/common.json
index 3138e03a2..5dcdfd143 100644
--- a/locales/zh-TW/common.json
+++ b/locales/zh-TW/common.json
@@ -620,7 +620,9 @@
       "copied": "驗證碼已複製",
       "copy_failed": "無法複製驗證碼"
     },
-    "mv_position": "第 {index} 封，共 {total} 封"
+    "mv_position": "第 {index} 封，共 {total} 封",
+    "plugin_panel_show": "顯示外掛程式面板",
+    "plugin_panel_hide": "隱藏外掛程式面板"
   },
   "email_composer": {
     "minimize": "最小化",
@@ -813,7 +815,8 @@
       "remove_background_color": "移除背景顏色"
     },
     "send_filing_warning": "郵件已傳送，但寄送後清理失敗，可能仍保留舊草稿。",
-    "pop_out": "在獨立視窗中開啟回覆"
+    "pop_out": "在獨立視窗中開啟回覆",
+    "send_guard_failed": "未傳送 - 傳送前檢查郵件的外掛程式發生錯誤或沒有回應。"
   },
   "confirm_dialog": {
     "confirm": "確認",
@@ -3970,6 +3973,354 @@
       "failed_detail": "授權失敗：{error}",
       "missing_params": "缺少授權碼或狀態。",
       "delivery_failed": "無法將授權結果傳遞至應用程式分頁。請關閉此視窗並再試一次。"
+    },
+    "settings": {
+      "title": "外掛程式",
+      "description": "由管理員新增的外掛程式。您可以為自己的帳號開啟或關閉。",
+      "description_uploads": "外掛程式可為網頁郵件新增功能。您可以為自己的帳號開啟或關閉，也可以自行安裝。",
+      "description_demo": "示範模式無法使用外掛程式。",
+      "install_button": "安裝外掛程式",
+      "install_hint": "請選擇外掛程式 ZIP 檔案。",
+      "install_hint_approval": "請選擇外掛程式 ZIP 檔案。需經管理員核准後才能開啟。",
+      "install_uploads_off": "管理員不允許安裝外掛程式。",
+      "install_managed_id": "管理員已提供同名的外掛程式，因此無法取代。",
+      "install_invalid": "此檔案不是可安裝的外掛程式：{details}",
+      "toast_installed": "外掛程式已安裝。請在下方開啟。",
+      "toast_installed_pending": "外掛程式已安裝，並已送交管理員核准。",
+      "toast_enabled": "{name} 已開啟",
+      "toast_disabled": "{name} 已關閉",
+      "toast_removed": "{name} 已移除",
+      "toast_forced": "管理員要求 {name} 保持開啟",
+      "toast_approval_requested": "{name} 正在等待管理員核准",
+      "empty_title": "尚無外掛程式",
+      "empty_admin": "管理員尚未新增任何外掛程式。",
+      "empty_uploads": "從 ZIP 檔案安裝外掛程式即可開始使用。",
+      "empty_demo": "外掛程式需要真實帳號，因此示範模式中沒有外掛程式。",
+      "syncing": "正在與伺服器核對外掛程式…",
+      "status_installed": "已關閉",
+      "status_enabled": "啟動中",
+      "status_running": "已開啟",
+      "status_disabled": "已關閉",
+      "status_error": "發生問題",
+      "badge_forced": "必要",
+      "badge_managed": "由管理員提供",
+      "badge_yours": "由您安裝",
+      "badge_awaiting": "等待核准",
+      "toggle_label": "開啟或關閉 {name}",
+      "forced_note": "管理員要求使用此外掛程式，因此無法關閉。",
+      "permissions": "可執行的動作",
+      "permissions_managed": "可執行的動作（已由管理員核准）",
+      "settings": "設定",
+      "remove": "移除",
+      "remove_title": "要移除 {name} 嗎？",
+      "remove_message": "外掛程式及其儲存在此瀏覽器中的所有內容都會被刪除。您之後可以再次安裝。",
+      "remove_confirm": "移除",
+      "error_user_plugins_off": "管理員已關閉使用者安裝的外掛程式，因此此外掛程式不會執行。",
+      "error_approval_unavailable": "此外掛程式是在需要核准之前安裝的。請移除後重新安裝，以送交核准。",
+      "error_approval_denied": "管理員未核准此外掛程式。",
+      "error_approval_pending": "正在等待管理員核准此外掛程式。",
+      "error_auto_disabled": "由於反覆出錯已關閉。重新開啟即可再試一次。",
+      "accounts_heading": "已連線的帳號",
+      "account_on": "{host} 上的 {label}",
+      "account_waiting": "{host} 上的 {label}（尚未完成登入）",
+      "disconnect": "中斷連線",
+      "disconnect_failed": "無法中斷 {label} 的連線"
+    },
+    "consent": {
+      "title": "要允許 {name} 執行這些動作嗎？",
+      "intro": "此外掛程式要求下列權限。只有在您允許後才會取得。",
+      "high_risk_note": "標示的項目會讓外掛程式存取您的郵件內容，或將資料傳送到其他地方。請只對您信任的外掛程式允許。",
+      "revoke_hint": "您隨時可以在設定中關閉或移除此外掛程式。",
+      "deny": "不允許",
+      "allow": "允許"
+    },
+    "permissions": {
+      "none": "不需要特殊權限。",
+      "high_risk": "需留意",
+      "email_read": {
+        "title": "讀取您的郵件",
+        "body": "查看您帳戶中任何郵件的寄件者、收件者、主旨和完整內文，以及您的信件匣。"
+      },
+      "email_write": {
+        "title": "變更和整理您的郵件",
+        "body": "為您的郵件新增或移除標籤、旗標和其他關鍵字，在您的信件匣之間移動郵件或將其移至封存，並儲存草稿。"
+      },
+      "email_send": {
+        "title": "在傳送前變更郵件",
+        "body": "讀取並變更您撰寫的郵件的收件者、主旨、內文和附件，並可阻止郵件傳送。"
+      },
+      "crypto_full": {
+        "title": "完整存取此應用程式",
+        "body": "以與網頁郵件本身相同的權限執行。它可以讀取您所有的郵件和已儲存的金鑰，並代表您執行動作。請只對您完全信任的外掛程式允許。"
+      },
+      "email_raw_send": {
+        "title": "傳送它自行建立的郵件",
+        "body": "從您的帳號傳送完整的郵件，例如已簽署或已加密的郵件。"
+      },
+      "email_blob_read": {
+        "title": "讀取郵件的原始內容",
+        "body": "讀取您的郵件和附件的原始資料，以及傳送前您附加的每個檔案。"
+      },
+      "email_blob_write": {
+        "title": "在傳送前取代附件",
+        "body": "將檔案上傳到您的郵件伺服器，並在郵件傳送前以另一個檔案取代您附加的檔案。"
+      },
+      "email_render_takeover": {
+        "title": "變更郵件的顯示方式",
+        "body": "取代您開啟的郵件和郵件清單中的內文，例如用來顯示解密後的內容。"
+      },
+      "calendar_read": {
+        "title": "讀取您的行事曆",
+        "body": "查看您的行事曆及其中的活動。"
+      },
+      "calendar_write": {
+        "title": "變更您的行事曆",
+        "body": "建立、變更和刪除活動。"
+      },
+      "contacts_read": {
+        "title": "讀取您的聯絡人",
+        "body": "搜尋和讀取您的通訊錄。"
+      },
+      "contacts_write": {
+        "title": "變更您的聯絡人",
+        "body": "建立、變更和刪除聯絡人及通訊錄。"
+      },
+      "files_read": {
+        "title": "讀取您的檔案",
+        "body": "瀏覽和開啟您帳號中儲存的檔案。"
+      },
+      "files_write": {
+        "title": "變更您的檔案",
+        "body": "上傳、重新命名、移動和刪除您帳號中的檔案。"
+      },
+      "identity_read": {
+        "title": "查看您的寄件身分",
+        "body": "查看您用來傳送郵件的地址及其簽名檔。"
+      },
+      "identity_write": {
+        "title": "變更您的寄件身分",
+        "body": "建立、變更和刪除寄件身分及簽名檔。"
+      },
+      "filters_read": {
+        "title": "讀取您的郵件篩選規則",
+        "body": "查看用來整理收到郵件的規則。"
+      },
+      "filters_write": {
+        "title": "變更您的郵件篩選規則",
+        "body": "在伺服器端篩選規則中新增規則。這些規則可以移動、轉寄或刪除收到的郵件。"
+      },
+      "tasks_read": {
+        "title": "讀取您的任務",
+        "body": "查看您的任務清單和任務。"
+      },
+      "tasks_write": {
+        "title": "變更您的任務",
+        "body": "建立、變更、完成和刪除任務。"
+      },
+      "templates_read": {
+        "title": "讀取您的範本",
+        "body": "查看您儲存的郵件範本。"
+      },
+      "templates_write": {
+        "title": "變更您的範本",
+        "body": "建立、變更和刪除郵件範本。"
+      },
+      "smime_read": {
+        "title": "查看您的 S/MIME 狀態",
+        "body": "查看您是否有 S/MIME 金鑰和憑證，但無法存取金鑰。"
+      },
+      "vacation_read": {
+        "title": "查看您的外出自動回覆",
+        "body": "查看自動回覆是否已開啟及其內容。"
+      },
+      "vacation_write": {
+        "title": "變更您的外出自動回覆",
+        "body": "開啟或關閉自動回覆，並變更其內容和日期。"
+      },
+      "settings_read": {
+        "title": "讀取您的設定",
+        "body": "查看您的偏好設定和標籤定義。"
+      },
+      "settings_write": {
+        "title": "變更您的設定",
+        "body": "新增標籤、調整標籤順序，並變更您的偏好設定。"
+      },
+      "security_read": {
+        "title": "查看您的帳號安全性",
+        "body": "查看雙因素驗證和加密是否已開啟，但無法存取機密資訊。"
+      },
+      "auth_observe": {
+        "title": "得知您何時登入",
+        "body": "在您登入、切換帳號或工作階段更新時收到通知。"
+      },
+      "auth_emit": {
+        "title": "將您登出",
+        "body": "將您從網頁郵件登出。"
+      },
+      "account_read": {
+        "title": "查看您的帳號",
+        "body": "查看您新增的帳號及其地址和伺服器。"
+      },
+      "http_post": {
+        "title": "代表您使用網頁郵件伺服器",
+        "body": "使用您的登入資訊呼叫下列伺服器端點："
+      },
+      "http_fetch": {
+        "title": "連線到其他網站",
+        "body": "向下列網站傳送要求。外掛程式能讀取的任何內容都可能被傳送到這些網站："
+      },
+      "admin_config": {
+        "title": "讀取管理員為其儲存的設定",
+        "body": "讀取管理員為此外掛程式儲存的設定。"
+      },
+      "ui_observe": {
+        "title": "追蹤您在應用程式中的位置",
+        "body": "得知目前開啟的頁面，並對您點選的連結做出回應。"
+      },
+      "ui_toolbar": {
+        "title": "在工具列新增按鈕",
+        "body": "在郵件工具列、開啟的郵件和頂端列顯示它自己的按鈕。"
+      },
+      "ui_app_top_banner": {
+        "title": "在頂端顯示橫幅",
+        "body": "在應用程式頂端顯示一則通知。"
+      },
+      "ui_email_banner": {
+        "title": "在郵件上顯示通知",
+        "body": "在開啟的郵件或對話串各部分的上方、內部和之間顯示它自己的通知和摘要。"
+      },
+      "ui_email_footer": {
+        "title": "在郵件下方新增內容",
+        "body": "在開啟的郵件下方顯示它自己的內容。"
+      },
+      "ui_contact_cryptokeys": {
+        "title": "顯示聯絡人的加密金鑰",
+        "body": "顯示並管理聯絡人的加密金鑰。"
+      },
+      "ui_email_details": {
+        "title": "在郵件詳細資料新增面板",
+        "body": "在開啟的郵件旁邊或下方顯示它自己的面板。"
+      },
+      "ui_download_file": {
+        "title": "將檔案儲存到您的裝置",
+        "body": "提供它建立的檔案供下載。"
+      },
+      "ui_message_list_tabs": {
+        "title": "為收件匣新增分頁",
+        "body": "將收件匣分成「最新快訊」或「促銷內容」等分頁。"
+      },
+      "ui_composer_toolbar": {
+        "title": "新增到撰寫視窗",
+        "body": "在您撰寫郵件時顯示它自己的按鈕、選單項目和區塊。"
+      },
+      "ui_composer_sidebar": {
+        "title": "在撰寫視窗新增面板",
+        "body": "在您撰寫的郵件旁邊顯示它自己的面板。"
+      },
+      "ui_sidebar_widget": {
+        "title": "新增到側邊欄",
+        "body": "在郵件側邊欄顯示它自己的方塊和區塊。"
+      },
+      "ui_settings_section": {
+        "title": "新增設定頁面",
+        "body": "在設定中顯示它自己的頁面。"
+      },
+      "ui_context_menu": {
+        "title": "新增到郵件選單",
+        "body": "在您按右鍵點選郵件時開啟的選單中新增項目。"
+      },
+      "ui_navigation_rail": {
+        "title": "新增到導覽列",
+        "body": "在導覽列顯示它自己的按鈕。"
+      },
+      "ui_keyboard": {
+        "title": "新增鍵盤快速鍵",
+        "body": "回應它定義的鍵盤快速鍵。"
+      },
+      "ui_calendar_action": {
+        "title": "新增到行事曆畫面",
+        "body": "在活動上顯示它自己的按鈕和區塊，並在行事曆日期上顯示簡短標籤和圓點。"
+      },
+      "ui_admin_page": {
+        "title": "新增管理頁面",
+        "body": "在管理設定中顯示它自己的頁面。"
+      },
+      "app_lifecycle": {
+        "title": "得知應用程式何時啟動和停止",
+        "body": "在應用程式啟動、離線或您登出時收到通知。"
+      },
+      "compose_open": {
+        "title": "為您開啟撰寫視窗",
+        "body": "開啟一封已填好收件者、內文或附件的新郵件。是否傳送仍由您決定。"
+      },
+      "compose_read": {
+        "title": "讀取您正在撰寫的郵件",
+        "body": "在編輯器中使用外掛程式時，讀取您正在撰寫的郵件內文。不包括簽名和引用的郵件。"
+      },
+      "compose_write": {
+        "title": "修改您正在撰寫的郵件",
+        "body": "在編輯器中使用外掛程式時，取代或新增您正在撰寫的郵件中的文字。每次修改都可以復原，是否寄出仍由您決定。"
+      },
+      "ui_notifications": {
+        "title": "顯示通知",
+        "body": "在您的裝置上顯示通知；如果您未允許通知，則在應用程式內顯示。每則通知都會註明外掛程式名稱。"
+      },
+      "ui_message_list": {
+        "title": "新增到郵件清單",
+        "body": "在郵件清單上方顯示它自己的內容，並在郵件上和所選郵件的工具列顯示按鈕。"
+      },
+      "ui_contacts": {
+        "title": "新增到聯絡人畫面",
+        "body": "在聯絡人詳細資料中顯示它自己的區塊，並在聯絡人清單中顯示按鈕。"
+      },
+      "ui_tasks": {
+        "title": "新增到工作畫面",
+        "body": "在工作詳細資料中顯示它自己的區塊，並在工作清單中顯示按鈕。"
+      },
+      "ui_files": {
+        "title": "新增到檔案畫面",
+        "body": "在檔案預覽中顯示它自己的區塊，並在檔案選單中顯示項目。"
+      },
+      "ui_commands": {
+        "title": "新增指令",
+        "body": "在指令面板（Ctrl+K）新增它自己的項目。"
+      },
+      "ui_app_page": {
+        "title": "新增頁面",
+        "body": "在應用程式中新增它自己的頁面，每個頁面在導覽列都有一個按鈕。"
+      },
+      "http_proxy": {
+        "title": "使用您連線的帳號",
+        "body": "使用您或管理員設定的帳號或金鑰，透過 Bulwark 的伺服器傳送要求。外掛程式永遠看不到密碼，但可以在該帳號所屬的伺服器上執行該帳號能做的任何動作。"
+      }
+    },
+    "dialog": {
+      "from_plugin": "來自外掛程式 {name}",
+      "ok": "確定",
+      "submit": "送出",
+      "confirm": "確認",
+      "cancel": "取消",
+      "close": "關閉",
+      "turn_off": "關閉 {name}",
+      "plugin_menu": "{name} 選項",
+      "password_note": "此表單來自外掛程式 {name}，而不是網頁郵件。只有在您信任此外掛程式時才輸入密碼。",
+      "toast_auto_disabled": "{name} 因反覆出錯已被關閉。"
+    },
+    "connect": {
+      "title": "連線至 {label}",
+      "intro_password": "{name} 想使用您的 {label} 帳號。Bulwark 會將密碼保存在自己的伺服器上，只會傳送給 {host}。外掛程式永遠看不到密碼。",
+      "intro_password_any": "{name} 想使用您的 {label} 帳號。Bulwark 會將密碼保存在自己的伺服器上，只會傳送給您在此輸入的伺服器。外掛程式永遠看不到密碼。",
+      "intro_signin": "{name} 想登入您的 {label} 帳號。請在此輸入伺服器，然後在該伺服器自己的頁面上登入。Bulwark 會將取得的存取權保存在自己的伺服器上；外掛程式永遠看不到它。",
+      "server": "伺服器位址",
+      "server_hint": "cloud.example.com",
+      "username": "使用者名稱",
+      "secret": "密碼或金鑰",
+      "connect": "連線",
+      "continue": "繼續",
+      "cancel": "取消",
+      "saving": "正在儲存…",
+      "error_server": "請輸入伺服器位址，例如 https://cloud.example.com",
+      "error_save": "無法儲存：{error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "選擇結果以預覽",
     "open_full": "開啟",
     "view_label": "檢視"
+  },
+  "top_bar": {
+    "more": "更多選項"
+  },
+  "plugin_pages": {
+    "loading": "正在載入頁面",
+    "not_available_title": "此頁面無法使用",
+    "not_available_description": "新增此頁面的外掛程式已關閉或已不再安裝。",
+    "back_to_mail": "返回郵件",
+    "settings_group": "外掛程式"
+  },
+  "command_palette": {
+    "title": "命令面板",
+    "open": "開啟命令面板",
+    "placeholder": "輸入命令",
+    "no_results": "沒有相符的命令",
+    "go_to": "前往{name}",
+    "compose": "新郵件",
+    "search": "搜尋郵件",
+    "theme_dark": "切換為深色主題",
+    "theme_light": "切換為淺色主題",
+    "shortcuts": "顯示鍵盤快速鍵",
+    "group_navigation": "前往",
+    "group_actions": "動作",
+    "group_plugins": "外掛程式"
+  },
+  "notification_center": {
+    "title": "通知",
+    "mark_all_read": "全部標示為已讀",
+    "clear": "清除",
+    "empty": "沒有通知",
+    "close": "關閉",
+    "unread": "未讀",
+    "unread_count": "{count} 則未讀",
+    "level_error": "錯誤",
+    "level_warning": "警告"
   }
 }
diff --git a/locales/zh/common.json b/locales/zh/common.json
index 4629d8574..054f17f8d 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -620,7 +620,9 @@
       "copied": "验证码已复制",
       "copy_failed": "无法复制验证码"
     },
-    "mv_position": "第 {index} 封，共 {total} 封"
+    "mv_position": "第 {index} 封，共 {total} 封",
+    "plugin_panel_show": "显示插件面板",
+    "plugin_panel_hide": "隐藏插件面板"
   },
   "email_composer": {
     "minimize": "最小化",
@@ -813,7 +815,8 @@
       "remove_background_color": "移除背景颜色"
     },
     "send_filing_warning": "已发送，但发送后的清理失败，可能会残留旧草稿。",
-    "pop_out": "在单独窗口中打开回复"
+    "pop_out": "在单独窗口中打开回复",
+    "send_guard_failed": "未发送 - 发送前检查邮件的插件出错或没有响应。"
   },
   "confirm_dialog": {
     "confirm": "确认",
@@ -3970,6 +3973,354 @@
       "failed_detail": "授权失败：{error}",
       "missing_params": "缺少授权码或状态。",
       "delivery_failed": "无法将授权结果传递到应用标签页。请关闭此窗口并重试。"
+    },
+    "settings": {
+      "title": "插件",
+      "description": "由管理员添加的插件。可以为您的账户开启或关闭。",
+      "description_uploads": "插件可为网页邮箱添加功能。可以为您的账户开启或关闭，也可以自行安装。",
+      "description_demo": "演示模式中无法使用插件。",
+      "install_button": "安装插件",
+      "install_hint": "请选择插件 ZIP 文件。",
+      "install_hint_approval": "请选择插件 ZIP 文件。需要管理员批准后才能开启。",
+      "install_uploads_off": "管理员不允许安装插件。",
+      "install_managed_id": "管理员已提供同名插件，因此无法替换。",
+      "install_invalid": "此文件不是可安装的插件：{details}",
+      "toast_installed": "插件已安装。请在下方开启。",
+      "toast_installed_pending": "插件已安装，并已提交给管理员审批。",
+      "toast_enabled": "{name} 已开启",
+      "toast_disabled": "{name} 已关闭",
+      "toast_removed": "{name} 已移除",
+      "toast_forced": "管理员要求 {name} 保持开启",
+      "toast_approval_requested": "{name} 正在等待管理员批准",
+      "empty_title": "暂无插件",
+      "empty_admin": "管理员尚未添加任何插件。",
+      "empty_uploads": "从 ZIP 文件安装插件即可开始使用。",
+      "empty_demo": "插件需要真实账户，因此演示模式中没有插件。",
+      "syncing": "正在与服务器核对插件…",
+      "status_installed": "已关闭",
+      "status_enabled": "正在启动",
+      "status_running": "已开启",
+      "status_disabled": "已关闭",
+      "status_error": "出现问题",
+      "badge_forced": "必需",
+      "badge_managed": "由管理员提供",
+      "badge_yours": "由您安装",
+      "badge_awaiting": "等待批准",
+      "toggle_label": "开启或关闭 {name}",
+      "forced_note": "管理员要求使用此插件，因此无法关闭。",
+      "permissions": "可执行的操作",
+      "permissions_managed": "可执行的操作（已由管理员批准）",
+      "settings": "设置",
+      "remove": "移除",
+      "remove_title": "移除 {name}？",
+      "remove_message": "插件及其在此浏览器中存储的所有内容都将被删除。您以后可以重新安装。",
+      "remove_confirm": "移除",
+      "error_user_plugins_off": "管理员已关闭用户安装的插件，因此此插件不会运行。",
+      "error_approval_unavailable": "此插件是在需要审批之前安装的。请移除后重新安装，以提交审批。",
+      "error_approval_denied": "管理员未批准此插件。",
+      "error_approval_pending": "正在等待管理员批准此插件。",
+      "error_auto_disabled": "由于反复出错已关闭。重新开启即可再试一次。",
+      "accounts_heading": "已连接的账户",
+      "account_on": "{host} 上的 {label}",
+      "account_waiting": "{host} 上的 {label}（尚未完成登录）",
+      "disconnect": "断开连接",
+      "disconnect_failed": "无法断开 {label} 的连接"
+    },
+    "consent": {
+      "title": "允许 {name} 执行这些操作？",
+      "intro": "此插件请求以下权限。只有在您允许后才会获得。",
+      "high_risk_note": "带标记的项目会让插件访问您的邮件内容，或将数据发送到其他地方。请只对您信任的插件允许。",
+      "revoke_hint": "您可以随时在设置中关闭或移除此插件。",
+      "deny": "不允许",
+      "allow": "允许"
+    },
+    "permissions": {
+      "none": "不需要特殊权限。",
+      "high_risk": "需谨慎",
+      "email_read": {
+        "title": "读取您的邮件",
+        "body": "查看您账户中任何邮件的发件人、收件人、主题和完整正文，以及您的文件夹。"
+      },
+      "email_write": {
+        "title": "更改和整理您的邮件",
+        "body": "为您的邮件添加或移除标签、旗标和其他关键词，在您的文件夹之间移动邮件或将其移至归档，并保存草稿。"
+      },
+      "email_send": {
+        "title": "在发送前更改邮件",
+        "body": "读取并更改您撰写的邮件的收件人、主题、正文和附件，并可阻止邮件发送。"
+      },
+      "crypto_full": {
+        "title": "完全访问此应用",
+        "body": "以与网页邮箱本身相同的权限运行。它可以读取您的所有邮件和已存储的密钥，并代表您执行操作。请只对您完全信任的插件允许。"
+      },
+      "email_raw_send": {
+        "title": "发送它自行构建的邮件",
+        "body": "从您的账户发送完整的邮件，例如已签名或已加密的邮件。"
+      },
+      "email_blob_read": {
+        "title": "读取邮件的原始内容",
+        "body": "读取您的邮件和附件的原始数据，以及发送前您附加的每个文件。"
+      },
+      "email_blob_write": {
+        "title": "在发送前替换附件",
+        "body": "将文件上传到您的邮件服务器，并在邮件发送前用另一个文件替换您附加的文件。"
+      },
+      "email_render_takeover": {
+        "title": "更改邮件的显示方式",
+        "body": "替换您打开的邮件和邮件列表中的正文，例如用于显示解密后的内容。"
+      },
+      "calendar_read": {
+        "title": "读取您的日历",
+        "body": "查看您的日历及其中的活动。"
+      },
+      "calendar_write": {
+        "title": "更改您的日历",
+        "body": "创建、更改和删除活动。"
+      },
+      "contacts_read": {
+        "title": "读取您的联系人",
+        "body": "搜索和读取您的通讯录。"
+      },
+      "contacts_write": {
+        "title": "更改您的联系人",
+        "body": "创建、更改和删除联系人及通讯录。"
+      },
+      "files_read": {
+        "title": "读取您的文件",
+        "body": "浏览和打开您账户中存储的文件。"
+      },
+      "files_write": {
+        "title": "更改您的文件",
+        "body": "上传、重命名、移动和删除您账户中的文件。"
+      },
+      "identity_read": {
+        "title": "查看您的发件身份",
+        "body": "查看您用于发送邮件的地址及其签名。"
+      },
+      "identity_write": {
+        "title": "更改您的发件身份",
+        "body": "创建、更改和删除发件身份及签名。"
+      },
+      "filters_read": {
+        "title": "读取您的邮件过滤器",
+        "body": "查看用于整理收到邮件的规则。"
+      },
+      "filters_write": {
+        "title": "更改您的邮件过滤器",
+        "body": "向服务器端过滤器添加规则。这些规则可以移动、转发或删除收到的邮件。"
+      },
+      "tasks_read": {
+        "title": "读取您的任务",
+        "body": "查看您的任务列表和任务。"
+      },
+      "tasks_write": {
+        "title": "更改您的任务",
+        "body": "创建、更改、完成和删除任务。"
+      },
+      "templates_read": {
+        "title": "读取您的模板",
+        "body": "查看您保存的邮件模板。"
+      },
+      "templates_write": {
+        "title": "更改您的模板",
+        "body": "创建、更改和删除邮件模板。"
+      },
+      "smime_read": {
+        "title": "查看您的 S/MIME 状态",
+        "body": "查看您是否拥有 S/MIME 密钥和证书，但无法访问密钥。"
+      },
+      "vacation_read": {
+        "title": "查看您的外出自动回复",
+        "body": "查看自动回复是否已开启及其内容。"
+      },
+      "vacation_write": {
+        "title": "更改您的外出自动回复",
+        "body": "开启或关闭自动回复，并更改其内容和日期。"
+      },
+      "settings_read": {
+        "title": "读取您的设置",
+        "body": "查看您的偏好设置和标签定义。"
+      },
+      "settings_write": {
+        "title": "更改您的设置",
+        "body": "添加标签、调整标签顺序，并更改您的偏好设置。"
+      },
+      "security_read": {
+        "title": "查看您的账户安全",
+        "body": "查看双因素身份验证和加密是否已开启，但无法访问机密信息。"
+      },
+      "auth_observe": {
+        "title": "得知您何时登录",
+        "body": "在您登录、切换账户或会话续期时收到通知。"
+      },
+      "auth_emit": {
+        "title": "让您退出登录",
+        "body": "让您退出网页邮箱。"
+      },
+      "account_read": {
+        "title": "查看您的账户",
+        "body": "查看您添加的账户及其地址和服务器。"
+      },
+      "http_post": {
+        "title": "代表您使用网页邮箱服务器",
+        "body": "使用您的登录信息调用以下服务器端点："
+      },
+      "http_fetch": {
+        "title": "连接其他网站",
+        "body": "向以下网站发送请求。插件能读取的任何内容都可能被发送到这些网站："
+      },
+      "admin_config": {
+        "title": "读取管理员为其保存的设置",
+        "body": "读取管理员为此插件保存的设置。"
+      },
+      "ui_observe": {
+        "title": "跟踪您在应用中的位置",
+        "body": "了解当前打开的页面，并对您点击的链接做出响应。"
+      },
+      "ui_toolbar": {
+        "title": "在工具栏中添加按钮",
+        "body": "在邮件工具栏、打开的邮件和顶部栏中显示它自己的按钮。"
+      },
+      "ui_app_top_banner": {
+        "title": "在顶部显示横幅",
+        "body": "在应用顶部显示一条通知。"
+      },
+      "ui_email_banner": {
+        "title": "在邮件上显示通知",
+        "body": "在打开的邮件或会话各部分的上方、内部和之间显示它自己的通知和摘要。"
+      },
+      "ui_email_footer": {
+        "title": "在邮件下方添加内容",
+        "body": "在打开的邮件下方显示它自己的内容。"
+      },
+      "ui_contact_cryptokeys": {
+        "title": "显示联系人的加密密钥",
+        "body": "显示并管理联系人的加密密钥。"
+      },
+      "ui_email_details": {
+        "title": "在邮件详情中添加面板",
+        "body": "在打开的邮件旁边或下方显示它自己的面板。"
+      },
+      "ui_download_file": {
+        "title": "将文件保存到您的设备",
+        "body": "提供它创建的文件供下载。"
+      },
+      "ui_message_list_tabs": {
+        "title": "为收件箱添加标签页",
+        "body": "将收件箱分为“动态”或“推广”等标签页。"
+      },
+      "ui_composer_toolbar": {
+        "title": "添加到撰写窗口",
+        "body": "在您撰写邮件时显示它自己的按钮、菜单项和区块。"
+      },
+      "ui_composer_sidebar": {
+        "title": "在撰写窗口中添加面板",
+        "body": "在您撰写的邮件旁边显示它自己的面板。"
+      },
+      "ui_sidebar_widget": {
+        "title": "添加到侧边栏",
+        "body": "在邮件侧边栏中显示它自己的方框和区块。"
+      },
+      "ui_settings_section": {
+        "title": "添加设置页面",
+        "body": "在设置中显示它自己的页面。"
+      },
+      "ui_context_menu": {
+        "title": "添加到邮件菜单",
+        "body": "在右键点击邮件时打开的菜单中添加条目。"
+      },
+      "ui_navigation_rail": {
+        "title": "添加到导航栏",
+        "body": "在导航栏中显示它自己的按钮。"
+      },
+      "ui_keyboard": {
+        "title": "添加键盘快捷键",
+        "body": "响应它定义的键盘快捷键。"
+      },
+      "ui_calendar_action": {
+        "title": "添加到日历界面",
+        "body": "在活动上显示它自己的按钮和区块，并在日历日期上显示简短标签和圆点。"
+      },
+      "ui_admin_page": {
+        "title": "添加管理页面",
+        "body": "在管理设置中显示它自己的页面。"
+      },
+      "app_lifecycle": {
+        "title": "得知应用何时启动和停止",
+        "body": "在应用启动、离线或您退出登录时收到通知。"
+      },
+      "compose_open": {
+        "title": "为您打开撰写窗口",
+        "body": "打开一封已填好收件人、正文或附件的新邮件。是否发送仍由您决定。"
+      },
+      "compose_read": {
+        "title": "读取您正在写的邮件",
+        "body": "在编辑器中使用插件时，读取您正在写的邮件正文。不包括签名和引用的邮件。"
+      },
+      "compose_write": {
+        "title": "修改您正在写的邮件",
+        "body": "在编辑器中使用插件时，替换或添加您正在写的邮件中的文字。每次修改都可以撤销，是否发送仍由您决定。"
+      },
+      "ui_notifications": {
+        "title": "显示通知",
+        "body": "在您的设备上显示通知；如果您未允许通知，则在应用内显示。每条通知都会注明插件名称。"
+      },
+      "ui_message_list": {
+        "title": "添加到邮件列表",
+        "body": "在邮件列表上方显示它自己的内容，并在邮件上和所选邮件的工具栏中显示按钮。"
+      },
+      "ui_contacts": {
+        "title": "添加到联系人界面",
+        "body": "在联系人详情中显示它自己的区块，并在联系人列表中显示按钮。"
+      },
+      "ui_tasks": {
+        "title": "添加到任务界面",
+        "body": "在任务详情中显示它自己的区块，并在任务列表中显示按钮。"
+      },
+      "ui_files": {
+        "title": "添加到文件界面",
+        "body": "在文件预览中显示它自己的区块，并在文件菜单中显示条目。"
+      },
+      "ui_commands": {
+        "title": "添加命令",
+        "body": "向命令面板（Ctrl+K）添加它自己的条目。"
+      },
+      "ui_app_page": {
+        "title": "添加页面",
+        "body": "向应用添加它自己的页面，每个页面在导航栏中都有一个按钮。"
+      },
+      "http_proxy": {
+        "title": "使用您连接的账户",
+        "body": "使用您或管理员设置的账户或密钥，通过 Bulwark 的服务器发送请求。插件永远看不到密码，但可以在该账户所属的服务器上执行该账户能做的任何操作。"
+      }
+    },
+    "dialog": {
+      "from_plugin": "来自插件 {name}",
+      "ok": "确定",
+      "submit": "提交",
+      "confirm": "确认",
+      "cancel": "取消",
+      "close": "关闭",
+      "turn_off": "关闭 {name}",
+      "plugin_menu": "{name} 选项",
+      "password_note": "此表单来自插件 {name}，而不是网页邮箱。只有在您信任此插件时才输入密码。",
+      "toast_auto_disabled": "{name} 因反复出错已被关闭。"
+    },
+    "connect": {
+      "title": "连接 {label}",
+      "intro_password": "{name} 想使用您的 {label} 账户。Bulwark 将密码保存在自己的服务器上，只会发送给 {host}。插件永远看不到密码。",
+      "intro_password_any": "{name} 想使用您的 {label} 账户。Bulwark 将密码保存在自己的服务器上，只会发送给您在此处输入的服务器。插件永远看不到密码。",
+      "intro_signin": "{name} 想登录您的 {label} 账户。请在此处输入服务器，然后在该服务器自己的页面上登录。Bulwark 将获得的访问权限保存在自己的服务器上；插件永远看不到它。",
+      "server": "服务器地址",
+      "server_hint": "cloud.example.com",
+      "username": "用户名",
+      "secret": "密码或密钥",
+      "connect": "连接",
+      "continue": "继续",
+      "cancel": "取消",
+      "saving": "正在保存…",
+      "error_server": "请输入服务器地址，例如 https://cloud.example.com",
+      "error_save": "无法保存：{error}"
     }
   },
   "global_search": {
@@ -3998,5 +4349,41 @@
     "preview_empty": "选择一个结果以预览",
     "open_full": "打开",
     "view_label": "视图"
+  },
+  "top_bar": {
+    "more": "更多选项"
+  },
+  "plugin_pages": {
+    "loading": "正在加载页面",
+    "not_available_title": "此页面不可用",
+    "not_available_description": "添加此页面的插件已关闭或已不再安装。",
+    "back_to_mail": "返回邮件",
+    "settings_group": "插件"
+  },
+  "command_palette": {
+    "title": "命令面板",
+    "open": "打开命令面板",
+    "placeholder": "输入命令",
+    "no_results": "没有匹配的命令",
+    "go_to": "前往{name}",
+    "compose": "新邮件",
+    "search": "搜索邮件",
+    "theme_dark": "切换到深色主题",
+    "theme_light": "切换到浅色主题",
+    "shortcuts": "显示键盘快捷键",
+    "group_navigation": "前往",
+    "group_actions": "操作",
+    "group_plugins": "插件"
+  },
+  "notification_center": {
+    "title": "通知",
+    "mark_all_read": "全部标为已读",
+    "clear": "清除",
+    "empty": "没有通知",
+    "close": "关闭",
+    "unread": "未读",
+    "unread_count": "{count} 条未读",
+    "level_error": "错误",
+    "level_warning": "警告"
   }
 }
diff --git a/next.config.ts b/next.config.ts
index 43ebe02b0..65f3e6c1b 100644
--- a/next.config.ts
+++ b/next.config.ts
@@ -59,6 +59,14 @@ const nextConfig: NextConfig = {
   // it from node_modules at runtime instead of trying to bundle it. Used by
   // PLUGIN_DEV_DIR's on-the-fly bundler.
   serverExternalPackages: ["esbuild"],
+  experimental: {
+    // proxy.ts runs for every request, /api included, and Next buffers the
+    // body for it up to this size and silently cuts off the rest. 10 MB (the
+    // default) truncated WOPI saves and WebDAV uploads of bigger files, and
+    // plugin uploads through /api/plugin-proxy. Keep MAX_PROXY_REQUEST_BYTES
+    // in lib/plugin-secrets/proxy.ts in step with it.
+    proxyClientMaxBodySize: "100mb",
+  },
   // Response headers are the host's job in a static export (see out/_headers).
   ...(isLite
     ? {}
diff --git a/proxy.ts b/proxy.ts
index ccc08fc87..f00047d52 100644
--- a/proxy.ts
+++ b/proxy.ts
@@ -261,7 +261,16 @@ export async function proxy(request: NextRequest) {
     ? `'self' 'nonce-${nonce}' 'unsafe-eval'`
     : `'self' 'nonce-${nonce}'`;
 
-  const connectSrc = isDev ? `'self' http: https: ws: wss:` : `'self' https:`;
+  // A plugin reaches the network only through api.http.fetch, which the host
+  // checks against the manifest's httpOrigins (H-03). The sandbox document
+  // itself gets its own origin and nothing else, so fetch(), images, fonts
+  // and CSS url() can't carry data to a host the manifest didn't name. Its
+  // own origin stays because the router refetches the page as RSC.
+  const connectSrc = isSandboxPath
+    ? `'self'`
+    : isDev ? `'self' http: https: ws: wss:` : `'self' https:`;
+  const imgSrc = isSandboxPath ? `'self' data: blob:` : `'self' data: blob: https:`;
+  const fontSrc = isSandboxPath ? `'self' data:` : `'self' https: data:`;
 
   // The admin dashboard and the setup wizard are never framed. The embedding
   // allowance is for the mail UI a portal wraps; a framed admin page is a
@@ -321,13 +330,15 @@ export async function proxy(request: NextRequest) {
     `default-src 'self'`,
     `script-src ${scriptSrc}`,
     `style-src 'self' 'unsafe-inline'`,
-    `img-src 'self' data: blob: https:`,
-    `font-src 'self' https: data:`,
+    `img-src ${imgSrc}`,
+    `font-src ${fontSrc}`,
     `connect-src ${connectSrc}`,
     frameSrc,
     `object-src 'self' blob:`,
     `base-uri 'self'`,
-    `form-action ${["'self'", ...wopiOrigins].join(" ")}`,
+    // Plugin frames may use <form> for its submit event (allow-forms), but a
+    // form must not post anywhere: that would be a way out past connect-src.
+    isSandboxPath ? `form-action 'none'` : `form-action ${["'self'", ...wopiOrigins].join(" ")}`,
     `frame-ancestors ${frameAncestors}`,
     `media-src 'self' blob:`,
   ].join("; ");
diff --git a/stores/__tests__/account-security-plugin-hooks.test.ts b/stores/__tests__/account-security-plugin-hooks.test.ts
new file mode 100644
index 000000000..00938cedd
--- /dev/null
+++ b/stores/__tests__/account-security-plugin-hooks.test.ts
@@ -0,0 +1,147 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+vi.mock('@/lib/stalwart/jmap-passthrough', () => ({
+  stalwartJmap: vi.fn(),
+  requireResult: <T,>(responses: Array<[string, unknown, string]>, method: string): T => {
+    const match = responses.find(r => r[0] === method);
+    if (!match) throw new Error(`Missing ${method}`);
+    return match[1] as T;
+  },
+}));
+
+vi.mock('@/stores/auth-store', () => ({
+  useAuthStore: {
+    getState: () => ({
+      updateBasicPassword: async () => {},
+      client: {
+        getAccountId: () => 'acc-primary',
+        hasAccountCapability: (cap: string) => cap === 'urn:stalwart:jmap',
+      },
+    }),
+  },
+}));
+
+import { useAccountSecurityStore } from '../account-security-store';
+import { stalwartJmap } from '@/lib/stalwart/jmap-passthrough';
+import { accountSecurityHooks, clearAllHooks } from '@/lib/plugin-hooks';
+
+const jmap = stalwartJmap as unknown as ReturnType<typeof vi.fn>;
+
+const updated = (method: string) => [[method, { updated: { singleton: null } }, '0']];
+const refused = (method: string) => [[method, { notUpdated: { singleton: { type: 'invalidProperties', description: 'wrong password' } } }, '0']];
+const authInfo = [
+  ['x:AccountPassword/get', { list: [{ otpAuth: {} }] }, '0'],
+  ['x:AppPassword/query', { ids: [] }, '1'],
+  ['x:ApiKey/query', { ids: [] }, '2'],
+];
+
+/** Every argument any security hook received, flattened to one string. */
+function allPayloads(...handlers: ReturnType<typeof vi.fn>[]): string {
+  return JSON.stringify(handlers.flatMap((h) => h.mock.calls));
+}
+
+describe('account security plugin hooks', () => {
+  beforeEach(() => {
+    jmap.mockReset();
+    useAccountSecurityStore.getState().clearState();
+  });
+  afterEach(() => clearAllHooks());
+
+  it('reports a password change only once the server accepted it, without the password', async () => {
+    const changed = vi.fn();
+    accountSecurityHooks.onPasswordChange.register('test', changed);
+    const store = useAccountSecurityStore.getState();
+
+    jmap.mockResolvedValueOnce(refused('x:AccountPassword/set'));
+    await expect(store.changePassword('old-secret', 'new-secret')).rejects.toThrow();
+    expect(changed).not.toHaveBeenCalled();
+
+    jmap.mockResolvedValueOnce(updated('x:AccountPassword/set'));
+    await store.changePassword('old-secret', 'new-secret', '123456');
+    expect(changed).toHaveBeenCalledTimes(1);
+    expect(changed).toHaveBeenCalledWith({});
+  });
+
+  it('reports two-factor sign-in turned on and off, without seed or code', async () => {
+    const changed = vi.fn();
+    accountSecurityHooks.onTotpChange.register('test', changed);
+    const store = useAccountSecurityStore.getState();
+
+    jmap.mockResolvedValueOnce(refused('x:AccountPassword/set'));
+    await expect(store.enableTotp('pw-secret', 'otpauth://totp/x?secret=SEED', '111111')).rejects.toThrow();
+    expect(changed).not.toHaveBeenCalled();
+
+    jmap.mockResolvedValueOnce(updated('x:AccountPassword/set'));
+    await store.enableTotp('pw-secret', 'otpauth://totp/x?secret=SEED', '111111');
+    jmap.mockResolvedValueOnce(updated('x:AccountPassword/set'));
+    await store.disableTotp('pw-secret', '222222');
+
+    expect(changed.mock.calls).toEqual([[{ enabled: true }], [{ enabled: false }]]);
+    expect(allPayloads(changed)).not.toMatch(/SEED|111111|222222|pw-secret/);
+  });
+
+  it('reports app passwords created and removed, never their value', async () => {
+    const changed = vi.fn();
+    accountSecurityHooks.onAppPasswordChange.register('test', changed);
+    const store = useAccountSecurityStore.getState();
+
+    jmap
+      .mockResolvedValueOnce([['x:AppPassword/set', { created: { new: { id: 'ap1', secret: 'APP-SECRET' } } }, '0']])
+      .mockResolvedValueOnce(authInfo);
+    const created = await store.createAppPassword({ description: 'Phone' });
+    expect(created.secret).toBe('APP-SECRET');
+
+    jmap
+      .mockResolvedValueOnce([['x:AppPassword/set', { notDestroyed: { ap1: { type: 'notFound' } } }, '0']])
+      .mockResolvedValueOnce(authInfo);
+    await store.removeAppPassword('ap1');
+
+    jmap
+      .mockResolvedValueOnce([['x:AppPassword/set', { destroyed: ['ap1'] }, '0']])
+      .mockResolvedValueOnce(authInfo);
+    await store.removeAppPassword('ap1');
+
+    expect(changed.mock.calls).toEqual([[{ change: 'created' }], [{ change: 'removed' }]]);
+    expect(allPayloads(changed)).not.toContain('APP-SECRET');
+  });
+
+  it('does not report API keys as app passwords', async () => {
+    const changed = vi.fn();
+    accountSecurityHooks.onAppPasswordChange.register('test', changed);
+    jmap
+      .mockResolvedValueOnce([['x:ApiKey/set', { created: { new: { id: 'k1', secret: 'KEY' } } }, '0']])
+      .mockResolvedValueOnce(authInfo);
+    await useAccountSecurityStore.getState().createApiKey({ description: 'CI' });
+    expect(changed).not.toHaveBeenCalled();
+  });
+
+  it('reports encryption at rest switched on and off after the server accepted it', async () => {
+    const changed = vi.fn();
+    accountSecurityHooks.onEncryptionChange.register('test', changed);
+    const store = useAccountSecurityStore.getState();
+
+    jmap.mockResolvedValueOnce(refused('x:AccountSettings/set'));
+    await expect(store.updateEncryptionAtRest({ type: 'Aes256', publicKeyId: 'pk1' })).rejects.toThrow();
+    expect(changed).not.toHaveBeenCalled();
+
+    jmap.mockResolvedValue(updated('x:AccountSettings/set'));
+    await store.updateEncryptionAtRest({ type: 'Aes256', publicKeyId: 'pk1' }).catch(() => {});
+    await store.updateEncryptionAtRest({ type: 'Disabled', publicKeyId: null }).catch(() => {});
+
+    expect(changed.mock.calls).toEqual([[{ enabled: true }], [{ enabled: false }]]);
+  });
+
+  it('reports a new display name after the server accepted it', async () => {
+    const changed = vi.fn();
+    accountSecurityHooks.onDisplayNameChange.register('test', changed);
+    const store = useAccountSecurityStore.getState();
+
+    jmap.mockResolvedValueOnce(refused('x:AccountSettings/set'));
+    await expect(store.updateDisplayName('Ann')).rejects.toThrow();
+    expect(changed).not.toHaveBeenCalled();
+
+    jmap.mockResolvedValueOnce(updated('x:AccountSettings/set'));
+    await store.updateDisplayName('Ann');
+    expect(changed).toHaveBeenCalledWith({ displayName: 'Ann' });
+  });
+});
diff --git a/stores/__tests__/auth-store-logout-hooks.test.ts b/stores/__tests__/auth-store-logout-hooks.test.ts
new file mode 100644
index 000000000..810e90e93
--- /dev/null
+++ b/stores/__tests__/auth-store-logout-hooks.test.ts
@@ -0,0 +1,46 @@
+import { beforeEach, afterEach, describe, expect, it, vi } from 'vitest';
+import * as browserNavigation from '@/lib/browser-navigation';
+import { authHooks, clearAllHooks } from '@/lib/plugin-hooks';
+import { useAuthStore, LOGOUT_HOOK_BUDGET_MS } from '../auth-store';
+import { useAccountStore } from '../account-store';
+
+describe('sign-out with plugins', () => {
+  beforeEach(() => {
+    vi.restoreAllMocks();
+    clearAllHooks();
+    sessionStorage.clear();
+    localStorage.clear();
+    vi.stubGlobal('fetch', vi.fn().mockResolvedValue({ ok: true, json: async () => ({}) }));
+    vi.spyOn(browserNavigation, 'replaceWindowLocation').mockImplementation(() => {});
+    useAccountStore.setState({ accounts: [], activeAccountId: null, defaultAccountId: null });
+    useAuthStore.setState({ isAuthenticated: true, authMode: 'basic', client: null, activeAccountId: null });
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  it('signs out even when a plugin answers false before sign-out', async () => {
+    const before = vi.fn().mockReturnValue(false);
+    const after = vi.fn();
+    authHooks.onBeforeLogout.register('p', before);
+    authHooks.onAfterLogout.register('p', after);
+
+    await useAuthStore.getState().logout();
+
+    expect(before).toHaveBeenCalledWith({ accountId: 'all' });
+    expect(useAuthStore.getState().isAuthenticated).toBe(false);
+    expect(after).toHaveBeenCalledWith({ accountId: 'all' });
+  });
+
+  it('does not wait on a plugin that never answers', async () => {
+    vi.useFakeTimers();
+    authHooks.onBeforeLogout.register('p', () => new Promise(() => {}));
+
+    const done = useAuthStore.getState().logout();
+    await vi.advanceTimersByTimeAsync(LOGOUT_HOOK_BUDGET_MS + 10);
+    await done;
+
+    expect(useAuthStore.getState().isAuthenticated).toBe(false);
+  });
+});
diff --git a/stores/__tests__/auth-store-plugin-hooks.test.ts b/stores/__tests__/auth-store-plugin-hooks.test.ts
new file mode 100644
index 000000000..6c8072ae0
--- /dev/null
+++ b/stores/__tests__/auth-store-plugin-hooks.test.ts
@@ -0,0 +1,72 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { authHooks, clearAllHooks } from '@/lib/plugin-hooks';
+import { useAuthStore } from '../auth-store';
+import { useAccountStore } from '../account-store';
+
+function listen(bus: { register: (id: string, fn: (...a: unknown[]) => unknown) => unknown }) {
+  const fn = vi.fn();
+  bus.register('test', fn);
+  return fn;
+}
+
+const ACCOUNT = {
+  label: 'Alice', serverUrl: 'https://mail.example.org', username: 'alice@example.org', authMode: 'basic' as const,
+  rememberMe: false, displayName: 'Alice', email: 'alice@example.org', lastLoginAt: 0,
+  isConnected: true, hasError: false, isDefault: true,
+};
+
+beforeEach(() => {
+  vi.restoreAllMocks();
+  clearAllHooks();
+  useAccountStore.setState({ accounts: [], activeAccountId: null, defaultAccountId: null });
+  useAuthStore.setState({ isAuthenticated: false, client: null, activeAccountId: null, username: null });
+});
+
+describe('auth hooks', () => {
+  it('reports accounts that are added and removed, once each', () => {
+    const added = listen(authHooks.onAccountAdd);
+    const removed = listen(authHooks.onAccountRemove);
+
+    const id = useAccountStore.getState().addAccount(ACCOUNT);
+    useAccountStore.getState().addAccount(ACCOUNT); // already there: an update
+    useAccountStore.getState().removeAccount(id);
+    useAccountStore.getState().removeAccount(id); // already gone
+
+    expect(added.mock.calls).toEqual([[{ accountId: id }]]);
+    expect(removed.mock.calls).toEqual([[{ accountId: id }]]);
+  });
+
+  it('says when the session is ready, and when another account becomes active', () => {
+    const ready = listen(authHooks.onAuthReady);
+    const switched = listen(authHooks.onAccountSwitch);
+    const client = {} as never;
+
+    useAuthStore.setState({ isAuthenticated: true, client, activeAccountId: 'a' });
+    useAuthStore.setState({ activeAccountId: 'b' });
+
+    expect(ready.mock.calls).toEqual([[{ accountId: 'a' }]]);
+    expect(switched).toHaveBeenCalledWith({ accountId: 'b', previousAccountId: 'a' });
+  });
+
+  it('reports a renewed access token', async () => {
+    const refreshed = listen(authHooks.onTokenRefresh);
+    vi.stubGlobal('fetch', vi.fn(async () => ({
+      ok: true, status: 200, json: async () => ({ access_token: 'new', expires_in: 3600 }),
+    })));
+    useAuthStore.setState({ activeAccountId: 'acc', authMode: 'oauth' });
+
+    await expect(useAuthStore.getState().refreshAccessToken()).resolves.toBe('new');
+
+    expect(refreshed).toHaveBeenCalledWith({ accountId: 'acc' });
+  });
+
+  it('reports a sign-in', async () => {
+    const signedIn = listen(authHooks.onLogin);
+
+    const ok = await useAuthStore.getState().loginDemo();
+
+    expect(ok).toBe(true);
+    const { activeAccountId, username } = useAuthStore.getState();
+    expect(signedIn).toHaveBeenCalledWith({ accountId: activeAccountId, username });
+  });
+});
diff --git a/stores/__tests__/calendar-store-event-hooks.test.ts b/stores/__tests__/calendar-store-event-hooks.test.ts
new file mode 100644
index 000000000..3568c54f2
--- /dev/null
+++ b/stores/__tests__/calendar-store-event-hooks.test.ts
@@ -0,0 +1,276 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { useCalendarStore } from '../calendar-store';
+import { calendarHooks, clearAllHooks } from '@/lib/plugin-hooks';
+import type { IJMAPClient } from '@/lib/jmap/client-interface';
+import type { CalendarEvent } from '@/lib/jmap/types';
+
+// Plugins see event creates, edits, deletes, RSVPs and imports through the
+// calendar hooks: the before-hooks run ahead of the server call and can stop
+// the action, the observers fire once it succeeded.
+
+function event(overrides: Partial<CalendarEvent> = {}): CalendarEvent {
+  return {
+    id: 'e1',
+    uid: 'uid-1',
+    title: 'Planning',
+    start: '2026-09-08T10:00:00',
+    duration: 'PT1H',
+    timeZone: 'Europe/Berlin',
+    showWithoutTime: false,
+    calendarIds: { c1: true },
+    participants: {
+      p1: { '@type': 'Participant', name: 'Me', email: 'me@example.com', participationStatus: 'needs-action' },
+    },
+    ...overrides,
+  } as CalendarEvent;
+}
+
+function fakeClient(overrides: Partial<Record<keyof IJMAPClient, unknown>> = {}) {
+  return {
+    createCalendarEvent: vi.fn(async (e: Partial<CalendarEvent>) => ({ ...e, id: 'new-1' })),
+    updateCalendarEvent: vi.fn().mockResolvedValue(undefined),
+    deleteCalendarEvent: vi.fn().mockResolvedValue(undefined),
+    queryAllCalendarEvents: vi.fn().mockResolvedValue([]),
+    getCalendarEvents: vi.fn().mockResolvedValue([]),
+    batchCreateCalendarEvents: vi.fn(async (batch: unknown[]) => ({
+      created: batch.map((_, i) => ({ id: `imp-${i}` })), failed: [], notCreated: {},
+    })),
+    ...overrides,
+  } as unknown as IJMAPClient & Record<string, ReturnType<typeof vi.fn>>;
+}
+
+beforeEach(() => {
+  clearAllHooks();
+  useCalendarStore.getState().clearState();
+  useCalendarStore.setState({ events: [], calendars: [], error: null, dateRange: null });
+});
+
+describe('createEvent hooks', () => {
+  it('asks onBeforeEventCreate before the server call and reports the created event', async () => {
+    const client = fakeClient();
+    const order: string[] = [];
+    calendarHooks.onBeforeEventCreate.register('t', vi.fn((view) => {
+      order.push('before');
+      expect(client.createCalendarEvent).not.toHaveBeenCalled();
+      expect(view).toMatchObject({ title: 'Planning', calendarId: 'c1' });
+      return true;
+    }));
+    const after = vi.fn();
+    calendarHooks.onAfterEventCreate.register('t', after);
+
+    const created = await useCalendarStore.getState().createEvent(client, { title: 'Planning', start: '2026-09-08T10:00:00', calendarIds: { c1: true } });
+
+    expect(order).toEqual(['before']);
+    expect(created?.id).toBe('new-1');
+    expect(after).toHaveBeenCalledTimes(1);
+    expect(after.mock.calls[0][0]).toMatchObject({ id: 'new-1', title: 'Planning', calendarId: 'c1' });
+  });
+
+  it('creates nothing when a plugin says no', async () => {
+    const client = fakeClient();
+    calendarHooks.onBeforeEventCreate.register('t', () => false);
+    const after = vi.fn();
+    calendarHooks.onAfterEventCreate.register('t', after);
+
+    const created = await useCalendarStore.getState().createEvent(client, { title: 'Nope' });
+
+    expect(created).toBeNull();
+    expect(client.createCalendarEvent).not.toHaveBeenCalled();
+    expect(useCalendarStore.getState().events).toEqual([]);
+    expect(after).not.toHaveBeenCalled();
+  });
+
+  it('does not report a create the server refused', async () => {
+    const client = fakeClient({ createCalendarEvent: vi.fn().mockRejectedValue(new Error('boom')) });
+    const after = vi.fn();
+    calendarHooks.onAfterEventCreate.register('t', after);
+    await useCalendarStore.getState().createEvent(client, { title: 'X' });
+    expect(after).not.toHaveBeenCalled();
+  });
+});
+
+describe('updateEvent hooks', () => {
+  it('passes id and patch to onBeforeEventUpdate and the changed event to onAfterEventUpdate', async () => {
+    const client = fakeClient();
+    useCalendarStore.setState({ events: [event()] });
+    const before = vi.fn(() => {
+      expect(client.updateCalendarEvent).not.toHaveBeenCalled();
+      return true;
+    });
+    calendarHooks.onBeforeEventUpdate.register('t', before);
+    const after = vi.fn();
+    calendarHooks.onAfterEventUpdate.register('t', after);
+
+    await useCalendarStore.getState().updateEvent(client, 'e1', { title: 'Renamed' });
+
+    expect(before).toHaveBeenCalledWith({ eventId: 'e1', patch: { title: 'Renamed' } });
+    expect(after).toHaveBeenCalledTimes(1);
+    expect(after.mock.calls[0][0]).toMatchObject({ id: 'e1', title: 'Renamed', start: '2026-09-08T10:00:00' });
+  });
+
+  it('leaves the event alone when a plugin says no', async () => {
+    const client = fakeClient();
+    useCalendarStore.setState({ events: [event()] });
+    calendarHooks.onBeforeEventUpdate.register('t', () => false);
+    const after = vi.fn();
+    calendarHooks.onAfterEventUpdate.register('t', after);
+
+    await useCalendarStore.getState().updateEvent(client, 'e1', { title: 'Renamed' });
+
+    expect(client.updateCalendarEvent).not.toHaveBeenCalled();
+    expect(useCalendarStore.getState().events[0].title).toBe('Planning');
+    expect(after).not.toHaveBeenCalled();
+  });
+
+  it('reports a single-occurrence edit once, with the edited occurrence', async () => {
+    const client = fakeClient();
+    const occ = event({
+      id: 'maaaaab', originalId: 'maaaaab', baseEventId: 'b', uid: 'series',
+      recurrenceId: '2026-09-08T10:00:00', recurrenceIdTimeZone: 'Europe/Berlin',
+      recurrenceRules: [{ '@type': 'RecurrenceRule', frequency: 'daily', count: 5 }] as unknown as CalendarEvent['recurrenceRules'],
+    });
+    useCalendarStore.setState({ events: [occ] });
+    const after = vi.fn();
+    calendarHooks.onAfterEventUpdate.register('t', after);
+
+    await useCalendarStore.getState().updateEvent(client, 'maaaaab', { title: 'Just this one' });
+
+    expect(after).toHaveBeenCalledTimes(1);
+    expect(after.mock.calls[0][0]).toMatchObject({ id: 'maaaaab', title: 'Just this one', isRecurring: true });
+  });
+
+  it('does not report an update the server refused', async () => {
+    const client = fakeClient({ updateCalendarEvent: vi.fn().mockRejectedValue(new Error('boom')) });
+    useCalendarStore.setState({ events: [event()] });
+    const after = vi.fn();
+    calendarHooks.onAfterEventUpdate.register('t', after);
+    await expect(useCalendarStore.getState().updateEvent(client, 'e1', { title: 'X' })).rejects.toThrow('boom');
+    expect(after).not.toHaveBeenCalled();
+  });
+});
+
+describe('deleteEvent hooks', () => {
+  it('asks first and reports the deleted event with its title', async () => {
+    const client = fakeClient();
+    useCalendarStore.setState({ events: [event()] });
+    const before = vi.fn(() => {
+      expect(client.deleteCalendarEvent).not.toHaveBeenCalled();
+      return true;
+    });
+    calendarHooks.onBeforeEventDelete.register('t', before);
+    const after = vi.fn();
+    calendarHooks.onAfterEventDelete.register('t', after);
+
+    await useCalendarStore.getState().deleteEvent(client, 'e1');
+
+    expect(before).toHaveBeenCalledWith({ eventId: 'e1', title: 'Planning' });
+    expect(after).toHaveBeenCalledTimes(1);
+    expect(after).toHaveBeenCalledWith({ eventId: 'e1', title: 'Planning' });
+  });
+
+  it('keeps the event when a plugin says no', async () => {
+    const client = fakeClient();
+    useCalendarStore.setState({ events: [event()] });
+    calendarHooks.onBeforeEventDelete.register('t', () => false);
+    const after = vi.fn();
+    calendarHooks.onAfterEventDelete.register('t', after);
+
+    await useCalendarStore.getState().deleteEvent(client, 'e1');
+
+    expect(client.deleteCalendarEvent).not.toHaveBeenCalled();
+    expect(useCalendarStore.getState().events).toHaveLength(1);
+    expect(after).not.toHaveBeenCalled();
+  });
+
+  it('does not report a delete the server refused', async () => {
+    const client = fakeClient({ deleteCalendarEvent: vi.fn().mockRejectedValue(new Error('boom')) });
+    useCalendarStore.setState({ events: [event()] });
+    const after = vi.fn();
+    calendarHooks.onAfterEventDelete.register('t', after);
+    await expect(useCalendarStore.getState().deleteEvent(client, 'e1')).rejects.toThrow('boom');
+    expect(after).not.toHaveBeenCalled();
+  });
+});
+
+describe('rsvpEvent hooks', () => {
+  it('asks first and reports the answer', async () => {
+    const client = fakeClient();
+    useCalendarStore.setState({ events: [event()] });
+    const before = vi.fn(() => {
+      expect(client.updateCalendarEvent).not.toHaveBeenCalled();
+      return true;
+    });
+    calendarHooks.onBeforeEventRsvp.register('t', before);
+    const after = vi.fn();
+    calendarHooks.onEventRsvp.register('t', after);
+
+    await useCalendarStore.getState().rsvpEvent(client, 'e1', 'p1', 'accepted');
+
+    expect(before).toHaveBeenCalledWith({ eventId: 'e1', status: 'accepted' });
+    expect(after).toHaveBeenCalledTimes(1);
+    expect(after).toHaveBeenCalledWith({ eventId: 'e1', status: 'accepted' });
+  });
+
+  it('sends no answer when a plugin says no', async () => {
+    const client = fakeClient();
+    useCalendarStore.setState({ events: [event()] });
+    calendarHooks.onBeforeEventRsvp.register('t', () => false);
+    const after = vi.fn();
+    calendarHooks.onEventRsvp.register('t', after);
+
+    await useCalendarStore.getState().rsvpEvent(client, 'e1', 'p1', 'accepted');
+
+    expect(client.updateCalendarEvent).not.toHaveBeenCalled();
+    expect(useCalendarStore.getState().events[0].participants?.p1.participationStatus).toBe('needs-action');
+    expect(after).not.toHaveBeenCalled();
+  });
+
+  it('does not report an answer the server refused', async () => {
+    const client = fakeClient({ updateCalendarEvent: vi.fn().mockRejectedValue(new Error('boom')) });
+    useCalendarStore.setState({ events: [event()] });
+    const after = vi.fn();
+    calendarHooks.onEventRsvp.register('t', after);
+    await expect(useCalendarStore.getState().rsvpEvent(client, 'e1', 'p1', 'accepted')).rejects.toThrow('boom');
+    expect(after).not.toHaveBeenCalled();
+  });
+});
+
+describe('importEvents hooks', () => {
+  const file = [
+    { uid: 'a', title: 'A', start: '2026-09-08T10:00:00' },
+    { uid: 'b', title: 'B', start: '2026-09-09T10:00:00' },
+    { uid: 'a', title: 'A again', start: '2026-09-08T10:00:00' },
+  ] as Partial<CalendarEvent>[];
+
+  it('asks with the event count and reports what was imported and skipped', async () => {
+    const client = fakeClient();
+    const before = vi.fn(() => {
+      expect(client.batchCreateCalendarEvents).not.toHaveBeenCalled();
+      return true;
+    });
+    calendarHooks.onBeforeEventsImport.register('t', before);
+    const after = vi.fn();
+    calendarHooks.onEventsImport.register('t', after);
+
+    const count = await useCalendarStore.getState().importEvents(client, file, 'c1');
+
+    expect(count).toBe(2);
+    expect(before).toHaveBeenCalledWith({ calendarId: 'c1', count: 3 });
+    expect(after).toHaveBeenCalledTimes(1);
+    expect(after).toHaveBeenCalledWith({ calendarId: 'c1', imported: 2, skipped: 1 });
+  });
+
+  it('imports nothing when a plugin says no', async () => {
+    const client = fakeClient();
+    calendarHooks.onBeforeEventsImport.register('t', () => false);
+    const after = vi.fn();
+    calendarHooks.onEventsImport.register('t', after);
+
+    const count = await useCalendarStore.getState().importEvents(client, file, 'c1');
+
+    expect(count).toBe(0);
+    expect(client.getCalendarEvents).not.toHaveBeenCalled();
+    expect(client.batchCreateCalendarEvents).not.toHaveBeenCalled();
+    expect(after).not.toHaveBeenCalled();
+  });
+});
diff --git a/stores/__tests__/calendar-store-view-hooks.test.ts b/stores/__tests__/calendar-store-view-hooks.test.ts
new file mode 100644
index 000000000..a8b22f1c2
--- /dev/null
+++ b/stores/__tests__/calendar-store-view-hooks.test.ts
@@ -0,0 +1,156 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { useCalendarStore } from '../calendar-store';
+import { calendarHooks, clearAllHooks } from '@/lib/plugin-hooks';
+import type { IJMAPClient } from '@/lib/jmap/client-interface';
+import type { Calendar } from '@/lib/jmap/types';
+
+// Plugins hear when the shown day or view changes, when calendars are
+// created, changed, removed, shown or hidden, and when an iCal subscription
+// is added, changed, removed or refreshed.
+
+function cal(overrides: Partial<Calendar> = {}): Calendar {
+  return { id: 'c1', name: 'Work', isDefault: false, ...overrides } as Calendar;
+}
+
+function fakeClient(overrides: Partial<Record<keyof IJMAPClient, unknown>> = {}) {
+  return {
+    createCalendar: vi.fn(async (c: Partial<Calendar>) => ({ ...c, id: 'new-cal' })),
+    updateCalendar: vi.fn().mockResolvedValue(undefined),
+    deleteCalendar: vi.fn().mockResolvedValue(undefined),
+    setDefaultCalendar: vi.fn().mockResolvedValue(undefined),
+    setCalendarShare: vi.fn().mockResolvedValue(undefined),
+    getAccountId: () => 'acct',
+    getCalendarsAccountId: () => 'acct',
+    getServerUrl: () => 'https://mail.example',
+    getUsername: () => 'me@example.com',
+    getCalendars: async () => [{ id: 'sub-cal', name: 'Feed' }],
+    uploadBlob: async () => ({ blobId: 'blob' }),
+    parseCalendarEvents: async () => [],
+    getCalendarEvents: async () => [],
+    batchDeleteCalendarEvents: vi.fn(),
+    ...overrides,
+  } as unknown as IJMAPClient & Record<string, ReturnType<typeof vi.fn>>;
+}
+
+beforeEach(() => {
+  clearAllHooks();
+  useCalendarStore.getState().clearState();
+  useCalendarStore.setState({
+    calendars: [cal()], selectedCalendarIds: ['c1'], icalSubscriptions: [], error: null, dateRange: null,
+    selectedDate: new Date(2026, 9, 12, 9, 0), viewMode: 'month',
+  });
+  vi.stubGlobal('fetch', vi.fn(async () => new Response('BEGIN:VCALENDAR\r\nEND:VCALENDAR\r\n', { status: 200 })));
+});
+
+describe('date and view hooks', () => {
+  it('reports a new day, but not the same day again', () => {
+    const handler = vi.fn();
+    calendarHooks.onCalendarDateChange.register('t', handler);
+    useCalendarStore.getState().setSelectedDate(new Date(2026, 9, 12, 15, 0));
+    expect(handler).not.toHaveBeenCalled();
+    useCalendarStore.getState().setSelectedDate(new Date(2026, 9, 13, 9, 0));
+    expect(handler).toHaveBeenCalledTimes(1);
+    expect(handler).toHaveBeenCalledWith({ date: '2026-10-13' });
+  });
+
+  it('reports a new view, but not the same view again', () => {
+    const handler = vi.fn();
+    calendarHooks.onCalendarViewChange.register('t', handler);
+    useCalendarStore.getState().setViewMode('month');
+    expect(handler).not.toHaveBeenCalled();
+    useCalendarStore.getState().setViewMode('week');
+    expect(handler).toHaveBeenCalledTimes(1);
+    expect(handler).toHaveBeenCalledWith({ view: 'week' });
+  });
+});
+
+describe('calendar hooks', () => {
+  it('reports created, updated and removed calendars', async () => {
+    const handler = vi.fn();
+    calendarHooks.onCalendarChange.register('t', handler);
+    const client = fakeClient();
+
+    await useCalendarStore.getState().createCalendar(client, { name: 'New' });
+    await useCalendarStore.getState().updateCalendar(client, 'c1', { name: 'Renamed' });
+    await useCalendarStore.getState().setDefaultCalendar(client, 'c1');
+    await useCalendarStore.getState().removeCalendar(client, 'c1');
+
+    expect(handler.mock.calls.map((c) => c[0])).toEqual([
+      { calendarId: 'new-cal', change: 'created' },
+      { calendarId: 'c1', change: 'updated' },
+      { calendarId: 'c1', change: 'updated' },
+      { calendarId: 'c1', change: 'removed' },
+    ]);
+  });
+
+  it('does not report calendar changes the server refused', async () => {
+    const handler = vi.fn();
+    calendarHooks.onCalendarChange.register('t', handler);
+    const fail = vi.fn().mockRejectedValue(new Error('boom'));
+    const client = fakeClient({ createCalendar: fail, updateCalendar: fail, deleteCalendar: fail });
+
+    await useCalendarStore.getState().createCalendar(client, { name: 'New' });
+    await expect(useCalendarStore.getState().updateCalendar(client, 'c1', { name: 'X' })).rejects.toThrow();
+    await expect(useCalendarStore.getState().removeCalendar(client, 'c1')).rejects.toThrow();
+
+    expect(handler).not.toHaveBeenCalled();
+  });
+
+  it('reports a calendar being hidden and shown', () => {
+    const handler = vi.fn();
+    calendarHooks.onCalendarVisibilityToggle.register('t', handler);
+    useCalendarStore.getState().toggleCalendarVisibility('c1');
+    useCalendarStore.getState().toggleCalendarVisibility('c1');
+    expect(handler.mock.calls.map((c) => c[0])).toEqual([
+      { calendarId: 'c1', visible: false },
+      { calendarId: 'c1', visible: true },
+    ]);
+    expect(useCalendarStore.getState().selectedCalendarIds).toEqual(['c1']);
+  });
+});
+
+describe('iCal subscription hooks', () => {
+  it('reports an added subscription once, without a separate refresh', async () => {
+    const handler = vi.fn();
+    calendarHooks.onICalSubscriptionChange.register('t', handler);
+    const client = fakeClient({ createCalendar: vi.fn(async () => ({ id: 'sub-cal', name: 'Feed' })) });
+
+    const sub = await useCalendarStore.getState().addICalSubscription(client, 'webcal://feeds.example/x.ics', 'Feed', '#f00');
+
+    expect(handler).toHaveBeenCalledTimes(1);
+    expect(handler).toHaveBeenCalledWith({ subscriptionId: sub!.id, change: 'added' });
+  });
+
+  it('does not report a subscription whose first fetch failed', async () => {
+    const handler = vi.fn();
+    calendarHooks.onICalSubscriptionChange.register('t', handler);
+    vi.stubGlobal('fetch', vi.fn(async () => new Response('{}', { status: 404 })));
+    const client = fakeClient({ createCalendar: vi.fn(async () => ({ id: 'sub-cal', name: 'Feed' })) });
+
+    await expect(useCalendarStore.getState().addICalSubscription(client, 'https://feeds.example/x.ics', 'Feed', '#f00')).rejects.toThrow();
+    expect(handler).not.toHaveBeenCalled();
+  });
+
+  it('reports refreshed, updated and removed subscriptions', async () => {
+    const client = fakeClient();
+    useCalendarStore.setState({
+      calendars: [cal({ id: 'sub-cal', name: 'Feed' })],
+      icalSubscriptions: [{
+        id: 's1', url: 'https://feeds.example/x.ics', calendarId: 'sub-cal', accountId: 'acct',
+        owner: 'https://mail.example|me@example.com', name: 'Feed', color: '#f00', refreshInterval: 60, lastRefreshed: null,
+      }],
+    });
+    const handler = vi.fn();
+    calendarHooks.onICalSubscriptionChange.register('t', handler);
+
+    await useCalendarStore.getState().refreshICalSubscription(client, 's1');
+    await useCalendarStore.getState().updateICalSubscription(client, 's1', { name: 'Renamed' });
+    await useCalendarStore.getState().removeICalSubscription(client, 's1');
+
+    expect(handler.mock.calls.map((c) => c[0])).toEqual([
+      { subscriptionId: 's1', change: 'refreshed' },
+      { subscriptionId: 's1', change: 'updated' },
+      { subscriptionId: 's1', change: 'removed' },
+    ]);
+  });
+});
diff --git a/stores/__tests__/contact-store-hooks.test.ts b/stores/__tests__/contact-store-hooks.test.ts
new file mode 100644
index 000000000..b4ec555b5
--- /dev/null
+++ b/stores/__tests__/contact-store-hooks.test.ts
@@ -0,0 +1,395 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { useContactStore } from '../contact-store';
+import { contactHooks, clearAllHooks } from '@/lib/plugin-hooks';
+import type { ContactCard } from '@/lib/jmap/types';
+import type { IJMAPClient } from '@/lib/jmap/client-interface';
+
+const card = (overrides: Partial<ContactCard> = {}): ContactCard => ({
+  id: 'c1',
+  addressBookIds: { 'ab-1': true },
+  name: { full: 'Jane Doe', components: [{ kind: 'given', value: 'Jane' }, { kind: 'surname', value: 'Doe' }], isOrdered: true },
+  emails: { e0: { address: 'jane@example.com' } },
+  ...overrides,
+});
+
+const makeClient = (overrides: Record<string, unknown> = {}) => ({
+  createContact: vi.fn(async (c: Partial<ContactCard>) => ({ ...c, id: 'srv-1' } as ContactCard)),
+  updateContact: vi.fn(async () => undefined),
+  deleteContact: vi.fn(async () => undefined),
+  ...overrides,
+}) as unknown as IJMAPClient & Record<string, ReturnType<typeof vi.fn>>;
+
+const flush = () => new Promise((r) => setTimeout(r, 0));
+
+describe('contact-store plugin hooks: contact CRUD', () => {
+  beforeEach(() => {
+    clearAllHooks();
+    useContactStore.setState({
+      contacts: [], addressBooks: [], selectedContactId: null, error: null,
+      supportsSync: true, selectedContactIds: new Set<string>(), lastSelectedContactId: null,
+    });
+  });
+
+  describe('createContact', () => {
+    it('asks plugins first and tells them about the created contact', async () => {
+      const client = makeClient();
+      const before = vi.fn(() => {
+        expect(client.createContact).not.toHaveBeenCalled();
+        return true;
+      });
+      const after = vi.fn();
+      contactHooks.onBeforeContactCreate.register('test', before);
+      contactHooks.onAfterContactCreate.register('test', after);
+
+      const { id: _id, ...draft } = card();
+      void _id;
+      expect(await useContactStore.getState().createContact(client, draft)).toBe(true);
+      await flush();
+
+      expect(before).toHaveBeenCalledOnce();
+      expect(before).toHaveBeenCalledWith(expect.objectContaining({ id: '', fullName: 'Jane Doe', emails: ['jane@example.com'] }));
+      expect(after).toHaveBeenCalledOnce();
+      expect(after.mock.calls[0][0]).toMatchObject({ id: 'srv-1', fullName: 'Jane Doe', addressBookId: 'ab-1' });
+    });
+
+    it('creates nothing when a plugin says no', async () => {
+      const client = makeClient();
+      const after = vi.fn();
+      contactHooks.onBeforeContactCreate.register('test', () => false);
+      contactHooks.onAfterContactCreate.register('test', after);
+
+      expect(await useContactStore.getState().createContact(client, card())).toBe(false);
+      await flush();
+
+      expect(client.createContact).not.toHaveBeenCalled();
+      expect(useContactStore.getState().contacts).toEqual([]);
+      expect(after).not.toHaveBeenCalled();
+    });
+
+    it('does not report a contact the server refused', async () => {
+      const client = makeClient({ createContact: vi.fn().mockRejectedValue(new Error('nope')) });
+      const after = vi.fn();
+      contactHooks.onAfterContactCreate.register('test', after);
+
+      await expect(useContactStore.getState().createContact(client, card())).rejects.toThrow('nope');
+      await flush();
+      expect(after).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('updateContact', () => {
+    it('passes the id and patch first, then the changed contact', async () => {
+      useContactStore.setState({ contacts: [card()] });
+      const client = makeClient();
+      const before = vi.fn(() => {
+        expect(client.updateContact).not.toHaveBeenCalled();
+        return true;
+      });
+      const after = vi.fn();
+      contactHooks.onBeforeContactUpdate.register('test', before);
+      contactHooks.onAfterContactUpdate.register('test', after);
+
+      const patch = { emails: { e0: { address: 'new@example.com' } } };
+      expect(await useContactStore.getState().updateContact(client, 'c1', patch)).toBe(true);
+      await flush();
+
+      expect(before).toHaveBeenCalledWith({ contactId: 'c1', patch });
+      expect(after).toHaveBeenCalledOnce();
+      expect(after.mock.calls[0][0]).toMatchObject({ id: 'c1', emails: ['new@example.com'] });
+    });
+
+    it('changes nothing when a plugin says no', async () => {
+      useContactStore.setState({ contacts: [card()] });
+      const client = makeClient();
+      const after = vi.fn();
+      contactHooks.onBeforeContactUpdate.register('test', () => false);
+      contactHooks.onAfterContactUpdate.register('test', after);
+
+      expect(await useContactStore.getState().updateContact(client, 'c1', { kind: 'org' })).toBe(false);
+      await flush();
+
+      expect(client.updateContact).not.toHaveBeenCalled();
+      expect(useContactStore.getState().contacts[0].kind).toBeUndefined();
+      expect(after).not.toHaveBeenCalled();
+    });
+
+    it('does not report an update the server refused', async () => {
+      useContactStore.setState({ contacts: [card()] });
+      const client = makeClient({ updateContact: vi.fn().mockRejectedValue(new Error('nope')) });
+      const after = vi.fn();
+      contactHooks.onAfterContactUpdate.register('test', after);
+
+      await expect(useContactStore.getState().updateContact(client, 'c1', { kind: 'org' })).rejects.toThrow();
+      await flush();
+      expect(after).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('deleteContact', () => {
+    it('asks plugins first and reports the deleted id', async () => {
+      useContactStore.setState({ contacts: [card()] });
+      const client = makeClient();
+      const before = vi.fn(() => {
+        expect(client.deleteContact).not.toHaveBeenCalled();
+        return true;
+      });
+      const after = vi.fn();
+      contactHooks.onBeforeContactDelete.register('test', before);
+      contactHooks.onAfterContactDelete.register('test', after);
+
+      expect(await useContactStore.getState().deleteContact(client, 'c1')).toBe(true);
+      await flush();
+
+      expect(before).toHaveBeenCalledWith({ contactIds: ['c1'] });
+      expect(after).toHaveBeenCalledWith({ contactIds: ['c1'] });
+      expect(useContactStore.getState().contacts).toEqual([]);
+    });
+
+    it('keeps the contact when a plugin says no', async () => {
+      useContactStore.setState({ contacts: [card()], selectedContactId: 'c1' });
+      const client = makeClient();
+      const after = vi.fn();
+      contactHooks.onBeforeContactDelete.register('test', () => false);
+      contactHooks.onAfterContactDelete.register('test', after);
+
+      expect(await useContactStore.getState().deleteContact(client, 'c1')).toBe(false);
+      await flush();
+
+      expect(client.deleteContact).not.toHaveBeenCalled();
+      expect(useContactStore.getState().contacts).toHaveLength(1);
+      expect(useContactStore.getState().selectedContactId).toBe('c1');
+      expect(after).not.toHaveBeenCalled();
+    });
+
+    it('does not report a delete the server refused', async () => {
+      useContactStore.setState({ contacts: [card()] });
+      const client = makeClient({ deleteContact: vi.fn().mockRejectedValue(new Error('nope')) });
+      const after = vi.fn();
+      contactHooks.onAfterContactDelete.register('test', after);
+
+      await expect(useContactStore.getState().deleteContact(client, 'c1')).rejects.toThrow();
+      await flush();
+      expect(after).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('local contacts (no server sync)', () => {
+    beforeEach(() => useContactStore.setState({ supportsSync: false }));
+
+    it('fires the same hooks for create, update and delete', async () => {
+      const created = vi.fn();
+      const updated = vi.fn();
+      const deleted = vi.fn();
+      contactHooks.onAfterContactCreate.register('test', created);
+      contactHooks.onAfterContactUpdate.register('test', updated);
+      contactHooks.onAfterContactDelete.register('test', deleted);
+
+      await useContactStore.getState().addLocalContact(card({ id: 'local-1' }));
+      await useContactStore.getState().updateLocalContact('local-1', { kind: 'org' });
+      await useContactStore.getState().deleteLocalContact('local-1');
+      await flush();
+
+      expect(created.mock.calls[0][0]).toMatchObject({ id: 'local-1', fullName: 'Jane Doe' });
+      expect(updated.mock.calls[0][0]).toMatchObject({ id: 'local-1', kind: 'org' });
+      expect(deleted).toHaveBeenCalledWith({ contactIds: ['local-1'] });
+    });
+
+    it('leaves the list alone when plugins say no', async () => {
+      useContactStore.setState({ contacts: [card({ id: 'local-1' })] });
+      contactHooks.onBeforeContactCreate.register('test', () => false);
+      contactHooks.onBeforeContactUpdate.register('test', () => false);
+      contactHooks.onBeforeContactDelete.register('test', () => false);
+
+      expect(await useContactStore.getState().addLocalContact(card({ id: 'local-2' }))).toBe(false);
+      expect(await useContactStore.getState().updateLocalContact('local-1', { kind: 'org' })).toBe(false);
+      expect(await useContactStore.getState().deleteLocalContact('local-1')).toBe(false);
+
+      const { contacts } = useContactStore.getState();
+      expect(contacts.map(c => c.id)).toEqual(['local-1']);
+      expect(contacts[0].kind).toBeUndefined();
+    });
+  });
+
+  describe('bulkDeleteContacts', () => {
+    it('asks once with every id and reports only the ones that went', async () => {
+      useContactStore.setState({ contacts: [card({ id: 'a' }), card({ id: 'b' }), card({ id: 'c' })] });
+      const client = makeClient({
+        deleteContact: vi.fn(async (id: string) => { if (id === 'b') throw new Error('locked'); }),
+      });
+      const before = vi.fn(() => {
+        expect(client.deleteContact).not.toHaveBeenCalled();
+        return true;
+      });
+      const after = vi.fn();
+      contactHooks.onBeforeContactDelete.register('test', before);
+      contactHooks.onAfterContactDelete.register('test', after);
+
+      await useContactStore.getState().bulkDeleteContacts(client, ['a', 'b', 'c']);
+      await flush();
+
+      expect(before).toHaveBeenCalledOnce();
+      expect(before).toHaveBeenCalledWith({ contactIds: ['a', 'b', 'c'] });
+      expect(after).toHaveBeenCalledOnce();
+      expect(after).toHaveBeenCalledWith({ contactIds: ['a', 'c'] });
+    });
+
+    it('deletes nothing when a plugin says no', async () => {
+      useContactStore.setState({
+        contacts: [card({ id: 'a' }), card({ id: 'b' })],
+        selectedContactIds: new Set(['a', 'b']),
+      });
+      const client = makeClient();
+      contactHooks.onBeforeContactDelete.register('test', () => false);
+
+      await useContactStore.getState().bulkDeleteContacts(client, ['a', 'b']);
+
+      expect(client.deleteContact).not.toHaveBeenCalled();
+      expect(useContactStore.getState().contacts).toHaveLength(2);
+      expect(useContactStore.getState().selectedContactIds.size).toBe(2);
+    });
+  });
+});
+
+describe('contact-store plugin hooks: groups, import, move, selection', () => {
+  beforeEach(() => {
+    clearAllHooks();
+    useContactStore.setState({
+      contacts: [], addressBooks: [], selectedContactId: null, error: null,
+      supportsSync: true, selectedContactIds: new Set<string>(), lastSelectedContactId: null,
+    });
+  });
+
+  it('reports created, renamed and deleted groups', async () => {
+    const client = makeClient({
+      createContact: vi.fn(async (c: Partial<ContactCard>) => ({ ...c, id: 'g1' } as ContactCard)),
+    });
+    const changes = vi.fn();
+    contactHooks.onContactGroupChange.register('test', changes);
+
+    await useContactStore.getState().createGroup(client, 'Team', []);
+    await useContactStore.getState().updateGroup(client, 'g1', 'Crew');
+    await useContactStore.getState().deleteGroup(client, 'g1');
+    await flush();
+
+    expect(changes.mock.calls.map(c => c[0])).toEqual([
+      { groupId: 'g1', change: 'created' },
+      { groupId: 'g1', change: 'updated' },
+      { groupId: 'g1', change: 'deleted' },
+    ]);
+  });
+
+  it('does not report a group change the server refused', async () => {
+    useContactStore.setState({ contacts: [card({ id: 'g1', kind: 'group', members: {} })] });
+    const client = makeClient({ deleteContact: vi.fn().mockRejectedValue(new Error('nope')) });
+    const changes = vi.fn();
+    contactHooks.onContactGroupChange.register('test', changes);
+
+    await expect(useContactStore.getState().deleteGroup(client, 'g1')).rejects.toThrow();
+    await flush();
+    expect(changes).not.toHaveBeenCalled();
+  });
+
+  it('reports the members that were really added or removed, once per action', async () => {
+    useContactStore.setState({
+      contacts: [
+        card({ id: 'a', uid: 'uid-a' }), card({ id: 'b', uid: 'uid-b' }),
+        card({ id: 'g1', kind: 'group', members: { 'uid-a': true } }),
+      ],
+    });
+    const client = makeClient();
+    const members = vi.fn();
+    contactHooks.onContactGroupMemberChange.register('test', members);
+
+    // a is already in the group; only b is new. bulkAddToGroup goes through
+    // addMembersToGroup and must not fire twice.
+    await useContactStore.getState().bulkAddToGroup(client, 'g1', ['a', 'b']);
+    await useContactStore.getState().removeMembersFromGroup(client, 'g1', ['a']);
+    await flush();
+
+    expect(members.mock.calls.map(c => c[0])).toEqual([
+      { groupId: 'g1', added: ['b'], removed: [] },
+      { groupId: 'g1', added: [], removed: ['a'] },
+    ]);
+  });
+
+  it('does not report members the server refused', async () => {
+    useContactStore.setState({ contacts: [card({ id: 'a' }), card({ id: 'g1', kind: 'group', members: {} })] });
+    const client = makeClient({ updateContact: vi.fn().mockRejectedValue(new Error('nope')) });
+    const members = vi.fn();
+    contactHooks.onContactGroupMemberChange.register('test', members);
+
+    await expect(useContactStore.getState().addMembersToGroup(client, 'g1', ['a'])).rejects.toThrow();
+    await flush();
+    expect(members).not.toHaveBeenCalled();
+  });
+
+  it('reports an import with the book and the count', async () => {
+    let n = 0;
+    const client = makeClient({
+      createContact: vi.fn(async (c: Partial<ContactCard>) => ({ ...c, id: `srv-${++n}`, addressBookIds: { 'book-9': true } } as ContactCard)),
+    });
+    const imported = vi.fn();
+    contactHooks.onContactsImport.register('test', imported);
+
+    await useContactStore.getState().importContacts(client, [card({ id: 'x' }), card({ id: 'y' })]);
+    await flush();
+
+    expect(imported).toHaveBeenCalledOnce();
+    expect(imported).toHaveBeenCalledWith({ addressBookId: 'book-9', imported: 2 });
+  });
+
+  it('does not report an import where nothing arrived', async () => {
+    const client = makeClient({ createContact: vi.fn().mockRejectedValue(new Error('nope')) });
+    const imported = vi.fn();
+    contactHooks.onContactsImport.register('test', imported);
+
+    await useContactStore.getState().importContacts(client, [card({ id: 'x' })]);
+    await flush();
+    expect(imported).not.toHaveBeenCalled();
+  });
+
+  it('reports each moved contact with the target book', async () => {
+    useContactStore.setState({ contacts: [card({ id: 'a' }), card({ id: 'b' })] });
+    const client = makeClient({ getContactsAccountId: () => 'acc' });
+    const moved = vi.fn();
+    contactHooks.onContactMove.register('test', moved);
+
+    await useContactStore.getState().moveContactToAddressBook(client, ['a', 'b'], { id: 'book-2', name: 'Work' } as never);
+    await flush();
+
+    expect(moved.mock.calls.map(c => c[0])).toEqual([
+      { contactId: 'a', toAddressBookId: 'book-2' },
+      { contactId: 'b', toAddressBookId: 'book-2' },
+    ]);
+  });
+
+  it('does not report a move the server refused', async () => {
+    useContactStore.setState({ contacts: [card({ id: 'a' })] });
+    const client = makeClient({ getContactsAccountId: () => 'acc', updateContact: vi.fn().mockRejectedValue(new Error('nope')) });
+    const moved = vi.fn();
+    contactHooks.onContactMove.register('test', moved);
+
+    await expect(useContactStore.getState().moveContactToAddressBook(client, ['a'], { id: 'book-2', name: 'Work' } as never)).rejects.toThrow();
+    await flush();
+    expect(moved).not.toHaveBeenCalled();
+  });
+
+  it('reports selection changes, and only real ones', async () => {
+    const selection = vi.fn();
+    contactHooks.onContactSelectionChange.register('test', selection);
+    const store = useContactStore.getState();
+
+    store.toggleContactSelection('a');
+    store.selectRangeContacts('c', ['a', 'b', 'c']);
+    store.selectAllContacts(['a', 'b', 'c']); // same ids: no change
+    store.clearSelection();
+    store.clearSelection(); // already empty: no change
+    await flush();
+
+    expect(selection.mock.calls.map(c => c[0])).toEqual([
+      { contactIds: ['a'] },
+      { contactIds: ['a', 'b', 'c'] },
+      { contactIds: [] },
+    ]);
+  });
+});
diff --git a/stores/__tests__/contact-store.test.ts b/stores/__tests__/contact-store.test.ts
index 89da2d6d4..ff9b46e3a 100644
--- a/stores/__tests__/contact-store.test.ts
+++ b/stores/__tests__/contact-store.test.ts
@@ -42,64 +42,64 @@ describe('contact-store', () => {
   });
 
   describe('addLocalContact', () => {
-    it('should append contact to array', () => {
-      useContactStore.getState().addLocalContact(makeContact());
+    it('should append contact to array', async () => {
+      await useContactStore.getState().addLocalContact(makeContact());
       expect(useContactStore.getState().contacts).toHaveLength(1);
       expect(useContactStore.getState().contacts[0].id).toBe('contact-1');
     });
 
-    it('should preserve existing contacts', () => {
-      useContactStore.getState().addLocalContact(makeContact({ id: 'c1' }));
-      useContactStore.getState().addLocalContact(makeContact({ id: 'c2' }));
+    it('should preserve existing contacts', async () => {
+      await useContactStore.getState().addLocalContact(makeContact({ id: 'c1' }));
+      await useContactStore.getState().addLocalContact(makeContact({ id: 'c2' }));
       expect(useContactStore.getState().contacts).toHaveLength(2);
     });
   });
 
   describe('updateLocalContact', () => {
-    it('should update matching contact', () => {
-      useContactStore.getState().addLocalContact(makeContact({ id: 'c1' }));
-      useContactStore.getState().updateLocalContact('c1', {
+    it('should update matching contact', async () => {
+      await useContactStore.getState().addLocalContact(makeContact({ id: 'c1' }));
+      await useContactStore.getState().updateLocalContact('c1', {
         emails: { e0: { address: 'updated@example.com' } },
       });
       expect(useContactStore.getState().contacts[0].emails!.e0.address).toBe('updated@example.com');
     });
 
-    it('should not modify other contacts', () => {
-      useContactStore.getState().addLocalContact(makeContact({ id: 'c1' }));
-      useContactStore.getState().addLocalContact(makeContact({ id: 'c2', emails: { e0: { address: 'c2@test.com' } } }));
-      useContactStore.getState().updateLocalContact('c1', { emails: { e0: { address: 'new@test.com' } } });
+    it('should not modify other contacts', async () => {
+      await useContactStore.getState().addLocalContact(makeContact({ id: 'c1' }));
+      await useContactStore.getState().addLocalContact(makeContact({ id: 'c2', emails: { e0: { address: 'c2@test.com' } } }));
+      await useContactStore.getState().updateLocalContact('c1', { emails: { e0: { address: 'new@test.com' } } });
       expect(useContactStore.getState().contacts[1].emails!.e0.address).toBe('c2@test.com');
     });
 
-    it('should no-op for non-existent id', () => {
-      useContactStore.getState().addLocalContact(makeContact());
-      useContactStore.getState().updateLocalContact('nonexistent', { kind: 'org' });
+    it('should no-op for non-existent id', async () => {
+      await useContactStore.getState().addLocalContact(makeContact());
+      await useContactStore.getState().updateLocalContact('nonexistent', { kind: 'org' });
       expect(useContactStore.getState().contacts).toHaveLength(1);
       expect(useContactStore.getState().contacts[0].kind).toBeUndefined();
     });
   });
 
   describe('deleteLocalContact', () => {
-    it('should remove contact by id', () => {
-      useContactStore.getState().addLocalContact(makeContact({ id: 'c1' }));
-      useContactStore.getState().addLocalContact(makeContact({ id: 'c2' }));
-      useContactStore.getState().deleteLocalContact('c1');
+    it('should remove contact by id', async () => {
+      await useContactStore.getState().addLocalContact(makeContact({ id: 'c1' }));
+      await useContactStore.getState().addLocalContact(makeContact({ id: 'c2' }));
+      await useContactStore.getState().deleteLocalContact('c1');
       expect(useContactStore.getState().contacts).toHaveLength(1);
       expect(useContactStore.getState().contacts[0].id).toBe('c2');
     });
 
-    it('should clear selectedContactId when deleting selected', () => {
-      useContactStore.getState().addLocalContact(makeContact({ id: 'c1' }));
+    it('should clear selectedContactId when deleting selected', async () => {
+      await useContactStore.getState().addLocalContact(makeContact({ id: 'c1' }));
       useContactStore.getState().setSelectedContact('c1');
-      useContactStore.getState().deleteLocalContact('c1');
+      await useContactStore.getState().deleteLocalContact('c1');
       expect(useContactStore.getState().selectedContactId).toBeNull();
     });
 
-    it('should preserve selectedContactId when deleting other', () => {
-      useContactStore.getState().addLocalContact(makeContact({ id: 'c1' }));
-      useContactStore.getState().addLocalContact(makeContact({ id: 'c2' }));
+    it('should preserve selectedContactId when deleting other', async () => {
+      await useContactStore.getState().addLocalContact(makeContact({ id: 'c1' }));
+      await useContactStore.getState().addLocalContact(makeContact({ id: 'c2' }));
       useContactStore.getState().setSelectedContact('c1');
-      useContactStore.getState().deleteLocalContact('c2');
+      await useContactStore.getState().deleteLocalContact('c2');
       expect(useContactStore.getState().selectedContactId).toBe('c1');
     });
   });
@@ -574,7 +574,7 @@ describe('contact-store', () => {
     });
 
     it('should preserve selectedContactId when deleting other group', async () => {
-      useContactStore.getState().addLocalContact(makeContact({ id: 'c1' }));
+      await useContactStore.getState().addLocalContact(makeContact({ id: 'c1' }));
       useContactStore.getState().setSelectedContact('c1');
       await useContactStore.getState().createGroup(null, 'Team', []);
       const groupId = useContactStore.getState().contacts[1].id;
diff --git a/stores/__tests__/email-store-open-close-hooks.test.ts b/stores/__tests__/email-store-open-close-hooks.test.ts
new file mode 100644
index 000000000..12239f19c
--- /dev/null
+++ b/stores/__tests__/email-store-open-close-hooks.test.ts
@@ -0,0 +1,32 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { useEmailStore } from '../email-store';
+import { clearAllHooks, emailHooks } from '@/lib/plugin-hooks';
+import type { Email } from '@/lib/jmap/types';
+
+const email = (id: string) => ({
+  id, threadId: `t-${id}`, mailboxIds: { inbox: true }, keywords: {}, subject: `Subject ${id}`,
+  from: [{ name: 'Bob', email: 'bob@example.org' }], to: [], receivedAt: '2026-10-01T00:00:00Z',
+  preview: 'p', size: 1, hasAttachment: false, blobId: 'raw-blob',
+} as unknown as Email);
+
+beforeEach(() => {
+  clearAllHooks();
+  useEmailStore.setState({ selectedEmail: null });
+});
+
+describe('message open and close hooks', () => {
+  it('hands plugins plain views, not the store object', () => {
+    const opened = vi.fn();
+    const closed = vi.fn();
+    emailHooks.onEmailOpen.register('t', opened);
+    emailHooks.onEmailClose.register('t', closed);
+
+    useEmailStore.getState().selectEmail(email('a'));
+    useEmailStore.getState().selectEmail(email('b'));
+
+    expect(opened).toHaveBeenCalledTimes(2);
+    expect(opened.mock.calls[0][0]).toMatchObject({ id: 'a', subject: 'Subject a', from: [{ name: 'Bob', email: 'bob@example.org' }] });
+    expect(opened.mock.calls[0][0]).not.toHaveProperty('blobId');
+    expect(closed).toHaveBeenCalledWith({ emailId: 'a' });
+  });
+});
diff --git a/stores/__tests__/email-store-plugin-mailbox-hooks.test.ts b/stores/__tests__/email-store-plugin-mailbox-hooks.test.ts
new file mode 100644
index 000000000..bd0eb48cb
--- /dev/null
+++ b/stores/__tests__/email-store-plugin-mailbox-hooks.test.ts
@@ -0,0 +1,192 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { useEmailStore } from '../email-store';
+import { useAuthStore } from '../auth-store';
+import { useSettingsStore } from '@/stores/settings-store';
+import { clearAllHooks, emailHooks } from '@/lib/plugin-hooks';
+import type { Mailbox } from '@/lib/jmap/types';
+import type { IJMAPClient } from '@/lib/jmap/client-interface';
+
+// Folder hooks: create, rename, delete, empty, the refreshed folder list and
+// the storage quota.
+
+function makeMailbox(overrides: Partial<Mailbox>): Mailbox {
+  return {
+    id: 'inbox',
+    name: 'Inbox',
+    sortOrder: 0,
+    totalEmails: 0,
+    unreadEmails: 0,
+    totalThreads: 0,
+    unreadThreads: 0,
+    isSubscribed: true,
+    isShared: false,
+    myRights: { mayRename: true, mayDelete: true },
+    ...overrides,
+  } as Mailbox;
+}
+
+const mailboxes = [
+  makeMailbox({ id: 'inbox', role: 'inbox', totalEmails: 4, unreadEmails: 1 }),
+  makeMailbox({ id: 'projects', name: 'Projects', parentId: 'inbox' }),
+  makeMailbox({ id: 'junk', name: 'Junk', role: 'junk', totalEmails: 7 }),
+  makeMailbox({ id: 'trash', name: 'Trash', role: 'trash' }),
+];
+
+let client: IJMAPClient;
+
+beforeEach(() => {
+  clearAllHooks();
+  client = {
+    getAccountId: () => 'me',
+    createMailbox: vi.fn().mockResolvedValue(makeMailbox({ id: 'new-1', name: 'Receipts' })),
+    updateMailbox: vi.fn().mockResolvedValue(undefined),
+    deleteMailbox: vi.fn().mockResolvedValue(undefined),
+    emptyMailbox: vi.fn().mockResolvedValue(undefined),
+    moveMailboxContents: vi.fn().mockResolvedValue(undefined),
+    getAllMailboxes: vi.fn().mockResolvedValue(mailboxes),
+    // A fresh object per read, as from the server.
+    getQuota: vi.fn().mockImplementation(async () => ({ used: 50, total: 200 })),
+  } as unknown as IJMAPClient;
+  useAuthStore.setState({ activeAccountId: 'acct', getClientForAccount: () => client as never } as never);
+  useSettingsStore.setState({ deleteAction: 'trash' } as never);
+  useEmailStore.setState({
+    mailboxes,
+    accountMailboxes: {},
+    viewingAccountId: null,
+    selectedMailbox: 'inbox',
+    emails: [],
+    quota: null,
+    error: null,
+  });
+});
+
+afterEach(() => clearAllHooks());
+
+describe('folder hooks', () => {
+  it('asks before creating a folder and reports the new folder', async () => {
+    const before = vi.fn(() => true);
+    const after = vi.fn();
+    emailHooks.onBeforeMailboxCreate.register('t', before);
+    emailHooks.onMailboxCreate.register('t', after);
+
+    await useEmailStore.getState().createMailbox(client, 'Receipts', 'inbox');
+
+    expect(before).toHaveBeenCalledWith({ name: 'Receipts', parentId: 'inbox' });
+    expect(after).toHaveBeenCalledWith({ mailboxId: 'new-1', name: 'Receipts', parentId: 'inbox' });
+  });
+
+  it('creates nothing when a plugin refuses', async () => {
+    const after = vi.fn();
+    emailHooks.onBeforeMailboxCreate.register('t', () => false);
+    emailHooks.onMailboxCreate.register('t', after);
+
+    await useEmailStore.getState().createMailbox(client, 'Receipts');
+
+    expect(client.createMailbox).not.toHaveBeenCalled();
+    expect(after).not.toHaveBeenCalled();
+  });
+
+  it('does not report a folder the server refused to create', async () => {
+    vi.mocked(client.createMailbox).mockRejectedValue(new Error('nope'));
+    const after = vi.fn();
+    emailHooks.onMailboxCreate.register('t', after);
+
+    await expect(useEmailStore.getState().createMailbox(client, 'Receipts')).rejects.toThrow('nope');
+    expect(after).not.toHaveBeenCalled();
+  });
+
+  it('reports a rename with the previous name', async () => {
+    const before = vi.fn(() => true);
+    const after = vi.fn();
+    emailHooks.onBeforeMailboxRename.register('t', before);
+    emailHooks.onMailboxRename.register('t', after);
+
+    await useEmailStore.getState().renameMailbox(client, 'projects', 'Work');
+
+    expect(before).toHaveBeenCalledWith({ mailboxId: 'projects', name: 'Work' });
+    expect(after).toHaveBeenCalledWith({ mailboxId: 'projects', name: 'Work', previousName: 'Projects' });
+  });
+
+  it('keeps the name when a plugin refuses a rename', async () => {
+    emailHooks.onBeforeMailboxRename.register('t', () => false);
+
+    await useEmailStore.getState().renameMailbox(client, 'projects', 'Work');
+
+    expect(client.updateMailbox).not.toHaveBeenCalled();
+    expect(useEmailStore.getState().mailboxes.find(m => m.id === 'projects')?.name).toBe('Projects');
+  });
+
+  it('asks before deleting a folder and reports it', async () => {
+    const before = vi.fn(() => true);
+    const after = vi.fn();
+    emailHooks.onBeforeMailboxDelete.register('t', before);
+    emailHooks.onMailboxDelete.register('t', after);
+
+    await useEmailStore.getState().deleteMailbox(client, 'projects');
+
+    expect(before).toHaveBeenCalledWith({ mailboxId: 'projects', name: 'Projects' });
+    expect(after).toHaveBeenCalledWith({ mailboxId: 'projects', name: 'Projects' });
+  });
+
+  it('keeps a folder a plugin refuses to delete', async () => {
+    emailHooks.onBeforeMailboxDelete.register('t', () => false);
+
+    await useEmailStore.getState().deleteMailbox(client, 'projects');
+
+    expect(client.deleteMailbox).not.toHaveBeenCalled();
+    expect(useEmailStore.getState().mailboxes.some(m => m.id === 'projects')).toBe(true);
+  });
+
+  it('asks before emptying a folder and reports how many messages it held', async () => {
+    const before = vi.fn(() => true);
+    const after = vi.fn();
+    emailHooks.onBeforeMailboxEmpty.register('t', before);
+    emailHooks.onMailboxEmpty.register('t', after);
+
+    await useEmailStore.getState().emptyMailbox(client, 'junk');
+
+    expect(before).toHaveBeenCalledWith({ mailboxId: 'junk', role: 'junk' });
+    expect(after).toHaveBeenCalledWith({ mailboxId: 'junk', role: 'junk', count: 7 });
+  });
+
+  it('leaves a folder full when a plugin refuses to empty it', async () => {
+    const after = vi.fn();
+    emailHooks.onBeforeMailboxEmpty.register('t', () => false);
+    emailHooks.onMailboxEmpty.register('t', after);
+
+    await useEmailStore.getState().emptyMailbox(client, 'junk');
+
+    expect(client.emptyMailbox).not.toHaveBeenCalled();
+    expect(useEmailStore.getState().mailboxes.find(m => m.id === 'junk')?.totalEmails).toBe(7);
+    expect(after).not.toHaveBeenCalled();
+  });
+
+  it('hands plugins plain folder views on refresh', async () => {
+    const refreshed = vi.fn();
+    emailHooks.onMailboxesRefresh.register('t', refreshed);
+
+    await useEmailStore.getState().fetchMailboxes(client);
+
+    expect(refreshed).toHaveBeenCalledTimes(1);
+    expect(refreshed.mock.calls[0][0][1]).toEqual({
+      id: 'projects', name: 'Projects', role: null, totalEmails: 0, unreadEmails: 0, parentId: 'inbox',
+    });
+  });
+});
+
+describe('quota hook', () => {
+  it('reports the quota when it was read and changed, not when it stayed the same', async () => {
+    const changed = vi.fn();
+    emailHooks.onQuotaChange.register('t', changed);
+
+    await useEmailStore.getState().fetchQuota(client);
+    await useEmailStore.getState().fetchQuota(client);
+    vi.mocked(client.getQuota).mockImplementation(async () => ({ used: 60, total: 200 }));
+    await useEmailStore.getState().fetchQuota(client);
+
+    expect(changed.mock.calls).toEqual([
+      [{ used: 50, total: 200, percentUsed: 25 }],
+      [{ used: 60, total: 200, percentUsed: 30 }],
+    ]);
+  });
+});
diff --git a/stores/__tests__/email-store-plugin-organize-hooks.test.ts b/stores/__tests__/email-store-plugin-organize-hooks.test.ts
new file mode 100644
index 000000000..2bab12d2b
--- /dev/null
+++ b/stores/__tests__/email-store-plugin-organize-hooks.test.ts
@@ -0,0 +1,407 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { useEmailStore } from '../email-store';
+import { useAuthStore } from '../auth-store';
+import { useSettingsStore } from '@/stores/settings-store';
+import { clearAllHooks, emailHooks } from '@/lib/plugin-hooks';
+import { emailKeyFor } from '@/lib/thread-utils';
+import type { Email, Mailbox } from '@/lib/jmap/types';
+import type { IJMAPClient } from '@/lib/jmap/client-interface';
+
+// The organize hooks (delete, move, archive, spam, read, star, keywords) fire
+// from the store actions every button, menu and shortcut goes through.
+
+function makeMailbox(overrides: Partial<Mailbox>): Mailbox {
+  return {
+    id: 'inbox',
+    name: 'Inbox',
+    sortOrder: 0,
+    totalEmails: 0,
+    unreadEmails: 0,
+    totalThreads: 0,
+    unreadThreads: 0,
+    isSubscribed: true,
+    isShared: false,
+    ...overrides,
+  } as Mailbox;
+}
+
+function makeEmail(id: string, overrides: Partial<Email> = {}): Email {
+  return {
+    id,
+    threadId: `t-${id}`,
+    subject: id,
+    receivedAt: '2026-01-01T00:00:00Z',
+    keywords: { $seen: true },
+    mailboxIds: { inbox: true },
+    ...overrides,
+  } as Email;
+}
+
+const mailboxes = [
+  makeMailbox({ id: 'inbox', role: 'inbox' }),
+  makeMailbox({ id: 'custom', name: 'Projects' }),
+  makeMailbox({ id: 'archive', name: 'Archive', role: 'archive' }),
+  makeMailbox({ id: 'archive-2026', name: '2026', parentId: 'archive' }),
+  makeMailbox({ id: 'trash', name: 'Trash', role: 'trash' }),
+  makeMailbox({ id: 'junk', name: 'Junk', role: 'junk' }),
+];
+
+function makeClient(): IJMAPClient {
+  return {
+    getAccountId: () => 'me',
+    moveToTrash: vi.fn().mockResolvedValue(undefined),
+    deleteEmail: vi.fn().mockResolvedValue(undefined),
+    batchDeleteEmails: vi.fn().mockResolvedValue(undefined),
+    moveEmail: vi.fn().mockResolvedValue(undefined),
+    batchMoveEmails: vi.fn().mockResolvedValue(undefined),
+    batchArchiveEmails: vi.fn().mockResolvedValue(undefined),
+    markAsRead: vi.fn().mockResolvedValue(undefined),
+    batchMarkAsRead: vi.fn().mockResolvedValue(undefined),
+    toggleStar: vi.fn().mockResolvedValue(undefined),
+    batchUpdateKeywords: vi.fn().mockResolvedValue(undefined),
+    setKeyword: vi.fn().mockResolvedValue(undefined),
+    markAsSpam: vi.fn().mockResolvedValue(undefined),
+    undoSpam: vi.fn().mockResolvedValue(undefined),
+    getMailboxes: vi.fn().mockResolvedValue(mailboxes),
+    getAllMailboxes: vi.fn().mockResolvedValue(mailboxes),
+    getEmails: vi.fn().mockResolvedValue({ emails: [], hasMore: false, total: 0 }),
+    getMaxObjectsInGet: () => 500,
+    getThreads: vi.fn().mockResolvedValue([]),
+  } as unknown as IJMAPClient;
+}
+
+let client: IJMAPClient;
+
+function openFolder(folderId: string, emails: Email[]) {
+  useEmailStore.setState({
+    mailboxes,
+    accountMailboxes: {},
+    viewingAccountId: null,
+    selectedMailbox: folderId,
+    selectedKeyword: null,
+    isUnifiedView: false,
+    unifiedRole: null,
+    crossView: null,
+    emails,
+    selectedEmail: null,
+    selectedEmailKeys: new Set(),
+    threadEmailsCache: new Map(),
+    processingReadStatus: new Set(),
+    error: null,
+  });
+}
+
+beforeEach(() => {
+  clearAllHooks();
+  client = makeClient();
+  useAuthStore.setState({
+    activeAccountId: 'acct',
+    getClientForAccount: () => client as never,
+  } as never);
+  useSettingsStore.setState({ deleteAction: 'trash', permanentlyDeleteJunk: false, archiveMode: 'single' } as never);
+});
+
+afterEach(() => clearAllHooks());
+
+describe('delete hooks', () => {
+  it('asks before moving to Trash and reports a non-permanent delete', async () => {
+    openFolder('inbox', [makeEmail('e1')]);
+    const order: string[] = [];
+    const before = vi.fn(() => { order.push('before'); return true; });
+    vi.mocked(client.moveToTrash).mockImplementation(async () => { order.push('server'); });
+    const after = vi.fn();
+    emailHooks.onBeforeEmailDelete.register('t', before);
+    emailHooks.onAfterEmailDelete.register('t', after);
+
+    await useEmailStore.getState().deleteEmail(client, 'e1');
+
+    expect(before).toHaveBeenCalledWith({ emailIds: ['e1'], permanent: false });
+    expect(order).toEqual(['before', 'server']);
+    expect(after).toHaveBeenCalledTimes(1);
+    expect(after).toHaveBeenCalledWith({ emailIds: ['e1'], permanent: false });
+  });
+
+  it('reports permanent when the message is destroyed', async () => {
+    openFolder('inbox', [makeEmail('e1')]);
+    const after = vi.fn();
+    emailHooks.onAfterEmailDelete.register('t', after);
+
+    await useEmailStore.getState().deleteEmail(client, 'e1', true);
+
+    expect(client.deleteEmail).toHaveBeenCalled();
+    expect(after).toHaveBeenCalledWith({ emailIds: ['e1'], permanent: true });
+  });
+
+  it('stops when a plugin says no', async () => {
+    openFolder('inbox', [makeEmail('e1')]);
+    const after = vi.fn();
+    emailHooks.onBeforeEmailDelete.register('t', () => false);
+    emailHooks.onAfterEmailDelete.register('t', after);
+
+    await useEmailStore.getState().deleteEmail(client, 'e1');
+
+    expect(client.moveToTrash).not.toHaveBeenCalled();
+    expect(useEmailStore.getState().emails.map(e => e.id)).toEqual(['e1']);
+    expect(after).not.toHaveBeenCalled();
+  });
+
+  it('does not report a delete the server refused', async () => {
+    openFolder('inbox', [makeEmail('e1')]);
+    vi.mocked(client.moveToTrash).mockRejectedValue(new Error('nope'));
+    const after = vi.fn();
+    emailHooks.onAfterEmailDelete.register('t', after);
+
+    await expect(useEmailStore.getState().deleteEmail(client, 'e1')).rejects.toThrow('nope');
+    expect(after).not.toHaveBeenCalled();
+  });
+
+  it('batch delete in Trash is permanent', async () => {
+    const a = makeEmail('a', { mailboxIds: { trash: true } });
+    const b = makeEmail('b', { mailboxIds: { trash: true } });
+    openFolder('trash', [a, b]);
+    useEmailStore.setState({ selectedEmailKeys: new Set([emailKeyFor(a), emailKeyFor(b)]) });
+    const before = vi.fn(() => true);
+    const after = vi.fn();
+    emailHooks.onBeforeEmailDelete.register('t', before);
+    emailHooks.onAfterEmailDelete.register('t', after);
+
+    await useEmailStore.getState().batchDelete(client);
+
+    expect(before).toHaveBeenCalledWith({ emailIds: ['a', 'b'], permanent: true });
+    expect(after).toHaveBeenCalledWith({ emailIds: ['a', 'b'], permanent: true });
+  });
+});
+
+describe('move and archive hooks', () => {
+  it('asks before a move and reports it with source and destination', async () => {
+    openFolder('inbox', [makeEmail('e1')]);
+    const before = vi.fn(() => true);
+    const after = vi.fn();
+    const archived = vi.fn();
+    emailHooks.onBeforeEmailMove.register('t', before);
+    emailHooks.onAfterEmailMove.register('t', after);
+    emailHooks.onEmailArchive.register('t', archived);
+
+    await useEmailStore.getState().moveToMailbox(client, 'e1', 'custom');
+
+    const payload = { emailIds: ['e1'], fromMailboxId: 'inbox', toMailboxId: 'custom' };
+    expect(before).toHaveBeenCalledWith(payload);
+    expect(after).toHaveBeenCalledTimes(1);
+    expect(after).toHaveBeenCalledWith(payload);
+    expect(archived).not.toHaveBeenCalled();
+  });
+
+  it('stops a move a plugin refuses', async () => {
+    openFolder('inbox', [makeEmail('e1')]);
+    const after = vi.fn();
+    emailHooks.onBeforeEmailMove.register('t', () => false);
+    emailHooks.onAfterEmailMove.register('t', after);
+
+    await useEmailStore.getState().moveToMailbox(client, 'e1', 'custom');
+
+    expect(client.moveEmail).not.toHaveBeenCalled();
+    expect(useEmailStore.getState().emails).toHaveLength(1);
+    expect(after).not.toHaveBeenCalled();
+  });
+
+  it('treats a move into the archive (or a sub-folder of it) as archiving', async () => {
+    openFolder('inbox', [makeEmail('e1'), makeEmail('e2')]);
+    const archived = vi.fn();
+    emailHooks.onEmailArchive.register('t', archived);
+
+    await useEmailStore.getState().moveToMailbox(client, 'e1', 'archive');
+    await useEmailStore.getState().moveToMailbox(client, 'e2', 'archive-2026');
+
+    expect(archived.mock.calls).toEqual([[{ emailIds: ['e1'] }], [{ emailIds: ['e2'] }]]);
+  });
+
+  it('lets onBeforeEmailArchive stop an archive', async () => {
+    openFolder('inbox', [makeEmail('e1')]);
+    emailHooks.onBeforeEmailArchive.register('t', () => false);
+
+    await useEmailStore.getState().moveToMailbox(client, 'e1', 'archive');
+
+    expect(client.moveEmail).not.toHaveBeenCalled();
+  });
+
+  it('reports a move out of the archive as unarchiving', async () => {
+    openFolder('archive', [makeEmail('e1', { mailboxIds: { archive: true } })]);
+    const archived = vi.fn();
+    const unarchived = vi.fn();
+    emailHooks.onEmailArchive.register('t', archived);
+    emailHooks.onEmailUnarchive.register('t', unarchived);
+
+    await useEmailStore.getState().moveToMailbox(client, 'e1', 'inbox');
+
+    expect(unarchived).toHaveBeenCalledWith({ emailIds: ['e1'], toMailboxId: 'inbox' });
+    expect(archived).not.toHaveBeenCalled();
+  });
+
+  it('batch archive asks and reports once for the selection', async () => {
+    const a = makeEmail('a');
+    const b = makeEmail('b');
+    openFolder('inbox', [a, b]);
+    useEmailStore.setState({ selectedEmailKeys: new Set([emailKeyFor(a), emailKeyFor(b)]) });
+    const before = vi.fn(() => true);
+    const archived = vi.fn();
+    emailHooks.onBeforeEmailArchive.register('t', before);
+    emailHooks.onEmailArchive.register('t', archived);
+
+    await useEmailStore.getState().batchArchive(client);
+
+    expect(before).toHaveBeenCalledWith({ emailIds: ['a', 'b'] });
+    expect(archived).toHaveBeenCalledTimes(1);
+    expect(archived).toHaveBeenCalledWith({ emailIds: ['a', 'b'] });
+  });
+
+  it('batch move reports nothing when the server refused it', async () => {
+    const a = makeEmail('a');
+    openFolder('inbox', [a]);
+    useEmailStore.setState({ selectedEmailKeys: new Set([emailKeyFor(a)]) });
+    vi.mocked(client.batchMoveEmails).mockRejectedValue(new Error('nope'));
+    const after = vi.fn();
+    emailHooks.onAfterEmailMove.register('t', after);
+
+    await useEmailStore.getState().batchMoveToMailbox(client, 'custom');
+
+    expect(after).not.toHaveBeenCalled();
+  });
+});
+
+describe('spam hooks', () => {
+  it('asks and reports mark-as-spam', async () => {
+    openFolder('inbox', [makeEmail('e1')]);
+    const before = vi.fn(() => true);
+    const after = vi.fn();
+    emailHooks.onBeforeEmailSpamToggle.register('t', before);
+    emailHooks.onEmailSpamToggle.register('t', after);
+
+    await useEmailStore.getState().markAsSpam(client, 'e1');
+
+    expect(before).toHaveBeenCalledWith({ emailIds: ['e1'], spam: true });
+    expect(after).toHaveBeenCalledWith({ emailIds: ['e1'], spam: true });
+  });
+
+  it('stops mark-as-spam a plugin refuses', async () => {
+    openFolder('inbox', [makeEmail('e1')]);
+    emailHooks.onBeforeEmailSpamToggle.register('t', () => false);
+
+    await useEmailStore.getState().markAsSpam(client, 'e1');
+
+    expect(client.markAsSpam).not.toHaveBeenCalled();
+    expect(useEmailStore.getState().emails).toHaveLength(1);
+  });
+
+  it('reports not-spam for a batch', async () => {
+    const a = makeEmail('a', { mailboxIds: { junk: true } });
+    const b = makeEmail('b', { mailboxIds: { junk: true } });
+    openFolder('junk', [a, b]);
+    const after = vi.fn();
+    emailHooks.onEmailSpamToggle.register('t', after);
+
+    await useEmailStore.getState().batchUndoSpam(client, ['a', 'b']);
+
+    expect(after).toHaveBeenCalledWith({ emailIds: ['a', 'b'], spam: false });
+  });
+});
+
+describe('read, star and keyword hooks', () => {
+  it('asks and reports a read-state change', async () => {
+    openFolder('inbox', [makeEmail('e1', { keywords: {} })]);
+    const before = vi.fn(() => true);
+    const after = vi.fn();
+    emailHooks.onBeforeEmailReadStateChange.register('t', before);
+    emailHooks.onEmailReadStateChange.register('t', after);
+
+    await useEmailStore.getState().markAsRead(client, 'e1', true);
+
+    expect(before).toHaveBeenCalledWith({ emailIds: ['e1'], read: true });
+    expect(after).toHaveBeenCalledWith({ emailIds: ['e1'], read: true });
+  });
+
+  it('leaves the message unread when a plugin refuses', async () => {
+    openFolder('inbox', [makeEmail('e1', { keywords: {} })]);
+    emailHooks.onBeforeEmailReadStateChange.register('t', () => false);
+
+    await useEmailStore.getState().markAsRead(client, 'e1', true);
+
+    expect(client.markAsRead).not.toHaveBeenCalled();
+    expect(useEmailStore.getState().emails[0].keywords.$seen).toBeUndefined();
+    // A later attempt is not blocked by a stale in-progress marker.
+    expect(useEmailStore.getState().processingReadStatus.size).toBe(0);
+  });
+
+  it('reports a batch read-state change', async () => {
+    const a = makeEmail('a', { keywords: {} });
+    openFolder('inbox', [a]);
+    useEmailStore.setState({ selectedEmailKeys: new Set([emailKeyFor(a)]) });
+    const after = vi.fn();
+    emailHooks.onEmailReadStateChange.register('t', after);
+
+    await useEmailStore.getState().batchMarkAsRead(client, true);
+
+    expect(after).toHaveBeenCalledWith({ emailIds: ['a'], read: true });
+  });
+
+  it('asks and reports a star toggle', async () => {
+    openFolder('inbox', [makeEmail('e1')]);
+    const before = vi.fn(() => true);
+    const after = vi.fn();
+    emailHooks.onBeforeEmailStarToggle.register('t', before);
+    emailHooks.onEmailStarToggle.register('t', after);
+
+    await useEmailStore.getState().toggleStar(client, 'e1');
+
+    expect(before).toHaveBeenCalledWith({ emailIds: ['e1'], starred: true });
+    expect(after).toHaveBeenCalledWith({ emailIds: ['e1'], starred: true });
+  });
+
+  it('stops a star toggle a plugin refuses', async () => {
+    openFolder('inbox', [makeEmail('e1')]);
+    emailHooks.onBeforeEmailStarToggle.register('t', () => false);
+
+    await useEmailStore.getState().toggleStar(client, 'e1');
+
+    expect(client.toggleStar).not.toHaveBeenCalled();
+  });
+
+  it('reports added and removed keywords', async () => {
+    openFolder('inbox', [makeEmail('e1', { keywords: { $seen: true, '$label:old': true } })]);
+    const before = vi.fn(() => true);
+    const after = vi.fn();
+    emailHooks.onBeforeEmailKeywordChange.register('t', before);
+    emailHooks.onEmailKeywordChange.register('t', after);
+
+    await useEmailStore.getState().setEmailKeywords(client, 'e1', { $seen: true, '$label:new': true });
+
+    const payload = { emailIds: ['e1'], added: ['$label:new'], removed: ['$label:old'] };
+    expect(before).toHaveBeenCalledWith(payload);
+    expect(after).toHaveBeenCalledTimes(1);
+    expect(after).toHaveBeenCalledWith(payload);
+  });
+
+  it('stops a keyword change a plugin refuses', async () => {
+    openFolder('inbox', [makeEmail('e1')]);
+    const after = vi.fn();
+    emailHooks.onBeforeEmailKeywordChange.register('t', () => false);
+    emailHooks.onEmailKeywordChange.register('t', after);
+
+    await useEmailStore.getState().patchEmailKeywords(client, 'e1', { '$label:x': true });
+
+    expect(client.batchUpdateKeywords).not.toHaveBeenCalled();
+    expect(after).not.toHaveBeenCalled();
+  });
+
+  it('reports a tag put on a selection', async () => {
+    const a = makeEmail('a');
+    const b = makeEmail('b');
+    openFolder('inbox', [a, b]);
+    useEmailStore.setState({ selectedEmailKeys: new Set([emailKeyFor(a), emailKeyFor(b)]) });
+    const after = vi.fn();
+    emailHooks.onEmailKeywordChange.register('t', after);
+
+    await useEmailStore.getState().batchSetTag(client, 'work', true);
+
+    expect(after).toHaveBeenCalledWith({ emailIds: ['a', 'b'], added: ['$label:work'], removed: [] });
+  });
+});
diff --git a/stores/__tests__/email-store-plugin-search-hooks.test.ts b/stores/__tests__/email-store-plugin-search-hooks.test.ts
new file mode 100644
index 000000000..25e45bc5c
--- /dev/null
+++ b/stores/__tests__/email-store-plugin-search-hooks.test.ts
@@ -0,0 +1,105 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { useEmailStore } from '../email-store';
+import { useAuthStore } from '../auth-store';
+import { useSettingsStore } from '@/stores/settings-store';
+import { DEFAULT_SEARCH_FILTERS, type SearchFilters } from '@/lib/jmap/search-utils';
+import { clearAllHooks, emailHooks } from '@/lib/plugin-hooks';
+import type { Mailbox } from '@/lib/jmap/types';
+import type { IJMAPClient } from '@/lib/jmap/client-interface';
+
+// onSearch lets a plugin change the query and filters before a search runs.
+
+let client: IJMAPClient;
+
+beforeEach(() => {
+  clearAllHooks();
+  client = {
+    getAccountId: () => 'me',
+    searchEmails: vi.fn().mockResolvedValue({ emails: [], hasMore: false, total: 0 }),
+    advancedSearchEmails: vi.fn().mockResolvedValue({ emails: [], hasMore: false, total: 0 }),
+    getSomeEmails: vi.fn().mockResolvedValue([]),
+  } as unknown as IJMAPClient;
+  useAuthStore.setState({ activeAccountId: 'acct', getClientForAccount: () => client as never } as never);
+  useSettingsStore.setState({ emailsPerPage: 50 } as never);
+  useEmailStore.setState({
+    mailboxes: [{ id: 'inbox', name: 'Inbox', role: 'inbox', isShared: false } as Mailbox],
+    accountMailboxes: {},
+    viewingAccountId: null,
+    selectedMailbox: 'inbox',
+    searchMailboxId: 'inbox',
+    selectedKeyword: null,
+    isUnifiedView: false,
+    unifiedRole: null,
+    crossView: null,
+    searchQuery: '',
+    searchFilters: { ...DEFAULT_SEARCH_FILTERS },
+    searchAbortController: null,
+  });
+});
+
+afterEach(() => clearAllHooks());
+
+describe('onSearch', () => {
+  it('runs the quick search with the query a plugin returns, keeping what the user typed', async () => {
+    const handler = vi.fn(({ query, filters }: { query: string; filters: SearchFilters }) => ({ query: `${query} -label:ads`, filters }));
+    emailHooks.onSearch.register('t', handler);
+
+    await useEmailStore.getState().searchEmails(client, 'invoice');
+
+    expect(handler).toHaveBeenCalledWith({ query: 'invoice', filters: DEFAULT_SEARCH_FILTERS });
+    expect(client.searchEmails).toHaveBeenCalledWith('invoice -label:ads', 'inbox', undefined, 50, 0);
+    expect(useEmailStore.getState().searchQuery).toBe('invoice');
+  });
+
+  it('runs an advanced search when a plugin adds filters to a quick search', async () => {
+    const handler = vi.fn(({ query }: { query: string }) => ({ query, filters: { isUnread: true } }));
+    emailHooks.onSearch.register('t', handler);
+
+    await useEmailStore.getState().searchEmails(client, 'invoice');
+
+    expect(handler).toHaveBeenCalledTimes(1);
+    expect(client.searchEmails).not.toHaveBeenCalled();
+    expect(client.advancedSearchEmails).toHaveBeenCalledTimes(1);
+    const filter = vi.mocked(client.advancedSearchEmails).mock.calls[0][0] as { conditions?: unknown[] };
+    expect(JSON.stringify(filter)).toContain('"notKeyword":"$seen"');
+    expect(JSON.stringify(filter)).toContain('invoice');
+  });
+
+  it('applies returned filters to an advanced search and asks plugins once', async () => {
+    useEmailStore.setState({ searchQuery: 'invoice', searchFilters: { ...DEFAULT_SEARCH_FILTERS, from: 'bob@x.test' } });
+    const handler = vi.fn(({ query, filters }: { query: string; filters: SearchFilters }) => ({ query, filters: { ...filters, from: 'alice@x.test' } }));
+    emailHooks.onSearch.register('t', handler);
+
+    await useEmailStore.getState().advancedSearch(client);
+
+    expect(handler).toHaveBeenCalledTimes(1);
+    const filter = JSON.stringify(vi.mocked(client.advancedSearchEmails).mock.calls[0][0]);
+    expect(filter).toContain('alice@x.test');
+    expect(filter).not.toContain('bob@x.test');
+  });
+});
+
+describe('onSearchResults', () => {
+  it('adds the messages a plugin names, fetched from the server, and nothing else', async () => {
+    vi.mocked(client.searchEmails).mockResolvedValue({ emails: [{ id: 'm1' }], hasMore: false, total: 1 } as never);
+    vi.mocked(client.getSomeEmails).mockResolvedValue([{ id: 'm9' }] as never);
+    const handler = vi.fn().mockReturnValue(['m9', 'm1', 42]);
+    emailHooks.onSearchResults.register('test', handler);
+
+    await useEmailStore.getState().searchEmails(client, 'invoice');
+
+    expect(handler).toHaveBeenCalledWith([], expect.objectContaining({ query: 'invoice', emailIds: ['m1'] }));
+    expect(client.getSomeEmails).toHaveBeenCalledWith(['m9'], undefined);
+    expect(useEmailStore.getState().emails.map((e) => e.id)).toEqual(['m1', 'm9']);
+  });
+
+  it('ignores anything that is not a list of ids', async () => {
+    vi.mocked(client.searchEmails).mockResolvedValue({ emails: [{ id: 'm1' }], hasMore: false, total: 1 } as never);
+    emailHooks.onSearchResults.register('test', () => ({ result: { emails: [{ id: 'fake', subject: 'Pay now' }] } }));
+
+    await useEmailStore.getState().searchEmails(client, 'invoice');
+
+    expect(client.getSomeEmails).not.toHaveBeenCalled();
+    expect(useEmailStore.getState().emails.map((e) => e.id)).toEqual(['m1']);
+  });
+});
diff --git a/stores/__tests__/email-store-plugin-selection-hooks.test.ts b/stores/__tests__/email-store-plugin-selection-hooks.test.ts
new file mode 100644
index 000000000..c8322942a
--- /dev/null
+++ b/stores/__tests__/email-store-plugin-selection-hooks.test.ts
@@ -0,0 +1,70 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { useEmailStore } from '../email-store';
+import { clearAllHooks, emailHooks } from '@/lib/plugin-hooks';
+import type { Email, Mailbox } from '@/lib/jmap/types';
+
+// onEmailSelectionChange and onMailboxChange follow the store state, so every
+// path that changes the selection or the open folder fires them once.
+
+function makeEmail(id: string, overrides: Partial<Email> = {}): Email {
+  return { id, threadId: `t-${id}`, keywords: {}, mailboxIds: { inbox: true }, ...overrides } as Email;
+}
+
+const mailboxes = [
+  { id: 'inbox', name: 'Inbox', role: 'inbox' },
+  { id: 'projects', name: 'Projects' },
+] as Mailbox[];
+
+beforeEach(() => {
+  clearAllHooks();
+  useEmailStore.setState({
+    mailboxes,
+    accountMailboxes: {},
+    viewingAccountId: null,
+    selectedMailbox: 'inbox',
+    emails: [makeEmail('a'), makeEmail('b'), makeEmail('c', { sourceClientAccountId: 'x', sourceAccountId: 'y' })],
+    selectedEmailKeys: new Set(),
+    lastSelectedEmailKey: null,
+    listRows: null,
+  });
+});
+
+afterEach(() => clearAllHooks());
+
+describe('onEmailSelectionChange', () => {
+  it('reports the selected ids each time the selection changes', () => {
+    const changed = vi.fn();
+    emailHooks.onEmailSelectionChange.register('t', changed);
+    const store = useEmailStore.getState();
+
+    store.toggleEmailSelection(makeEmail('a'));
+    store.selectRangeEmails(makeEmail('b'));
+    store.selectAllEmails();
+    store.clearSelection();
+    // Clearing an empty selection is no change.
+    store.clearSelection();
+
+    expect(changed.mock.calls).toEqual([
+      [{ emailIds: ['a'] }],
+      [{ emailIds: ['a', 'b'] }],
+      [{ emailIds: ['a', 'b', 'c'] }],
+      [{ emailIds: [] }],
+    ]);
+  });
+});
+
+describe('onMailboxChange', () => {
+  it('reports the folder opened, its role and the one left', () => {
+    const changed = vi.fn();
+    emailHooks.onMailboxChange.register('t', changed);
+
+    useEmailStore.getState().selectMailbox('projects');
+    useEmailStore.getState().selectMailbox('projects');
+    useEmailStore.getState().selectMailbox('inbox');
+
+    expect(changed.mock.calls).toEqual([
+      [{ mailboxId: 'projects', role: null, previousMailboxId: 'inbox' }],
+      [{ mailboxId: 'inbox', role: 'inbox', previousMailboxId: 'projects' }],
+    ]);
+  });
+});
diff --git a/stores/__tests__/email-store-plugin-sync-hooks.test.ts b/stores/__tests__/email-store-plugin-sync-hooks.test.ts
new file mode 100644
index 000000000..b9fa8689b
--- /dev/null
+++ b/stores/__tests__/email-store-plugin-sync-hooks.test.ts
@@ -0,0 +1,155 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { useEmailStore } from '../email-store';
+import { useAuthStore } from '../auth-store';
+import { useSettingsStore } from '@/stores/settings-store';
+import { DEFAULT_SEARCH_FILTERS } from '@/lib/jmap/search-utils';
+import { clearAllHooks, emailHooks } from '@/lib/plugin-hooks';
+import { emailSummary } from '@/lib/plugin-projection';
+import type { Email, Mailbox, StateChange } from '@/lib/jmap/types';
+import type { IJMAPClient } from '@/lib/jmap/client-interface';
+
+// Sync hooks: new mail in the Inbox, live-update connection, and the
+// syncing/idle/error cycle of a push or poll.
+
+function makeMailbox(overrides: Partial<Mailbox>): Mailbox {
+  return {
+    id: 'inbox', name: 'Inbox', sortOrder: 0, totalEmails: 0, unreadEmails: 0,
+    totalThreads: 0, unreadThreads: 0, isSubscribed: true, isShared: false, ...overrides,
+  } as Mailbox;
+}
+
+function makeEmail(id: string, overrides: Partial<Email> = {}): Email {
+  return {
+    id, threadId: `t-${id}`, subject: id, receivedAt: '2026-01-01T00:00:00Z',
+    keywords: {}, mailboxIds: { inbox: true }, from: [{ name: 'A', email: 'a@x.test' }], ...overrides,
+  } as Email;
+}
+
+const serverEmails: Record<string, Email> = {
+  arrived: makeEmail('arrived'),
+  draft: makeEmail('draft', { keywords: { $draft: true } }),
+  sent: makeEmail('sent', { mailboxIds: { sent: true } }),
+  movedIn: makeEmail('movedIn'),
+  old: makeEmail('old'),
+};
+
+let client: IJMAPClient;
+
+function change(state: string): StateChange {
+  return { '@type': 'StateChange', changed: { me: { Email: state } } } as StateChange;
+}
+
+/** Let the void-ed new-mail check finish. */
+const settle = () => new Promise(resolve => setTimeout(resolve, 20));
+
+beforeEach(() => {
+  clearAllHooks();
+  client = {
+    getAccountId: () => 'me',
+    getEmailChanges: vi.fn().mockResolvedValue({
+      oldState: 's0', newState: 's1', hasMoreChanges: false,
+      created: ['arrived', 'draft', 'sent'], updated: ['movedIn'], destroyed: [], updatedProperties: null,
+    }),
+    getSomeEmails: vi.fn().mockImplementation(async (ids: string[]) => ids.map(id => serverEmails[id]).filter(Boolean)),
+    getEmails: vi.fn().mockResolvedValue({ emails: [], hasMore: false, total: 0, state: 's1' }),
+    getMaxObjectsInGet: () => 500,
+    getThreads: vi.fn().mockResolvedValue([]),
+  } as unknown as IJMAPClient;
+  useAuthStore.setState({ activeAccountId: 'acct', getClientForAccount: () => client as never } as never);
+  useSettingsStore.setState({ emailsPerPage: 50, emailKeywords: [] } as never);
+  useEmailStore.setState({
+    mailboxes: [makeMailbox({ id: 'inbox', role: 'inbox' }), makeMailbox({ id: 'sent', role: 'sent' })],
+    accountMailboxes: {},
+    viewingAccountId: null,
+    selectedMailbox: 'inbox',
+    selectedKeyword: null,
+    isUnifiedView: false,
+    isScheduledView: false,
+    crossView: null,
+    searchQuery: '',
+    searchFilters: { ...DEFAULT_SEARCH_FILTERS },
+    emails: [],
+    emailListSync: null,
+    isPushConnected: false,
+  });
+});
+
+afterEach(() => clearAllHooks());
+
+describe('onNewEmailReceived', () => {
+  it('reports each message created in the Inbox, and not drafts, other folders or moves', async () => {
+    // A baseline other tests have not advanced yet.
+    useEmailStore.setState({ emailListSync: { state: 's0', accountId: 'me', mailboxId: 'inbox' } });
+    vi.mocked(client.getEmailChanges!).mockResolvedValue({
+      oldState: 's0', newState: 's1', hasMoreChanges: false,
+      created: ['arrived', 'draft', 'sent'], updated: ['movedIn'], destroyed: [], updatedProperties: null,
+    });
+    const received = vi.fn();
+    emailHooks.onNewEmailReceived.register('t', received);
+
+    await useEmailStore.getState().handleStateChange(change('s1'), client);
+    await settle();
+
+    expect(received).toHaveBeenCalledTimes(1);
+    expect(received).toHaveBeenCalledWith(emailSummary(serverEmails.arrived));
+    expect(client.getEmailChanges).toHaveBeenCalledWith('s0', undefined, expect.any(Number));
+
+    // The same state again reports nothing new.
+    await useEmailStore.getState().handleStateChange(change('s1'), client);
+    await settle();
+    expect(received).toHaveBeenCalledTimes(1);
+  });
+
+  it('reports nothing for what was there before the first sync state (the initial load)', async () => {
+    const received = vi.fn();
+    emailHooks.onNewEmailReceived.register('t', received);
+    // A fresh account: no list baseline, so the first push only sets one.
+    useAuthStore.setState({ activeAccountId: 'fresh' } as never);
+    const freshClient = { ...client, getAccountId: () => 'fresh' } as IJMAPClient;
+    vi.mocked(client.getEmailChanges!).mockResolvedValue({
+      oldState: 'f0', newState: 'f1', hasMoreChanges: false,
+      created: ['old'], updated: [], destroyed: [], updatedProperties: null,
+    });
+
+    await useEmailStore.getState().handleStateChange(
+      { '@type': 'StateChange', changed: { fresh: { Email: 'f1' } } } as StateChange, freshClient,
+    );
+    await settle();
+
+    expect(received).not.toHaveBeenCalled();
+  });
+});
+
+describe('onSyncStateChange', () => {
+  it('goes syncing then idle around a state change', async () => {
+    const states = vi.fn();
+    emailHooks.onSyncStateChange.register('t', states);
+
+    await useEmailStore.getState().handleStateChange({ '@type': 'StateChange', changed: {} } as StateChange, client);
+
+    expect(states.mock.calls).toEqual([[{ state: 'syncing' }], [{ state: 'idle' }]]);
+  });
+
+  it('reports an error when handling the change failed', async () => {
+    const states = vi.fn();
+    emailHooks.onSyncStateChange.register('t', states);
+    const broken = { ...client, getAccountId: () => { throw new Error('session gone'); } } as IJMAPClient;
+
+    await useEmailStore.getState().handleStateChange({ '@type': 'StateChange', changed: {} } as StateChange, broken);
+
+    expect(states.mock.calls).toEqual([[{ state: 'syncing' }], [{ state: 'error', error: 'session gone' }]]);
+  });
+});
+
+describe('onPushConnectionChange', () => {
+  it('reports when live updates connect and drop, not repeats', () => {
+    const connection = vi.fn();
+    emailHooks.onPushConnectionChange.register('t', connection);
+
+    useEmailStore.getState().setPushConnected(true);
+    useEmailStore.getState().setPushConnected(true);
+    useEmailStore.getState().setPushConnected(false);
+
+    expect(connection.mock.calls).toEqual([[{ connected: true }], [{ connected: false }]]);
+  });
+});
diff --git a/stores/__tests__/file-store-hooks.test.ts b/stores/__tests__/file-store-hooks.test.ts
new file mode 100644
index 000000000..aa31ec20d
--- /dev/null
+++ b/stores/__tests__/file-store-hooks.test.ts
@@ -0,0 +1,483 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { useFileStore } from '../file-store';
+import { fileHooks, clearAllHooks } from '@/lib/plugin-hooks';
+import type { IJMAPClient } from '@/lib/jmap/client-interface';
+import type { FileNode } from '@/lib/jmap/types';
+
+const dir = (id: string, name: string, parentId: string | null): FileNode => ({
+  id, parentId, name, type: 'd', blobId: null, size: 0, created: '', modified: '2026-01-01T00:00:00Z',
+});
+const file = (id: string, name: string, parentId: string | null): FileNode => ({
+  id, parentId, name, type: 'text/plain', blobId: `b-${id}`, size: 10, created: '', modified: '2026-01-01T00:00:00Z',
+});
+
+/** In-memory FileNode backend with spies on every server call. */
+function makeClient(initial: FileNode[]) {
+  let nodes = initial.map(n => ({ ...n }));
+  let seq = 0;
+  const create = (name: string, blobId: string | null, type: string, size: number, parentId: string | null) => {
+    const node: FileNode = { id: `new${++seq}`, parentId, name, type, blobId, size, created: '', modified: '' };
+    nodes.push(node);
+    return { ...node };
+  };
+  const client = {
+    listAllFileNodes: vi.fn(async () => nodes.map(n => ({ ...n }))),
+    createFileDirectory: vi.fn(async (name: string, parentId: string | null) => create(name, null, 'd', 0, parentId)),
+    createFileNode: vi.fn(async (name: string, blobId: string, type: string, size: number, parentId: string | null) =>
+      create(name, blobId, type, size, parentId)),
+    updateFileNode: vi.fn(async (id: string, patch: Partial<FileNode>) => {
+      const node = nodes.find(n => n.id === id);
+      if (node) Object.assign(node, patch);
+    }),
+    destroyFileNodes: vi.fn(async (ids: string[]) => {
+      nodes = nodes.filter(n => !ids.includes(n.id));
+      return { destroyed: ids, notDestroyed: [] };
+    }),
+    copyFileNode: vi.fn(async (id: string, newName: string, parentId: string | null) => {
+      const original = nodes.find(n => n.id === id)!;
+      return create(newName, original.blobId, original.type, original.size, parentId);
+    }),
+    uploadBlob: vi.fn(async (f: File) => ({ blobId: `blob-${f.name}`, type: f.type })),
+    downloadBlob: vi.fn(async () => undefined),
+  };
+  return client as unknown as IJMAPClient & typeof client;
+}
+
+const flush = () => new Promise((r) => setTimeout(r, 0));
+
+/** A drive with /Docs (a.txt, b.txt) and /Docs/Target, opened at /Docs. */
+async function openDocs() {
+  const client = makeClient([
+    dir('docs', 'Docs', null),
+    file('a', 'a.txt', 'docs'),
+    file('b', 'b.txt', 'docs'),
+    dir('target', 'Target', 'docs'),
+  ]);
+  useFileStore.setState({
+    client, currentParentId: null, currentPath: '/', pathStack: [{ id: null, name: '' }],
+    resources: [], allFolders: [], selectedResources: new Set(), clipboard: null, lastAction: null,
+    uploadAbortController: null, uploadProgress: null, hasListed: false,
+  });
+  await useFileStore.getState().navigate('docs', 'Docs');
+  return client;
+}
+
+const names = () => useFileStore.getState().resources.map(r => r.name).sort();
+
+describe('file-store plugin hooks: changing files', () => {
+  beforeEach(() => clearAllHooks());
+
+  describe('uploads', () => {
+    it('asks about each file before it goes up and skips the refused ones', async () => {
+      const client = await openDocs();
+      const before = vi.fn(({ name }: { name: string }) => {
+        expect(client.uploadBlob).not.toHaveBeenCalled();
+        return name !== 'no.txt';
+      });
+      const after = vi.fn();
+      fileHooks.onBeforeFileUpload.register('test', before);
+      fileHooks.onAfterFileUpload.register('test', after);
+
+      const yes = new File(['hello'], 'yes.txt', { type: 'text/plain' });
+      const no = new File(['nope'], 'no.txt', { type: 'text/plain' });
+      const result = await useFileStore.getState().uploadFiles([yes, no]);
+      await flush();
+
+      expect(before).toHaveBeenCalledTimes(2);
+      expect(before).toHaveBeenCalledWith({ name: 'yes.txt', size: 5, type: 'text/plain', path: '/Docs' });
+      expect(result.uploaded).toBe(1);
+      expect(client.uploadBlob).toHaveBeenCalledTimes(1);
+      expect(names()).not.toContain('no.txt');
+      expect(after).toHaveBeenCalledOnce();
+      expect(after.mock.calls[0][0]).toMatchObject({ name: 'yes.txt', type: 'file', mimeType: 'text/plain', path: '/Docs' });
+    });
+
+    it('uploads nothing when every file is refused', async () => {
+      const client = await openDocs();
+      fileHooks.onBeforeFileUpload.register('test', () => false);
+
+      await useFileStore.getState().uploadFile(new File(['x'], 'x.txt'));
+      const result = await useFileStore.getState().uploadFiles([new File(['y'], 'y.txt')]);
+
+      expect(result).toEqual({ uploaded: 0, canceled: false });
+      expect(client.uploadBlob).not.toHaveBeenCalled();
+      expect(client.createFileNode).not.toHaveBeenCalled();
+    });
+
+    it('does not create the folder of a refused file in a folder upload', async () => {
+      const client = await openDocs();
+      const after = vi.fn();
+      fileHooks.onBeforeFileUpload.register('test', ({ path }: { path: string }) => path !== '/Docs/secret');
+      fileHooks.onAfterFileUpload.register('test', after);
+
+      const inSub = new File(['s'], 'key.pem');
+      Object.defineProperty(inSub, 'webkitRelativePath', { value: 'secret/key.pem' });
+      const top = new File(['t'], 'readme.md');
+      await useFileStore.getState().uploadFolder([inSub, top]);
+      await flush();
+
+      expect(client.createFileDirectory).not.toHaveBeenCalled();
+      expect(after).toHaveBeenCalledOnce();
+      expect(after.mock.calls[0][0]).toMatchObject({ name: 'readme.md', path: '/Docs' });
+    });
+
+    it('does not report an upload the server refused', async () => {
+      const client = await openDocs();
+      client.createFileNode.mockRejectedValueOnce(new Error('quota'));
+      const after = vi.fn();
+      fileHooks.onAfterFileUpload.register('test', after);
+
+      await expect(useFileStore.getState().uploadFiles([new File(['x'], 'x.txt')])).rejects.toThrow('quota');
+      await flush();
+      expect(after).not.toHaveBeenCalled();
+    });
+
+    it('reports a cancelled upload, but only while one runs', async () => {
+      await openDocs();
+      const cancelled = vi.fn();
+      fileHooks.onFileUploadCancel.register('test', cancelled);
+
+      useFileStore.getState().cancelUpload();
+      useFileStore.setState({
+        uploadAbortController: new AbortController(),
+        uploadProgress: { name: 'big.iso', loaded: 1, total: 9, current: 1, totalFiles: 1 },
+      });
+      useFileStore.getState().cancelUpload();
+      await flush();
+
+      expect(cancelled).toHaveBeenCalledOnce();
+      expect(cancelled).toHaveBeenCalledWith({ name: 'big.iso', path: '/Docs' });
+    });
+  });
+
+  it('reports a created folder', async () => {
+    await openDocs();
+    const created = vi.fn();
+    fileHooks.onDirectoryCreate.register('test', created);
+
+    await useFileStore.getState().createDirectory('New');
+    await flush();
+
+    expect(created).toHaveBeenCalledOnce();
+    expect(created.mock.calls[0][0]).toMatchObject({ name: 'New', type: 'directory', path: '/Docs' });
+  });
+
+  describe('delete', () => {
+    it('asks once for all files and reports them', async () => {
+      const client = await openDocs();
+      const before = vi.fn(() => {
+        expect(client.destroyFileNodes).not.toHaveBeenCalled();
+        return true;
+      });
+      const after = vi.fn();
+      fileHooks.onBeforeFileDelete.register('test', before);
+      fileHooks.onAfterFileDelete.register('test', after);
+
+      expect(await useFileStore.getState().deleteResources(['a.txt', 'b.txt'])).toBe(true);
+      await flush();
+
+      expect(before).toHaveBeenCalledOnce();
+      const asked = (before.mock.calls[0] as unknown as [{ files: { id: string; path: string }[] }])[0];
+      expect(asked.files.map(f => f.id)).toEqual(['a', 'b']);
+      expect(asked.files[0].path).toBe('/Docs');
+      expect(after).toHaveBeenCalledOnce();
+      expect(after.mock.calls[0][0].files.map((f: { id: string }) => f.id)).toEqual(['a', 'b']);
+    });
+
+    it('keeps everything when a plugin says no', async () => {
+      const client = await openDocs();
+      const after = vi.fn();
+      fileHooks.onBeforeFileDelete.register('test', () => false);
+      fileHooks.onAfterFileDelete.register('test', after);
+
+      expect(await useFileStore.getState().deleteResource('a.txt')).toBe(false);
+      expect(await useFileStore.getState().deleteResources(['a.txt', 'b.txt'])).toBe(false);
+      expect(await useFileStore.getState().deleteNode('target')).toBe(false);
+      await flush();
+
+      expect(client.destroyFileNodes).not.toHaveBeenCalled();
+      expect(names()).toEqual(['Target', 'a.txt', 'b.txt']);
+      expect(after).not.toHaveBeenCalled();
+    });
+
+    it('does not report a delete the server refused', async () => {
+      const client = await openDocs();
+      client.destroyFileNodes.mockRejectedValueOnce(new Error('locked'));
+      const after = vi.fn();
+      fileHooks.onAfterFileDelete.register('test', after);
+
+      await expect(useFileStore.getState().deleteResource('a.txt')).rejects.toThrow();
+      await flush();
+      expect(after).not.toHaveBeenCalled();
+    });
+
+    it('reports a folder deleted from the tree with its path', async () => {
+      await openDocs();
+      const after = vi.fn();
+      fileHooks.onAfterFileDelete.register('test', after);
+
+      await useFileStore.getState().deleteNode('target');
+      await flush();
+      expect(after.mock.calls[0][0].files[0]).toMatchObject({ id: 'target', name: 'Target', type: 'directory', path: '/Docs' });
+    });
+  });
+
+  describe('rename', () => {
+    it('passes the file and new name first, then the previous name', async () => {
+      const client = await openDocs();
+      const before = vi.fn(() => {
+        expect(client.updateFileNode).not.toHaveBeenCalled();
+        return true;
+      });
+      const after = vi.fn();
+      fileHooks.onBeforeFileRename.register('test', before);
+      fileHooks.onFileRename.register('test', after);
+
+      expect(await useFileStore.getState().renameResource('a.txt', 'c.txt')).toBe(true);
+      await flush();
+
+      expect(before).toHaveBeenCalledWith({ file: expect.objectContaining({ id: 'a', name: 'a.txt', path: '/Docs' }), newName: 'c.txt' });
+      expect(after).toHaveBeenCalledWith({ file: expect.objectContaining({ id: 'a', name: 'c.txt' }), previousName: 'a.txt' });
+    });
+
+    it('keeps the name when a plugin says no', async () => {
+      const client = await openDocs();
+      const after = vi.fn();
+      fileHooks.onBeforeFileRename.register('test', () => false);
+      fileHooks.onFileRename.register('test', after);
+
+      expect(await useFileStore.getState().renameResource('a.txt', 'c.txt')).toBe(false);
+      expect(await useFileStore.getState().renameNode('target', 'Moved')).toBe(false);
+      await flush();
+
+      expect(client.updateFileNode).not.toHaveBeenCalled();
+      expect(useFileStore.getState().lastAction).toBeNull();
+      expect(after).not.toHaveBeenCalled();
+    });
+
+    it('does not report a rename the server refused', async () => {
+      const client = await openDocs();
+      client.updateFileNode.mockRejectedValueOnce(new Error('taken'));
+      const after = vi.fn();
+      fileHooks.onFileRename.register('test', after);
+
+      await expect(useFileStore.getState().renameNode('target', 'X')).rejects.toThrow();
+      await flush();
+      expect(after).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('move and copy', () => {
+    it('asks once for all moved files with the target path', async () => {
+      const client = await openDocs();
+      const before = vi.fn(() => {
+        expect(client.updateFileNode).not.toHaveBeenCalled();
+        return true;
+      });
+      const after = vi.fn();
+      fileHooks.onBeforeFileMove.register('test', before);
+      fileHooks.onFileMove.register('test', after);
+
+      expect(await useFileStore.getState().moveToFolderId(['a.txt', 'b.txt'], 'target')).toBe(true);
+      await flush();
+
+      expect(before).toHaveBeenCalledOnce();
+      const asked = (before.mock.calls[0] as unknown as [{ files: { id: string }[]; toPath: string }])[0];
+      expect(asked.files.map(f => f.id)).toEqual(['a', 'b']);
+      expect(asked.toPath).toBe('/Docs/Target');
+      expect(after).toHaveBeenCalledOnce();
+      expect(after.mock.calls[0][0].toPath).toBe('/Docs/Target');
+      expect(after.mock.calls[0][0].files.map((f: { id: string }) => f.id)).toEqual(['a', 'b']);
+    });
+
+    it('moves nothing when a plugin says no', async () => {
+      const client = await openDocs();
+      const after = vi.fn();
+      fileHooks.onBeforeFileMove.register('test', () => false);
+      fileHooks.onFileMove.register('test', after);
+
+      expect(await useFileStore.getState().moveToFolderId(['a.txt'], 'target')).toBe(false);
+      expect(await useFileStore.getState().moveToFolder(['a.txt'], 'Target')).toBe(false);
+      expect(await useFileStore.getState().moveToParent(['a.txt'])).toBe(false);
+      useFileStore.getState().cutResources(['b.txt']);
+      await useFileStore.getState().navigate('target', 'Target');
+      expect(await useFileStore.getState().pasteResources()).toBe(false);
+      await flush();
+
+      expect(client.updateFileNode).not.toHaveBeenCalled();
+      expect(useFileStore.getState().clipboard).not.toBeNull();
+      expect(after).not.toHaveBeenCalled();
+    });
+
+    it('reports only the files that moved before a failure', async () => {
+      const client = await openDocs();
+      client.updateFileNode.mockImplementationOnce(async () => undefined).mockRejectedValueOnce(new Error('denied'));
+      const after = vi.fn();
+      fileHooks.onFileMove.register('test', after);
+
+      await expect(useFileStore.getState().moveToParent(['a.txt', 'b.txt'])).rejects.toThrow('denied');
+      await flush();
+
+      expect(after).toHaveBeenCalledOnce();
+      expect(after.mock.calls[0][0]).toMatchObject({ toPath: '/', files: [expect.objectContaining({ id: 'a', path: '/' })] });
+    });
+
+    it('reports cut and paste as a move and copy and paste as a copy', async () => {
+      await openDocs();
+      const moved = vi.fn();
+      const copied = vi.fn();
+      fileHooks.onFileMove.register('test', moved);
+      fileHooks.onFileCopy.register('test', copied);
+
+      useFileStore.getState().copyResources(['a.txt']);
+      await useFileStore.getState().navigate('target', 'Target');
+      await useFileStore.getState().pasteResources();
+      await useFileStore.getState().navigate('docs', 'Docs');
+      useFileStore.getState().cutResources(['b.txt']);
+      await useFileStore.getState().navigate('target', 'Target');
+      await useFileStore.getState().pasteResources();
+      await flush();
+
+      expect(copied).toHaveBeenCalledOnce();
+      const copy = copied.mock.calls[0][0];
+      expect(copy.toPath).toBe('/Docs/Target');
+      expect(copy.files[0]).toMatchObject({ name: 'a.txt', path: '/Docs/Target' });
+      expect(copy.files[0].id).not.toBe('a');
+      expect(moved).toHaveBeenCalledOnce();
+      expect(moved.mock.calls[0][0]).toMatchObject({ toPath: '/Docs/Target', files: [expect.objectContaining({ id: 'b', path: '/Docs/Target' })] });
+    });
+
+    it('reports a duplicate with the new copy', async () => {
+      await openDocs();
+      const duplicated = vi.fn();
+      fileHooks.onFileDuplicate.register('test', duplicated);
+
+      await useFileStore.getState().duplicateResource('a.txt');
+      await flush();
+
+      expect(duplicated).toHaveBeenCalledOnce();
+      expect(duplicated.mock.calls[0][0]).toMatchObject({ name: 'a (copy).txt', path: '/Docs', type: 'file' });
+    });
+  });
+
+  describe('download', () => {
+    it('reports each downloaded file', async () => {
+      await openDocs();
+      const downloaded = vi.fn();
+      fileHooks.onFileDownload.register('test', downloaded);
+
+      await useFileStore.getState().downloadResources(['a.txt', 'b.txt']);
+      await useFileStore.getState().downloadNode('a');
+      await flush();
+
+      expect(downloaded.mock.calls.map(c => [c[0].id, c[0].path])).toEqual([['a', '/Docs'], ['b', '/Docs'], ['a', '/Docs']]);
+    });
+
+    it('does not report a failed download', async () => {
+      const client = await openDocs();
+      client.downloadBlob.mockRejectedValueOnce(new Error('gone'));
+      const downloaded = vi.fn();
+      fileHooks.onFileDownload.register('test', downloaded);
+
+      await expect(useFileStore.getState().downloadResource('a.txt')).rejects.toThrow();
+      await flush();
+      expect(downloaded).not.toHaveBeenCalled();
+    });
+  });
+});
+
+describe('file-store plugin hooks: navigation, selection, favourites, undo', () => {
+  beforeEach(() => clearAllHooks());
+
+  it('reports each newly opened folder, but not a refresh', async () => {
+    const navigated = vi.fn();
+    fileHooks.onFileNavigate.register('test', navigated);
+
+    await openDocs();
+    await useFileStore.getState().refresh();
+    await useFileStore.getState().navigate('target', 'Target');
+    await useFileStore.getState().navigateUp();
+    await useFileStore.getState().navigateByPath('/');
+    await flush();
+
+    expect(navigated.mock.calls.map(c => c[0])).toEqual([
+      { path: '/Docs' },
+      { path: '/Docs/Target' },
+      { path: '/Docs' },
+      { path: '/' },
+    ]);
+  });
+
+  it('does not report a folder that failed to load', async () => {
+    const client = await openDocs();
+    client.listAllFileNodes.mockRejectedValueOnce(new Error('offline'));
+    const navigated = vi.fn();
+    fileHooks.onFileNavigate.register('test', navigated);
+
+    await useFileStore.getState().navigate('target', 'Target');
+    await flush();
+    expect(navigated).not.toHaveBeenCalled();
+  });
+
+  it('reports selection changes with the selected files, and only real ones', async () => {
+    await openDocs();
+    const selection = vi.fn();
+    fileHooks.onFileSelectionChange.register('test', selection);
+    const store = useFileStore.getState();
+
+    store.selectResource('a.txt');
+    store.selectResource('a.txt'); // same: no change
+    store.toggleSelect('b.txt');
+    store.setSelection(new Set(['a.txt', 'b.txt'])); // same: no change
+    store.clearSelection();
+    store.selectAll();
+    await flush();
+
+    const calls = selection.mock.calls.map(c => c[0].files.map((f: { id: string }) => f.id).sort());
+    expect(calls).toEqual([['a'], ['a', 'b'], [], ['a', 'b', 'target']]);
+    expect(selection.mock.calls[0][0].files[0]).toMatchObject({ name: 'a.txt', path: '/Docs' });
+  });
+
+  it('reports starring and unstarring a folder', async () => {
+    await openDocs();
+    const toggled = vi.fn();
+    fileHooks.onFileFavoriteToggle.register('test', toggled);
+    useFileStore.setState({ favorites: [] });
+
+    useFileStore.getState().toggleFavorite('/Docs/Target');
+    useFileStore.getState().toggleFavorite('/Docs/Target');
+    await flush();
+
+    expect(toggled.mock.calls.map(c => c[0])).toEqual([
+      { file: expect.objectContaining({ id: 'target', name: 'Target', type: 'directory', path: '/Docs' }), favorite: true },
+      { file: expect.objectContaining({ id: 'target' }), favorite: false },
+    ]);
+  });
+
+  it('reports an undone rename', async () => {
+    await openDocs();
+    const undone = vi.fn();
+    fileHooks.onFileUndo.register('test', undone);
+
+    await useFileStore.getState().renameResource('a.txt', 'c.txt');
+    await useFileStore.getState().undoLastAction();
+    await flush();
+
+    expect(undone).toHaveBeenCalledOnce();
+    expect(undone).toHaveBeenCalledWith({
+      action: { type: 'rename', entries: [{ id: 'a', from: { name: 'a.txt' }, to: { name: 'c.txt' } }] },
+    });
+  });
+
+  it('does not report an undo the server refused', async () => {
+    const client = await openDocs();
+    await useFileStore.getState().renameResource('a.txt', 'c.txt');
+    client.updateFileNode.mockRejectedValueOnce(new Error('nope'));
+    const undone = vi.fn();
+    fileHooks.onFileUndo.register('test', undone);
+
+    await expect(useFileStore.getState().undoLastAction()).rejects.toThrow();
+    await flush();
+    expect(undone).not.toHaveBeenCalled();
+  });
+});
diff --git a/stores/__tests__/filter-plugin-hooks.test.ts b/stores/__tests__/filter-plugin-hooks.test.ts
new file mode 100644
index 000000000..630706e7c
--- /dev/null
+++ b/stores/__tests__/filter-plugin-hooks.test.ts
@@ -0,0 +1,131 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { useFilterStore } from '../filter-store';
+import { updateAccountFilters, FiltersSaveVetoedError } from '@/lib/filters/account-filters';
+import { generateScript } from '@/lib/sieve/generator';
+import { clearAllHooks, filterHooks } from '@/lib/plugin-hooks';
+import type { FilterRule } from '@/lib/jmap/sieve-types';
+import type { IJMAPClient } from '@/lib/jmap/client-interface';
+
+const rule = (overrides: Partial<FilterRule> = {}): FilterRule => ({
+  id: 'r1',
+  name: 'Receipts',
+  enabled: true,
+  matchType: 'all',
+  conditions: [{ field: 'from', comparator: 'contains', value: 'shop@example.com' }],
+  actions: [{ type: 'move', value: 'Receipts', mailboxId: 'mb-receipts' }],
+  stopProcessing: false,
+  ...overrides,
+});
+
+const VIEW = {
+  id: 'r1',
+  name: 'Receipts',
+  isActive: true,
+  conditions: [{ field: 'from', comparator: 'contains', value: 'shop@example.com' }],
+  actions: [{ type: 'move', value: 'Receipts', mailboxId: 'mb-receipts' }],
+};
+
+function mockClient(script: string) {
+  return {
+    getSieveAccountId: () => 'primary',
+    getSieveAccounts: () => [{ id: 'primary', name: 'Me', isPrimary: true }],
+    getSieveCapabilities: () => null,
+    getSieveScripts: vi.fn(async () => [{ id: 's1', name: 'filters', blobId: 'b1', isActive: true }]),
+    getSieveScriptContent: vi.fn(async () => script),
+    updateSieveScript: vi.fn(async () => {}),
+    createSieveScript: vi.fn(async () => ({ id: 's2' })),
+  };
+}
+
+describe('filter plugin hooks', () => {
+  beforeEach(() => useFilterStore.getState().clearState());
+  afterEach(() => clearAllHooks());
+
+  it('hands plugins the loaded rules as plain views', async () => {
+    const loaded = vi.fn();
+    filterHooks.onFiltersLoaded.register('test', loaded);
+    const client = mockClient(generateScript([rule({ rawBlock: 'secret' })]));
+
+    await useFilterStore.getState().fetchFilters(client as unknown as IJMAPClient);
+
+    expect(loaded).toHaveBeenCalledTimes(1);
+    expect(loaded).toHaveBeenCalledWith([VIEW]);
+  });
+
+  it('does not report a load that failed', async () => {
+    const loaded = vi.fn();
+    filterHooks.onFiltersLoaded.register('test', loaded);
+    const client = mockClient('');
+    client.getSieveScripts.mockRejectedValueOnce(new Error('down'));
+    await useFilterStore.getState().fetchFilters(client as unknown as IJMAPClient);
+    expect(loaded).not.toHaveBeenCalled();
+  });
+
+  it('reports each kind of rule edit, and none for read-only rules', () => {
+    const changed = vi.fn();
+    filterHooks.onFilterRuleChange.register('test', changed);
+    const store = useFilterStore.getState();
+
+    store.addRule(rule());
+    store.addRule(rule({ id: 'r2' }));
+    store.updateRule('r1', { name: 'Shop' });
+    store.toggleRule('r1');
+    store.reorderRules(['r2', 'r1']);
+    store.deleteRule('r2');
+    useFilterStore.setState({ rules: [...useFilterStore.getState().rules, rule({ id: 'ext', origin: 'external' })] });
+    store.toggleRule('ext');
+    store.deleteRule('missing');
+
+    expect(changed.mock.calls.map((c) => c[0])).toEqual([
+      { ruleId: 'r1', change: 'added' },
+      { ruleId: 'r2', change: 'added' },
+      { ruleId: 'r1', change: 'updated' },
+      { ruleId: 'r1', change: 'toggled' },
+      { ruleId: 'r2', change: 'reordered' },
+      { ruleId: 'r2', change: 'deleted' },
+    ]);
+  });
+
+  it('asks before saving and saves when allowed', async () => {
+    const client = mockClient('');
+    const before = vi.fn(() => {
+      expect(client.updateSieveScript).not.toHaveBeenCalled();
+      expect(client.createSieveScript).not.toHaveBeenCalled();
+      return true;
+    });
+    filterHooks.onBeforeFiltersSave.register('test', before);
+    useFilterStore.getState().addRule(rule());
+
+    await useFilterStore.getState().saveFilters(client as unknown as IJMAPClient);
+
+    expect(before).toHaveBeenCalledWith({ rules: [VIEW] });
+    expect(client.createSieveScript).toHaveBeenCalledTimes(1);
+  });
+
+  it('writes nothing when a plugin stops the save', async () => {
+    const client = mockClient('');
+    const saved = vi.fn();
+    filterHooks.onBeforeFiltersSave.register('test', () => false);
+    filterHooks.onFiltersSave.register('test', saved);
+    useFilterStore.getState().addRule(rule());
+
+    await expect(useFilterStore.getState().saveFilters(client as unknown as IJMAPClient)).rejects.toBeInstanceOf(FiltersSaveVetoedError);
+
+    expect(client.createSieveScript).not.toHaveBeenCalled();
+    expect(client.updateSieveScript).not.toHaveBeenCalled();
+    expect(saved).not.toHaveBeenCalled();
+    expect(useFilterStore.getState().isSaving).toBe(false);
+  });
+
+  it('asks before a rule made from a message is saved', async () => {
+    const client = mockClient(generateScript([]));
+    const before = vi.fn(() => false);
+    filterHooks.onBeforeFiltersSave.register('test', before);
+
+    await expect(updateAccountFilters(client as unknown as IJMAPClient, 'primary', () => [rule()]))
+      .rejects.toBeInstanceOf(FiltersSaveVetoedError);
+
+    expect(before).toHaveBeenCalledWith({ rules: [VIEW] });
+    expect(client.updateSieveScript).not.toHaveBeenCalled();
+  });
+});
diff --git a/stores/__tests__/folder-management.test.ts b/stores/__tests__/folder-management.test.ts
index 4e9d3816b..ee9e53eba 100644
--- a/stores/__tests__/folder-management.test.ts
+++ b/stores/__tests__/folder-management.test.ts
@@ -5,6 +5,7 @@ import type { Mailbox } from '@/lib/jmap/types';
 import type { IJMAPClient } from '@/lib/jmap/client-interface';
 import { UNIFIED_MAILBOX_IDS } from '@/lib/jmap/types';
 import { emailHooks } from '@/lib/plugin-hooks';
+import { mailboxToView } from '@/lib/plugin-mail-hooks';
 
 function makeMailbox(overrides: Partial<Mailbox> = {}): Mailbox {
   return {
@@ -454,7 +455,7 @@ describe('email-store folder management', () => {
 
       try {
         await useEmailStore.getState().fetchMailboxes(client);
-        expect(observer).toHaveBeenCalledWith(refreshed);
+        expect(observer).toHaveBeenCalledWith(refreshed.map(mailboxToView));
       } finally {
         disposable.dispose();
       }
diff --git a/stores/__tests__/identity-plugin-hooks.test.ts b/stores/__tests__/identity-plugin-hooks.test.ts
new file mode 100644
index 000000000..d0251f6f1
--- /dev/null
+++ b/stores/__tests__/identity-plugin-hooks.test.ts
@@ -0,0 +1,151 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { renderHook, waitFor } from '@testing-library/react';
+import {
+  useIdentityStore, createIdentityWithHooks, updateIdentityWithHooks, deleteIdentityWithHooks, notifyIdentitySelected,
+} from '../identity-store';
+import { usePluginSignature } from '@/hooks/use-plugin-signature';
+import { clearAllHooks, identityHooks } from '@/lib/plugin-hooks';
+import type { Identity } from '@/lib/jmap/types';
+import type { IJMAPClient } from '@/lib/jmap/client-interface';
+
+const identity = (overrides: Partial<Identity> = {}): Identity => ({
+  id: 'id-1',
+  name: 'Ann',
+  email: 'ann@example.com',
+  mayDelete: true,
+  htmlSignature: '<b>Ann</b>',
+  textSignature: 'Ann',
+  ...overrides,
+});
+
+const view = (i: Identity) => ({
+  id: i.id,
+  name: i.name,
+  email: i.email,
+  replyTo: null,
+  bcc: null,
+  htmlSignature: i.htmlSignature ?? '',
+  textSignature: i.textSignature ?? '',
+});
+
+function mockClient() {
+  return {
+    createIdentity: vi.fn(async () => identity({ id: 'new-1', email: 'new@example.com', name: 'New' })),
+    updateIdentity: vi.fn(async () => {}),
+    deleteIdentity: vi.fn(async () => {}),
+  };
+}
+
+describe('identity plugin hooks', () => {
+  beforeEach(() => {
+    useIdentityStore.setState({ identities: [], selectedIdentityId: null });
+  });
+  afterEach(() => clearAllHooks());
+
+  it('reports loaded identities, but not a reorder of the same ones', () => {
+    const loaded = vi.fn();
+    identityHooks.onIdentitiesLoaded.register('test', loaded);
+    const a = identity();
+    const b = identity({ id: 'id-2', email: 'b@example.com' });
+
+    useIdentityStore.getState().setIdentities([a, b]);
+    expect(loaded).toHaveBeenCalledTimes(1);
+    expect(loaded).toHaveBeenCalledWith([view(a), view(b)]);
+
+    useIdentityStore.getState().setIdentities([b, a]);
+    expect(loaded).toHaveBeenCalledTimes(1);
+  });
+
+  it('asks before creating and reports what the server created', async () => {
+    const client = mockClient();
+    const before = vi.fn(() => {
+      expect(client.createIdentity).not.toHaveBeenCalled();
+      return true;
+    });
+    const created = vi.fn();
+    identityHooks.onBeforeIdentityChange.register('test', before);
+    identityHooks.onIdentityCreate.register('test', created);
+
+    const ok = await createIdentityWithHooks(client as unknown as IJMAPClient, { name: 'New', email: 'new@example.com' });
+
+    expect(ok).toBe(true);
+    expect(before).toHaveBeenCalledWith(expect.objectContaining({ change: 'create', identity: expect.objectContaining({ email: 'new@example.com' }) }));
+    expect(created).toHaveBeenCalledTimes(1);
+    expect(created).toHaveBeenCalledWith(expect.objectContaining({ id: 'new-1', email: 'new@example.com' }));
+  });
+
+  it('does not create when a plugin says no', async () => {
+    const client = mockClient();
+    const created = vi.fn();
+    identityHooks.onBeforeIdentityChange.register('test', () => false);
+    identityHooks.onIdentityCreate.register('test', created);
+
+    expect(await createIdentityWithHooks(client as unknown as IJMAPClient, { name: 'x', email: 'x@example.com' })).toBe(false);
+    expect(client.createIdentity).not.toHaveBeenCalled();
+    expect(created).not.toHaveBeenCalled();
+  });
+
+  it('reports an update after the server stored it, and not when it failed', async () => {
+    const client = mockClient();
+    const updated = vi.fn();
+    identityHooks.onIdentityUpdate.register('test', updated);
+
+    client.updateIdentity.mockRejectedValueOnce(new Error('down'));
+    await expect(updateIdentityWithHooks(client as unknown as IJMAPClient, identity(), { name: 'Anna' })).rejects.toThrow();
+    expect(updated).not.toHaveBeenCalled();
+
+    await updateIdentityWithHooks(client as unknown as IJMAPClient, identity(), { name: 'Anna' });
+    expect(updated).toHaveBeenCalledWith(expect.objectContaining({ id: 'id-1', name: 'Anna' }));
+  });
+
+  it('stops an update when a plugin says no', async () => {
+    const client = mockClient();
+    const before = vi.fn(() => false);
+    identityHooks.onBeforeIdentityChange.register('test', before);
+    expect(await updateIdentityWithHooks(client as unknown as IJMAPClient, identity(), { name: 'Anna' })).toBe(false);
+    expect(before).toHaveBeenCalledWith(expect.objectContaining({ identityId: 'id-1', change: 'update' }));
+    expect(client.updateIdentity).not.toHaveBeenCalled();
+  });
+
+  it('asks before deleting and reports the deleted id', async () => {
+    const client = mockClient();
+    const deleted = vi.fn();
+    identityHooks.onIdentityDelete.register('test', deleted);
+    identityHooks.onBeforeIdentityChange.register('test', () => false);
+    expect(await deleteIdentityWithHooks(client as unknown as IJMAPClient, identity())).toBe(false);
+    expect(client.deleteIdentity).not.toHaveBeenCalled();
+
+    clearAllHooks();
+    identityHooks.onIdentityDelete.register('test', deleted);
+    expect(await deleteIdentityWithHooks(client as unknown as IJMAPClient, identity())).toBe(true);
+    expect(deleted).toHaveBeenCalledWith({ identityId: 'id-1' });
+  });
+
+  it('reports the From identity the user picked', () => {
+    const selected = vi.fn();
+    identityHooks.onIdentitySelect.register('test', selected);
+    const b = identity({ id: 'id-2', email: 'b@example.com' });
+    notifyIdentitySelected([identity(), b], 'id-2');
+    expect(selected).toHaveBeenCalledWith(view(b));
+  });
+
+  it('hands the signature to plugins and uses what they return', async () => {
+    identityHooks.onSignatureRender.register('test', (sig: { html: string; text: string }, ctx: { identityId: string }) => {
+      expect(ctx).toEqual({ identityId: 'id-1' });
+      return { html: `${sig.html}<p>Sent from Bulwark</p>`, text: `${sig.text}\nSent from Bulwark` };
+    });
+    const ident = identity();
+    const { result } = renderHook(() => usePluginSignature(ident));
+
+    await waitFor(() => expect(result.current.revision).toBe(1));
+    expect(result.current.identity?.htmlSignature).toBe('<b>Ann</b><p>Sent from Bulwark</p>');
+    expect(result.current.identity?.textSignature).toBe('Ann\nSent from Bulwark');
+    expect(result.current.identity?.id).toBe('id-1');
+  });
+
+  it('leaves the signature alone when no plugin listens', () => {
+    const ident = identity();
+    const { result } = renderHook(() => usePluginSignature(ident));
+    expect(result.current.identity).toBe(ident);
+  });
+});
diff --git a/stores/__tests__/notification-center-store.test.ts b/stores/__tests__/notification-center-store.test.ts
new file mode 100644
index 000000000..7dcb96087
--- /dev/null
+++ b/stores/__tests__/notification-center-store.test.ts
@@ -0,0 +1,70 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import {
+  MAX_ENTRIES,
+  reloadNotificationCenter,
+  selectUnreadCount,
+  useNotificationCenterStore,
+} from '../notification-center-store';
+import { toast } from '../toast-store';
+
+const store = () => useNotificationCenterStore.getState();
+
+beforeEach(() => {
+  localStorage.clear();
+  store().clear();
+});
+afterEach(() => vi.restoreAllMocks());
+
+describe('notification center', () => {
+  it('keeps the newest first and only the last 50', () => {
+    for (let i = 0; i < MAX_ENTRIES + 5; i++) store().add({ level: 'info', title: `n${i}`, body: '' });
+    expect(store().entries).toHaveLength(MAX_ENTRIES);
+    expect(store().entries[0].title).toBe(`n${MAX_ENTRIES + 4}`);
+    expect(store().entries.at(-1)!.title).toBe('n5');
+  });
+
+  it('survives a reload of the page', () => {
+    store().add({ level: 'info', title: 'From the plugin', body: 'b', pluginId: 'rss', pluginName: 'RSS', tag: 't1' });
+    useNotificationCenterStore.setState({ entries: [] });
+    reloadNotificationCenter();
+    expect(store().entries).toMatchObject([{ title: 'From the plugin', pluginId: 'rss', pluginName: 'RSS', tag: 't1', read: false }]);
+  });
+
+  it('counts unread, marks all read and clears', () => {
+    store().add({ level: 'error', title: 'a', body: '' });
+    store().add({ level: 'warning', title: 'b', body: '' });
+    expect(selectUnreadCount(store())).toBe(2);
+    store().markAllRead();
+    expect(selectUnreadCount(store())).toBe(0);
+    reloadNotificationCenter();
+    expect(selectUnreadCount(store())).toBe(0);
+    store().clear();
+    reloadNotificationCenter();
+    expect(store().entries).toEqual([]);
+  });
+
+  it('works without storage', () => {
+    vi.spyOn(Storage.prototype, 'setItem').mockImplementation(() => { throw new Error('blocked'); });
+    vi.spyOn(localStorage, 'setItem').mockImplementation(() => { throw new Error('blocked'); });
+    expect(() => store().add({ level: 'info', title: 'x', body: '' })).not.toThrow();
+    expect(store().entries).toHaveLength(1);
+  });
+
+  it('drops malformed stored entries', () => {
+    localStorage.setItem('notification-center', JSON.stringify([{ id: 1 }, 'x', { id: 'a', time: 1, title: 't', body: '', read: false, level: 'info' }]));
+    reloadNotificationCenter();
+    expect(store().entries.map((e) => e.id)).toEqual(['a']);
+  });
+
+  it('records the app\'s error and warning toasts, not the others', () => {
+    toast.error('Could not send', 'Server said no');
+    toast.warning('Quota almost full');
+    toast.success('Sent');
+    toast.info('Heads up');
+    expect(store().entries.map((e) => [e.level, e.title, e.body])).toEqual([
+      ['warning', 'Quota almost full', ''],
+      ['error', 'Could not send', 'Server said no'],
+    ]);
+    expect(store().entries[0].pluginId).toBeUndefined();
+  });
+});
diff --git a/stores/__tests__/settings-store-plugin-hooks.test.ts b/stores/__tests__/settings-store-plugin-hooks.test.ts
new file mode 100644
index 000000000..f0a64283c
--- /dev/null
+++ b/stores/__tests__/settings-store-plugin-hooks.test.ts
@@ -0,0 +1,193 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+const apiFetch = vi.hoisted(() => vi.fn());
+vi.mock('@/lib/browser-navigation', () => ({ apiFetch }));
+
+import { useSettingsStore, DEFAULT_KEYWORDS } from '../settings-store';
+import { useContactStore } from '../contact-store';
+import { clearAllHooks, settingsHooks } from '@/lib/plugin-hooks';
+import type { IJMAPClient } from '@/lib/jmap/client-interface';
+
+const flush = () => new Promise((resolve) => setTimeout(resolve, 0));
+
+describe('settings plugin hooks', () => {
+  beforeEach(() => {
+    apiFetch.mockReset();
+    useSettingsStore.getState().disableSync();
+    useSettingsStore.setState({
+      sendDelaySeconds: 0,
+      tourCompleted: false,
+      trustedSenders: [],
+      folderIcons: {},
+      emailKeywords: [...DEFAULT_KEYWORDS],
+      settingsSyncDisabled: false,
+    });
+  });
+
+  afterEach(() => clearAllHooks());
+
+  it('asks onBeforeSettingChange first and reports the change afterwards', async () => {
+    const order: string[] = [];
+    const before = vi.fn(() => { order.push(`before:${useSettingsStore.getState().sendDelaySeconds}`); return true; });
+    const after = vi.fn(() => { order.push('after'); });
+    settingsHooks.onBeforeSettingChange.register('test', before);
+    settingsHooks.onSettingChange.register('test', after);
+
+    useSettingsStore.getState().updateSetting('sendDelaySeconds', 30);
+    await flush();
+
+    expect(before).toHaveBeenCalledWith({ key: 'sendDelaySeconds', value: 30, previous: 0 });
+    expect(after).toHaveBeenCalledTimes(1);
+    expect(after).toHaveBeenCalledWith({ key: 'sendDelaySeconds', value: 30, previous: 0 });
+    expect(order).toEqual(['before:0', 'after']);
+    expect(useSettingsStore.getState().sendDelaySeconds).toBe(30);
+  });
+
+  it('keeps the old value when a plugin says no', async () => {
+    const after = vi.fn();
+    settingsHooks.onBeforeSettingChange.register('test', () => false);
+    settingsHooks.onSettingChange.register('test', after);
+
+    useSettingsStore.getState().updateSetting('sendDelaySeconds', 30);
+    await flush();
+
+    expect(useSettingsStore.getState().sendDelaySeconds).toBe(0);
+    expect(after).not.toHaveBeenCalled();
+  });
+
+  it('applies synchronously when no plugin intercepts', () => {
+    const after = vi.fn();
+    settingsHooks.onSettingChange.register('test', after);
+    useSettingsStore.getState().updateSetting('sendDelaySeconds', 10);
+    expect(useSettingsStore.getState().sendDelaySeconds).toBe(10);
+    expect(after).toHaveBeenCalledWith({ key: 'sendDelaySeconds', value: 10, previous: 0 });
+  });
+
+  it('leaves bookkeeping and internal writes out of the setting hooks', async () => {
+    const before = vi.fn(() => false);
+    const after = vi.fn();
+    settingsHooks.onBeforeSettingChange.register('test', before);
+    settingsHooks.onSettingChange.register('test', after);
+
+    useSettingsStore.getState().updateSetting('tourCompleted', true);
+    useSettingsStore.getState().updateSetting('sendDelaySeconds', 60, { internal: true });
+    await flush();
+
+    expect(useSettingsStore.getState().tourCompleted).toBe(true);
+    expect(useSettingsStore.getState().sendDelaySeconds).toBe(60);
+    expect(before).not.toHaveBeenCalled();
+    expect(after).not.toHaveBeenCalled();
+  });
+
+  it('routes folder icon changes through the setting hooks', async () => {
+    settingsHooks.onBeforeSettingChange.register('test', () => false);
+    useSettingsStore.getState().setFolderIcon('mb1', 'Star');
+    await flush();
+    expect(useSettingsStore.getState().folderIcons).toEqual({});
+  });
+
+  it('reports export but not the sync snapshot', () => {
+    const exported = vi.fn();
+    settingsHooks.onSettingsExport.register('test', exported);
+
+    useSettingsStore.getState().exportSettings({ forSync: true });
+    expect(exported).not.toHaveBeenCalled();
+
+    useSettingsStore.getState().exportSettings();
+    expect(exported).toHaveBeenCalledTimes(1);
+    const { keys } = exported.mock.calls[0][0] as { keys: string[] };
+    expect(keys).toContain('sendDelaySeconds');
+    expect(keys).toContain('theme');
+  });
+
+  it('reports a file import with the keys taken over, and not a failed one', () => {
+    const imported = vi.fn();
+    settingsHooks.onSettingsImport.register('test', imported);
+
+    expect(useSettingsStore.getState().importSettings('not json')).toBe(false);
+    expect(imported).not.toHaveBeenCalled();
+
+    useSettingsStore.getState().importSettings(JSON.stringify({ sendDelaySeconds: 30, unknownKey: 1, proInterface: true }));
+    expect(imported).toHaveBeenCalledTimes(1);
+    expect(imported).toHaveBeenCalledWith({ keys: ['sendDelaySeconds'] });
+  });
+
+  it('reports a reset', () => {
+    const reset = vi.fn();
+    settingsHooks.onSettingsReset.register('test', reset);
+    useSettingsStore.getState().resetToDefaults();
+    expect(reset).toHaveBeenCalledWith({});
+  });
+
+  it('reports a pull from the server as a sync, not an import', async () => {
+    const synced = vi.fn();
+    const imported = vi.fn();
+    settingsHooks.onSettingsSync.register('test', synced);
+    settingsHooks.onSettingsImport.register('test', imported);
+    apiFetch.mockResolvedValue(new Response(JSON.stringify({ settings: { sendDelaySeconds: 10 } }), { status: 200 }));
+
+    await useSettingsStore.getState().loadFromServer('a@example.com', 'https://mail.example.com');
+
+    expect(synced).toHaveBeenCalledWith({ direction: 'pulled' });
+    expect(imported).not.toHaveBeenCalled();
+  });
+
+  it('reports a push only when the server accepted it', async () => {
+    const synced = vi.fn();
+    settingsHooks.onSettingsSync.register('test', synced);
+    const settings = useSettingsStore.getState();
+    settings.enableSync('a@example.com', 'https://mail.example.com');
+
+    apiFetch.mockResolvedValueOnce(new Response(JSON.stringify({ error: 'nope' }), { status: 400 }));
+    settings.updateSetting('sendDelaySeconds', 10);
+    await useSettingsStore.getState().flushSync();
+    expect(synced).not.toHaveBeenCalled();
+
+    apiFetch.mockResolvedValueOnce(new Response(JSON.stringify({ ok: true }), { status: 200 }));
+    useSettingsStore.getState().updateSetting('sendDelaySeconds', 30);
+    await useSettingsStore.getState().flushSync();
+    expect(synced).toHaveBeenCalledWith({ direction: 'pushed' });
+  });
+
+  it('reports tag definition changes as keyword views', () => {
+    const changed = vi.fn();
+    settingsHooks.onKeywordChange.register('test', changed);
+    useSettingsStore.getState().addKeyword({ id: 'work', label: 'Work', color: 'blue' });
+    expect(changed).toHaveBeenCalledTimes(1);
+    const { keywords } = changed.mock.calls[0][0] as { keywords: unknown[] };
+    expect(keywords).toContainEqual({ id: 'work', name: 'Work', color: 'blue' });
+
+    // Writing an identical list is no change.
+    useSettingsStore.getState().reorderKeywords([...useSettingsStore.getState().emailKeywords]);
+    expect(changed).toHaveBeenCalledTimes(1);
+  });
+
+  it('reports trusted senders added and removed, once each', () => {
+    const changed = vi.fn();
+    settingsHooks.onTrustedSenderChange.register('test', changed);
+    const s = useSettingsStore.getState();
+    s.addTrustedSender('Alice <Alice@Example.com>');
+    s.addTrustedSender('alice@example.com');
+    s.removeTrustedSender('alice@example.com');
+    s.removeTrustedSender('alice@example.com');
+    expect(changed.mock.calls).toEqual([
+      [{ email: 'alice@example.com', trusted: true }],
+      [{ email: 'alice@example.com', trusted: false }],
+    ]);
+  });
+
+  it('reports trusted senders kept in the address book after the server stored them', async () => {
+    const changed = vi.fn();
+    settingsHooks.onTrustedSenderChange.register('test', changed);
+    useContactStore.setState({ trustedSendersBookId: 'book1', trustedSenderEmails: [] });
+    const client = {
+      createContact: vi.fn().mockRejectedValueOnce(new Error('down')).mockResolvedValue({ id: 'c1' }),
+    } as unknown as IJMAPClient;
+
+    await expect(useContactStore.getState().addToTrustedSendersBook(client, 'bob@example.com')).rejects.toThrow();
+    expect(changed).not.toHaveBeenCalled();
+
+    await useContactStore.getState().addToTrustedSendersBook(client, 'bob@example.com');
+    expect(changed).toHaveBeenCalledWith({ email: 'bob@example.com', trusted: true });
+  });
+});
diff --git a/stores/__tests__/task-store-hooks.test.ts b/stores/__tests__/task-store-hooks.test.ts
new file mode 100644
index 000000000..0a861e5e9
--- /dev/null
+++ b/stores/__tests__/task-store-hooks.test.ts
@@ -0,0 +1,210 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { useTaskStore } from '../task-store';
+import { clearAllHooks, taskHooks } from '@/lib/plugin-hooks';
+import type { CalendarTask } from '@/lib/jmap/types';
+import type { IJMAPClient } from '@/lib/jmap/client-interface';
+
+// Plugins hear about loaded, created, changed, deleted and checked-off tasks
+// and filter changes; the before-hooks run ahead of the server call and can
+// stop the change.
+
+function makeTask(overrides: Partial<CalendarTask> = {}): CalendarTask {
+  return {
+    id: 't1',
+    calendarIds: { 'cal-1': true },
+    '@type': 'Task',
+    uid: 'task-uid-1',
+    title: 'Write report',
+    description: '',
+    due: '2026-09-08T10:00:00',
+    progress: 'needs-action',
+    priority: 0,
+    keywords: null,
+    ...overrides,
+  } as CalendarTask;
+}
+
+let client: IJMAPClient;
+
+beforeEach(() => {
+  clearAllHooks();
+  useTaskStore.setState({ tasks: [], selectedTaskId: null, filter: 'all', showCompleted: false, isLoading: false, error: null });
+  client = {
+    getCalendarTasks: vi.fn().mockResolvedValue([makeTask()]),
+    createCalendarTask: vi.fn(async (t: Partial<CalendarTask>) => makeTask({ ...t, id: 'created' })),
+    updateCalendarTask: vi.fn().mockResolvedValue(undefined),
+    deleteCalendarTask: vi.fn().mockResolvedValue(undefined),
+  } as never;
+});
+
+describe('onTasksLoaded', () => {
+  it('reports the fetched tasks as views', async () => {
+    const handler = vi.fn();
+    taskHooks.onTasksLoaded.register('t', handler);
+    await useTaskStore.getState().fetchTasks(client);
+    expect(handler).toHaveBeenCalledTimes(1);
+    expect(handler.mock.calls[0][0]).toEqual([
+      expect.objectContaining({ id: 't1', title: 'Write report', isComplete: false, calendarId: 'cal-1' }),
+    ]);
+  });
+
+  it('stays quiet when loading failed', async () => {
+    vi.mocked(client.getCalendarTasks).mockRejectedValue(new Error('boom'));
+    const handler = vi.fn();
+    taskHooks.onTasksLoaded.register('t', handler);
+    await useTaskStore.getState().fetchTasks(client);
+    expect(handler).not.toHaveBeenCalled();
+  });
+});
+
+describe('create, update and delete', () => {
+  it('asks before creating and reports the created task', async () => {
+    const before = vi.fn((view) => {
+      expect(client.createCalendarTask).not.toHaveBeenCalled();
+      expect(view).toMatchObject({ title: 'New task' });
+      return true;
+    });
+    taskHooks.onBeforeTaskCreate.register('t', before);
+    const after = vi.fn();
+    taskHooks.onTaskCreate.register('t', after);
+
+    await useTaskStore.getState().createTask(client, { title: 'New task', calendarIds: { 'cal-1': true } });
+
+    expect(before).toHaveBeenCalledTimes(1);
+    expect(after).toHaveBeenCalledTimes(1);
+    expect(after.mock.calls[0][0]).toMatchObject({ id: 'created', title: 'New task' });
+  });
+
+  it('creates nothing when a plugin says no', async () => {
+    taskHooks.onBeforeTaskCreate.register('t', () => false);
+    const after = vi.fn();
+    taskHooks.onTaskCreate.register('t', after);
+
+    const created = await useTaskStore.getState().createTask(client, { title: 'New task' });
+
+    expect(created).toBeNull();
+    expect(client.createCalendarTask).not.toHaveBeenCalled();
+    expect(useTaskStore.getState().tasks).toEqual([]);
+    expect(after).not.toHaveBeenCalled();
+  });
+
+  it('asks before changing and reports the changed task', async () => {
+    useTaskStore.setState({ tasks: [makeTask()] });
+    const before = vi.fn(() => {
+      expect(client.updateCalendarTask).not.toHaveBeenCalled();
+      return true;
+    });
+    taskHooks.onBeforeTaskUpdate.register('t', before);
+    const after = vi.fn();
+    taskHooks.onTaskUpdate.register('t', after);
+
+    await useTaskStore.getState().updateTask(client, 't1', { title: 'Renamed' });
+
+    expect(before).toHaveBeenCalledWith({ taskId: 't1', patch: { title: 'Renamed' } });
+    expect(after).toHaveBeenCalledTimes(1);
+    expect(after.mock.calls[0][0]).toMatchObject({ id: 't1', title: 'Renamed' });
+  });
+
+  it('leaves the task alone when a plugin says no', async () => {
+    useTaskStore.setState({ tasks: [makeTask()] });
+    taskHooks.onBeforeTaskUpdate.register('t', () => false);
+    const after = vi.fn();
+    taskHooks.onTaskUpdate.register('t', after);
+
+    await useTaskStore.getState().updateTask(client, 't1', { title: 'Renamed' });
+
+    expect(client.updateCalendarTask).not.toHaveBeenCalled();
+    expect(useTaskStore.getState().tasks[0].title).toBe('Write report');
+    expect(after).not.toHaveBeenCalled();
+  });
+
+  it('does not report a change the server refused', async () => {
+    useTaskStore.setState({ tasks: [makeTask()] });
+    vi.mocked(client.updateCalendarTask).mockRejectedValue(new Error('boom'));
+    const after = vi.fn();
+    taskHooks.onTaskUpdate.register('t', after);
+    await expect(useTaskStore.getState().updateTask(client, 't1', { title: 'X' })).rejects.toThrow('boom');
+    expect(after).not.toHaveBeenCalled();
+  });
+
+  it('asks before deleting and reports the deleted task with its title', async () => {
+    useTaskStore.setState({ tasks: [makeTask()] });
+    const before = vi.fn(() => {
+      expect(client.deleteCalendarTask).not.toHaveBeenCalled();
+      return true;
+    });
+    taskHooks.onBeforeTaskDelete.register('t', before);
+    const after = vi.fn();
+    taskHooks.onTaskDelete.register('t', after);
+
+    await useTaskStore.getState().deleteTask(client, 't1');
+
+    expect(before).toHaveBeenCalledWith({ taskId: 't1', title: 'Write report' });
+    expect(after).toHaveBeenCalledWith({ taskId: 't1', title: 'Write report' });
+  });
+
+  it('keeps the task when a plugin says no, and reports no failed delete', async () => {
+    useTaskStore.setState({ tasks: [makeTask()] });
+    taskHooks.onBeforeTaskDelete.register('t', () => false);
+    const after = vi.fn();
+    taskHooks.onTaskDelete.register('t', after);
+
+    await useTaskStore.getState().deleteTask(client, 't1');
+    expect(client.deleteCalendarTask).not.toHaveBeenCalled();
+    expect(useTaskStore.getState().tasks).toHaveLength(1);
+
+    clearAllHooks();
+    taskHooks.onTaskDelete.register('t', after);
+    vi.mocked(client.deleteCalendarTask).mockRejectedValue(new Error('boom'));
+    await expect(useTaskStore.getState().deleteTask(client, 't1')).rejects.toThrow('boom');
+    expect(after).not.toHaveBeenCalled();
+  });
+});
+
+describe('onTaskToggleComplete', () => {
+  it('reports the new state after the server took it, and not as an update', async () => {
+    const task = makeTask();
+    useTaskStore.setState({ tasks: [task] });
+    const toggled = vi.fn((_payload: unknown) => {
+      expect(client.updateCalendarTask).toHaveBeenCalled();
+    });
+    taskHooks.onTaskToggleComplete.register('t', toggled);
+    const updated = vi.fn();
+    taskHooks.onTaskUpdate.register('t', updated);
+
+    await useTaskStore.getState().toggleTaskComplete(client, task);
+    await useTaskStore.getState().toggleTaskComplete(client, { ...task, progress: 'completed' });
+
+    expect(toggled.mock.calls.map((c) => c[0])).toEqual([
+      { taskId: 't1', complete: true },
+      { taskId: 't1', complete: false },
+    ]);
+    expect(updated).not.toHaveBeenCalled();
+  });
+
+  it('stays quiet when the server refused', async () => {
+    const task = makeTask();
+    vi.mocked(client.updateCalendarTask).mockRejectedValue(new Error('boom'));
+    const toggled = vi.fn();
+    taskHooks.onTaskToggleComplete.register('t', toggled);
+    await expect(useTaskStore.getState().toggleTaskComplete(client, task)).rejects.toThrow('boom');
+    expect(toggled).not.toHaveBeenCalled();
+  });
+});
+
+describe('onTaskFilterChange', () => {
+  it('reports filter and show-completed changes, but not unchanged values', () => {
+    const handler = vi.fn();
+    taskHooks.onTaskFilterChange.register('t', handler);
+    useTaskStore.getState().setFilter('all');
+    useTaskStore.getState().setShowCompleted(false);
+    expect(handler).not.toHaveBeenCalled();
+
+    useTaskStore.getState().setFilter('overdue');
+    useTaskStore.getState().setShowCompleted(true);
+    expect(handler.mock.calls.map((c) => c[0])).toEqual([
+      { filter: 'overdue', showCompleted: false },
+      { filter: 'overdue', showCompleted: true },
+    ]);
+  });
+});
diff --git a/stores/__tests__/task-store.test.ts b/stores/__tests__/task-store.test.ts
index 73adad370..89d4d19ac 100644
--- a/stores/__tests__/task-store.test.ts
+++ b/stores/__tests__/task-store.test.ts
@@ -105,7 +105,7 @@ describe('task-store', () => {
       const created = await useTaskStore.getState().createTask(mockClient as IJMAPClient, { title: 'New Task' });
 
       expect(mockClient.createCalendarTask).toHaveBeenCalledWith({ title: 'New Task' });
-      expect(created.id).toBe('task-created');
+      expect(created?.id).toBe('task-created');
       expect(useTaskStore.getState().tasks).toContainEqual(created);
     });
 
diff --git a/stores/__tests__/template-plugin-hooks.test.ts b/stores/__tests__/template-plugin-hooks.test.ts
new file mode 100644
index 000000000..a412182ac
--- /dev/null
+++ b/stores/__tests__/template-plugin-hooks.test.ts
@@ -0,0 +1,56 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { useTemplateStore, renderTemplateWithPlugins } from '../template-store';
+import { clearAllHooks, templateHooks } from '@/lib/plugin-hooks';
+
+const DATA = { name: 'Greeting', category: 'Work', subject: 'Hi', body: 'Hello', isHTML: false, isFavorite: false, placeholders: [] };
+
+describe('template plugin hooks', () => {
+  beforeEach(() => {
+    useTemplateStore.setState({ templates: [], recentTemplateIds: [], deletedTemplateIds: {} });
+  });
+  afterEach(() => clearAllHooks());
+
+  it('reports created, duplicated, changed and deleted templates', () => {
+    const created = vi.fn();
+    const updated = vi.fn();
+    const deleted = vi.fn();
+    templateHooks.onTemplateCreate.register('test', created);
+    templateHooks.onTemplateUpdate.register('test', updated);
+    templateHooks.onTemplateDelete.register('test', deleted);
+    const store = useTemplateStore.getState();
+
+    const t = store.addTemplate(DATA as never);
+    expect(created).toHaveBeenCalledWith({ id: t.id, name: 'Greeting', category: 'Work', subject: 'Hi', body: 'Hello', isHTML: false });
+
+    const copy = store.duplicateTemplate(t.id)!;
+    expect(created).toHaveBeenLastCalledWith(expect.objectContaining({ id: copy.id }));
+
+    store.updateTemplate(t.id, { subject: 'Hey' });
+    expect(updated).toHaveBeenCalledWith(expect.objectContaining({ id: t.id, subject: 'Hey' }));
+
+    store.deleteTemplate(t.id);
+    store.deleteTemplate(t.id);
+    expect(deleted).toHaveBeenCalledTimes(1);
+    expect(deleted).toHaveBeenCalledWith({ templateId: t.id });
+  });
+
+  it('reports how many templates an import added, and nothing for a failed one', () => {
+    const imported = vi.fn();
+    templateHooks.onTemplatesImport.register('test', imported);
+    useTemplateStore.getState().importTemplates('not json');
+    expect(imported).not.toHaveBeenCalled();
+
+    const json = JSON.stringify({ type: 'webmail-templates', version: 1, templates: [{ ...DATA, id: 'x' }] });
+    const { count } = useTemplateStore.getState().importTemplates(json);
+    expect(count).toBe(1);
+    expect(imported).toHaveBeenCalledWith({ count: 1 });
+  });
+
+  it('renders through plugins only when one listens, and keeps fields a plugin got wrong', async () => {
+    const input = { subject: 'Hi', html: '<p>Hello</p>', text: 'Hello' };
+    expect(await renderTemplateWithPlugins('t1', input)).toBeNull();
+
+    templateHooks.onTemplateRender.register('test', (value: typeof input) => ({ ...value, html: '<p>Changed</p>', text: 42 }));
+    expect(await renderTemplateWithPlugins('t1', input)).toEqual({ subject: 'Hi', html: '<p>Changed</p>', text: 'Hello' });
+  });
+});
diff --git a/stores/__tests__/toast-store-hooks.test.ts b/stores/__tests__/toast-store-hooks.test.ts
new file mode 100644
index 000000000..777d45d05
--- /dev/null
+++ b/stores/__tests__/toast-store-hooks.test.ts
@@ -0,0 +1,32 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { clearAllHooks, toastHooks } from '@/lib/plugin-hooks';
+import { useToastStore } from '../toast-store';
+
+beforeEach(() => {
+  clearAllHooks();
+  useToastStore.setState({ toasts: [] });
+});
+
+describe('toast hooks', () => {
+  it('tells plugins about a toast when it is shown and when it goes away', () => {
+    const shown = vi.fn();
+    const dismissed = vi.fn();
+    toastHooks.onToastShow.register('t', shown);
+    toastHooks.onToastDismiss.register('t', dismissed);
+
+    const id = useToastStore.getState().addToast({ type: 'success', title: 'Moved', message: '3 messages' });
+    useToastStore.getState().removeToast(id);
+
+    expect(shown).toHaveBeenCalledWith({ id, type: 'success', title: 'Moved', message: '3 messages' });
+    expect(dismissed).toHaveBeenCalledWith({ id });
+  });
+
+  it('does not report a dismissal for a toast that is not there', () => {
+    const dismissed = vi.fn();
+    toastHooks.onToastDismiss.register('t', dismissed);
+
+    useToastStore.getState().removeToast('gone');
+
+    expect(dismissed).not.toHaveBeenCalled();
+  });
+});
diff --git a/stores/__tests__/vacation-plugin-hooks.test.ts b/stores/__tests__/vacation-plugin-hooks.test.ts
new file mode 100644
index 000000000..f91f95eaf
--- /dev/null
+++ b/stores/__tests__/vacation-plugin-hooks.test.ts
@@ -0,0 +1,89 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { useVacationStore } from '../vacation-store';
+import { clearAllHooks, vacationHooks } from '@/lib/plugin-hooks';
+import type { IJMAPClient } from '@/lib/jmap/client-interface';
+
+const SERVER = {
+  id: 'singleton',
+  isEnabled: false,
+  fromDate: null,
+  toDate: null,
+  subject: 'Away',
+  textBody: 'Back soon',
+  htmlBody: null,
+};
+
+function mockClient() {
+  return {
+    supportsSieve: () => false,
+    getVacationResponse: vi.fn(async () => ({ ...SERVER })),
+    setVacationResponse: vi.fn(async () => {}),
+  };
+}
+
+const initial = useVacationStore.getState();
+afterEach(() => {
+  useVacationStore.setState(initial, true);
+  clearAllHooks();
+});
+
+describe('vacation plugin hooks', () => {
+  it('reports the loaded reply, and nothing when loading failed', async () => {
+    const loaded = vi.fn();
+    vacationHooks.onVacationLoaded.register('test', loaded);
+    const client = mockClient();
+
+    client.getVacationResponse.mockRejectedValueOnce(new Error('down'));
+    await useVacationStore.getState().fetchVacationResponse(client as unknown as IJMAPClient);
+    expect(loaded).not.toHaveBeenCalled();
+
+    await useVacationStore.getState().fetchVacationResponse(client as unknown as IJMAPClient);
+    expect(loaded).toHaveBeenCalledWith({
+      isEnabled: false, subject: 'Away', htmlBody: '', textBody: 'Back soon', fromDate: null, toDate: null,
+    });
+  });
+
+  it('asks before saving, then reports the saved reply', async () => {
+    const client = mockClient();
+    await useVacationStore.getState().fetchVacationResponse(client as unknown as IJMAPClient);
+    const before = vi.fn(() => {
+      expect(client.setVacationResponse).not.toHaveBeenCalled();
+      return true;
+    });
+    const updated = vi.fn();
+    vacationHooks.onBeforeVacationUpdate.register('test', before);
+    vacationHooks.onVacationUpdate.register('test', updated);
+
+    const saved = await useVacationStore.getState().updateVacationResponse(client as unknown as IJMAPClient, { isEnabled: true });
+
+    const expected = { isEnabled: true, subject: 'Away', htmlBody: '', textBody: 'Back soon', fromDate: null, toDate: null };
+    expect(saved).toBe(true);
+    expect(before).toHaveBeenCalledWith(expected);
+    expect(updated).toHaveBeenCalledWith(expected);
+  });
+
+  it('leaves the reply alone when a plugin says no', async () => {
+    const client = mockClient();
+    const updated = vi.fn();
+    vacationHooks.onBeforeVacationUpdate.register('test', () => false);
+    vacationHooks.onVacationUpdate.register('test', updated);
+
+    const saved = await useVacationStore.getState().updateVacationResponse(client as unknown as IJMAPClient, { isEnabled: true });
+
+    expect(saved).toBe(false);
+    expect(client.setVacationResponse).not.toHaveBeenCalled();
+    expect(useVacationStore.getState().isEnabled).toBe(false);
+    expect(useVacationStore.getState().isSaving).toBe(false);
+    expect(updated).not.toHaveBeenCalled();
+  });
+
+  it('does not report a save the server refused', async () => {
+    const client = mockClient();
+    client.setVacationResponse.mockRejectedValueOnce(new Error('refused'));
+    const updated = vi.fn();
+    vacationHooks.onVacationUpdate.register('test', updated);
+
+    await expect(useVacationStore.getState().updateVacationResponse(client as unknown as IJMAPClient, { isEnabled: true })).rejects.toThrow();
+    expect(updated).not.toHaveBeenCalled();
+  });
+});
diff --git a/stores/account-security-store.ts b/stores/account-security-store.ts
index bc2abd717..7a9b2dd0f 100644
--- a/stores/account-security-store.ts
+++ b/stores/account-security-store.ts
@@ -4,6 +4,10 @@ import { useAuthStore } from '@/stores/auth-store';
 import { stalwartJmap, requireResult, type JmapMethodResponse } from '@/lib/stalwart/jmap-passthrough';
 import { isStalwartJmapPassthroughEnabled } from '@/lib/stalwart/principal';
 import { currentStoreEpoch } from '@/lib/store-epoch';
+import { accountSecurityHooks } from '@/lib/plugin-hooks';
+
+// Security hooks fire only once the server confirmed the change, and carry no
+// secrets: never a password, TOTP seed or code, or an app password value.
 
 export type EncryptionType = 'Disabled' | 'Aes128' | 'Aes256';
 
@@ -191,6 +195,7 @@ async function createCredential(
   method: SetMethod,
   input: AppCredentialInput,
   fallbackError: string,
+  onCreated?: () => void,
 ): Promise<{ id: string; secret: string }> {
   set({ isSaving: true, error: null });
   try {
@@ -212,6 +217,7 @@ async function createCredential(
     if (!created?.id || !created.secret) {
       throw new Error(`Server did not return created credential`);
     }
+    onCreated?.();
 
     await get().fetchAuthInfo();
     set({ isSaving: false });
@@ -225,19 +231,28 @@ async function createCredential(
   }
 }
 
+/** The server's /set answer lists `id` as destroyed. */
+function wasDestroyed(responses: JmapMethodResponse[], method: string, id: string): boolean {
+  const match = responses.find((r) => r[0] === method);
+  const destroyed = (match?.[1] as { destroyed?: unknown } | undefined)?.destroyed;
+  return Array.isArray(destroyed) && destroyed.includes(id);
+}
+
 async function removeCredential(
   get: StoreGet,
   set: StoreSet,
   method: SetMethod,
   id: string,
   fallbackError: string,
+  onRemoved?: () => void,
 ): Promise<void> {
   set({ isSaving: true, error: null });
   try {
     const accountId = getPrimaryAccountId();
-    await stalwartJmap([
+    const responses = await stalwartJmap([
       [method, { accountId, destroy: [id] }, '0'],
     ]);
+    if (onRemoved && wasDestroyed(responses, method, id)) onRemoved();
     await get().fetchAuthInfo();
     set({ isSaving: false });
   } catch (error) {
@@ -491,6 +506,7 @@ export const useAccountSecurityStore = create<AccountSecurityState>()((set, get)
       if (notUpdated) {
         throw new Error(notUpdated.description || notUpdated.type || 'Failed to update encryption settings');
       }
+      void accountSecurityHooks.onEncryptionChange.emit({ enabled: type !== 'Disabled' });
 
       // Refresh settings after success
       await get().fetchCryptoInfo();
@@ -601,6 +617,7 @@ export const useAccountSecurityStore = create<AccountSecurityState>()((set, get)
         ],
       ]);
       requireAccountPasswordUpdate(responses, 'Failed to change password');
+      void accountSecurityHooks.onPasswordChange.emit({});
       // The session still authenticates with the old password; switch it over
       // so the next request does not bounce the user to the login page.
       try {
@@ -633,6 +650,7 @@ export const useAccountSecurityStore = create<AccountSecurityState>()((set, get)
         responses, 'x:AccountSettings/set',
       ).notUpdated?.singleton;
       if (failed) throw new Error(failed.description || failed.type || 'Failed to update display name');
+      void accountSecurityHooks.onDisplayNameChange.emit({ displayName });
       set({ displayName, isSaving: false });
     } catch (error) {
       set({
@@ -663,6 +681,7 @@ export const useAccountSecurityStore = create<AccountSecurityState>()((set, get)
         ],
       ]);
       requireAccountPasswordUpdate(responses, 'Failed to enable TOTP');
+      void accountSecurityHooks.onTotpChange.emit({ enabled: true });
       set({ otpEnabled: true, isSaving: false });
     } catch (error) {
       set({
@@ -693,6 +712,7 @@ export const useAccountSecurityStore = create<AccountSecurityState>()((set, get)
         ],
       ]);
       requireAccountPasswordUpdate(responses, 'Failed to disable TOTP');
+      void accountSecurityHooks.onTotpChange.emit({ enabled: false });
       set({ otpEnabled: false, isSaving: false });
     } catch (error) {
       set({
@@ -704,11 +724,13 @@ export const useAccountSecurityStore = create<AccountSecurityState>()((set, get)
   },
 
   createAppPassword: async (input) => {
-    return createCredential(get, set, 'x:AppPassword/set', input, 'Failed to create app password');
+    return createCredential(get, set, 'x:AppPassword/set', input, 'Failed to create app password',
+      () => void accountSecurityHooks.onAppPasswordChange.emit({ change: 'created' }));
   },
 
   removeAppPassword: async (id) => {
-    return removeCredential(get, set, 'x:AppPassword/set', id, 'Failed to remove app password');
+    return removeCredential(get, set, 'x:AppPassword/set', id, 'Failed to remove app password',
+      () => void accountSecurityHooks.onAppPasswordChange.emit({ change: 'removed' }));
   },
 
   createApiKey: async (input) => {
diff --git a/stores/account-store.ts b/stores/account-store.ts
index d43fe42c3..2a6a37059 100644
--- a/stores/account-store.ts
+++ b/stores/account-store.ts
@@ -1,6 +1,7 @@
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
 import { generateAccountId, generateAvatarColor, getMaxAccounts } from '@/lib/account-utils';
+import { authHooks } from '@/lib/plugin-hooks';
 
 export interface AccountEntry {
   /** Unique key: `${username}@${serverHostname}` */
@@ -130,11 +131,13 @@ export const useAccountStore = create<AccountState>()(
           activeAccountId: s.activeAccountId ?? id,
           defaultAccountId: isDefault ? id : s.defaultAccountId,
         }));
+        void authHooks.onAccountAdd.emit({ accountId: id });
 
         return id;
       },
 
       removeAccount: (accountId) => {
+        if (!get().accounts.some((a) => a.id === accountId)) return;
         set((s) => {
           const remaining = s.accounts.filter((a) => a.id !== accountId);
           const wasDefault = s.defaultAccountId === accountId;
@@ -158,6 +161,7 @@ export const useAccountStore = create<AccountState>()(
             defaultAccountId: newDefault,
           };
         });
+        void authHooks.onAccountRemove.emit({ accountId });
       },
 
       setActiveAccount: (accountId) => {
diff --git a/stores/auth-store.ts b/stores/auth-store.ts
index b2c5a8b79..eb32d905a 100644
--- a/stores/auth-store.ts
+++ b/stores/auth-store.ts
@@ -809,7 +809,7 @@ export function applyPreferredIdentity(accountId?: string | null): void {
     if (legacy) {
       preferred = legacy;
       const current = useSettingsStore.getState().preferredIdentityIds;
-      useSettingsStore.getState().updateSetting('preferredIdentityIds', { ...current, [targetId]: legacy });
+      useSettingsStore.getState().updateSetting('preferredIdentityIds', { ...current, [targetId]: legacy }, { internal: true });
     }
   }
   if (!preferred) return;
@@ -931,7 +931,7 @@ function initializeFeatureStores(client: IJMAPClient): void {
     // user has already made an explicit choice (`null` = not yet decided).
     const settings = useSettingsStore.getState();
     if (settings.trustedSendersAddressBook === null) {
-      settings.updateSetting('trustedSendersAddressBook', true);
+      settings.updateSetting('trustedSendersAddressBook', true, { internal: true });
     }
   } else {
     useContactStore.getState().setSupportsSync(false);
@@ -1243,6 +1243,25 @@ function performFullLogout(set: (state: Partial<AuthState>) => void): void {
   broadcastSignOut();
 }
 
+/**
+ * How long sign-out waits for plugins to tidy up. Plugins observe sign-out;
+ * they cannot stop it or hold it up, or a plugin could keep the user signed
+ * in on a shared computer.
+ */
+export const LOGOUT_HOOK_BUDGET_MS = 2000;
+
+function notifySignedIn(state: { activeAccountId: string | null; username: string | null }): void {
+  if (!state.activeAccountId) return;
+  void authHooks.onLogin.emit({ accountId: state.activeAccountId, username: state.username ?? '' });
+}
+
+function beforeLogoutHooks(accountId: string): Promise<void> {
+  return Promise.race([
+    authHooks.onBeforeLogout.emit({ accountId }),
+    new Promise<void>((resolve) => setTimeout(resolve, LOGOUT_HOOK_BUDGET_MS)),
+  ]);
+}
+
 export const useAuthStore = create<AuthState>()(
   persist(
     (set, get) => ({
@@ -1494,6 +1513,7 @@ export const useAuthStore = create<AuthState>()(
             });
           }).catch(() => {});
 
+          notifySignedIn(get());
           return true;
         } catch (error) {
           debug.error('Login error:', error);
@@ -1608,6 +1628,7 @@ export const useAuthStore = create<AuthState>()(
           }).catch(() => {});
 
           resumeSettingsSync({ id: accountId, username, serverUrl });
+          notifySignedIn(get());
           return true;
         } catch (error) {
           debug.error('Token login error:', error);
@@ -1673,6 +1694,7 @@ export const useAuthStore = create<AuthState>()(
             activeAccountId: demoAccountId,
             isDemoMode: true,
           });
+          notifySignedIn(get());
           return true;
         } catch (error) {
           debug.error('Demo login error:', error);
@@ -1816,6 +1838,7 @@ export const useAuthStore = create<AuthState>()(
             sessionStorage.removeItem('oauth_cookie_slot');
           }
 
+          notifySignedIn(get());
           return true;
         } catch (error) {
           debug.error('OAuth login error:', error);
@@ -1953,6 +1976,7 @@ export const useAuthStore = create<AuthState>()(
             });
           }).catch(() => {});
 
+          notifySignedIn(get());
           return true;
         } catch (error) {
           debug.error('Server SSO login error:', error);
@@ -2047,6 +2071,7 @@ export const useAuthStore = create<AuthState>()(
 
             resetRefreshBackoff(accountId ?? undefined);
             scheduleRefresh(expires_in, get().refreshAccessToken, accountId ?? undefined);
+            if (accountId) void authHooks.onTokenRefresh.emit({ accountId });
             return access_token;
           } catch (error) {
             // Network failure (offline, Wi-Fi switch, server unreachable) -
@@ -2080,13 +2105,7 @@ export const useAuthStore = create<AuthState>()(
         const userInitiated = options?.endProviderSession !== false;
         const endProviderSession = userInitiated && !wasDemoMode && shouldEndProviderSession(account);
 
-        const ok = await authHooks.onBeforeLogout.intercept({
-          accountId: accountId ?? 'all',
-        });
-
-        if(!ok){
-          return;
-        }
+        await beforeLogoutHooks(accountId ?? 'all');
 
         // From here on nothing may renew this slot's session; the cleanup
         // below reopens it once the credentials are gone.
@@ -2111,7 +2130,7 @@ export const useAuthStore = create<AuthState>()(
         await useSettingsStore.getState().flushSync();
         useSettingsStore.getState().disableSync();
 
-        await authHooks.onAfterLogout.emit({
+        void authHooks.onAfterLogout.emit({
           accountId: accountId ?? 'all',
         });
 
@@ -2234,13 +2253,7 @@ export const useAuthStore = create<AuthState>()(
       },
 
       logoutAll: async () => {
-        const ok = await authHooks.onBeforeLogout.intercept({
-          accountId: 'all'
-        });
-
-        if(!ok){
-          return;
-        }
+        await beforeLogoutHooks('all');
 
         const accountStore = useAccountStore.getState();
         const allAccounts = [...accountStore.accounts];
@@ -2272,7 +2285,7 @@ export const useAuthStore = create<AuthState>()(
           accountStore.removeAccount(account.id);
         }
 
-        await authHooks.onAfterLogout.emit({
+        void authHooks.onAfterLogout.emit({
           accountId: 'all'
         });
 
@@ -3057,3 +3070,14 @@ if (typeof window !== 'undefined') {
     if (useAuthStore.getState().isAuthenticated) navigateToLogin();
   });
 }
+
+// Plugins hear when a session becomes usable (after start-up or a sign-in)
+// and when another account becomes active, whichever path got there.
+useAuthStore.subscribe((state, prev) => {
+  const ready = state.isAuthenticated && !!state.client && !!state.activeAccountId;
+  const wasReady = prev.isAuthenticated && !!prev.client && !!prev.activeAccountId;
+  if (ready && !wasReady) void authHooks.onAuthReady.emit({ accountId: state.activeAccountId });
+  if (state.activeAccountId && prev.activeAccountId && state.activeAccountId !== prev.activeAccountId) {
+    void authHooks.onAccountSwitch.emit({ accountId: state.activeAccountId, previousAccountId: prev.activeAccountId });
+  }
+});
diff --git a/stores/calendar-store.ts b/stores/calendar-store.ts
index 13fd76342..487febf0e 100644
--- a/stores/calendar-store.ts
+++ b/stores/calendar-store.ts
@@ -20,12 +20,14 @@ import {
   isServerRecurrenceInstance,
   isSyntheticIdMutationUnsupported,
 } from '@/lib/recurrence-instances';
-import { parseISO } from 'date-fns';
+import { format, parseISO } from 'date-fns';
 import { generateUUID } from '@/lib/utils';
 import { apiFetch } from '@/lib/browser-navigation';
 import { explainServerAuthError } from '@/lib/server-auth-status';
 import { BIRTHDAY_CALENDAR_ID } from '@/lib/birthday-calendar';
 import { getClientByLocalAccountId } from './client-registry';
+import { calendarHooks } from '@/lib/plugin-hooks';
+import { eventToView } from '@/lib/plugin-projection';
 
 /**
  * When the Pro shell aggregates calendars/events from every connected
@@ -345,6 +347,8 @@ function selectionAfterFetch(
 // manual refresh, two account-switch reloads, etc.) share the same
 // promise instead of double-fetching and racing the diff/import phase.
 const refreshInFlight = new Map<string, Promise<void>>();
+// Subscriptions whose first fetch is running inside addICalSubscription.
+const subscriptionsBeingAdded = new Set<string>();
 
 export type CalendarViewMode = 'month' | 'week' | 'day' | 'agenda' | 'tasks';
 
@@ -792,6 +796,9 @@ export const useCalendarStore = create<CalendarStore>()(
       },
 
       createEvent: async (client, event, sendSchedulingMessages) => {
+        if (!(await calendarHooks.onBeforeEventCreate.intercept(eventToView({ id: '', ...event } as CalendarEvent)))) {
+          return null;
+        }
         set({ error: null });
         try {
           // Resolve shared calendar context from calendarIds. Also pin the
@@ -869,6 +876,7 @@ export const useCalendarStore = create<CalendarStore>()(
           }
 
           set((state) => ({ events: [...state.events, mappedCreated] }));
+          void calendarHooks.onAfterEventCreate.emit(eventToView(mappedCreated));
           // Invitation emails are sent by the server: `sendSchedulingMessages`
           // on CalendarEvent/set makes Stalwart queue the iTIP REQUEST itself.
           // Sending a client-side iMIP copy here produced duplicate emails.
@@ -883,6 +891,7 @@ export const useCalendarStore = create<CalendarStore>()(
       },
 
       updateEvent: async (client, id, updates, sendSchedulingMessages) => {
+        if (!(await calendarHooks.onBeforeEventUpdate.intercept({ eventId: id, patch: updates }))) return;
         set({ error: null });
         try {
           // Resolve shared event IDs and client-side expanded occurrence IDs
@@ -915,6 +924,9 @@ export const useCalendarStore = create<CalendarStore>()(
           } else {
             await client.updateCalendarEvent(realId, cleanUpdates, sendSchedulingMessages, targetAccountId);
           }
+          // The event as it is after the change, before a refetch reshuffles
+          // occurrence ids: for a single-occurrence edit this is that occurrence.
+          let updatedEvent: CalendarEvent | undefined;
           set((state) => ({
             events: state.events.map(e => {
               if (e.id !== id) return e;
@@ -940,9 +952,14 @@ export const useCalendarStore = create<CalendarStore>()(
                   new Date(merged.utcStart).getTime() + durationMinutes * 60000,
                 ).toISOString();
               }
+              updatedEvent = merged;
               return merged;
             }),
           }));
+          if (calendarHooks.onAfterEventUpdate.size > 0) {
+            const after = updatedEvent ?? ({ ...(storeEvent ?? {}), ...updates, id } as CalendarEvent);
+            void calendarHooks.onAfterEventUpdate.emit(eventToView(after));
+          }
           if (target.isOccurrence || target.isBrowserOccurrence || hasExpandedOccurrencesOf(get().events, realId, target)) {
             await refetchAfterOccurrenceMutation();
           }
@@ -965,6 +982,7 @@ export const useCalendarStore = create<CalendarStore>()(
           set({ error: 'Invalid participant ID' });
           throw new Error('Invalid participant ID');
         }
+        if (!(await calendarHooks.onBeforeEventRsvp.intercept({ eventId, status }))) return;
         try {
           // Resolve shared event IDs and client-side expanded occurrence IDs.
           // Scope 'series' answers for the whole series, so an expanded
@@ -1011,6 +1029,7 @@ export const useCalendarStore = create<CalendarStore>()(
               };
             }),
           }));
+          void calendarHooks.onEventRsvp.emit({ eventId, status });
           // Only the answered event was updated above: after a series answer
           // the other occurrences in view still show the old status, after an
           // occurrence answer the synthetic ids / overrides are stale.
@@ -1025,194 +1044,15 @@ export const useCalendarStore = create<CalendarStore>()(
       },
 
       importEvents: async (client, events, calendarId) => {
-        // Resolve shared calendar IDs
-        const cal = get().calendars.find(c => c.id === calendarId);
-        const realCalendarId = cal?.originalId || stripLocalAccountPrefix(calendarId, cal?.localAccountId);
-        const targetAccountId = cal?.accountId;
-        client = resolveAccountClient(client, cal?.localAccountId);
-
-        // Drop within-file UID duplicates first (first occurrence wins).
-        // CalendarEvent/parse already merges master + RECURRENCE-ID overrides
-        // into one object, so anything still sharing a UID here is a corrupt
-        // feed - creating both either fails ("UID already exists") or stores
-        // two events under one UID, depending on the Stalwart version.
-        const seenUids = new Set<string>();
-        let eventsToProcess = events.filter((e) => {
-          if (!e.uid) return true;
-          if (seenUids.has(e.uid)) return false;
-          seenUids.add(e.uid);
-          return true;
-        });
-
-        // Deduplicate UIDs: Stalwart enforces UID uniqueness across all calendars.
-        // - Events already in the target calendar → skip (true duplicates)
-        // - Events in other calendars → link to target calendar via calendarIds update
-        // - New events → create as normal
-        let linked = 0;
-        try {
-          const allServerEvents = await client.getCalendarEvents(undefined, targetAccountId);
-          const uidToEvent = new Map<string, { id: string; calendarIds: Record<string, boolean> }>();
-          for (const e of allServerEvents) {
-            if (e.uid) {
-              uidToEvent.set(e.uid, {
-                id: (e as CalendarEvent).originalId || e.id,
-                calendarIds: (e as CalendarEvent).originalCalendarIds || e.calendarIds || {},
-              });
-            }
-          }
-
-          const newEvents: Partial<CalendarEvent>[] = [];
-          const eventsToLink: { eventId: string; calendarIds: Record<string, boolean> }[] = [];
-
-          for (const e of eventsToProcess) {
-            if (!e.uid || !uidToEvent.has(e.uid)) {
-              // UID doesn't exist on server - create it
-              newEvents.push(e);
-            } else {
-              const existing = uidToEvent.get(e.uid)!;
-              if (existing.calendarIds[realCalendarId]) {
-                // Already in target calendar - skip
-                continue;
-              }
-              // Exists in another calendar - link to target calendar
-              eventsToLink.push({
-                eventId: existing.id,
-                calendarIds: { ...existing.calendarIds, [realCalendarId]: true },
-              });
-            }
-          }
-
-          // Batch-link existing events to the target calendar
-          for (const { eventId, calendarIds } of eventsToLink) {
-            try {
-              await client.updateCalendarEvent(eventId, { calendarIds } as Partial<CalendarEvent>, undefined, targetAccountId);
-              linked++;
-            } catch (err) {
-              debug.warn('calendar', `Import: failed to link event ${eventId} to target calendar:`, err);
-            }
-          }
-
-          if (linked > 0) {
-            debug.log('calendar', `Import: linked ${linked} existing events to target calendar`);
-          }
-          const skipped = eventsToProcess.length - newEvents.length - eventsToLink.length;
-          if (skipped > 0) {
-            debug.log('calendar', `Import: skipped ${skipped} events already in target calendar`);
-          }
-          eventsToProcess = newEvents;
-        } catch (error) {
-          debug.warn('calendar', 'Could not fetch existing events for deduplication, proceeding without:', error);
-        }
-
-        // Prepare all events for batch creation
-        const prepared: Partial<CalendarEvent>[] = [];
-        for (const event of eventsToProcess) {
-          const src = sanitizeOutgoingCalendarEventData(event as Partial<CalendarEvent>);
-          let cleanParticipants: Record<string, CalendarParticipant> | null = null;
-          if (src.participants) {
-            cleanParticipants = {};
-            for (const [key, p] of Object.entries(src.participants)) {
-              const participant: Record<string, unknown> = {
-                '@type': 'Participant',
-                name: p.name,
-                email: p.email,
-                // calendarAddress carries the scheduling address in jscalendarbis
-                // (Stalwart); sendTo is retired there, so it only serves as a
-                // fallback source for events parsed from legacy RFC 8984 data.
-                calendarAddress: p.calendarAddress || p.sendTo?.imip,
-                description: p.description,
-                kind: p.kind,
-                roles: p.roles,
-                participationStatus: p.participationStatus,
-                participationComment: p.participationComment,
-                expectReply: p.expectReply,
-                scheduleAgent: p.scheduleAgent,
-                scheduleForceSend: p.scheduleForceSend,
-                scheduleId: p.scheduleId,
-                delegatedTo: p.delegatedTo,
-                delegatedFrom: p.delegatedFrom,
-                memberOf: p.memberOf,
-                locationId: p.locationId,
-                language: p.language,
-                links: p.links,
-              };
-              Object.keys(participant).forEach(k => {
-                if (participant[k] === undefined || participant[k] === null) delete participant[k];
-              });
-              cleanParticipants[key] = participant as unknown as CalendarParticipant;
-            }
-          }
-
-          const data: Partial<CalendarEvent> = {
-            calendarIds: { [realCalendarId]: true },
-            uid: src.uid,
-            title: src.title,
-            description: src.description,
-            descriptionContentType: src.descriptionContentType,
-            start: src.start,
-            duration: src.showWithoutTime ? normalizeAllDayDuration(src.duration) : src.duration,
-            timeZone: src.showWithoutTime ? null : src.timeZone,
-            showWithoutTime: src.showWithoutTime,
-            status: src.status,
-            freeBusyStatus: src.freeBusyStatus,
-            privacy: src.privacy,
-            color: src.color,
-            keywords: src.keywords,
-            categories: src.categories,
-            locale: src.locale,
-            // Stalwart derives the iCalendar ORGANIZER solely from
-            // organizerCalendarAddress (replyTo is retired in jscalendarbis);
-            // dropping it here would strip the ORGANIZER from imported invites
-            // and break RSVP replies afterwards.
-            organizerCalendarAddress: src.organizerCalendarAddress || src.replyTo?.imip,
-            locations: src.locations,
-            virtualLocations: src.virtualLocations,
-            links: src.links,
-            recurrenceRules: src.recurrenceRules,
-            recurrenceOverrides: src.recurrenceOverrides,
-            excludedRecurrenceRules: src.excludedRecurrenceRules,
-            alerts: src.alerts,
-            participants: cleanParticipants,
-          };
-          Object.keys(data).forEach(k => {
-            const v = (data as Record<string, unknown>)[k];
-            if (v === undefined || v === null) delete (data as Record<string, unknown>)[k];
-          });
-          prepared.push(data);
-        }
-
-        if (prepared.length === 0) return linked;
-
-        // Batch create in chunks of 50 to avoid oversized requests
-        const BATCH_SIZE = 50;
-        let imported = 0;
-        for (let i = 0; i < prepared.length; i += BATCH_SIZE) {
-          const batch = prepared.slice(i, i + BATCH_SIZE);
-          try {
-            const { created, failed, notCreated } = await client.batchCreateCalendarEvents(batch, targetAccountId);
-            imported += created.length;
-            if (failed.length > 0) {
-              const first = Object.values(notCreated)[0];
-              const reason = first?.description || first?.type || 'unknown error';
-              debug.warn('calendar', `Import batch ${i / BATCH_SIZE + 1}: ${failed.length} events failed (${reason})`);
-              set({ error: `${failed.length} event(s) could not be imported: ${reason}` });
-            }
-          } catch (error) {
-            debug.error(`Import batch ${i / BATCH_SIZE + 1} failed:`, error);
-          }
-        }
-
-        // Re-fetch all events properly so the store state is consistent
-        // (with recurrence expansion, multi-account mapping, etc.)
-        const { dateRange } = get();
-        if (dateRange) {
-          await get().fetchEvents(client, dateRange.start, dateRange.end);
-        }
-
-        return imported + linked;
+        if (!(await calendarHooks.onBeforeEventsImport.intercept({ calendarId, count: events.length }))) return 0;
+        const imported = await importEventsUnhooked(client, events, calendarId);
+        void calendarHooks.onEventsImport.emit({ calendarId, imported, skipped: Math.max(0, events.length - imported) });
+        return imported;
       },
 
       deleteEvent: async (client, id, sendSchedulingMessages) => {
+        const title = get().events.find((e) => e.id === id)?.title || '';
+        if (!(await calendarHooks.onBeforeEventDelete.intercept({ eventId: id, title }))) return;
         set({ error: null });
         try {
           // Resolve shared event IDs and client-side expanded occurrence IDs
@@ -1242,6 +1082,7 @@ export const useCalendarStore = create<CalendarStore>()(
             events: state.events.filter(e => e.id !== id),
             selectedEventId: state.selectedEventId === id ? null : state.selectedEventId,
           }));
+          void calendarHooks.onAfterEventDelete.emit({ eventId: id, title });
           if (target.isOccurrence || target.isBrowserOccurrence || hadOccurrences) {
             await refetchAfterOccurrenceMutation();
           }
@@ -1252,8 +1093,22 @@ export const useCalendarStore = create<CalendarStore>()(
         }
       },
 
-      setSelectedDate: (date) => set({ selectedDate: date }),
-      setViewMode: (mode) => set({ viewMode: getSafeCalendarViewMode(mode) }),
+      setSelectedDate: (date) => {
+        // Plugins get the shown day; a new time on the same day is no change.
+        const previous = get().selectedDate;
+        set({ selectedDate: date });
+        if (Number.isNaN(date.getTime())) return;
+        const day = format(date, 'yyyy-MM-dd');
+        if (Number.isNaN(previous.getTime()) || format(previous, 'yyyy-MM-dd') !== day) {
+          void calendarHooks.onCalendarDateChange.emit({ date: day });
+        }
+      },
+      setViewMode: (mode) => {
+        const view = getSafeCalendarViewMode(mode);
+        const previous = get().viewMode;
+        set({ viewMode: view });
+        if (previous !== view) void calendarHooks.onCalendarViewChange.emit({ view });
+      },
 
       updateCalendar: async (client, calendarId, updates) => {
         set({ error: null });
@@ -1268,6 +1123,7 @@ export const useCalendarStore = create<CalendarStore>()(
               c.id === calendarId ? { ...c, ...updates } : c
             ),
           }));
+          void calendarHooks.onCalendarChange.emit({ calendarId, change: 'updated' });
         } catch (error) {
           debug.error('Failed to update calendar:', error);
           set({ error: 'Failed to update calendar' });
@@ -1298,6 +1154,7 @@ export const useCalendarStore = create<CalendarStore>()(
               return c;
             }),
           }));
+          void calendarHooks.onCalendarChange.emit({ calendarId, change: 'updated' });
         } catch (error) {
           debug.error('Failed to set default calendar:', error);
           set({ error: 'Failed to set default calendar' });
@@ -1322,6 +1179,7 @@ export const useCalendarStore = create<CalendarStore>()(
               return { ...c, shareWith: next };
             }),
           }));
+          void calendarHooks.onCalendarChange.emit({ calendarId, change: 'updated' });
         } catch (error) {
           debug.error('Failed to share calendar:', error);
           set({ error: 'Failed to share calendar' });
@@ -1339,6 +1197,7 @@ export const useCalendarStore = create<CalendarStore>()(
             calendars: [...state.calendars, created],
             selectedCalendarIds: [...state.selectedCalendarIds, created.id],
           }));
+          void calendarHooks.onCalendarChange.emit({ calendarId: created.id, change: 'created' });
           return created;
         } catch (error) {
           debug.error('Failed to create calendar:', error);
@@ -1360,6 +1219,7 @@ export const useCalendarStore = create<CalendarStore>()(
             selectedCalendarIds: state.selectedCalendarIds.filter(id => id !== calendarId),
             events: state.events.filter(e => !e.calendarIds?.[calendarId]),
           }));
+          void calendarHooks.onCalendarChange.emit({ calendarId, change: 'removed' });
         } catch (error) {
           debug.error('Failed to delete calendar:', error);
           set({ error: 'Failed to delete calendar' });
@@ -1447,14 +1307,15 @@ export const useCalendarStore = create<CalendarStore>()(
         }
       },
 
-      toggleCalendarVisibility: (calendarId) => set((state) => {
-        const ids = state.selectedCalendarIds;
-        return {
-          selectedCalendarIds: ids.includes(calendarId)
-            ? ids.filter(id => id !== calendarId)
-            : [...ids, calendarId],
-        };
-      }),
+      toggleCalendarVisibility: (calendarId) => {
+        const visible = !get().selectedCalendarIds.includes(calendarId);
+        set((state) => ({
+          selectedCalendarIds: visible
+            ? [...state.selectedCalendarIds, calendarId]
+            : state.selectedCalendarIds.filter(id => id !== calendarId),
+        }));
+        void calendarHooks.onCalendarVisibilityToggle.emit({ calendarId, visible });
+      },
 
       setSelectedEventId: (id) => set({ selectedEventId: id }),
 
@@ -1511,8 +1372,15 @@ export const useCalendarStore = create<CalendarStore>()(
 
           // Initial fetch - roll back the calendar create if it fails so we
           // don't leave a phantom calendar around after a bad URL / 404 / etc.
-          await get().refreshICalSubscription(client, subscription.id);
+          // Plugins hear "added" for it, not also "refreshed".
+          subscriptionsBeingAdded.add(subscription.id);
+          try {
+            await get().refreshICalSubscription(client, subscription.id);
+          } finally {
+            subscriptionsBeingAdded.delete(subscription.id);
+          }
 
+          void calendarHooks.onICalSubscriptionChange.emit({ subscriptionId: subscription.id, change: 'added' });
           return subscription;
         } catch (error) {
           debug.error('Failed to add iCal subscription:', error);
@@ -1570,6 +1438,7 @@ export const useCalendarStore = create<CalendarStore>()(
             };
           }),
         }));
+        void calendarHooks.onICalSubscriptionChange.emit({ subscriptionId, change: 'updated' });
 
         // If URL changed, refresh to fetch events from new source
         if (normalizedUpdates.url && normalizedUpdates.url !== sub.url) {
@@ -1598,6 +1467,7 @@ export const useCalendarStore = create<CalendarStore>()(
           selectedCalendarIds: state.selectedCalendarIds.filter(id => id !== sub.calendarId),
           events: state.events.filter(e => !e.calendarIds?.[sub.calendarId]),
         }));
+        void calendarHooks.onICalSubscriptionChange.emit({ subscriptionId, change: 'removed' });
       },
 
       refreshICalSubscription: async (client, subscriptionId) => {
@@ -1684,7 +1554,7 @@ export const useCalendarStore = create<CalendarStore>()(
 
           // Import new events (importEvents will re-fetch all events at the end)
           if (eventsToImport.length > 0) {
-            await get().importEvents(client, eventsToImport, sub.calendarId);
+            await importEventsUnhooked(client, eventsToImport, sub.calendarId);
           } else {
             // No new events to import, but stale ones may have been deleted
             // Re-fetch to reflect deletions
@@ -1705,6 +1575,9 @@ export const useCalendarStore = create<CalendarStore>()(
         refreshInFlight.set(subscriptionId, work);
         try {
           await work;
+          if (!subscriptionsBeingAdded.has(subscriptionId)) {
+            void calendarHooks.onICalSubscriptionChange.emit({ subscriptionId, change: 'refreshed' });
+          }
         } catch (error) {
           debug.error('Failed to refresh iCal subscription:', sub.name, error);
           throw error;
@@ -1783,3 +1656,202 @@ export const useCalendarStore = create<CalendarStore>()(
     }
   )
 );
+
+/**
+ * Imports events into a calendar without the plugin import hooks. The
+ * store's importEvents wraps it with them; a subscription refresh calls it
+ * directly, since syncing a feed is not the user importing a file.
+ */
+async function importEventsUnhooked(
+  client: IJMAPClient,
+  events: Partial<CalendarEvent>[],
+  calendarId: string,
+): Promise<number> {
+  const get = useCalendarStore.getState;
+  const set = useCalendarStore.setState;
+  // Resolve shared calendar IDs
+  const cal = get().calendars.find(c => c.id === calendarId);
+  const realCalendarId = cal?.originalId || stripLocalAccountPrefix(calendarId, cal?.localAccountId);
+  const targetAccountId = cal?.accountId;
+  client = resolveAccountClient(client, cal?.localAccountId);
+
+  // Drop within-file UID duplicates first (first occurrence wins).
+  // CalendarEvent/parse already merges master + RECURRENCE-ID overrides
+  // into one object, so anything still sharing a UID here is a corrupt
+  // feed - creating both either fails ("UID already exists") or stores
+  // two events under one UID, depending on the Stalwart version.
+  const seenUids = new Set<string>();
+  let eventsToProcess = events.filter((e) => {
+    if (!e.uid) return true;
+    if (seenUids.has(e.uid)) return false;
+    seenUids.add(e.uid);
+    return true;
+  });
+
+  // Deduplicate UIDs: Stalwart enforces UID uniqueness across all calendars.
+  // - Events already in the target calendar → skip (true duplicates)
+  // - Events in other calendars → link to target calendar via calendarIds update
+  // - New events → create as normal
+  let linked = 0;
+  try {
+    const allServerEvents = await client.getCalendarEvents(undefined, targetAccountId);
+    const uidToEvent = new Map<string, { id: string; calendarIds: Record<string, boolean> }>();
+    for (const e of allServerEvents) {
+      if (e.uid) {
+        uidToEvent.set(e.uid, {
+          id: (e as CalendarEvent).originalId || e.id,
+          calendarIds: (e as CalendarEvent).originalCalendarIds || e.calendarIds || {},
+        });
+      }
+    }
+
+    const newEvents: Partial<CalendarEvent>[] = [];
+    const eventsToLink: { eventId: string; calendarIds: Record<string, boolean> }[] = [];
+
+    for (const e of eventsToProcess) {
+      if (!e.uid || !uidToEvent.has(e.uid)) {
+        // UID doesn't exist on server - create it
+        newEvents.push(e);
+      } else {
+        const existing = uidToEvent.get(e.uid)!;
+        if (existing.calendarIds[realCalendarId]) {
+          // Already in target calendar - skip
+          continue;
+        }
+        // Exists in another calendar - link to target calendar
+        eventsToLink.push({
+          eventId: existing.id,
+          calendarIds: { ...existing.calendarIds, [realCalendarId]: true },
+        });
+      }
+    }
+
+    // Batch-link existing events to the target calendar
+    for (const { eventId, calendarIds } of eventsToLink) {
+      try {
+        await client.updateCalendarEvent(eventId, { calendarIds } as Partial<CalendarEvent>, undefined, targetAccountId);
+        linked++;
+      } catch (err) {
+        debug.warn('calendar', `Import: failed to link event ${eventId} to target calendar:`, err);
+      }
+    }
+
+    if (linked > 0) {
+      debug.log('calendar', `Import: linked ${linked} existing events to target calendar`);
+    }
+    const skipped = eventsToProcess.length - newEvents.length - eventsToLink.length;
+    if (skipped > 0) {
+      debug.log('calendar', `Import: skipped ${skipped} events already in target calendar`);
+    }
+    eventsToProcess = newEvents;
+  } catch (error) {
+    debug.warn('calendar', 'Could not fetch existing events for deduplication, proceeding without:', error);
+  }
+
+  // Prepare all events for batch creation
+  const prepared: Partial<CalendarEvent>[] = [];
+  for (const event of eventsToProcess) {
+    const src = sanitizeOutgoingCalendarEventData(event as Partial<CalendarEvent>);
+    let cleanParticipants: Record<string, CalendarParticipant> | null = null;
+    if (src.participants) {
+      cleanParticipants = {};
+      for (const [key, p] of Object.entries(src.participants)) {
+        const participant: Record<string, unknown> = {
+          '@type': 'Participant',
+          name: p.name,
+          email: p.email,
+          // calendarAddress carries the scheduling address in jscalendarbis
+          // (Stalwart); sendTo is retired there, so it only serves as a
+          // fallback source for events parsed from legacy RFC 8984 data.
+          calendarAddress: p.calendarAddress || p.sendTo?.imip,
+          description: p.description,
+          kind: p.kind,
+          roles: p.roles,
+          participationStatus: p.participationStatus,
+          participationComment: p.participationComment,
+          expectReply: p.expectReply,
+          scheduleAgent: p.scheduleAgent,
+          scheduleForceSend: p.scheduleForceSend,
+          scheduleId: p.scheduleId,
+          delegatedTo: p.delegatedTo,
+          delegatedFrom: p.delegatedFrom,
+          memberOf: p.memberOf,
+          locationId: p.locationId,
+          language: p.language,
+          links: p.links,
+        };
+        Object.keys(participant).forEach(k => {
+          if (participant[k] === undefined || participant[k] === null) delete participant[k];
+        });
+        cleanParticipants[key] = participant as unknown as CalendarParticipant;
+      }
+    }
+
+    const data: Partial<CalendarEvent> = {
+      calendarIds: { [realCalendarId]: true },
+      uid: src.uid,
+      title: src.title,
+      description: src.description,
+      descriptionContentType: src.descriptionContentType,
+      start: src.start,
+      duration: src.showWithoutTime ? normalizeAllDayDuration(src.duration) : src.duration,
+      timeZone: src.showWithoutTime ? null : src.timeZone,
+      showWithoutTime: src.showWithoutTime,
+      status: src.status,
+      freeBusyStatus: src.freeBusyStatus,
+      privacy: src.privacy,
+      color: src.color,
+      keywords: src.keywords,
+      categories: src.categories,
+      locale: src.locale,
+      // Stalwart derives the iCalendar ORGANIZER solely from
+      // organizerCalendarAddress (replyTo is retired in jscalendarbis);
+      // dropping it here would strip the ORGANIZER from imported invites
+      // and break RSVP replies afterwards.
+      organizerCalendarAddress: src.organizerCalendarAddress || src.replyTo?.imip,
+      locations: src.locations,
+      virtualLocations: src.virtualLocations,
+      links: src.links,
+      recurrenceRules: src.recurrenceRules,
+      recurrenceOverrides: src.recurrenceOverrides,
+      excludedRecurrenceRules: src.excludedRecurrenceRules,
+      alerts: src.alerts,
+      participants: cleanParticipants,
+    };
+    Object.keys(data).forEach(k => {
+      const v = (data as Record<string, unknown>)[k];
+      if (v === undefined || v === null) delete (data as Record<string, unknown>)[k];
+    });
+    prepared.push(data);
+  }
+
+  if (prepared.length === 0) return linked;
+
+  // Batch create in chunks of 50 to avoid oversized requests
+  const BATCH_SIZE = 50;
+  let imported = 0;
+  for (let i = 0; i < prepared.length; i += BATCH_SIZE) {
+    const batch = prepared.slice(i, i + BATCH_SIZE);
+    try {
+      const { created, failed, notCreated } = await client.batchCreateCalendarEvents(batch, targetAccountId);
+      imported += created.length;
+      if (failed.length > 0) {
+        const first = Object.values(notCreated)[0];
+        const reason = first?.description || first?.type || 'unknown error';
+        debug.warn('calendar', `Import batch ${i / BATCH_SIZE + 1}: ${failed.length} events failed (${reason})`);
+        set({ error: `${failed.length} event(s) could not be imported: ${reason}` });
+      }
+    } catch (error) {
+      debug.error(`Import batch ${i / BATCH_SIZE + 1} failed:`, error);
+    }
+  }
+
+  // Re-fetch all events properly so the store state is consistent
+  // (with recurrence expansion, multi-account mapping, etc.)
+  const { dateRange } = get();
+  if (dateRange) {
+    await get().fetchEvents(client, dateRange.start, dateRange.end);
+  }
+
+  return imported + linked;
+}
diff --git a/stores/contact-store.ts b/stores/contact-store.ts
index cef716d91..5dd6ab39e 100644
--- a/stores/contact-store.ts
+++ b/stores/contact-store.ts
@@ -4,8 +4,22 @@ import type { ContactCard, AddressBook, AddressBookRights, ContactName } from '@
 import type { IJMAPClient } from '@/lib/jmap/client-interface';
 import { generateUUID } from '@/lib/utils';
 import { debug } from '@/lib/debug';
+import { settingsHooks } from '@/lib/plugin-hooks';
 import { getClientByLocalAccountId } from './client-registry';
 import { sanitizeDisplayName, splitMailbox } from '@/lib/rfc5322-mailbox';
+import { contactHooks } from '@/lib/plugin-hooks';
+import { contactToView } from '@/lib/plugin-projection';
+
+/** A contact that is about to be created, projected for plugins (no id yet). */
+function draftContactView(contact: Partial<ContactCard>) {
+  return contactToView({ addressBookIds: {}, ...contact, id: contact.id ?? '' } as ContactCard);
+}
+
+function sameIdSet(a: Set<string>, b: Set<string>): boolean {
+  if (a.size !== b.size) return false;
+  for (const id of a) if (!b.has(id)) return false;
+  return true;
+}
 
 /** One compose-autocomplete suggestion: a person, or a contact group. */
 type RecipientSuggestion = { name: string; email: string; group?: { id: string; memberCount: number } };
@@ -343,13 +357,15 @@ interface ContactStore {
   fetchAddressBooks: (client: IJMAPClient) => Promise<void>;
   fetchAllAccountsContacts: (accounts: ContactAccountClient[]) => Promise<void>;
   fetchAllAccountsAddressBooks: (accounts: ContactAccountClient[]) => Promise<void>;
-  createContact: (client: IJMAPClient, contact: Partial<ContactCard>) => Promise<void>;
-  updateContact: (client: IJMAPClient, id: string, updates: Partial<ContactCard>) => Promise<void>;
-  deleteContact: (client: IJMAPClient, id: string) => Promise<void>;
+  // The contact actions resolve to false when a plugin stopped them
+  // (onBeforeContactCreate / Update / Delete); nothing changed then.
+  createContact: (client: IJMAPClient, contact: Partial<ContactCard>) => Promise<boolean>;
+  updateContact: (client: IJMAPClient, id: string, updates: Partial<ContactCard>) => Promise<boolean>;
+  deleteContact: (client: IJMAPClient, id: string) => Promise<boolean>;
 
-  addLocalContact: (contact: ContactCard) => void;
-  updateLocalContact: (id: string, updates: Partial<ContactCard>) => void;
-  deleteLocalContact: (id: string) => void;
+  addLocalContact: (contact: ContactCard) => Promise<boolean>;
+  updateLocalContact: (id: string, updates: Partial<ContactCard>) => Promise<boolean>;
+  deleteLocalContact: (id: string) => Promise<boolean>;
 
   setSelectedContact: (id: string | null) => void;
   setSearchQuery: (query: string) => void;
@@ -537,6 +553,7 @@ export const useContactStore = create<ContactStore>()(
       },
 
       createContact: async (client, contact) => {
+        if (!(await contactHooks.onBeforeContactCreate.intercept(draftContactView(contact)))) return false;
         set({ isLoading: true, error: null });
         try {
           // Determine target account from the selected address book. Also
@@ -572,6 +589,8 @@ export const useContactStore = create<ContactStore>()(
             contacts: [...state.contacts, created],
             isLoading: false,
           }));
+          void contactHooks.onAfterContactCreate.emit(contactToView(created));
+          return true;
         } catch (error) {
           const msg = error instanceof Error ? error.message : 'Failed to create contact';
           set({ error: msg, isLoading: false });
@@ -580,6 +599,7 @@ export const useContactStore = create<ContactStore>()(
       },
 
       updateContact: async (client, id, updates) => {
+        if (!(await contactHooks.onBeforeContactUpdate.intercept({ contactId: id, patch: updates }))) return false;
         set({ error: null });
         try {
           const contact = get().contacts.find(c => c.id === id);
@@ -602,6 +622,9 @@ export const useContactStore = create<ContactStore>()(
               c.id === id ? { ...c, ...updates } : c
             ),
           }));
+          const updated = get().contacts.find(c => c.id === id);
+          if (updated) void contactHooks.onAfterContactUpdate.emit(contactToView(updated));
+          return true;
         } catch (error) {
           const msg = error instanceof Error ? error.message : 'Failed to update contact';
           set({ error: msg });
@@ -610,6 +633,7 @@ export const useContactStore = create<ContactStore>()(
       },
 
       deleteContact: async (client, id) => {
+        if (!(await contactHooks.onBeforeContactDelete.intercept({ contactIds: [id] }))) return false;
         set({ error: null });
         try {
           const contact = get().contacts.find(c => c.id === id);
@@ -625,6 +649,8 @@ export const useContactStore = create<ContactStore>()(
               selectedContactId: state.selectedContactId === id ? null : state.selectedContactId,
             };
           });
+          void contactHooks.onAfterContactDelete.emit({ contactIds: [id] });
+          return true;
         } catch (error) {
           const msg = error instanceof Error ? error.message : 'Failed to delete contact';
           set({ error: msg });
@@ -632,24 +658,38 @@ export const useContactStore = create<ContactStore>()(
         }
       },
 
-      addLocalContact: (contact) => set((state) => ({
-        contacts: [...state.contacts, contact],
-      })),
+      addLocalContact: async (contact) => {
+        if (!(await contactHooks.onBeforeContactCreate.intercept(draftContactView(contact)))) return false;
+        set((state) => ({ contacts: [...state.contacts, contact] }));
+        void contactHooks.onAfterContactCreate.emit(contactToView(contact));
+        return true;
+      },
 
-      updateLocalContact: (id, updates) => set((state) => ({
-        contacts: state.contacts.map(c =>
-          c.id === id ? { ...c, ...updates } : c
-        ),
-      })),
+      updateLocalContact: async (id, updates) => {
+        if (!(await contactHooks.onBeforeContactUpdate.intercept({ contactId: id, patch: updates }))) return false;
+        set((state) => ({
+          contacts: state.contacts.map(c =>
+            c.id === id ? { ...c, ...updates } : c
+          ),
+        }));
+        const updated = get().contacts.find(c => c.id === id);
+        if (updated) void contactHooks.onAfterContactUpdate.emit(contactToView(updated));
+        return true;
+      },
 
-      deleteLocalContact: (id) => set((state) => {
-        const removedIds = new Set([id]);
-        const cleaned = cleanGroupMembers(state.contacts, removedIds);
-        return {
-          contacts: cleaned.filter(c => c.id !== id),
-          selectedContactId: state.selectedContactId === id ? null : state.selectedContactId,
-        };
-      }),
+      deleteLocalContact: async (id) => {
+        if (!(await contactHooks.onBeforeContactDelete.intercept({ contactIds: [id] }))) return false;
+        set((state) => {
+          const removedIds = new Set([id]);
+          const cleaned = cleanGroupMembers(state.contacts, removedIds);
+          return {
+            contacts: cleaned.filter(c => c.id !== id),
+            selectedContactId: state.selectedContactId === id ? null : state.selectedContactId,
+          };
+        });
+        void contactHooks.onAfterContactDelete.emit({ contactIds: [id] });
+        return true;
+      },
 
       setSelectedContact: (id) => set({ selectedContactId: id }),
       setSearchQuery: (query) => set({ searchQuery: query }),
@@ -798,9 +838,11 @@ export const useContactStore = create<ContactStore>()(
           members,
         };
 
+        let groupId: string;
         if (client && get().supportsSync) {
           const created = await client.createContact(groupData);
           set((state) => ({ contacts: [...state.contacts, created] }));
+          groupId = created.id;
         } else {
           const localGroup: ContactCard = {
             id: `local-${generateUUID()}`,
@@ -808,7 +850,9 @@ export const useContactStore = create<ContactStore>()(
             ...groupData,
           } as ContactCard;
           set((state) => ({ contacts: [...state.contacts, localGroup] }));
+          groupId = localGroup.id;
         }
+        void contactHooks.onContactGroupChange.emit({ groupId, change: 'created' });
       },
 
       updateGroup: async (client, groupId, name) => {
@@ -826,6 +870,7 @@ export const useContactStore = create<ContactStore>()(
             c.id === groupId ? { ...c, ...updates } : c
           ),
         }));
+        void contactHooks.onContactGroupChange.emit({ groupId, change: 'updated' });
       },
 
       addMembersToGroup: async (client, groupId, memberIds) => {
@@ -834,9 +879,11 @@ export const useContactStore = create<ContactStore>()(
         if (!group) return;
 
         const newMembers = { ...group.members };
+        const added: string[] = [];
         memberIds.forEach(id => {
           const contact = contacts.find(c => c.id === id);
           const key = contact?.uid || contact?.originalId || id;
+          if (!newMembers[key]) added.push(id);
           newMembers[key] = true;
         });
 
@@ -851,6 +898,9 @@ export const useContactStore = create<ContactStore>()(
             c.id === groupId ? { ...c, members: newMembers } : c
           ),
         }));
+        if (added.length > 0) {
+          void contactHooks.onContactGroupMemberChange.emit({ groupId, added, removed: [] });
+        }
       },
 
       removeMembersFromGroup: async (client, groupId, memberIds) => {
@@ -859,16 +909,19 @@ export const useContactStore = create<ContactStore>()(
         if (!group?.members) return;
 
         const newMembers = { ...group.members };
+        const removed: string[] = [];
         memberIds.forEach(id => {
           // Try direct id match first
           if (newMembers[id] !== undefined) {
             delete newMembers[id];
+            removed.push(id);
             return;
           }
           // Try uid-based match
           const contact = contacts.find(c => c.id === id);
           if (contact?.uid && newMembers[contact.uid] !== undefined) {
             delete newMembers[contact.uid];
+            removed.push(id);
           } else {
             // Try stripping urn:uuid: prefix matching
             for (const key of Object.keys(newMembers)) {
@@ -876,6 +929,7 @@ export const useContactStore = create<ContactStore>()(
               const bareUid = contact?.uid?.startsWith('urn:uuid:') ? contact.uid.slice(9) : contact?.uid;
               if (bareKey === id || bareKey === bareUid) {
                 delete newMembers[key];
+                removed.push(id);
                 break;
               }
             }
@@ -893,6 +947,9 @@ export const useContactStore = create<ContactStore>()(
             c.id === groupId ? { ...c, members: newMembers } : c
           ),
         }));
+        if (removed.length > 0) {
+          void contactHooks.onContactGroupMemberChange.emit({ groupId, added: [], removed });
+        }
       },
 
       deleteGroup: async (client, groupId) => {
@@ -906,6 +963,7 @@ export const useContactStore = create<ContactStore>()(
           contacts: state.contacts.filter(c => c.id !== groupId),
           selectedContactId: state.selectedContactId === groupId ? null : state.selectedContactId,
         }));
+        void contactHooks.onContactGroupChange.emit({ groupId, change: 'deleted' });
       },
 
       toggleContactSelection: (id) => set((state) => {
@@ -939,6 +997,8 @@ export const useContactStore = create<ContactStore>()(
       clearSelection: () => set({ selectedContactIds: new Set<string>(), lastSelectedContactId: null }),
 
       bulkDeleteContacts: async (client, ids) => {
+        if (ids.length === 0) return;
+        if (!(await contactHooks.onBeforeContactDelete.intercept({ contactIds: [...ids] }))) return;
         set({ error: null });
         const { supportsSync, contacts } = get();
         const deletedIds = new Set(ids);
@@ -968,6 +1028,9 @@ export const useContactStore = create<ContactStore>()(
             selectedContactIds: new Set<string>(),
           };
         });
+        if (deletedIds.size > 0) {
+          void contactHooks.onAfterContactDelete.emit({ contactIds: ids.filter(id => deletedIds.has(id)) });
+        }
       },
 
       bulkAddToGroup: async (client, groupId, contactIds) => {
@@ -1000,6 +1063,7 @@ export const useContactStore = create<ContactStore>()(
                 c.id === id ? { ...c, addressBookIds: { [addressBook.id]: true } } : c
               ),
             }));
+            void contactHooks.onContactMove.emit({ contactId: id, toAddressBookId: addressBook.id });
           } else {
             // Cross-account: create in target, delete from source
             const { originalId: _oid, accountId: _aid, accountName: _an, isShared: _is, id: _id, ...contactData } = contact;
@@ -1026,6 +1090,7 @@ export const useContactStore = create<ContactStore>()(
                 };
               }),
             }));
+            void contactHooks.onContactMove.emit({ contactId: id, toAddressBookId: addressBook.id });
           }
         }
       },
@@ -1276,6 +1341,7 @@ export const useContactStore = create<ContactStore>()(
         });
         set((state) => ({ trustedSenderEmails: [...state.trustedSenderEmails, emailAddress] }));
         debug.log('contacts', 'Trusted sender added successfully');
+        void settingsHooks.onTrustedSenderChange.emit({ email: emailAddress, trusted: true });
       },
 
       removeFromTrustedSendersBook: async (client, email) => {
@@ -1295,7 +1361,9 @@ export const useContactStore = create<ContactStore>()(
           await client.deleteContact(match.id);
           debug.log('contacts', 'Trusted sender removed');
         }
+        const wasTrusted = get().trustedSenderEmails.includes(normalizedEmail);
         set((state) => ({ trustedSenderEmails: state.trustedSenderEmails.filter(e => e !== normalizedEmail) }));
+        if (wasTrusted) void settingsHooks.onTrustedSenderChange.emit({ email: normalizedEmail, trusted: false });
       },
 
       isTrustedAddressBookSender: (email) => {
@@ -1309,26 +1377,30 @@ export const useContactStore = create<ContactStore>()(
       importContacts: async (client, contacts) => {
         const { supportsSync } = get();
         let imported = 0;
+        // The book the cards landed in, as the server filed the first one.
+        let addressBookId = '';
 
         for (const contact of contacts) {
           try {
+            let added: ContactCard;
             if (client && supportsSync) {
               const { id: _id, ...data } = contact;
-              const created = await client.createContact(data);
-              set((state) => ({ contacts: [...state.contacts, created] }));
+              added = await client.createContact(data);
             } else {
-              const localContact: ContactCard = {
+              added = {
                 ...contact,
                 id: `local-${generateUUID()}`,
               };
-              set((state) => ({ contacts: [...state.contacts, localContact] }));
             }
+            set((state) => ({ contacts: [...state.contacts, added] }));
+            if (!addressBookId) addressBookId = Object.keys(added.addressBookIds || {}).find(k => added.addressBookIds[k]) || '';
             imported++;
           } catch (error) {
             console.error('Failed to import contact:', error);
           }
         }
 
+        if (imported > 0) void contactHooks.onContactsImport.emit({ addressBookId, imported });
         return imported;
       },
     });
@@ -1343,4 +1415,15 @@ export const useContactStore = create<ContactStore>()(
   )
 );
 
+// Tell plugins when the set of checked contacts changes, whichever action
+// changed it (toggle, range, select all, clear, bulk actions). Re-setting the
+// same ids is not a change.
+useContactStore.subscribe((state, prev) => {
+  if (state.selectedContactIds === prev.selectedContactIds) return;
+  if (contactHooks.onContactSelectionChange.size === 0) return;
+  const next = state.selectedContactIds ?? new Set<string>();
+  if (sameIdSet(next, prev.selectedContactIds ?? new Set<string>())) return;
+  void contactHooks.onContactSelectionChange.emit({ contactIds: [...next] });
+});
+
 export type { ContactName };
diff --git a/stores/email-store.ts b/stores/email-store.ts
index 63d62eb7c..b18672634 100644
--- a/stores/email-store.ts
+++ b/stores/email-store.ts
@@ -7,6 +7,8 @@ import { useCalendarStore } from "@/stores/calendar-store";
 import { orderKeywords, placeHeldRows, type HeldKeywords, type SortLevel } from "@/lib/message-list-order";
 import { SearchFilters, DEFAULT_SEARCH_FILTERS, buildJMAPFilter, isFilterEmpty } from "@/lib/jmap/search-utils";
 import { emailHooks } from "@/lib/plugin-hooks";
+import { allowEmailMove, emitEmailMove, idsFromSelectionKeys, keywordChangeLists, mailboxToView, quotaToView } from "@/lib/plugin-mail-hooks";
+import { emailSummary, emailToReadView } from "@/lib/plugin-projection";
 import { resolveThreadRoute } from "@/lib/thread-routing";
 import { emailKeyFor, threadKeyFor, threadIdFromKey, KEYWORD_PREFIX, KEYWORD_PREFIX_LEGACY } from "@/lib/thread-utils";
 import type { ExternalSearchResult } from "@/lib/plugin-types";
@@ -340,7 +342,12 @@ interface EmailStore {
   /** Pass emails rather than ids where you have them: an id alone can name another account's namesake. */
   copyEmailsToAccount: (emails: Array<string | Email>, destAccountId: string, destMailboxId: string) => Promise<void>;
   searchEmails: (client: IJMAPClient, query: string) => Promise<void>;
-  advancedSearch: (client: IJMAPClient) => Promise<void>;
+  /**
+   * Runs the search held in searchQuery/searchFilters. `transformed` is the
+   * query and filters onSearch already returned for this search (searchEmails
+   * hands over when a plugin added filters), so plugins are not asked twice.
+   */
+  advancedSearch: (client: IJMAPClient, transformed?: { query: string; filters: SearchFilters }) => Promise<void>;
   setSearchFilters: (filters: Partial<SearchFilters>) => void;
   setSearchMailboxId: (mailboxId: string) => void;
   scopeSearchToOpenFolder: () => void;
@@ -739,6 +746,79 @@ async function applyEmailDeltaNow(client: IJMAPClient, newState: string, get: St
   return true;
 }
 
+// ─── New mail for plugins (onNewEmailReceived) ───────────────────────────────
+//
+// A message is new mail when Email/changes reports it as created and it sits
+// in the Inbox. A move into the Inbox (undo spam, a drag, unarchive) keeps
+// its id and shows up as updated, and the initial load is the baseline, so
+// neither is reported. The check runs on its own baseline, independent of
+// whichever folder or view is open.
+
+/** Email state per JMAP account up to which new mail was reported. */
+const newMailBaselines = new Map<string, string>();
+/** Recently reported ids, so an overlapping delta never reports one twice. */
+const reportedNewMail: string[] = [];
+let newMailQueue: Promise<void> = Promise.resolve();
+const NEW_MAIL_MAX_PAGES = 5;
+
+function reportNewInboxMail(client: IJMAPClient, accountId: string, pushedState: string, seedState: string | undefined, get: StoreGet): Promise<void> {
+  const run = async () => {
+    const since = newMailBaselines.get(accountId) ?? seedState;
+    // Nobody listens: keep the baseline current so a plugin that starts
+    // listening later is not handed old mail.
+    if (emailHooks.onNewEmailReceived.size === 0 || !client.getEmailChanges || !since) {
+      newMailBaselines.set(accountId, pushedState);
+      return;
+    }
+    if (since === pushedState) return;
+    const created: string[] = [];
+    let state = since;
+    for (let page = 0; page < NEW_MAIL_MAX_PAGES; page++) {
+      const delta = await client.getEmailChanges(state, undefined, EMAIL_DELTA_MAX_CHANGES);
+      if (!delta) {
+        // The baseline is too old for the server; start over from here.
+        newMailBaselines.set(accountId, pushedState);
+        return;
+      }
+      created.push(...delta.created);
+      state = delta.newState;
+      if (!delta.hasMoreChanges) break;
+    }
+    newMailBaselines.set(accountId, state);
+    const fresh = created.filter(id => !reportedNewMail.includes(id));
+    if (fresh.length === 0) return;
+    const inbox = get().mailboxes.find(mb => mb.role === 'inbox' && !mb.isShared);
+    if (!inbox) return;
+    const inboxIds = [inbox.id, inbox.originalId].filter((id): id is string => !!id);
+    const emails = await client.getSomeEmails(fresh);
+    for (const email of emails) {
+      if (email.keywords?.$draft || !inboxIds.some(id => email.mailboxIds?.[id])) continue;
+      reportedNewMail.push(email.id);
+      if (reportedNewMail.length > 500) reportedNewMail.shift();
+      void emailHooks.onNewEmailReceived.emit(emailSummary(email));
+    }
+  };
+  const next = newMailQueue.then(run, run).catch((error) => {
+    console.error('Failed to check for new mail:', error);
+  });
+  newMailQueue = next;
+  return next;
+}
+
+/** Let plugins change a search before it runs (onSearch); keeps what they return only when it is usable. */
+async function transformSearch(query: string, filters: SearchFilters): Promise<{ query: string; filters: SearchFilters }> {
+  const out = await emailHooks.onSearch.transform({ query, filters: { ...filters } }) as { query?: unknown; filters?: unknown } | null;
+  return {
+    query: typeof out?.query === 'string' ? out.query : query,
+    filters: out?.filters && typeof out.filters === 'object'
+      ? { ...DEFAULT_SEARCH_FILTERS, ...(out.filters as Partial<SearchFilters>) }
+      : filters,
+  };
+}
+
+/** Overlapping state-change runs share one syncing/idle cycle (onSyncStateChange). */
+let syncRuns = 0;
+
 function resolveActionClient(passedClient: IJMAPClient): IJMAPClient {
   const viewingId = useEmailStore.getState().viewingAccountId;
   if (!viewingId) return passedClient;
@@ -1433,6 +1513,25 @@ async function refreshMailboxesForViewingAccount(fallbackClient: IJMAPClient): P
 // still carries a bare owner id (scoped to the owning account via
 // `sourceAccountId === mailbox.accountId` so a bare owner id can't collide with
 // another account's folder). (#281)
+/**
+ * The folder messages are moved out of, for the move hooks: the open folder,
+ * or in an aggregate view (unified, tag, search across folders) the one
+ * folder they all share, else null.
+ */
+function moveSourceMailboxId(emails: Array<Pick<Email, 'mailboxIds' | 'sourceAccountId'>>, mailboxes: Mailbox[]): string | null {
+  const { selectedMailbox, selectedKeyword, isUnifiedView } = useEmailStore.getState();
+  if (!selectedKeyword && !isUnifiedView && selectedMailbox && mailboxes.some(mb => mb.id === selectedMailbox)) {
+    return selectedMailbox;
+  }
+  const sources = new Set<string>();
+  for (const email of emails) {
+    const mailbox = mailboxes.find(mb => emailInMailbox(email, mb));
+    if (!mailbox) return null;
+    sources.add(mailbox.id);
+  }
+  return sources.size === 1 ? [...sources][0] : null;
+}
+
 function emailInMailbox(
   email: { mailboxIds?: Record<string, boolean>; sourceAccountId?: string },
   mailbox: Mailbox,
@@ -1549,6 +1648,11 @@ async function runBatchSpamAction(
   if (targets.length === 0) {
     throw new Error('Emails not found');
   }
+  const spam = role === 'junk';
+  if (emailHooks.onBeforeEmailSpamToggle.size > 0
+    && !(await emailHooks.onBeforeEmailSpamToggle.intercept({ emailIds: [...new Set(targets.map(e => e.id))], spam }))) {
+    return;
+  }
 
   const destinationByKey = new Map<string, string | undefined>();
   const failures: unknown[] = [];
@@ -1598,6 +1702,7 @@ async function runBatchSpamAction(
         ...patch,
       };
     });
+    void emailHooks.onEmailSpamToggle.emit({ emailIds: [...new Set(moved.map(e => e.id))], spam });
   }
 
   if (failures.length > 0) {
@@ -1839,6 +1944,18 @@ function mergeRetainedRows(previous: Email[], merged: Email[], retainedIds: Set<
   return out;
 }
 
+/** Most message ids a plugin may add to one search through onSearchResults. */
+const MAX_PLUGIN_SEARCH_IDS = 100;
+
+async function pluginSearchResultIds(query: string, filters: unknown, emails: Email[]): Promise<string[]> {
+  if (emailHooks.onSearchResults.size === 0) return [];
+  const shown = new Set(emails.map((e) => e.id));
+  const ids = await emailHooks.onSearchResults.transform([] as string[], { query, filters, emailIds: [...shown] });
+  if (!Array.isArray(ids)) return [];
+  return [...new Set(ids.filter((id): id is string => typeof id === 'string' && id.length > 0 && id.length < 256 && !shown.has(id)))]
+    .slice(0, MAX_PLUGIN_SEARCH_IDS);
+}
+
 export const useEmailStore = create<EmailStore>((set, get) => ({
   emails: [],
   mailboxes: [],
@@ -1978,11 +2095,13 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
   selectEmail: (email) => {
     const prev = get().selectedEmail;
     set({ selectedEmail: email, lastSelectedEmailKey: email ? emailKeyFor(email) : get().lastSelectedEmailKey });
-    if (prev && (!email || email.id !== prev.id)) {
-      emailHooks.onEmailClose.emitSync(prev);
+    // Plain data only: handlers in a sandbox get a copy, and the raw store
+    // object carries fields no plugin permission covers.
+    if (prev && (!email || email.id !== prev.id) && emailHooks.onEmailClose.size > 0) {
+      emailHooks.onEmailClose.emitSync({ emailId: prev.id });
     }
-    if (email && (!prev || email.id !== prev.id)) {
-      emailHooks.onEmailOpen.emitSync(email);
+    if (email && (!prev || email.id !== prev.id) && emailHooks.onEmailOpen.size > 0) {
+      emailHooks.onEmailOpen.emitSync(emailToReadView(email));
     }
   },
   holdListRow: (rowKey) => {
@@ -2153,7 +2272,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
       // Publish the existing mailbox-refresh extension hook after a successful
       // fetch. This is also emitted for Mailbox-only state changes (for example
       // an empty provider label), where no Email fetch follows.
-      await emailHooks.onMailboxesRefresh.emit(mailboxes);
+      if (emailHooks.onMailboxesRefresh.size > 0) await emailHooks.onMailboxesRefresh.emit(mailboxes.map(mailboxToView));
       if (stale()) return;
 
       // Auto-select inbox if no mailbox is selected or the current selection
@@ -2790,6 +2909,12 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
         forceDelete = true;
       }
 
+      const permanent = !((deleteAction === 'trash' || deleteAction === 'trash-and-read') && !forceDelete);
+      if (emailHooks.onBeforeEmailDelete.size > 0
+        && !(await emailHooks.onBeforeEmailDelete.intercept({ emailIds: [emailId], permanent }))) {
+        return;
+      }
+
       // If deleteAction is 'trash' or 'trash-and-read' and not forced permanent delete, try to move to trash mailbox
       if ((deleteAction === 'trash' || deleteAction === 'trash-and-read') && !forceDelete) {
         const trashMailbox = findTrashMailbox(mailboxes, { accountId });
@@ -2837,6 +2962,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
               ...mailboxPatch,
             };
           });
+          void emailHooks.onAfterEmailDelete.emit({ emailIds: [emailId], permanent: false });
           return;
         }
         // No trash folder found in this account. Surface the failure rather
@@ -2870,6 +2996,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
           ...mailboxPatch,
         };
       });
+      void emailHooks.onAfterEmailDelete.emit({ emailIds: [emailId], permanent: true });
     } catch (error) {
       set({
         error: error instanceof Error ? error.message : "Failed to delete email"
@@ -2902,6 +3029,16 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
         processingReadStatus: new Set([...state.processingReadStatus, processingKey])
       }));
 
+      if (emailHooks.onBeforeEmailReadStateChange.size > 0
+        && !(await emailHooks.onBeforeEmailReadStateChange.intercept({ emailIds: [emailId], read }))) {
+        set((state) => {
+          const next = new Set(state.processingReadStatus);
+          next.delete(processingKey);
+          return { processingReadStatus: next };
+        });
+        return;
+      }
+
       // In unified view route to the email's own account client; otherwise use
       // the active/viewing client and the shared-folder accountId. (#281)
       const { client: actionClient, accountId } = resolveEmailActionContext(email, client);
@@ -2979,6 +3116,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
           })(),
         };
       });
+      void emailHooks.onEmailReadStateChange.emit({ emailIds: [emailId], read });
       refillAfterKeywordChange(get, client, ['$seen']);
     } catch (error) {
       // Remove from processing set on error
@@ -3057,6 +3195,9 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
       const destMailbox = mailboxes.find(mb => mb.id === destinationMailboxId);
       const jmapDestId = destMailbox?.originalId || destinationMailboxId;
 
+      const move = { emailIds: [emailId], fromMailboxId: moveSourceMailboxId([email], mailboxes), toMailboxId: destinationMailboxId };
+      if (!(await allowEmailMove(move, mailboxes))) return;
+
       await actionClient.moveEmail(emailId, jmapDestId, accountId);
 
       set((state) => {
@@ -3090,6 +3231,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
           ...mailboxPatch,
         };
       });
+      emitEmailMove(move, mailboxes);
     } catch (error) {
       set({
         error: error instanceof Error ? error.message : "Failed to move email"
@@ -3112,6 +3254,10 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
       const jmapDestId = destMailbox?.originalId || destinationMailboxId;
       const idSet = new Set(emailIds);
       const affected = emails.filter(e => idSet.has(e.id));
+      const move = { emailIds: [...idSet], fromMailboxId: moveSourceMailboxId(affected, mailboxes), toMailboxId: destinationMailboxId };
+      if (!(await allowEmailMove(move, mailboxes))) return;
+      // Messages of an account no client reaches stay where they are.
+      const skipped = new Set<string>();
 
       if (isAggregateListView()) {
         // In unified view, emails may span accounts – group by owning JMAP account
@@ -3128,7 +3274,10 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
           const acctClient = sourceAccountId === '__default__'
             ? resolveActionClient(client)
             : (clientAccountId ? useAuthStore.getState().getClientForAccount(clientAccountId) : undefined);
-          if (!acctClient) return;
+          if (!acctClient) {
+            ids.forEach(id => skipped.add(id));
+            return;
+          }
           const jmapAccountId = sourceAccountId === '__default__' ? undefined : sourceAccountId;
           await acctClient.batchMoveEmails(ids, jmapDestId, jmapAccountId);
         }));
@@ -3178,6 +3327,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
           ...patch,
         };
       });
+      emitEmailMove({ ...move, emailIds: move.emailIds.filter(id => !skipped.has(id)) }, mailboxes);
     } catch (error) {
       set({ error: error instanceof Error ? error.message : 'Failed to move emails' });
       throw error;
@@ -3187,6 +3337,15 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
   crossAccountMoveEmails: async (emailIdsBySource, destAccountId, destMailboxId, destJmapAccountId, sourceJmapAccountId, options) => {
     if (emailIdsBySource.size === 0) return;
     const keepOriginal = options?.keepOriginal === true;
+    // A copy leaves the messages where they are, so only a move asks plugins.
+    const hookMailboxes = [...resolveActionMailboxes(), ...(get().accountMailboxes[destAccountId] ?? [])];
+    const requestedIds = [...new Set([...emailIdsBySource.values()].flat())];
+    const move = keepOriginal ? null : {
+      emailIds: requestedIds,
+      fromMailboxId: moveSourceMailboxId(get().emails.filter(e => requestedIds.includes(e.id)), hookMailboxes),
+      toMailboxId: destMailboxId,
+    };
+    if (move && !(await allowEmailMove(move, hookMailboxes))) return;
     set({ isLoading: true, error: null });
     try {
       const destClient = useAuthStore.getState().getClientForAccount(destAccountId);
@@ -3290,6 +3449,8 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
         }
       }
 
+      if (move && movedIds.length > 0) emitEmailMove({ ...move, emailIds: movedIds }, hookMailboxes);
+
       if (failures.length > 0) {
         const first = failures[0];
         const verb = keepOriginal ? 'copy' : 'move';
@@ -3383,6 +3544,9 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
         return;
       }
 
+      const move = { emailIds: threadEmailIds, fromMailboxId: moveSourceMailboxId([email], mailboxes), toMailboxId: destinationMailboxId };
+      if (!(await allowEmailMove(move, mailboxes))) return;
+
       await effectiveClient.batchMoveEmails(threadEmailIds, jmapDestId, accountId);
 
       const removedEmailIds = new Set(threadEmailIds);
@@ -3407,6 +3571,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
           threadEmailsCache: nextThreadEmailsCache,
         };
       });
+      emitEmailMove(move, mailboxes);
     } catch (error) {
       set({
         error: error instanceof Error ? error.message : "Failed to move email thread"
@@ -3415,7 +3580,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
     }
   },
 
-  searchEmails: async (client, query) => {
+  searchEmails: async (client, typedQuery) => {
     const { searchAbortController } = get();
 
     if (searchAbortController) {
@@ -3426,13 +3591,25 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
     set({
       isLoading: true,
       error: null,
-      searchQuery: query,
+      searchQuery: typedQuery,
       emails: [],
       hasMoreEmails: false,
       totalEmails: 0,
       searchAbortController: controller,
     }); // Clear emails for loading state
     try {
+      // The store keeps what the user typed; plugins' changes apply to this run.
+      // Without listeners the request goes out in this same tick, as before.
+      const search = emailHooks.onSearch.size > 0
+        ? await transformSearch(typedQuery, get().searchFilters)
+        : { query: typedQuery, filters: get().searchFilters };
+      if (controller.signal.aborted) return;
+      if (!isFilterEmpty(search.filters)) {
+        // A plugin added filters: only the advanced search applies them.
+        await get().advancedSearch(client, search);
+        return;
+      }
+      const query = search.query;
       const { isUnifiedView, unifiedRole, crossView, searchMailboxId, searchFilters, selectedKeyword } = get();
       const emailsPerPage = useSettingsStore.getState().emailsPerPage;
 
@@ -3487,17 +3664,11 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
         result = await resolveActionClient(client).searchEmails(query, jmapMailboxId, accountId, emailsPerPage, 0);
       }
 
-      const hookEdit = await emailHooks.onSearchResults.transform({
-        newEmailIds: [] as string[],
-        result: result,
-        query: query,
-        filters: searchFilters
-      });
-
-      result = hookEdit.result;
-      if (hookEdit.newEmailIds.length > 0) {
-        // in unified, accountId will be undefined and we will use the default.
-        const newEmails = await resolveActionClient(client).getSomeEmails(hookEdit.newEmailIds, accountId);
+      // Plugins may add messages to the results by id; the messages are
+      // fetched from the server, so a plugin can't put made-up rows in the list.
+      const extraIds = await pluginSearchResultIds(query, searchFilters, result.emails);
+      if (extraIds.length > 0) {
+        const newEmails = await resolveActionClient(client).getSomeEmails(extraIds, accountId);
         result.emails.push(...newEmails);
         result.total += newEmails.length;
       }
@@ -3534,8 +3705,8 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
     }
   },
 
-  advancedSearch: async (client) => {
-    const { searchQuery, searchFilters, searchMailboxId, searchAbortController, isUnifiedView, unifiedRole, crossView, selectedKeyword } = get();
+  advancedSearch: async (client, transformed) => {
+    const { searchQuery: typedQuery, searchFilters: typedFilters, searchMailboxId, searchAbortController, isUnifiedView, unifiedRole, crossView, selectedKeyword } = get();
     const mailboxes = resolveActionMailboxes();
 
     if (searchAbortController) {
@@ -3553,6 +3724,9 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
     });
 
     try {
+      const { query: searchQuery, filters: searchFilters } = transformed
+        ?? (emailHooks.onSearch.size > 0 ? await transformSearch(typedQuery, typedFilters) : { query: typedQuery, filters: typedFilters });
+      if (controller.signal.aborted) return;
       const emailsPerPage = useSettingsStore.getState().emailsPerPage;
       let result;
       let accountId;
@@ -3610,17 +3784,11 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
 
       if (controller.signal.aborted) return;
 
-      const hookEdit = await emailHooks.onSearchResults.transform({ 
-        newEmailIds: [] as string[], 
-        result: result, 
-        query: searchQuery, 
-        filters: searchFilters 
-      });
-
-      result = hookEdit.result;
-
-      if (hookEdit.newEmailIds.length > 0) {
-        const newEmails = await resolveActionClient(client).getSomeEmails(hookEdit.newEmailIds, accountId);
+      // Plugins may add messages to the results by id; the messages are
+      // fetched from the server, so a plugin can't put made-up rows in the list.
+      const extraIds = await pluginSearchResultIds(searchQuery, searchFilters, result.emails);
+      if (extraIds.length > 0) {
+        const newEmails = await resolveActionClient(client).getSomeEmails(extraIds, accountId);
         result.emails.push(...newEmails);
         result.total += newEmails.length;
       }
@@ -3692,6 +3860,10 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
       if (!email) return;
 
       const isFlagged = email.keywords.$flagged || false;
+      if (emailHooks.onBeforeEmailStarToggle.size > 0
+        && !(await emailHooks.onBeforeEmailStarToggle.intercept({ emailIds: [emailId], starred: !isFlagged }))) {
+        return;
+      }
       // In unified view route to the email's own account client + owner accountId
       // (the reaching client's primary is not the owner for shared sources). (#281)
       const { client: actionClient, accountId } = resolveEmailActionContext(email, client);
@@ -3714,6 +3886,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
           emailId,
         ),
       }));
+      void emailHooks.onEmailStarToggle.emit({ emailIds: [emailId], starred: !isFlagged });
       refillAfterKeywordChange(get, client, ['$flagged']);
     } catch (error) {
       set({
@@ -3728,8 +3901,13 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
     // $mdnsent). Same routing, same reason: an unrouted write against the
     // reaching client's primary account is a silent no-op on a shared/group
     // message. Best-effort by contract - callers treat a failure as non-fatal.
+    if (emailHooks.onBeforeEmailKeywordChange.size > 0
+      && !(await emailHooks.onBeforeEmailKeywordChange.intercept({ emailIds: [emailId], added: [keyword], removed: [] }))) {
+      return;
+    }
     const { client: actionClient, accountId } = resolveKeywordActionContext(emailId, client);
     await actionClient.setKeyword(emailId, keyword, accountId);
+    void emailHooks.onEmailKeywordChange.emit({ emailIds: [emailId], added: [keyword], removed: [] });
   },
 
   setEmailKeywords: async (client, emailId, keywords) => {
@@ -3760,6 +3938,10 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
   patchEmailKeywords: async (client, emailId, changes) => {
     const keys = Object.keys(changes);
     if (keys.length === 0) return;
+    if (emailHooks.onBeforeEmailKeywordChange.size > 0
+      && !(await emailHooks.onBeforeEmailKeywordChange.intercept({ emailIds: [emailId], ...keywordChangeLists(changes) }))) {
+      return;
+    }
     const { client: actionClient, accountId } = resolveKeywordActionContext(emailId, client);
     // `keywords/<name>` pointers touch only these keywords on the server;
     // a cleared keyword is removed (null), since a keyword map holds `true`
@@ -3774,6 +3956,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
       else delete next[key];
     }
     get().setEmailKeywordsLocal(emailId, next);
+    void emailHooks.onEmailKeywordChange.emit({ emailIds: [emailId], ...keywordChangeLists(changes) });
     refillAfterKeywordChange(get, client, keys.filter(k => !!previous[k] !== !!changes[k]));
   },
 
@@ -3809,9 +3992,15 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
     const targetIds = target ? new Set(target.emailIds) : null;
     const emailIdsArray = targetIds ? Array.from(targetIds) : selectedEmails.map(e => e.id);
     if (emailIdsArray.length === 0) return;
+    if (emailHooks.onBeforeEmailReadStateChange.size > 0
+      && !(await emailHooks.onBeforeEmailReadStateChange.intercept({ emailIds: [...new Set(emailIdsArray)], read }))) {
+      return;
+    }
 
     set({ isLoading: true, error: null });
     try {
+      // Ids of an account whose write failed or that no client reaches.
+      const notWritten = new Set<string>();
 
       if (target) {
         // Messages named by the caller need not be loaded, so the list's
@@ -3830,9 +4019,15 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
           const acctClient = sourceAccountId === '__default__'
             ? resolveActionClient(client)
             : (clientAccountId ? useAuthStore.getState().getClientForAccount(clientAccountId) : undefined);
-          if (!acctClient) return;
+          if (!acctClient) {
+            ids.forEach(id => notWritten.add(id));
+            return;
+          }
           const jmapAccountId = sourceAccountId === '__default__' ? undefined : sourceAccountId;
-          await acctClient.batchMarkAsRead(ids, read, jmapAccountId);
+          await acctClient.batchMarkAsRead(ids, read, jmapAccountId).catch((error) => {
+            ids.forEach(id => notWritten.add(id));
+            throw error;
+          });
         });
         await Promise.allSettled(promises);
       } else {
@@ -3892,6 +4087,8 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
         selectedEmailKeys: target ? get().selectedEmailKeys : new Set(),
         isLoading: false
       });
+      const changedIds = [...new Set(emailIdsArray)].filter(id => !notWritten.has(id));
+      if (changedIds.length > 0) void emailHooks.onEmailReadStateChange.emit({ emailIds: changedIds, read });
       refillAfterKeywordChange(get, client, ['$seen']);
     } catch (error) {
       set({
@@ -3925,14 +4122,24 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
       byAccount.set(accountId, [...(byAccount.get(accountId) ?? []), email]);
     }
 
+    if (groups.size === 0) return;
+    const tagChange = add ? { added: changedKeys, removed: [] } : { added: [], removed: changedKeys };
+    if (emailHooks.onBeforeEmailKeywordChange.size > 0) {
+      const emailIds = [...new Set([...groups.values()].flatMap(byAccount => [...byAccount.values()].flat().map(e => e.id)))];
+      if (!(await emailHooks.onBeforeEmailKeywordChange.intercept({ emailIds, ...tagChange }))) return;
+    }
+
     const writes = [...groups].flatMap(([actionClient, byAccount]) =>
       [...byAccount].map(async ([accountId, group]) => {
         await actionClient.batchUpdateKeywords(group.map(e => e.id), patch, accountId);
-        return group.map(emailKeyFor);
+        return group;
       }),
     );
-    if (writes.length === 0) return;
-    const results = await Promise.allSettled(writes);
+    const settled = await Promise.allSettled(writes);
+    const writtenEmails = settled.flatMap(result => result.status === 'fulfilled' ? result.value : []);
+    const results = settled.map(result => result.status === 'fulfilled'
+      ? { status: 'fulfilled' as const, value: result.value.map(emailKeyFor) }
+      : result);
 
     // Only the accounts whose write went through are patched locally.
     const written = new Set(results.flatMap(result => result.status === 'fulfilled' ? result.value : []));
@@ -3949,6 +4156,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
         : state.selectedEmail,
     }));
     if (written.size > 0) {
+      void emailHooks.onEmailKeywordChange.emit({ emailIds: [...new Set(writtenEmails.map(e => e.id))], ...tagChange });
       void get().fetchTagCounts(client);
       refillAfterKeywordChange(get, client, changedKeys);
     }
@@ -3962,6 +4170,15 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
     const mailboxes = resolveActionMailboxes();
     if (selectedEmailKeys.size === 0) return;
 
+    if (emailHooks.onBeforeEmailDelete.size > 0) {
+      const toDelete = resolveSelectedEmails(get());
+      if (toDelete.length > 0) {
+        const currentMailbox = mailboxes.find(m => m.id === selectedMailbox);
+        const destroys = permanent || bulkDeleteIsPermanent(currentMailbox);
+        if (!(await emailHooks.onBeforeEmailDelete.intercept({ emailIds: [...new Set(toDelete.map(e => e.id))], permanent: destroys }))) return;
+      }
+    }
+
     set({ isLoading: true, error: null });
     try {
       // The selection is keyed by owning account; JMAP takes the bare ids of
@@ -4012,11 +4229,14 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
       const jmapIdFor = (sourceAccountId: string) =>
         sourceAccountId === '__default__' ? viewAccountId : sourceAccountId;
 
+      // Ids the server confirmed, for onAfterEmailDelete.
+      const deletedIds = new Set<string>();
       if (forceDestroy) {
         const promises = Array.from(bySource.entries()).map(async ([sourceAccountId, { clientAccountId, ids }]) => {
           const acctClient = getClient(sourceAccountId, clientAccountId);
           if (!acctClient) return;
           await acctClient.batchDeleteEmails(ids, jmapIdFor(sourceAccountId));
+          ids.forEach(id => deletedIds.add(id));
         });
         await Promise.allSettled(promises);
       } else {
@@ -4042,6 +4262,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
           const trashId = trashMailbox.originalId || trashMailbox.id;
           await acctClient.batchMoveEmails(ids, trashId, jmapIdFor(sourceAccountId), alsoMarkRead);
           keys.forEach(key => movedKeys.add(key));
+          ids.forEach(id => deletedIds.add(id));
         });
         await Promise.allSettled(promises);
 
@@ -4063,6 +4284,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
             isLoading: false,
             error: 'Some emails could not be moved: trash folder missing for one or more accounts',
           });
+          void emailHooks.onAfterEmailDelete.emit({ emailIds: [...deletedIds], permanent: false });
           return;
         }
       }
@@ -4081,6 +4303,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
         selectedEmail: null,
         isLoading: false
       });
+      if (deletedIds.size > 0) void emailHooks.onAfterEmailDelete.emit({ emailIds: [...deletedIds], permanent: forceDestroy });
     } catch (error) {
       set({
         error: error instanceof Error ? error.message : "Failed to delete emails",
@@ -4096,9 +4319,18 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
     const targetIds = target ? new Set(target.emailIds) : null;
     const emailIdsArray = targetIds ? Array.from(targetIds) : selectedEmails.map(e => e.id);
     if (emailIdsArray.length === 0) return;
+    const hookMailboxes = resolveActionMailboxes();
+    const move = {
+      emailIds: [...new Set(emailIdsArray)],
+      fromMailboxId: moveSourceMailboxId(targetIds ? emails.filter(e => targetIds.has(e.id)) : selectedEmails, hookMailboxes),
+      toMailboxId,
+    };
+    if (!(await allowEmailMove(move, hookMailboxes))) return;
 
     set({ isLoading: true, error: null });
     try {
+      // Ids of an account whose move failed or that no client reaches.
+      const notMoved = new Set<string>();
 
       if (target) {
         // Messages named by the caller need not be loaded, so the list's
@@ -4120,9 +4352,15 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
           const acctClient = sourceAccountId === '__default__'
             ? resolveActionClient(client)
             : (clientAccountId ? useAuthStore.getState().getClientForAccount(clientAccountId) : undefined);
-          if (!acctClient) return;
+          if (!acctClient) {
+            ids.forEach(id => notMoved.add(id));
+            return;
+          }
           const jmapAccountId = sourceAccountId === '__default__' ? undefined : sourceAccountId;
-          await acctClient.batchMoveEmails(ids, jmapDestId, jmapAccountId);
+          await acctClient.batchMoveEmails(ids, jmapDestId, jmapAccountId).catch((error) => {
+            ids.forEach(id => notMoved.add(id));
+            throw error;
+          });
         });
         await Promise.allSettled(promises);
       } else {
@@ -4145,6 +4383,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
         selectedEmailKeys: target ? dropFromSelection(get(), moved) : new Set(),
         isLoading: false
       });
+      emitEmailMove({ ...move, emailIds: move.emailIds.filter(id => !notMoved.has(id)) }, hookMailboxes);
 
       // Refresh emails to get updated list (honors active search/filters)
       if (!get().isUnifiedView) {
@@ -4188,6 +4427,14 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
     const selected = emails.filter(e => selectedEmailKeys.has(emailKeyFor(e)));
     if (selected.length === 0) return;
 
+    const hookMailboxes = [...resolveActionMailboxes(), archiveMailbox];
+    const move = {
+      emailIds: [...new Set(selected.map(e => e.id))],
+      fromMailboxId: moveSourceMailboxId(selected, hookMailboxes),
+      toMailboxId: archiveMailbox.id,
+    };
+    if (!(await allowEmailMove(move, hookMailboxes))) return;
+
     set({ isLoading: true, error: null });
     try {
       await resolveActionClient(client).batchArchiveEmails(
@@ -4200,6 +4447,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
 
       const remaining = emails.filter(e => !selectedEmailKeys.has(emailKeyFor(e)));
       set({ emails: remaining, selectedEmailKeys: new Set(), isLoading: false });
+      emitEmailMove(move, hookMailboxes);
 
       // Refresh the active or viewed account's mailbox cache after the
       // archive (a year/month archive can create new sub-folders).
@@ -4226,6 +4474,10 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
     if (!email) {
       throw new Error('Email not found - cannot mark as spam');
     }
+    if (emailHooks.onBeforeEmailSpamToggle.size > 0
+      && !(await emailHooks.onBeforeEmailSpamToggle.intercept({ emailIds: [emailId], spam: true }))) {
+      return;
+    }
 
     // In unified view route to the email's own account (client + that account's
     // mailbox list); otherwise the active/viewing context. (#281)
@@ -4294,6 +4546,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
           ...mailboxPatch,
         };
       });
+      void emailHooks.onEmailSpamToggle.emit({ emailIds: [emailId], spam: true });
     } catch (error) {
       console.error('Failed to mark as spam:', error);
       throw error;
@@ -4301,6 +4554,10 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
   },
 
   undoSpam: async (client, emailId) => {
+    if (emailHooks.onBeforeEmailSpamToggle.size > 0
+      && !(await emailHooks.onBeforeEmailSpamToggle.intercept({ emailIds: [emailId], spam: false }))) {
+      return;
+    }
     const { selectedMailbox } = get();
     const mailboxes = resolveActionMailboxes();
 
@@ -4360,6 +4617,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
         emails: state.emails.filter(e => e.id !== emailId),
         selectedEmail: getNextSelectedEmail(state, emailId),
       }));
+      void emailHooks.onEmailSpamToggle.emit({ emailIds: [emailId], spam: false });
 
       // Refresh the view the user is actually looking at. If they leave it
       // while the account list loads, skip the fetch rather than re-enter it.
@@ -4464,12 +4722,15 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
     if (patched) {
       // Same extension hook a full refresh publishes, so plugins that mirror
       // folder counters see delta updates too.
-      await emailHooks.onMailboxesRefresh.emit(mailboxes);
+      if (emailHooks.onMailboxesRefresh.size > 0) await emailHooks.onMailboxesRefresh.emit(mailboxes.map(mailboxToView));
     }
     return true;
   },
 
   handleStateChange: async (change, client) => {
+    syncRuns += 1;
+    if (syncRuns === 1) void emailHooks.onSyncStateChange.emit({ state: 'syncing' });
+    let syncError: string | null = null;
     try {
       // Update last push update timestamp
       set({ lastPushUpdate: Date.now() });
@@ -4477,6 +4738,18 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
       // Get the current account ID from the client (assuming primary account)
       const accountId = client.getAccountId();
 
+      // New mail for plugins. Read the list's baseline before the delta
+      // below moves it past the new messages.
+      const pushedEmailState = change.changed[accountId]?.Email;
+      if (pushedEmailState) {
+        const listSync = get().emailListSync;
+        void reportNewInboxMail(
+          client, accountId, pushedEmailState,
+          listSync?.accountId === accountId ? listSync.state : undefined,
+          get,
+        );
+      }
+
       // Changes may arrive for the client's primary account OR a delegated
       // shared/group owner it has access to. Active-account *view* concerns
       // (current email list, scheduled, calendar, filters) key off the primary
@@ -4573,9 +4846,15 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
       }
     } catch (error) {
       console.error('Failed to handle state change:', error);
-      set({
-        error: error instanceof Error ? error.message : "Failed to handle push notification"
-      });
+      syncError = error instanceof Error ? error.message : "Failed to handle push notification";
+      set({ error: syncError });
+    } finally {
+      syncRuns -= 1;
+      if (syncError !== null) {
+        void emailHooks.onSyncStateChange.emit({ state: 'error', error: syncError });
+      } else if (syncRuns === 0) {
+        void emailHooks.onSyncStateChange.emit({ state: 'idle' });
+      }
     }
   },
 
@@ -5026,6 +5305,10 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
       .map(e => e.id);
 
     if (unreadIds.length === 0) return;
+    if (emailHooks.onBeforeEmailReadStateChange.size > 0
+      && !(await emailHooks.onBeforeEmailReadStateChange.intercept({ emailIds: [...unreadIds], read: true }))) {
+      return;
+    }
 
     // Group by account for unified view support
     const emailsById = new Map<string, Email>();
@@ -5092,6 +5375,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
           : state.selectedEmail,
       };
     });
+    void emailHooks.onEmailReadStateChange.emit({ emailIds: [...unreadIds], read: true });
     refillAfterKeywordChange(get, client, ['$seen']);
   },
 
@@ -5155,7 +5439,12 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
       const target = parentId
         ? resolveMailboxMutationContext(client, parentId)
         : { ...resolveMailboxAccountTarget(client, accountId), mailboxId: undefined };
-      await target.client.createMailbox(name, target.mailboxId, target.accountId);
+      if (emailHooks.onBeforeMailboxCreate.size > 0
+        && !(await emailHooks.onBeforeMailboxCreate.intercept({ name, parentId: parentId ?? null }))) {
+        return;
+      }
+      const created = await target.client.createMailbox(name, target.mailboxId, target.accountId);
+      void emailHooks.onMailboxCreate.emit({ mailboxId: created?.id ?? null, name, parentId: parentId ?? null });
       if (get().viewingAccountId) {
         await refreshMailboxesForViewingAccount(client);
       } else {
@@ -5170,7 +5459,13 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
   renameMailbox: async (client, mailboxId, name) => {
     try {
       const target = resolveMailboxMutationContext(client, mailboxId);
+      if (emailHooks.onBeforeMailboxRename.size > 0
+        && !(await emailHooks.onBeforeMailboxRename.intercept({ mailboxId, name }))) {
+        return;
+      }
+      const previousName = resolveActionMailboxes().find(mb => mb.id === mailboxId)?.name ?? null;
       await target.client.updateMailbox(target.mailboxId, { name }, target.accountId);
+      void emailHooks.onMailboxRename.emit({ mailboxId, name, previousName });
       const viewingId = get().viewingAccountId;
       if (viewingId) {
         set((state) => ({
@@ -5197,6 +5492,11 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
   deleteMailbox: async (client, mailboxId, options) => {
     try {
       const target = resolveMailboxMutationContext(client, mailboxId);
+      const deletedName = resolveActionMailboxes().find(mb => mb.id === mailboxId)?.name ?? null;
+      if (emailHooks.onBeforeMailboxDelete.size > 0
+        && !(await emailHooks.onBeforeMailboxDelete.intercept({ mailboxId, name: deletedName }))) {
+        return;
+      }
       // Only pass the options when set: the plain call keeps the two-argument
       // shape other client implementations (demo, plugins) expect.
       if (options?.removeEmails) {
@@ -5204,6 +5504,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
       } else {
         await target.client.deleteMailbox(target.mailboxId, target.accountId);
       }
+      void emailHooks.onMailboxDelete.emit({ mailboxId, name: deletedName });
       const { selectedMailbox, viewingAccountId: viewingId } = get();
       if (viewingId) {
         const updatedList = (get().accountMailboxes[viewingId] ?? []).filter(mb => mb.id !== mailboxId);
@@ -5418,6 +5719,11 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
   },
 
   emptyMailbox: async (client, mailboxId) => {
+    const emptied = resolveActionMailboxes().find(mb => mb.id === mailboxId);
+    if (emailHooks.onBeforeMailboxEmpty.size > 0
+      && !(await emailHooks.onBeforeMailboxEmpty.intercept({ mailboxId, role: emptied?.role ?? null }))) {
+      return;
+    }
     try {
       set({ isLoading: true, error: null });
       const mailboxes = resolveActionMailboxes();
@@ -5476,6 +5782,7 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
         set({ mailboxes: get().mailboxes.map(updateCounters) });
       }
       set({ isLoading: false });
+      void emailHooks.onMailboxEmpty.emit({ mailboxId, role: mailbox?.role ?? null, count: mailbox?.totalEmails ?? 0 });
     } catch (error) {
       set({
         error: error instanceof Error ? error.message : 'Failed to empty folder',
@@ -6076,6 +6383,32 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
   },
 }));
 
+// Plugin hooks that follow a piece of store state rather than one action, so
+// every path that changes it (clicks, keyboard, a batch action clearing the
+// selection, an account switch) fires them once.
+useEmailStore.subscribe((state, prev) => {
+  if (state.selectedEmailKeys !== prev.selectedEmailKeys && emailHooks.onEmailSelectionChange.size > 0) {
+    const changed = state.selectedEmailKeys.size !== prev.selectedEmailKeys.size
+      || [...state.selectedEmailKeys].some(key => !prev.selectedEmailKeys.has(key));
+    if (changed) void emailHooks.onEmailSelectionChange.emit({ emailIds: idsFromSelectionKeys(state.selectedEmailKeys) });
+  }
+  if (state.selectedMailbox !== prev.selectedMailbox && state.selectedMailbox && emailHooks.onMailboxChange.size > 0) {
+    const mailbox = mailboxesInView(state).find(mb => mb.id === state.selectedMailbox);
+    void emailHooks.onMailboxChange.emit({
+      mailboxId: state.selectedMailbox,
+      role: mailbox?.role ?? (state.isUnifiedView ? state.unifiedRole : null) ?? null,
+      previousMailboxId: prev.selectedMailbox || null,
+    });
+  }
+  if (state.quota && state.quota !== prev.quota
+    && (state.quota.used !== prev.quota?.used || state.quota.total !== prev.quota?.total)) {
+    void emailHooks.onQuotaChange.emit(quotaToView(state.quota));
+  }
+  if (state.isPushConnected !== prev.isPushConnected) {
+    void emailHooks.onPushConnectionChange.emit({ connected: state.isPushConnected });
+  }
+});
+
 // Keep the unified-section badges in lockstep with the live per-account mailbox
 // lists. Whenever `mailboxes`, `accountMailboxes`, or the unified scope change -
 // i.e. after any optimistic delete/move/markRead patch or a push-driven mailbox
diff --git a/stores/file-store.ts b/stores/file-store.ts
index 5a0c56c0e..6d21d40d6 100644
--- a/stores/file-store.ts
+++ b/stores/file-store.ts
@@ -2,6 +2,9 @@ import { create } from 'zustand';
 import type { IJMAPClient } from '@/lib/jmap/client-interface';
 import type { FileNode, FileNodeRights } from '@/lib/jmap/types';
 import { imageBlobUrl } from '@/lib/file-preview';
+import { fileHooks } from '@/lib/plugin-hooks';
+import { fileToView } from '@/lib/plugin-projection';
+import type { FileResourceView } from '@/lib/plugin-types';
 
 export interface FileResource {
   id: string;
@@ -38,6 +41,8 @@ interface ClipboardState {
   serverNames: string[];
   sourceParentId: string | null;
   sourcePath: string;
+  /** The cut or copied items as plugins see them, taken when they were picked. */
+  files: FileResourceView[];
 }
 
 /** How a batch upload ended: files that made it, and whether the user cancelled. */
@@ -104,22 +109,24 @@ interface FileState {
   uploadFiles: (files: File[]) => Promise<UploadResult>;
   uploadFolder: (files: File[]) => Promise<UploadResult>;
   cancelUpload: () => void;
-  deleteResource: (name: string) => Promise<void>;
-  deleteResources: (names: string[]) => Promise<void>;
-  renameResource: (oldName: string, newName: string) => Promise<void>;
+  // Deletes, renames and moves resolve to false when a plugin stopped them
+  // (onBeforeFileDelete / Rename / Move); nothing changed then.
+  deleteResource: (name: string) => Promise<boolean>;
+  deleteResources: (names: string[]) => Promise<boolean>;
+  renameResource: (oldName: string, newName: string) => Promise<boolean>;
   downloadResource: (name: string) => Promise<void>;
   downloadResources: (names: string[]) => Promise<void>;
   getImageUrl: (name: string) => Promise<string>;
   getFileContent: (name: string) => Promise<{ blob: Blob; contentType: string }>;
   createTextFile: (name: string) => Promise<void>;
   duplicateResource: (name: string) => Promise<void>;
-  moveToFolder: (names: string[], targetFolder: string) => Promise<void>;
-  moveToParent: (names: string[]) => Promise<void>;
+  moveToFolder: (names: string[], targetFolder: string) => Promise<boolean>;
+  moveToParent: (names: string[]) => Promise<boolean>;
   /** Move listed items into any folder by id (null = the root), e.g. a tree or breadcrumb drop. */
-  moveToFolderId: (names: string[], targetId: string | null) => Promise<void>;
+  moveToFolderId: (names: string[], targetId: string | null) => Promise<boolean>;
   cutResources: (names: string[]) => void;
   copyResources: (names: string[]) => void;
-  pasteResources: () => Promise<void>;
+  pasteResources: () => Promise<boolean>;
   selectResource: (name: string | null) => void;
   toggleSelect: (name: string) => void;
   selectAll: () => void;
@@ -132,9 +139,9 @@ interface FileState {
   /** Open the folder holding a node and return the node's name, or null when it is gone. */
   revealNode: (id: string) => Promise<string | null>;
   /** Rename any node by id, e.g. a folder in the tree that is not listed. */
-  renameNode: (id: string, newName: string) => Promise<void>;
+  renameNode: (id: string, newName: string) => Promise<boolean>;
   /** Delete any node by id; leaves the folder on screen if it was inside it. */
-  deleteNode: (id: string) => Promise<void>;
+  deleteNode: (id: string) => Promise<boolean>;
   /** Download a file by id, wherever it lives. */
   downloadNode: (id: string) => Promise<void>;
   removeRecentFile: (id: string) => void;
@@ -280,6 +287,81 @@ function buildPathFromStack(stack: { id: string | null; name: string }[]): strin
   return '/' + stack.slice(1).map(s => s.name).join('/');
 }
 
+function joinPath(base: string, name: string): string {
+  if (!name) return base;
+  return base === '/' || base === '' ? `/${name}` : `${base}/${name}`;
+}
+
+/** A listed item as plugins see it; `path` is the folder that holds it. */
+export function resourceToView(r: FileResource, path: string): FileResourceView {
+  return fileToView({
+    id: r.id,
+    parentId: r.parentId,
+    name: r.name,
+    type: r.isDirectory ? 'd' : r.contentType,
+    blobId: r.isDirectory ? null : r.blobId,
+    size: r.contentLength,
+    created: r.lastModified,
+    modified: r.lastModified,
+  }, path);
+}
+
+/** Path of the folder holding a node, from the folder list ('' when unknown). */
+function parentPath(folders: FileResource[], parentId: string | null | undefined): string {
+  if (parentId == null) return '/';
+  return folderPath(folders, parentId) ?? '';
+}
+
+/** Views of the items whose ids the server reports as destroyed. */
+function destroyedViews(views: FileResourceView[], result: { destroyed?: string[] } | undefined): FileResourceView[] {
+  if (!result?.destroyed) return views;
+  const gone = new Set(result.destroyed);
+  return views.filter(v => gone.has(v.id));
+}
+
+/** A starred folder as plugins see it; favourites are kept by path. */
+function favoriteFolderView(folders: FileResource[], path: string): FileResourceView {
+  const slash = path.lastIndexOf('/');
+  const parent = slash > 0 ? path.slice(0, slash) : '/';
+  const folder = folders.find(f => folderPath(folders, f.id) === path);
+  if (folder) return resourceToView(folder, parent);
+  return { id: '', name: path.slice(slash + 1), type: 'directory', size: 0, mimeType: '', path: parent, modified: '' };
+}
+
+function sameNameSet(a: Set<string>, b: Set<string>): boolean {
+  if (a.size !== b.size) return false;
+  for (const n of a) if (!b.has(n)) return false;
+  return true;
+}
+
+/** A node that is not in any listing; plugins get at least its id. */
+function unknownNodeView(id: string): FileResourceView {
+  return { id, name: '', type: 'file', size: 0, mimeType: '', path: '', modified: '' };
+}
+
+/** Ask plugins once about moving these items from `fromPath` to `toPath`. */
+async function approveMove(items: FileResource[], fromPath: string, toPath: string): Promise<boolean> {
+  if (items.length === 0) return true;
+  const files = items.map(r => resourceToView(r, fromPath));
+  return fileHooks.onBeforeFileMove.intercept({ files, toPath });
+}
+
+/**
+ * Move each item with `moveOne`, then tell plugins which ones moved. Items
+ * moved before a failure are still reported; the error is passed on.
+ */
+async function reportMoves(items: FileResource[], toPath: string, moveOne: (r: FileResource) => Promise<void>): Promise<void> {
+  const moved: FileResourceView[] = [];
+  try {
+    for (const resource of items) {
+      await moveOne(resource);
+      moved.push(resourceToView(resource, toPath));
+    }
+  } finally {
+    if (moved.length > 0) void fileHooks.onFileMove.emit({ files: moved, toPath });
+  }
+}
+
 export const useFileStore = create<FileState>((set, get) => ({
   currentParentId: null,
   currentPath: '/',
@@ -540,8 +622,10 @@ export const useFileStore = create<FileState>((set, get) => ({
   },
 
   navigate: async (parentId: string | null, name?: string) => {
-    const { client, pathStack } = get();
+    const { client, pathStack, currentParentId: previousParentId, hasListed } = get();
     if (!client) return;
+    // A refresh lists the same folder again; plugins only hear about a new one.
+    const opensFolder = !hasListed || parentId !== previousParentId;
 
     set({ isLoading: true, error: null, currentParentId: parentId, selectedResources: new Set() });
 
@@ -587,6 +671,7 @@ export const useFileStore = create<FileState>((set, get) => ({
       } else {
         set({ resources, allFolders, isLoading: false, hasListed: true });
       }
+      if (opensFolder) void fileHooks.onFileNavigate.emit({ path: newPath });
     } catch (error) {
       set({
         error: error instanceof Error ? error.message : 'Failed to list directory',
@@ -644,16 +729,18 @@ export const useFileStore = create<FileState>((set, get) => ({
   },
 
   createDirectory: async (name: string) => {
-    const { client, currentParentId, refresh } = get();
+    const { client, currentParentId, currentPath, refresh } = get();
     if (!client) return;
 
-    await client.createFileDirectory(name, currentParentId);
+    const created = await client.createFileDirectory(name, currentParentId);
+    void fileHooks.onDirectoryCreate.emit(fileToView(created, currentPath));
     await refresh();
   },
 
   uploadFile: async (file: File) => {
-    const { client, currentParentId } = get();
+    const { client, currentParentId, currentPath } = get();
     if (!client) return;
+    if (!(await fileHooks.onBeforeFileUpload.intercept({ name: file.name, size: file.size, type: file.type, path: currentPath }))) return;
 
     const abortController = new AbortController();
     set({ uploadAbortController: abortController });
@@ -669,17 +756,27 @@ export const useFileStore = create<FileState>((set, get) => ({
       });
       if (abortController.signal.aborted) return;
       set({ uploadProgress: { name: file.name, loaded: file.size, total: file.size, current: 1, totalFiles: 1 } });
-      await client.createFileNode(file.name, blobId, type || file.type || 'application/octet-stream', file.size, currentParentId);
+      const node = await client.createFileNode(file.name, blobId, type || file.type || 'application/octet-stream', file.size, currentParentId);
+      void fileHooks.onAfterFileUpload.emit(fileToView(node, currentPath));
     } finally {
       set({ uploadProgress: null, uploadAbortController: null });
     }
   },
 
-  uploadFiles: async (files: File[]) => {
-    const { client, currentParentId, resources } = get();
+  uploadFiles: async (allFiles: File[]) => {
+    const { client, currentParentId, currentPath, resources } = get();
     if (!client) return { uploaded: 0, canceled: false };
     let uploaded = 0;
 
+    // Plugins may hold back single files; the rest go up.
+    const files: File[] = [];
+    for (const file of allFiles) {
+      if (await fileHooks.onBeforeFileUpload.intercept({ name: file.name, size: file.size, type: file.type, path: currentPath })) {
+        files.push(file);
+      }
+    }
+    if (files.length === 0) return { uploaded: 0, canceled: false };
+
     const abortController = new AbortController();
     set({ uploadAbortController: abortController });
     const totalFiles = files.length;
@@ -702,8 +799,9 @@ export const useFileStore = create<FileState>((set, get) => ({
         });
         if (abortController.signal.aborted) break;
         set({ uploadProgress: { name: file.name, loaded: file.size, total: file.size, current: i + 1, totalFiles } });
-        await client.createFileNode(uniqueName, blobId, type || file.type || 'application/octet-stream', file.size, currentParentId);
+        const node = await client.createFileNode(uniqueName, blobId, type || file.type || 'application/octet-stream', file.size, currentParentId);
         uploaded++;
+        void fileHooks.onAfterFileUpload.emit(fileToView(node, currentPath));
       } catch (err) {
         if (err instanceof DOMException && err.name === 'AbortError') break;
         set({ uploadProgress: null, uploadAbortController: null });
@@ -716,18 +814,36 @@ export const useFileStore = create<FileState>((set, get) => ({
   },
 
   cancelUpload: () => {
-    const { uploadAbortController } = get();
+    const { uploadAbortController, uploadProgress, currentPath } = get();
     if (uploadAbortController) {
       uploadAbortController.abort();
       set({ uploadProgress: null, uploadAbortController: null });
+      void fileHooks.onFileUploadCancel.emit({ name: uploadProgress?.name ?? '', path: currentPath });
     }
   },
 
-  uploadFolder: async (files: File[]) => {
-    const { client, currentParentId } = get();
-    if (!client || files.length === 0) return { uploaded: 0, canceled: false };
+  uploadFolder: async (allFiles: File[]) => {
+    const { client, currentParentId, currentPath } = get();
+    if (!client || allFiles.length === 0) return { uploaded: 0, canceled: false };
     let uploaded = 0;
 
+    const relativeOf = (file: File) => (file as File & { webkitRelativePath?: string }).webkitRelativePath || file.name;
+    const dirOf = (relativePath: string) => {
+      const slash = relativePath.lastIndexOf('/');
+      return slash >= 0 ? relativePath.slice(0, slash) : '';
+    };
+
+    // Ask plugins about every file before anything is created, so a folder
+    // that only held refused files is not created either.
+    const files: File[] = [];
+    for (const file of allFiles) {
+      const path = joinPath(currentPath, dirOf(relativeOf(file)));
+      if (await fileHooks.onBeforeFileUpload.intercept({ name: file.name, size: file.size, type: file.type, path })) {
+        files.push(file);
+      }
+    }
+    if (files.length === 0) return { uploaded: 0, canceled: false };
+
     const abortController = new AbortController();
     set({ uploadAbortController: abortController });
     const totalFiles = files.length;
@@ -758,6 +874,7 @@ export const useFileStore = create<FileState>((set, get) => ({
       try {
         const created = await client.createFileDirectory(dirName, parentId);
         dirIds.set(dir, created.id);
+        void fileHooks.onDirectoryCreate.emit(fileToView(created, joinPath(currentPath, parentPath)));
       } catch {
         // Directory may already exist - leave it unmapped; files fall back to
         // the closest known parent below.
@@ -768,9 +885,8 @@ export const useFileStore = create<FileState>((set, get) => ({
     for (let i = 0; i < files.length; i++) {
       if (abortController.signal.aborted) break;
       const file = files[i];
-      const relativePath = (file as File & { webkitRelativePath?: string }).webkitRelativePath || file.name;
-      const slash = relativePath.lastIndexOf('/');
-      const dirPath = slash >= 0 ? relativePath.slice(0, slash) : '';
+      const relativePath = relativeOf(file);
+      const dirPath = dirOf(relativePath);
       const parentId = dirIds.get(dirPath) ?? currentParentId;
 
       set({ uploadProgress: { name: relativePath, loaded: 0, total: file.size, current: i + 1, totalFiles } });
@@ -785,8 +901,11 @@ export const useFileStore = create<FileState>((set, get) => ({
         });
         if (abortController.signal.aborted) break;
         set({ uploadProgress: { name: relativePath, loaded: file.size, total: file.size, current: i + 1, totalFiles } });
-        await client.createFileNode(file.name, blobId, type || file.type || 'application/octet-stream', file.size, parentId);
+        const node = await client.createFileNode(file.name, blobId, type || file.type || 'application/octet-stream', file.size, parentId);
         uploaded++;
+        // A file whose folder could not be created lands in the closest known one.
+        const landedIn = dirIds.has(dirPath) ? joinPath(currentPath, dirPath) : currentPath;
+        void fileHooks.onAfterFileUpload.emit(fileToView(node, landedIn));
       } catch (err) {
         if (err instanceof DOMException && err.name === 'AbortError') break;
         set({ uploadProgress: null, uploadAbortController: null });
@@ -799,50 +918,68 @@ export const useFileStore = create<FileState>((set, get) => ({
   },
 
   deleteResource: async (name: string) => {
-    const { client, resources, recentFiles, refresh } = get();
-    if (!client) return;
+    const { client, resources, recentFiles, currentPath, refresh } = get();
+    if (!client) return false;
 
     const resource = resources.find(r => r.name === name);
-    if (!resource) return;
+    if (!resource) return false;
+
+    const files = [resourceToView(resource, currentPath)];
+    if (!(await fileHooks.onBeforeFileDelete.intercept({ files }))) return false;
 
     // The server removes descendant nodes (onDestroyRemoveChildren).
-    await client.destroyFileNodes([resource.id]);
+    const result = await client.destroyFileNodes([resource.id]);
+    const deleted = destroyedViews(files, result);
+    if (deleted.length > 0) void fileHooks.onAfterFileDelete.emit({ files: deleted });
     const nextRecentFiles = recentFiles.filter(r => r.id !== resource.id);
     set({ recentFiles: nextRecentFiles });
     try { localStorage.setItem('files-recent-files', JSON.stringify(nextRecentFiles)); } catch { /* ignore */ }
     await refresh();
+    return true;
   },
 
   deleteResources: async (names: string[]) => {
-    const { client, resources, recentFiles, refresh } = get();
-    if (!client) return;
+    const { client, resources, recentFiles, currentPath, refresh } = get();
+    if (!client) return false;
 
     const idsToDelete: string[] = [];
+    const files: FileResourceView[] = [];
     for (const name of names) {
       const resource = resources.find(r => r.name === name);
-      if (resource) idsToDelete.push(resource.id);
+      if (resource) {
+        idsToDelete.push(resource.id);
+        files.push(resourceToView(resource, currentPath));
+      }
     }
 
-    if (idsToDelete.length === 0) return;
+    if (idsToDelete.length === 0) return false;
+    if (!(await fileHooks.onBeforeFileDelete.intercept({ files }))) return false;
 
     // The server removes descendant nodes (onDestroyRemoveChildren).
-    await client.destroyFileNodes(idsToDelete);
+    const result = await client.destroyFileNodes(idsToDelete);
+    const deleted = destroyedViews(files, result);
+    if (deleted.length > 0) void fileHooks.onAfterFileDelete.emit({ files: deleted });
     const deletedIdSet = new Set(idsToDelete);
     const nextRecentFiles = recentFiles.filter(r => !deletedIdSet.has(r.id));
     set({ selectedResources: new Set() });
     set({ recentFiles: nextRecentFiles });
     try { localStorage.setItem('files-recent-files', JSON.stringify(nextRecentFiles)); } catch { /* ignore */ }
     await refresh();
+    return true;
   },
 
   renameResource: async (oldName: string, newName: string) => {
-    const { client, resources, refresh } = get();
-    if (!client) return;
+    const { client, resources, currentPath, refresh } = get();
+    if (!client) return false;
 
     const resource = resources.find(r => r.name === oldName);
-    if (!resource) return;
+    if (!resource) return false;
+
+    const file = resourceToView(resource, currentPath);
+    if (!(await fileHooks.onBeforeFileRename.intercept({ file, newName }))) return false;
 
     await client.updateFileNode(resource.id, { name: newName });
+    void fileHooks.onFileRename.emit({ file: { ...file, name: newName }, previousName: oldName });
 
     set({
       lastAction: {
@@ -852,16 +989,18 @@ export const useFileStore = create<FileState>((set, get) => ({
       },
     });
     await refresh();
+    return true;
   },
 
   downloadResource: async (name: string) => {
-    const { client, resources } = get();
+    const { client, resources, currentPath } = get();
     if (!client) return;
 
     const resource = resources.find(r => r.name === name);
     if (!resource?.blobId) return;
 
     await client.downloadBlob(resource.blobId, resource.name, resource.contentType);
+    void fileHooks.onFileDownload.emit(resourceToView(resource, currentPath));
   },
 
   downloadResources: async (names: string[]) => {
@@ -908,7 +1047,7 @@ export const useFileStore = create<FileState>((set, get) => ({
   },
 
   duplicateResource: async (name: string) => {
-    const { client, resources, currentParentId, refresh } = get();
+    const { client, resources, currentParentId, currentPath, refresh } = get();
     if (!client) return;
 
     const resource = resources.find(r => r.name === name);
@@ -919,56 +1058,67 @@ export const useFileStore = create<FileState>((set, get) => ({
       ? `${name.substring(0, dotIdx)} (copy)${name.substring(dotIdx)}`
       : `${name} (copy)`;
 
-    await client.copyFileNode(resource.id, copyName, currentParentId);
+    const copy = await client.copyFileNode(resource.id, copyName, currentParentId);
+    void fileHooks.onFileDuplicate.emit(fileToView(copy, currentPath));
     await refresh();
   },
 
   moveToFolder: async (names: string[], targetFolder: string) => {
-    const { client, resources, refresh } = get();
-    if (!client) return;
+    const { client, resources, currentPath, refresh } = get();
+    if (!client) return false;
 
     const targetResource = resources.find(r => r.name === targetFolder && r.isDirectory);
-    if (!targetResource) return;
+    if (!targetResource) return false;
+
+    const toMove = names
+      .map(name => resources.find(r => r.name === name))
+      .filter((r): r is FileResource => !!r && r.id !== targetResource.id);
+    const toPath = joinPath(currentPath, targetFolder);
+    if (!(await approveMove(toMove, currentPath, toPath))) return false;
 
     const entries: UndoAction['entries'] = [];
-    for (const name of names) {
-      const resource = resources.find(r => r.name === name);
-      if (!resource || resource.id === targetResource.id) continue;
+    await reportMoves(toMove, toPath, async (resource) => {
       await client.updateFileNode(resource.id, { parentId: targetResource.id });
       entries.push({ id: resource.id, from: { parentId: resource.parentId }, to: { parentId: targetResource.id } });
-    }
+    });
     set({
       selectedResources: new Set(),
       lastAction: { type: 'move', entries, sourceParentId: null },
     });
     await refresh();
+    return true;
   },
 
   moveToParent: async (names: string[]) => {
-    const { client, resources, pathStack, refresh } = get();
-    if (!client || pathStack.length <= 1) return;
+    const { client, resources, pathStack, currentPath, refresh } = get();
+    if (!client || pathStack.length <= 1) return false;
 
     // Move into the grandparent of the current folder's contents, i.e. the
     // entry one level up in the breadcrumb stack.
     const newParentId = pathStack[pathStack.length - 2].id;
 
+    const toMove = names
+      .map(name => resources.find(r => r.name === name))
+      .filter((r): r is FileResource => !!r);
+    const toPath = buildPathFromStack(pathStack.slice(0, -1));
+    if (!(await approveMove(toMove, currentPath, toPath))) return false;
+
     const entries: UndoAction['entries'] = [];
-    for (const name of names) {
-      const resource = resources.find(r => r.name === name);
-      if (!resource) continue;
+    await reportMoves(toMove, toPath, async (resource) => {
       await client.updateFileNode(resource.id, { parentId: newParentId });
       entries.push({ id: resource.id, from: { parentId: resource.parentId }, to: { parentId: newParentId } });
-    }
+    });
     set({
       selectedResources: new Set(),
       lastAction: { type: 'move', entries, sourceParentId: null },
     });
     await refresh();
+    return true;
   },
 
   moveToFolderId: async (names: string[], targetId: string | null) => {
-    const { client, resources, currentParentId, allFolders, refresh } = get();
-    if (!client || targetId === currentParentId) return;
+    const { client, resources, currentParentId, currentPath, allFolders, refresh } = get();
+    if (!client || targetId === currentParentId) return false;
 
     // A folder must not move into itself or anything below it.
     const parentOf = new Map(allFolders.map(f => [f.id, f.parentId ?? null]));
@@ -979,50 +1129,74 @@ export const useFileStore = create<FileState>((set, get) => ({
       return false;
     };
 
+    const toMove = names
+      .map(name => resources.find(r => r.name === name))
+      .filter((r): r is FileResource => !!r && !(r.isDirectory && isInside(targetId, r.id)));
+    const toPath = parentPath(allFolders, targetId);
+    if (!(await approveMove(toMove, currentPath, toPath))) return false;
+
     const entries: UndoAction['entries'] = [];
-    for (const name of names) {
-      const resource = resources.find(r => r.name === name);
-      if (!resource) continue;
-      if (resource.isDirectory && isInside(targetId, resource.id)) continue;
+    await reportMoves(toMove, toPath, async (resource) => {
       await client.updateFileNode(resource.id, { parentId: targetId });
       entries.push({ id: resource.id, from: { parentId: resource.parentId }, to: { parentId: targetId } });
-    }
+    });
     set({
       selectedResources: new Set(),
       lastAction: entries.length > 0 ? { type: 'move', entries, sourceParentId: null } : get().lastAction,
     });
     await refresh();
+    return true;
   },
 
   cutResources: (names: string[]) => {
     const { currentPath, currentParentId, resources } = get();
     const ids = names.map(n => resources.find(r => r.name === n)?.id).filter(Boolean) as string[];
     const serverNames = names.map(n => resources.find(r => r.name === n)?.serverName).filter(Boolean) as string[];
-    set({ clipboard: { mode: 'cut', ids, names, serverNames, sourceParentId: currentParentId, sourcePath: currentPath } });
+    const files = resources.filter(r => names.includes(r.name)).map(r => resourceToView(r, currentPath));
+    set({ clipboard: { mode: 'cut', ids, names, serverNames, sourceParentId: currentParentId, sourcePath: currentPath, files } });
   },
 
   copyResources: (names: string[]) => {
     const { currentPath, currentParentId, resources } = get();
     const ids = names.map(n => resources.find(r => r.name === n)?.id).filter(Boolean) as string[];
     const serverNames = names.map(n => resources.find(r => r.name === n)?.serverName).filter(Boolean) as string[];
-    set({ clipboard: { mode: 'copy', ids, names, serverNames, sourceParentId: currentParentId, sourcePath: currentPath } });
+    const files = resources.filter(r => names.includes(r.name)).map(r => resourceToView(r, currentPath));
+    set({ clipboard: { mode: 'copy', ids, names, serverNames, sourceParentId: currentParentId, sourcePath: currentPath, files } });
   },
 
   pasteResources: async () => {
-    const { client, currentParentId, clipboard, refresh } = get();
-    if (!client || !clipboard) return;
+    const { client, currentParentId, currentPath, clipboard, refresh } = get();
+    if (!client || !clipboard) return false;
+
+    const viewOf = (id: string) => clipboard.files?.find(f => f.id === id);
+    if (clipboard.mode === 'cut') {
+      const files = clipboard.ids.map(viewOf).filter((f): f is FileResourceView => !!f);
+      if (!(await fileHooks.onBeforeFileMove.intercept({ files, toPath: currentPath }))) return false;
+    }
 
     const entries: UndoAction['entries'] = [];
+    const done: FileResourceView[] = [];
 
-    for (let i = 0; i < clipboard.ids.length; i++) {
-      const id = clipboard.ids[i];
-      const displayName = clipboard.names[i];
+    try {
+      for (let i = 0; i < clipboard.ids.length; i++) {
+        const id = clipboard.ids[i];
+        const displayName = clipboard.names[i];
 
-      if (clipboard.mode === 'cut') {
-        await client.updateFileNode(id, { parentId: currentParentId });
-        entries.push({ id, from: { parentId: clipboard.sourceParentId }, to: { parentId: currentParentId } });
-      } else {
-        await client.copyFileNode(id, displayName, currentParentId);
+        if (clipboard.mode === 'cut') {
+          await client.updateFileNode(id, { parentId: currentParentId });
+          entries.push({ id, from: { parentId: clipboard.sourceParentId }, to: { parentId: currentParentId } });
+          const view = viewOf(id);
+          if (view) done.push({ ...view, path: currentPath });
+        } else {
+          const copy = await client.copyFileNode(id, displayName, currentParentId);
+          done.push(fileToView(copy, currentPath));
+        }
+      }
+    } finally {
+      // Report what really happened, also when a later item failed.
+      if (done.length > 0) {
+        if (clipboard.mode === 'cut') void fileHooks.onFileMove.emit({ files: done, toPath: currentPath });
+        else void fileHooks.onFileCopy.emit({ files: done, toPath: currentPath });
       }
     }
 
@@ -1033,6 +1207,7 @@ export const useFileStore = create<FileState>((set, get) => ({
       });
     }
     await refresh();
+    return true;
   },
 
   selectResource: (name: string | null) => {
@@ -1089,12 +1264,14 @@ export const useFileStore = create<FileState>((set, get) => ({
   },
 
   toggleFavorite: (path: string) => {
-    const { favorites } = get();
-    const next = favorites.includes(path)
-      ? favorites.filter(f => f !== path)
-      : [...favorites, path];
+    const { favorites, allFolders } = get();
+    const favorite = !favorites.includes(path);
+    const next = favorite ? [...favorites, path] : favorites.filter(f => f !== path);
     set({ favorites: next });
     try { localStorage.setItem('files-favorites', JSON.stringify(next)); } catch { /* ignore */ }
+    if (fileHooks.onFileFavoriteToggle.size > 0) {
+      void fileHooks.onFileFavoriteToggle.emit({ file: favoriteFolderView(allFolders, path), favorite });
+    }
   },
 
   addRecentFile: (name: string, id: string) => {
@@ -1137,11 +1314,15 @@ export const useFileStore = create<FileState>((set, get) => ({
   },
 
   renameNode: async (id: string, newName: string) => {
-    const { client, allFolders, favorites, refresh } = get();
-    if (!client) return;
+    const { client, allFolders, resources, favorites, refresh } = get();
+    if (!client) return false;
     const node = allFolders.find(f => f.id === id);
     const oldPath = folderPath(allFolders, id);
+    const known = node ?? resources.find(r => r.id === id);
+    const file = known ? resourceToView(known, parentPath(allFolders, known.parentId)) : unknownNodeView(id);
+    if (!(await fileHooks.onBeforeFileRename.intercept({ file, newName }))) return false;
     await client.updateFileNode(id, { name: newName });
+    void fileHooks.onFileRename.emit({ file: { ...file, name: newName }, previousName: file.name });
     // Starred folders are kept by path: follow the rename.
     if (oldPath) {
       const newPath = oldPath.slice(0, oldPath.lastIndexOf('/') + 1) + newName;
@@ -1163,13 +1344,19 @@ export const useFileStore = create<FileState>((set, get) => ({
       set({ currentPath: buildPathFromStack(get().pathStack) });
     }
     await refresh();
+    return true;
   },
 
   deleteNode: async (id: string) => {
-    const { client, allFolders, favorites, recentFiles, pathStack, navigate, refresh } = get();
-    if (!client) return;
+    const { client, allFolders, resources, favorites, recentFiles, pathStack, navigate, refresh } = get();
+    if (!client) return false;
     const path = folderPath(allFolders, id);
-    await client.destroyFileNodes([id]);
+    const known = allFolders.find(f => f.id === id) ?? resources.find(r => r.id === id);
+    const files = [known ? resourceToView(known, parentPath(allFolders, known.parentId)) : unknownNodeView(id)];
+    if (!(await fileHooks.onBeforeFileDelete.intercept({ files }))) return false;
+    const result = await client.destroyFileNodes([id]);
+    const deleted = destroyedViews(files, result);
+    if (deleted.length > 0) void fileHooks.onAfterFileDelete.emit({ files: deleted });
 
     const nextFavorites = path ? favorites.filter(f => !isUnder(f, path)) : favorites;
     // Recent files only know their own id; drop the one deleted, the rest are
@@ -1187,9 +1374,10 @@ export const useFileStore = create<FileState>((set, get) => ({
       const parent = pathStack[idx - 1];
       set({ pathStack: pathStack.slice(0, idx) });
       await navigate(parent.id, parent.name);
-      return;
+      return true;
     }
     await refresh();
+    return true;
   },
 
   downloadNode: async (id: string) => {
@@ -1201,6 +1389,8 @@ export const useFileStore = create<FileState>((set, get) => ({
     const node = nodes.find(n => n.id === id);
     if (!node?.blobId) throw new Error('File not found');
     await client.downloadBlob(node.blobId, node.name, node.type);
+    const folders = nodes.filter(isFolder).map(nodeToResource);
+    void fileHooks.onFileDownload.emit(fileToView(node, parentPath(folders, node.parentId)));
   },
 
   removeRecentFile: (id: string) => {
@@ -1217,6 +1407,12 @@ export const useFileStore = create<FileState>((set, get) => ({
       await client.updateFileNode(entry.id, entry.from);
     }
     set({ lastAction: null });
+    void fileHooks.onFileUndo.emit({
+      action: {
+        type: lastAction.type,
+        entries: lastAction.entries.map(e => ({ id: e.id, from: { ...e.from }, to: { ...e.to } })),
+      },
+    });
     await refresh();
   },
 
@@ -1254,3 +1450,15 @@ export const useFileStore = create<FileState>((set, get) => ({
     }
   },
 }));
+
+// Tell plugins when the selected files change, whichever action changed it
+// (click, toggle, select all, clear, navigating away, after a delete or move).
+// Selecting the same files again is not a change.
+useFileStore.subscribe((state, prev) => {
+  if (state.selectedResources === prev.selectedResources) return;
+  if (fileHooks.onFileSelectionChange.size === 0) return;
+  const next = state.selectedResources ?? new Set<string>();
+  if (sameNameSet(next, prev.selectedResources ?? new Set<string>())) return;
+  const files = state.resources.filter(r => next.has(r.name)).map(r => resourceToView(r, state.currentPath));
+  void fileHooks.onFileSelectionChange.emit({ files });
+});
diff --git a/stores/filter-store.ts b/stores/filter-store.ts
index 35f113e88..573508abf 100644
--- a/stores/filter-store.ts
+++ b/stores/filter-store.ts
@@ -3,7 +3,10 @@ import type { IJMAPClient } from '@/lib/jmap/client-interface';
 import type { FilterRule, SieveCapabilities, VacationAudience, VacationForward, VacationSieveConfig } from '@/lib/jmap/sieve-types';
 import { parseScript } from '@/lib/sieve/parser';
 import { generateScript, supportsSpamGuard, VACATION_SCRIPT_NAME } from '@/lib/sieve/generator';
-import { OpaqueFiltersError, applyScriptTransforms, supportsInclude, writeFiltersScript } from '@/lib/filters/account-filters';
+import {
+  OpaqueFiltersError, applyScriptTransforms, assertFiltersSaveAllowed, filterRuleToView, supportsInclude, writeFiltersScript,
+} from '@/lib/filters/account-filters';
+import { filterHooks } from '@/lib/plugin-hooks';
 import { worstCaseForwards } from '@/lib/filters/forward-limit';
 import { supportsPeriods } from '@/lib/sieve/period';
 import { isValidVacationForward, withVacationPeriod } from '@/lib/sieve/vacation-forward';
@@ -16,6 +19,22 @@ interface SieveAccount {
   isPrimary: boolean;
 }
 
+function emitFiltersLoaded(rules: FilterRule[]): void {
+  if (filterHooks.onFiltersLoaded.size > 0) void filterHooks.onFiltersLoaded.emit(rules.map(filterRuleToView));
+}
+
+type RuleChange = 'added' | 'updated' | 'deleted' | 'reordered' | 'toggled';
+
+function emitRuleChange(ruleId: string, change: RuleChange): void {
+  void filterHooks.onFilterRuleChange.emit({ ruleId, change });
+}
+
+/** Rules from other clients and hand-edited scripts are read-only here. */
+function isEditableRule(rules: FilterRule[], ruleId: string): boolean {
+  const rule = rules.find(r => r.id === ruleId);
+  return !!rule && rule.origin !== 'external' && rule.origin !== 'opaque';
+}
+
 interface FilterStore {
   rules: FilterRule[];
   isLoading: boolean;
@@ -108,6 +127,7 @@ export const useFilterStore = create<FilterStore>()((set, get) => ({
 
       const activeScript = scripts.find(s => s.isActive) || scripts[0];
       if (!activeScript) {
+        emitFiltersLoaded([]);
         set({
           isLoading: false,
           rules: [],
@@ -131,6 +151,7 @@ export const useFilterStore = create<FilterStore>()((set, get) => ({
 
       if (result.isOpaque) {
         debug.log('filters', 'Sieve script is opaque (hand-edited)');
+        emitFiltersLoaded([]);
         set({
           isLoading: false,
           isOpaque: true,
@@ -143,6 +164,7 @@ export const useFilterStore = create<FilterStore>()((set, get) => ({
         });
       } else {
         debug.log('filters', 'Parsed', result.rules.length, 'filter rules');
+        emitFiltersLoaded(result.rules);
         set({
           isLoading: false,
           isOpaque: false,
@@ -189,6 +211,9 @@ export const useFilterStore = create<FilterStore>()((set, get) => ({
         isOpaque, rawScript, rules, activeScriptId, vacationSettings, externalRequires, includeVacation,
         vacationForward, vacationAudience, selectedAccountId, sieveCapabilities,
       } = get();
+      // Throws FiltersSaveVetoedError (handled below like any failed save,
+      // so the settings UI puts its optimistic change back).
+      await assertFiltersSaveAllowed(rules);
 
       let content: string;
       if (isOpaque) {
@@ -229,9 +254,11 @@ export const useFilterStore = create<FilterStore>()((set, get) => ({
       const external = state.rules.filter(r => r.origin === 'external' || r.origin === 'opaque');
       return { rules: [...bulwark, rule, ...external] };
     });
+    emitRuleChange(rule.id, 'added');
   },
 
   updateRule: (ruleId, updates) => {
+    if (!isEditableRule(get().rules, ruleId)) return;
     set((state) => ({
       rules: state.rules.map(r => {
         if (r.id !== ruleId) return r;
@@ -239,18 +266,22 @@ export const useFilterStore = create<FilterStore>()((set, get) => ({
         return { ...r, ...updates };
       }),
     }));
+    emitRuleChange(ruleId, 'updated');
   },
 
   deleteRule: (ruleId) => {
+    if (!isEditableRule(get().rules, ruleId)) return;
     set((state) => ({
       rules: state.rules.filter(r => {
         if (r.id !== ruleId) return true;
         return r.origin === 'external' || r.origin === 'opaque';
       }),
     }));
+    emitRuleChange(ruleId, 'deleted');
   },
 
   reorderRules: (ruleIds) => {
+    const before = get().rules;
     // Only reorder bulwark rules; external rules always stay at the end in
     // their original order.
     set((state) => {
@@ -261,9 +292,14 @@ export const useFilterStore = create<FilterStore>()((set, get) => ({
       const reordered = ruleIds.map(id => bulwarkMap.get(id)).filter(Boolean) as FilterRule[];
       return { rules: [...reordered, ...external] };
     });
+    // A reorder moves several rules at once, so the first rule that changed
+    // place stands for it.
+    const moved = get().rules.find((r, i) => r.id !== before[i]?.id);
+    if (moved) emitRuleChange(moved.id, 'reordered');
   },
 
   toggleRule: (ruleId) => {
+    if (!isEditableRule(get().rules, ruleId)) return;
     set((state) => ({
       rules: state.rules.map(r => {
         if (r.id !== ruleId) return r;
@@ -271,6 +307,7 @@ export const useFilterStore = create<FilterStore>()((set, get) => ({
         return { ...r, enabled: !r.enabled };
       }),
     }));
+    emitRuleChange(ruleId, 'toggled');
   },
 
   setRawScript: (content) => set({ rawScript: content }),
diff --git a/stores/identity-store.ts b/stores/identity-store.ts
index e233be78c..3f22669b6 100644
--- a/stores/identity-store.ts
+++ b/stores/identity-store.ts
@@ -1,6 +1,9 @@
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
-import { Identity } from '@/lib/jmap/types';
+import type { EmailAddress, Identity } from '@/lib/jmap/types';
+import type { IJMAPClient } from '@/lib/jmap/client-interface';
+import { identityHooks } from '@/lib/plugin-hooks';
+import { identityToView } from '@/lib/plugin-projection';
 
 // Constants for sub-addressing limits
 const MAX_RECENT_TAGS = 10;
@@ -53,7 +56,15 @@ export const useIdentityStore = create<IdentityStore>()(
         tagSuggestions: {},
       },
 
-      setIdentities: (identities) => set({ identities }),
+      setIdentities: (identities) => {
+        const changed = identitySetKey(get().identities) !== identitySetKey(identities);
+        set({ identities });
+        // Reordering (a new default sender) is not a load; only tell plugins
+        // when the identities themselves are new or differ.
+        if (changed && identityHooks.onIdentitiesLoaded.size > 0) {
+          void identityHooks.onIdentitiesLoaded.emit(identities.map(identityToView));
+        }
+      },
 
       addIdentity: (identity) => set((state) => ({
         identities: [...state.identities, identity]
@@ -138,3 +149,63 @@ export const useIdentityStore = create<IdentityStore>()(
     }
   )
 );
+
+/** Order-independent fingerprint of an identity list. */
+function identitySetKey(identities: Identity[]): string {
+  return JSON.stringify(identities.map((i) => JSON.stringify(i)).sort());
+}
+
+export interface IdentityInput {
+  name: string;
+  email: string;
+  replyTo?: EmailAddress[] | null;
+  bcc?: EmailAddress[] | null;
+  textSignature?: string | null;
+  htmlSignature?: string | null;
+}
+
+// Identity changes made by the user (Settings > Identities). Each asks
+// onBeforeIdentityChange first, makes the JMAP call, and tells plugins only
+// once the server accepted it. They return false when a plugin stopped the
+// change, true otherwise; server errors are thrown to the caller.
+
+export async function createIdentityWithHooks(client: IJMAPClient, data: IdentityInput): Promise<boolean> {
+  const draft = identityToView({ id: '', mayDelete: true, ...data } as Identity);
+  if (!(await identityHooks.onBeforeIdentityChange.intercept({ change: 'create', identity: draft }))) return false;
+  const created = await client.createIdentity(
+    data.name, data.email, data.replyTo, data.bcc, data.textSignature, data.htmlSignature,
+  );
+  void identityHooks.onIdentityCreate.emit(identityToView(created));
+  return true;
+}
+
+export async function updateIdentityWithHooks(
+  client: IJMAPClient,
+  identity: Identity,
+  updates: Omit<IdentityInput, 'email'>,
+): Promise<boolean> {
+  const next = identityToView({ ...identity, ...updates } as Identity);
+  if (!(await identityHooks.onBeforeIdentityChange.intercept({ identityId: identity.id, change: 'update', identity: next }))) {
+    return false;
+  }
+  await client.updateIdentity(identity.id, updates);
+  void identityHooks.onIdentityUpdate.emit(next);
+  return true;
+}
+
+export async function deleteIdentityWithHooks(client: IJMAPClient, identity: Identity): Promise<boolean> {
+  if (!(await identityHooks.onBeforeIdentityChange.intercept({
+    identityId: identity.id, change: 'delete', identity: identityToView(identity),
+  }))) {
+    return false;
+  }
+  await client.deleteIdentity(identity.id);
+  void identityHooks.onIdentityDelete.emit({ identityId: identity.id });
+  return true;
+}
+
+/** Tells plugins the user picked another From identity in the composer. */
+export function notifyIdentitySelected(identities: Identity[], identityId: string): void {
+  const identity = identities.find((i) => i.id === identityId);
+  if (identity) void identityHooks.onIdentitySelect.emit(identityToView(identity));
+}
diff --git a/stores/notification-center-store.ts b/stores/notification-center-store.ts
new file mode 100644
index 000000000..e4b77b681
--- /dev/null
+++ b/stores/notification-center-store.ts
@@ -0,0 +1,131 @@
+import { create } from 'zustand';
+import { generateUUID } from '@/lib/utils';
+
+// The in-app notification list behind the bell: what plugins showed with
+// api.notifications.show and the app's own error and warning toasts. Kept in
+// this browser only (localStorage), the last MAX_ENTRIES of them.
+
+export const MAX_ENTRIES = 50;
+const STORAGE_KEY = 'notification-center';
+
+export interface CenterEntry {
+  id: string;
+  /** Unix ms. */
+  time: number;
+  level: 'error' | 'warning' | 'info';
+  title: string;
+  body: string;
+  /** Set for plugin notifications: whose they are, and the tag the plugin passed. */
+  pluginId?: string;
+  pluginName?: string;
+  tag?: string;
+  /** A link the plugin added (checked by the host when it was shown). */
+  action?: { label: string; url: string };
+  read: boolean;
+}
+
+export type CenterEntryInput = Omit<CenterEntry, 'id' | 'time' | 'read'> & { time?: number };
+
+interface NotificationCenterState {
+  entries: CenterEntry[];
+  add: (input: CenterEntryInput) => void;
+  markRead: (id: string) => void;
+  markAllRead: () => void;
+  clear: () => void;
+}
+
+function isEntry(value: unknown): value is CenterEntry {
+  if (!value || typeof value !== 'object') return false;
+  const e = value as Record<string, unknown>;
+  return typeof e.id === 'string' && typeof e.time === 'number' && typeof e.title === 'string'
+    && typeof e.body === 'string' && typeof e.read === 'boolean'
+    && (e.level === 'error' || e.level === 'warning' || e.level === 'info')
+    && (e.action === undefined || isLink(e.action));
+}
+
+// Storage is the user's own, but a link is only ever shown when it is http(s).
+function isLink(value: unknown): value is { label: string; url: string } {
+  if (!value || typeof value !== 'object') return false;
+  const { label, url } = value as Record<string, unknown>;
+  if (typeof label !== 'string' || typeof url !== 'string') return false;
+  try {
+    const { protocol } = new URL(url);
+    return protocol === 'https:' || protocol === 'http:';
+  } catch {
+    return false;
+  }
+}
+
+function load(): CenterEntry[] {
+  try {
+    const raw = typeof localStorage !== 'undefined' ? localStorage.getItem(STORAGE_KEY) : null;
+    if (!raw) return [];
+    const parsed: unknown = JSON.parse(raw);
+    return Array.isArray(parsed) ? parsed.filter(isEntry).slice(0, MAX_ENTRIES) : [];
+  } catch {
+    return [];
+  }
+}
+
+function save(entries: CenterEntry[]): void {
+  try {
+    if (entries.length === 0) localStorage.removeItem(STORAGE_KEY);
+    else localStorage.setItem(STORAGE_KEY, JSON.stringify(entries));
+  } catch {
+    // Storage blocked or full: the list still works for this page load.
+  }
+}
+
+export const useNotificationCenterStore = create<NotificationCenterState>((set, get) => ({
+  entries: load(),
+
+  add: (input) => {
+    const entry: CenterEntry = {
+      id: generateUUID(),
+      time: input.time ?? Date.now(),
+      level: input.level,
+      title: input.title,
+      body: input.body,
+      ...(input.pluginId ? { pluginId: input.pluginId, pluginName: input.pluginName ?? input.pluginId } : {}),
+      ...(input.tag ? { tag: input.tag } : {}),
+      ...(input.action && isLink(input.action) ? { action: { label: input.action.label, url: input.action.url } } : {}),
+      read: false,
+    };
+    const entries = [entry, ...get().entries].slice(0, MAX_ENTRIES);
+    set({ entries });
+    save(entries);
+  },
+
+  markRead: (id) => {
+    const entries = get().entries.map((e) => (e.id === id && !e.read ? { ...e, read: true } : e));
+    set({ entries });
+    save(entries);
+  },
+
+  markAllRead: () => {
+    const entries = get().entries.map((e) => (e.read ? e : { ...e, read: true }));
+    set({ entries });
+    save(entries);
+  },
+
+  clear: () => {
+    set({ entries: [] });
+    save([]);
+  },
+}));
+
+export const selectUnreadCount = (s: NotificationCenterState) => s.entries.reduce((n, e) => n + (e.read ? 0 : 1), 0);
+
+/** Add an entry from outside React (toast store, plugin host API). */
+export function recordNotification(input: CenterEntryInput): void {
+  try {
+    useNotificationCenterStore.getState().add(input);
+  } catch {
+    // Never let the list break the thing that is being reported.
+  }
+}
+
+/** Test helper: read the list back from storage as a fresh page load would. */
+export function reloadNotificationCenter(): void {
+  useNotificationCenterStore.setState({ entries: load() });
+}
diff --git a/stores/plugin-store.ts b/stores/plugin-store.ts
index 078c36491..e3dd189d3 100644
--- a/stores/plugin-store.ts
+++ b/stores/plugin-store.ts
@@ -1,6 +1,7 @@
 // Plugin store - manages installed plugins and lifecycle. Slot registrations
 // are owned by `lib/plugin-sandbox/registry` (per-iframe), not by the store.
 
+import { cancelConnectFor, forgetCredentials } from '@/lib/plugin-sandbox/connect-dialog';
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
 import type { InstalledPlugin, PluginStatus, PluginTier } from '@/lib/plugin-types';
@@ -11,8 +12,13 @@ import { useLocaleStore } from '@/stores/locale-store';
 import { getEffectiveLocale } from '@/i18n/detect-locale';
 import { removeAllPluginHooks } from '@/lib/plugin-hooks';
 import { requestConsent } from '@/lib/plugin-sandbox/consent';
+import { packageHash, type ValidatedPluginManifest } from '@/lib/extension-package';
+import JSZip from 'jszip';
 import { sha256Hex } from '@/lib/plugin-sandbox/bundle-integrity';
 import { downloadManagedBundle } from '@/lib/plugin-sandbox/bundle-fetch';
+import { forEachInstance } from '@/lib/plugin-sandbox/host-bridge';
+import { get as getActivePlugin } from '@/lib/plugin-sandbox/registry';
+import { coerceSetting, effectiveSettings } from '@/lib/plugin-settings';
 import { usePolicyStore } from '@/stores/policy-store';
 import { apiFetch } from '@/lib/browser-navigation';
 import { IMPLICIT_PERMISSIONS } from '@/lib/plugin-types';
@@ -25,12 +31,24 @@ let localeSubscribed = false;
 
 // ─── Store Interface ─────────────────────────────────────────
 
+/**
+ * `reason` names why an install was refused so the settings page can say so
+ * in the user's language; `error` carries the validator's details.
+ */
+export interface InstallResult {
+  success: boolean;
+  reason?: 'invalid' | 'uploads-disabled' | 'managed-id';
+  error?: string;
+  warnings?: string[];
+  approvalStatus?: InstalledPlugin['approvalStatus'];
+}
+
 interface PluginStoreState {
   plugins: InstalledPlugin[];
   initialized: boolean;
 
   // Management
-  installPlugin: (file: File) => Promise<{ success: boolean; error?: string; warnings?: string[] }>;
+  installPlugin: (file: File) => Promise<InstallResult>;
   uninstallPlugin: (id: string) => void;
   enablePlugin: (id: string) => Promise<void>;
   disablePlugin: (id: string) => void;
@@ -52,9 +70,13 @@ export const usePluginStore = create<PluginStoreState>()(
       initialized: false,
 
       installPlugin: async (file: File) => {
+        const policy = usePolicyStore.getState();
+        if (!policy.isFeatureEnabled('pluginsUploadEnabled')) {
+          return { success: false, reason: 'uploads-disabled' };
+        }
         const result = await extractPlugin(file);
         if (!result.valid || !result.manifest) {
-          return { success: false, error: result.errors.join('; '), warnings: result.warnings };
+          return { success: false, reason: 'invalid', error: result.errors.join('; '), warnings: result.warnings };
         }
 
         const { manifest, code } = result;
@@ -62,6 +84,12 @@ export const usePluginStore = create<PluginStoreState>()(
 
         // Check for duplicate
         const existing = plugins.find(p => p.id === manifest.id);
+        // An admin-deployed plugin owns its id. A user package under the same
+        // id would inherit its "managed" trust (no consent, maybe the
+        // privileged tier) the next time the record is marked managed.
+        if (existing?.managed || getServerManagedPluginIds().has(manifest.id)) {
+          return { success: false, reason: 'managed-id' };
+        }
         if (existing) {
           // Update: deactivate old, replace
           deactivatePlugin(manifest.id);
@@ -70,6 +98,7 @@ export const usePluginStore = create<PluginStoreState>()(
         // Compute bundleHash so the admin-approval gate can pin to this
         // specific bundle (server-side state keys on (id, hash) pairs).
         const bundleHash = await sha256Hex(code).catch(() => undefined);
+        const approvalHash = await packageHash(manifest as ValidatedPluginManifest, code);
 
         const plugin: InstalledPlugin = {
           id: manifest.id,
@@ -88,25 +117,33 @@ export const usePluginStore = create<PluginStoreState>()(
           adminApproved: false, // Requires admin approval before it can be enabled
           settings: existing?.settings ?? {},
           settingsSchema: manifest.settingsSchema,
+          ...(manifest.locales ? { locales: manifest.locales } : {}),
           ...(bundleHash ? { bundleHash } : {}),
+          packageManifest: manifest as unknown as Record<string, unknown>,
+          approvalHash,
           ...(manifest.httpOrigins && manifest.httpOrigins.length > 0
             ? { httpOrigins: manifest.httpOrigins }
             : {}),
           ...(manifest.apiPostPaths && manifest.apiPostPaths.length > 0
             ? { apiPostPaths: manifest.apiPostPaths }
             : {}),
+          ...(manifest.credentials ? { credentials: manifest.credentials } : {}),
         };
 
         // Save code to IndexedDB
         await pluginStorage.saveCode(manifest.id, code);
 
+        if (policy.isFeatureEnabled('requirePluginApproval')) {
+          plugin.approvalStatus = await submitApprovalRequest(plugin, code);
+        }
+
         if (existing) {
           set({ plugins: plugins.map(p => p.id === manifest.id ? plugin : p) });
         } else {
           set({ plugins: [...plugins, plugin] });
         }
 
-        return { success: true, warnings: result.warnings };
+        return { success: true, warnings: result.warnings, approvalStatus: plugin.approvalStatus };
       },
 
       uninstallPlugin: (id: string) => {
@@ -116,25 +153,7 @@ export const usePluginStore = create<PluginStoreState>()(
         const forceEnabledByPolicy = usePolicyStore.getState().isPluginForceEnabled(id);
         if (plugin.forceEnabled || forceEnabledByPolicy) return;
 
-        // Deactivate if running
-        deactivatePlugin(id);
-        removeAllPluginHooks(id);
-
-        // Clean up storage
-        pluginStorage.deleteCode(id);
-        pluginStorage.deletePreview(id);
-
-        // Remove plugin-scoped localStorage entries
-        if (typeof window !== 'undefined') {
-          const prefix = `plugin:${id}:`;
-          const keysToRemove: string[] = [];
-          for (let i = 0; i < localStorage.length; i++) {
-            const key = localStorage.key(i);
-            if (key?.startsWith(prefix)) keysToRemove.push(key);
-          }
-          keysToRemove.forEach(k => localStorage.removeItem(k));
-        }
-
+        removePluginData(id);
         set({ plugins: plugins.filter(p => p.id !== id) });
       },
 
@@ -143,35 +162,9 @@ export const usePluginStore = create<PluginStoreState>()(
         const plugin = plugins.find(p => p.id === id);
         if (!plugin) return;
 
-        // Admin approval gate. Managed (admin-pushed) plugins are pre-
-        // approved. For user-installed plugins the server-side state is
-        // authoritative: the client-only `isPluginApproved` flag is kept as
-        // a fast-path hint but the server result wins.
-        const requireApproval = usePolicyStore.getState().isFeatureEnabled('requirePluginApproval');
-        const policyApproved = plugin.adminApproved || plugin.managed || usePolicyStore.getState().isPluginApproved(id);
-        if (requireApproval && !policyApproved && plugin.bundleHash) {
-          const status = await checkServerApproval(plugin.id, plugin.bundleHash).catch(() => null);
-          if (status?.status === 'approved') {
-            // Approval available; proceed.
-          } else if (status?.status === 'denied') {
-            set(state => ({
-              plugins: state.plugins.map(p =>
-                p.id === id ? { ...p, status: 'error' as PluginStatus, error: 'Plugin denied by administrator' } : p
-              ),
-            }));
-            return;
-          } else {
-            // 'pending' or 'not-requested' - submit a request and refuse to enable.
-            await submitApprovalRequest(plugin).catch(() => { /* best effort */ });
-            set(state => ({
-              plugins: state.plugins.map(p =>
-                p.id === id ? { ...p, status: 'error' as PluginStatus, error: 'Awaiting administrator approval' } : p
-              ),
-            }));
-            return;
-          }
-        } else if (requireApproval && !policyApproved) {
-          // No bundleHash means we can't pin the approval - refuse.
+        // Admin approval gate for plugins the user installed. The server
+        // holds the decision, pinned to the package hash (code + manifest).
+        if (!plugin.managed && !(await userPluginMayRun(plugin, get, set, { request: true }))) {
           return;
         }
 
@@ -184,7 +177,10 @@ export const usePluginStore = create<PluginStoreState>()(
           .filter((p): p is Permission => !!p)
           .filter((p) => !implicit.has(p) && !granted.has(p));
         if (missing.length > 0 && !plugin.managed) {
-          const accepted = await requestConsent(plugin.id, plugin.name, missing as Permission[]);
+          const accepted = await requestConsent(plugin.id, plugin.name, missing as Permission[], {
+            httpOrigins: plugin.httpOrigins,
+            apiPostPaths: plugin.apiPostPaths,
+          });
           if (!accepted) return;
           // Persist the grants so future enables don't re-prompt.
           const allGranted = [...new Set<string>([...granted, ...missing])];
@@ -196,7 +192,7 @@ export const usePluginStore = create<PluginStoreState>()(
         }
 
         // Ensure bridge is wired before loading (may not have run initializePlugins yet)
-        setPluginStoreAccessor({ setPluginStatus: get().setPluginStatus });
+        wireLoader(get, set);
 
         set(state => ({
           plugins: state.plugins.map(p =>
@@ -229,11 +225,19 @@ export const usePluginStore = create<PluginStoreState>()(
 
       updatePluginSettings: (id: string, settings: Record<string, unknown>) => {
         const { plugins } = get();
-        set({
-          plugins: plugins.map(p =>
-            p.id === id ? { ...p, settings: { ...p.settings, ...settings } } : p
-          ),
-        });
+        const plugin = plugins.find(p => p.id === id);
+        if (!plugin) return;
+        // Keep only values the schema accepts (numbers within min/max, an
+        // existing select option), so what is stored is what the plugin gets.
+        const schema = plugin.settingsSchema ?? {};
+        const accepted: Record<string, unknown> = {};
+        for (const [key, value] of Object.entries(settings)) {
+          accepted[key] = schema[key] ? coerceSetting(schema[key], value) : value;
+        }
+        const updated = { ...plugin, settings: { ...plugin.settings, ...accepted } };
+        set({ plugins: plugins.map(p => (p.id === id ? updated : p)) });
+        // The subscription at the end of this file passes it on to the
+        // running plugin.
       },
 
       setPluginStatus: (id: string, status: PluginStatus, error?: string) => {
@@ -263,9 +267,7 @@ export const usePluginStore = create<PluginStoreState>()(
           }
 
           // Wire up bridges
-          setPluginStoreAccessor({
-            setPluginStatus: get().setPluginStatus,
-          });
+          wireLoader(get, set);
           setupAutoDisable();
           // Keep the sandbox locale in step with the app locale. Set it
           // synchronously *before* activation so background instances get the
@@ -296,7 +298,11 @@ export const usePluginStore = create<PluginStoreState>()(
           // hung/slow plugin block every subsequent one; loadSandboxedPlugin
           // catches its own errors so allSettled is just for tidy completion.
           const enabledPlugins = get().plugins.filter(p => p.enabled && p.status !== 'error');
-          await Promise.allSettled(enabledPlugins.map(plugin => loadPlugin(plugin)));
+          // A plugin the user installed is checked again on every start: the
+          // admin may have revoked its approval or turned user plugins off.
+          const allowed = await Promise.all(enabledPlugins.map(p =>
+            p.managed ? true : userPluginMayRun(p, get, set, { request: false })));
+          await Promise.allSettled(enabledPlugins.filter((_, i) => allowed[i]).map(plugin => loadPlugin(plugin)));
 
           set({ initialized: true });
         })();
@@ -331,6 +337,47 @@ export const usePluginStore = create<PluginStoreState>()(
   )
 );
 
+/**
+ * Everything a plugin left in this browser: its running iframes and hooks,
+ * its code and preview, and what it stored for any account. Used when the
+ * user removes a plugin and when the admin does.
+ */
+function removePluginData(id: string): void {
+  deactivatePlugin(id);
+  removeAllPluginHooks(id);
+  void pluginStorage.deleteCode(id).catch(() => {});
+  void pluginStorage.deletePreview(id).catch(() => {});
+  // Accounts the user connected for it live on the server (this mail account's).
+  cancelConnectFor(id);
+  void forgetCredentials(id);
+  if (typeof window !== 'undefined') {
+    const prefix = `plugin:${id}:`;
+    const keysToRemove: string[] = [];
+    for (let i = 0; i < localStorage.length; i++) {
+      const key = localStorage.key(i);
+      if (key?.startsWith(prefix)) keysToRemove.push(key);
+    }
+    keysToRemove.forEach(k => localStorage.removeItem(k));
+  }
+}
+
+/** Give the loader its way back into the store. */
+function wireLoader(
+  get: () => PluginStoreState,
+  set: (partial: Partial<PluginStoreState> | ((state: PluginStoreState) => Partial<PluginStoreState>)) => void,
+): void {
+  setPluginStoreAccessor({
+    setPluginStatus: get().setPluginStatus,
+    markAutoDisabled: (id) => set(state => ({
+      plugins: state.plugins.map(p => (p.id === id
+        // enabled: false is persisted, so a reload doesn't start the
+        // failing plugin again behind the user's back.
+        ? { ...p, enabled: false, status: 'error' as PluginStatus, error: 'auto-disabled' }
+        : p)),
+    })),
+  });
+}
+
 // ─── Server Plugin Sync ──────────────────────────────────────
 
 interface ServerPluginInfo {
@@ -358,6 +405,7 @@ interface ServerPluginInfo {
   settingsSchema?: InstalledPlugin['settingsSchema'];
   /** Plugin-declared i18n tables (locale -> key -> string), from the manifest. */
   locales?: InstalledPlugin['locales'];
+  credentials?: InstalledPlugin['credentials'];
 }
 
 /**
@@ -383,6 +431,7 @@ function serverMeta(sp: ServerPluginInfo) {
     apiPostPaths: sp.apiPostPaths,
     settingsSchema: sp.settingsSchema,
     locales: sp.locales,
+    credentials: sp.credentials,
   };
 }
 
@@ -463,7 +512,7 @@ async function syncServerPlugins(
 
       if (!local) {
         // New server plugin - download bundle and install.
-        const code = await downloadPluginBundle(sp.id, sp.bundleHash);
+        const code = await downloadPluginBundle(sp.id, sp.bundleHash, sp.tier);
         if (!code) continue;
         await pluginStorage.saveCode(sp.id, code);
 
@@ -508,7 +557,7 @@ async function syncServerPlugins(
         (!!sp.bundleHash && local.bundleHash !== sp.bundleHash);
 
       if (needsBundle) {
-        const code = await downloadPluginBundle(sp.id, sp.bundleHash);
+        const code = await downloadPluginBundle(sp.id, sp.bundleHash, sp.tier);
         if (!code) continue;
         await pluginStorage.saveCode(sp.id, code);
       }
@@ -534,11 +583,9 @@ async function syncServerPlugins(
     // Remove plugins that were previously server-managed but no longer on the server
     const staleIds = [...prevServerIds].filter(id => !serverPluginIds.has(id));
     if (staleIds.length > 0) {
-      for (const id of staleIds) {
-        deactivatePlugin(id);
-        removeAllPluginHooks(id);
-        pluginStorage.deleteCode(id);
-      }
+      // The admin removed them: same cleanup as an uninstall, so their data
+      // doesn't come back if the admin installs the plugin again.
+      for (const id of staleIds) removePluginData(id);
       const staleSet = new Set(staleIds);
       set(state => ({
         plugins: state.plugins.filter(p => !staleSet.has(p.id)),
@@ -559,9 +606,9 @@ async function syncServerPlugins(
  * The sandbox loader shares the same download path
  * (`lib/plugin-sandbox/bundle-fetch`) to refill a missing bundle at load time.
  */
-async function downloadPluginBundle(pluginId: string, bundleHash?: string): Promise<string | null> {
+async function downloadPluginBundle(pluginId: string, bundleHash?: string, tier?: PluginTier): Promise<string | null> {
   try {
-    return await downloadManagedBundle(pluginId, bundleHash);
+    return await downloadManagedBundle(pluginId, bundleHash, { requireSignature: tier === 'privileged' });
   } catch (err) {
     console.error(`[plugin-store] ${err instanceof Error ? err.message : String(err)}`);
     return null;
@@ -581,27 +628,84 @@ async function checkServerApproval(pluginId: string, bundleHash: string): Promis
   }
 }
 
-async function submitApprovalRequest(plugin: InstalledPlugin): Promise<void> {
-  if (!plugin.bundleHash) return;
+/**
+ * Send the package to the server for an admin to review. The server reads
+ * the manifest and code from the ZIP and pins the request to the hash it
+ * computes itself. Returns the resulting status, or undefined when the
+ * server could not be reached.
+ */
+async function submitApprovalRequest(
+  plugin: InstalledPlugin,
+  code?: string,
+): Promise<InstalledPlugin['approvalStatus']> {
+  if (!plugin.packageManifest) return undefined;
   try {
-    await apiFetch('/api/plugin-approval-status', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({
-        pluginId: plugin.id,
-        bundleHash: plugin.bundleHash,
-        manifest: {
-          name: plugin.name,
-          version: plugin.version,
-          author: plugin.author,
-          description: plugin.description,
-          permissions: plugin.permissions,
-          httpOrigins: plugin.httpOrigins,
-          apiPostPaths: plugin.apiPostPaths,
-        },
-      }),
-    });
+    const source = code ?? await pluginStorage.getCode(plugin.id);
+    if (!source) return undefined;
+    const zip = new JSZip();
+    zip.file('manifest.json', JSON.stringify(plugin.packageManifest));
+    zip.file(String(plugin.packageManifest.entrypoint ?? plugin.entrypoint), source);
+    const form = new FormData();
+    form.append('file', await zip.generateAsync({ type: 'blob' }), `${plugin.id}.zip`);
+    const res = await apiFetch('/api/plugin-approval-status', { method: 'POST', body: form });
+    if (!res.ok) return undefined;
+    const data = await res.json() as { status?: InstalledPlugin['approvalStatus'] };
+    return data.status;
   } catch {
-    /* best effort */
+    return undefined;
   }
 }
+
+/**
+ * Whether a plugin the user installed may run now: user plugins must be
+ * allowed by policy, and when approval is required the server must have
+ * approved this exact package. Records the outcome on the plugin so the
+ * settings page can explain it. With `request`, an unknown package is sent
+ * for review.
+ */
+async function userPluginMayRun(
+  plugin: InstalledPlugin,
+  get: () => PluginStoreState,
+  set: (partial: Partial<PluginStoreState> | ((state: PluginStoreState) => Partial<PluginStoreState>)) => void,
+  opts: { request: boolean },
+): Promise<boolean> {
+  const policy = usePolicyStore.getState();
+  const mark = (patch: Partial<InstalledPlugin>) => set(state => ({
+    plugins: state.plugins.map(p => (p.id === plugin.id ? { ...p, ...patch } : p)),
+  }));
+  if (!policy.isFeatureEnabled('pluginsUploadEnabled')) {
+    mark({ status: 'error', error: 'user-plugins-off' });
+    return false;
+  }
+  if (!policy.isFeatureEnabled('requirePluginApproval')) return true;
+  if (!plugin.approvalHash) {
+    mark({ status: 'error', error: 'approval-unavailable' });
+    return false;
+  }
+  let status = (await checkServerApproval(plugin.id, plugin.approvalHash))?.status;
+  if (opts.request && (status === 'not-requested' || status === undefined)) {
+    status = await submitApprovalRequest(plugin) ?? status;
+  }
+  if (status === 'approved') {
+    mark({ approvalStatus: 'approved' });
+    return true;
+  }
+  mark({ approvalStatus: status, status: 'error', error: status === 'denied' ? 'approval-denied' : 'approval-pending' });
+  void get;
+  return false;
+}
+
+// Whatever changed a plugin's settings (Settings, a server sync, an
+// import), the running plugin hears it right away, and slots it opens later
+// start with the new values: they are built from the running plugin's record.
+usePluginStore.subscribe((state, prev) => {
+  if (state.plugins === prev.plugins) return;
+  for (const plugin of state.plugins) {
+    const before = prev.plugins.find((p) => p.id === plugin.id);
+    if (!before || before.settings === plugin.settings) continue;
+    const active = getActivePlugin(plugin.id);
+    if (active) active.plugin = { ...active.plugin, settings: plugin.settings };
+    const next = effectiveSettings(plugin);
+    forEachInstance(plugin.id, (instance) => instance.setSettings(next));
+  }
+});
diff --git a/stores/policy-store.ts b/stores/policy-store.ts
index 146fd6719..d3870f969 100644
--- a/stores/policy-store.ts
+++ b/stores/policy-store.ts
@@ -25,7 +25,6 @@ interface PolicyState {
   getForcedThemeId: (availableThemeIds?: string[]) => string | null;
   isThemeDisabled: (themeId: string, isBuiltIn: boolean) => boolean;
   isPluginForceEnabled: (pluginId: string) => boolean;
-  isPluginApproved: (pluginId: string) => boolean;
   isThemeForceEnabled: (themeId: string) => boolean;
 }
 
@@ -116,10 +115,6 @@ export const usePolicyStore = create<PolicyState>()((set, get) => ({
     return (get().policy.forceEnabledPlugins || []).includes(pluginId);
   },
 
-  isPluginApproved: (pluginId) => {
-    return (get().policy.approvedPlugins || []).includes(pluginId);
-  },
-
   isThemeForceEnabled: (themeId) => {
     return (get().policy.forceEnabledThemes || []).includes(themeId);
   },
diff --git a/stores/pro-tab-store.ts b/stores/pro-tab-store.ts
index 017ee8e1a..b4063e394 100644
--- a/stores/pro-tab-store.ts
+++ b/stores/pro-tab-store.ts
@@ -1,6 +1,7 @@
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
 import type { ComposerDraftData } from '@/components/email/email-composer';
+import type { ComposePrefill } from '@/lib/plugin-compose-gate';
 import type { SearchScope } from '@/lib/global-search/query-parser';
 
 export type ProTabKind =
@@ -56,6 +57,8 @@ export interface ProComposeTabData {
   replyTo?: ProReplyContext;
   initialDraftText?: string;
   initialData?: ComposerDraftData | null;
+  /** Fields a plugin filled in through onBeforeCompose; dropped on the first state save. */
+  prefill?: ComposePrefill | null;
   sourceEmailId?: string | null;
   title: string;
 }
@@ -664,7 +667,9 @@ export const useProTabStore = create<ProTabState>()(
           set({
             tabs: get().tabs.map((tab) => {
               if (tab.id !== id || tab.kind !== 'compose' || !tab.composeData) return tab;
-              return { ...tab, composeData: { ...tab.composeData, initialData: draft } };
+              // The draft now carries the user's own text: a remount must not
+              // apply the plugin's prefill over it again.
+              return { ...tab, composeData: { ...tab.composeData, initialData: draft, prefill: null } };
             }),
           });
         },
diff --git a/stores/settings-store.ts b/stores/settings-store.ts
index d7f02625f..99ce6ba2b 100644
--- a/stores/settings-store.ts
+++ b/stores/settings-store.ts
@@ -5,6 +5,7 @@ import { useLocaleStore } from './locale-store';
 import type { EmailTemplate } from '@/lib/template-types';
 import type { NotificationSoundChoice } from '@/lib/notification-sound';
 import { apiFetch } from '@/lib/browser-navigation';
+import { settingsHooks } from '@/lib/plugin-hooks';
 import { generateAccountId } from '@/lib/account-utils';
 import { orderForMailbox, sanitizeSortLevels, type MessageListOrderScope, type SortLevel } from '@/lib/message-list-order';
 import {
@@ -153,9 +154,50 @@ async function syncSettingsJob(job: SettingsSyncJob, retries = 1): Promise<void>
     syncError('Settings sync failed:', body.error || `status ${res.status}`);
   } else {
     syncLog('Settings synced to server successfully');
+    void settingsHooks.onSettingsSync.emit({ direction: 'pushed' });
   }
 }
 
+/**
+ * Keys the app writes for its own bookkeeping rather than because the user
+ * changed a preference. Plugins are neither asked nor told about these: a
+ * plugin vetoing "the welcome banner was dismissed" would leave the banner
+ * stuck, and reporting it as a preference change is noise.
+ *
+ * How the line is drawn: a key belongs here when only the app writes it (a
+ * dismissed banner, a finished tour) and Settings shows no control for it.
+ * Everything else set through updateSetting is a user preference. When the
+ * app itself writes a user-facing key (a one-time migration, a default
+ * resolved on first connect), the caller passes `{ internal: true }`.
+ * Imports, resets and server loads have their own hooks (onSettingsImport,
+ * onSettingsReset, onSettingsSync) and do not fire per-key ones.
+ */
+const BOOKKEEPING_SETTING_KEYS = new Set<string>(['onboardingCompleted', 'tourCompleted']);
+
+/**
+ * Runs a user's change to one preference through the plugin hooks: asks
+ * onBeforeSettingChange first (false keeps the old value), applies it, then
+ * tells onSettingChange. With no interceptor registered the change applies
+ * synchronously, so inputs bound to the store keep behaving as before.
+ */
+function changePreference(key: string, value: unknown, previous: unknown, apply: () => void): void {
+  const commit = () => {
+    apply();
+    void settingsHooks.onSettingChange.emit({ key, value, previous });
+  };
+  if (settingsHooks.onBeforeSettingChange.size === 0) {
+    commit();
+    return;
+  }
+  void settingsHooks.onBeforeSettingChange.intercept({ key, value, previous }).then((allowed) => {
+    if (allowed) commit();
+  });
+}
+
+function toKeywordViews(keywords: KeywordDefinition[]): { id: string; name: string; color: string }[] {
+  return keywords.map((k) => ({ id: k.id, name: k.label, color: k.color }));
+}
+
 export type FontSize = 'small' | 'medium' | 'large';
 export type Density = 'extra-compact' | 'compact' | 'regular' | 'comfortable';
 /**
@@ -627,12 +669,19 @@ interface SettingsState {
   settingsSyncDisabled: boolean;
 
   // Actions
+  /**
+   * Changes one preference. Plugins may stop the change (onBeforeSettingChange)
+   * and are told about it afterwards (onSettingChange). Pass `internal: true`
+   * for writes the app makes on its own; those skip the plugin hooks.
+   */
   updateSetting: <K extends keyof SettingsState>(
     key: K,
-    value: SettingsState[K]
+    value: SettingsState[K],
+    opts?: { internal?: boolean }
   ) => void;
   resetToDefaults: () => void;
-  exportSettings: () => string;
+  /** `forSync` builds the snapshot pushed to the server; it is not a user export. */
+  exportSettings: (opts?: { forSync?: boolean }) => string;
   importSettings: (json: string, opts?: { serverAccountId?: string; keepCrossAccountViews?: boolean }) => boolean;
 
   // Folder icons
@@ -915,11 +964,8 @@ export const useSettingsStore = create<SettingsState>()(
         applyAnimations(DEFAULT_SETTINGS.animationsEnabled);
       };
 
-      return {
-      ...DEFAULT_SETTINGS,
-
-      updateSetting: (key, value) => {
-        set({ [key]: value });
+      const applySetting = <K extends keyof SettingsState>(key: K, value: SettingsState[K]) => {
+        set({ [key]: value } as Partial<SettingsState>);
 
         // Apply font size to document root
         if (key === 'fontSize') {
@@ -941,17 +987,9 @@ export const useSettingsStore = create<SettingsState>()(
         if (key === 'animationsEnabled') {
           applyAnimations(value as boolean);
         }
-      },
+      };
 
-      resetToDefaults: () => {
-        set(DEFAULT_SETTINGS);
-        applyFontSize(DEFAULT_SETTINGS.fontSize);
-        applyDensity(DEFAULT_SETTINGS.density, DEFAULT_SETTINGS.interfaceLayout);
-        applyInterfaceLayout(DEFAULT_SETTINGS.interfaceLayout, DEFAULT_SETTINGS.density);
-        applyAnimations(DEFAULT_SETTINGS.animationsEnabled);
-      },
-
-      exportSettings: () => {
+      const buildExport = (): string => {
         const state = get();
         const templateSync = templateSyncBridge?.getSyncedState();
         const settings = {
@@ -1080,6 +1118,34 @@ export const useSettingsStore = create<SettingsState>()(
             : {}),
         };
         return JSON.stringify(settings, null, 2);
+      };
+
+      return {
+      ...DEFAULT_SETTINGS,
+
+      updateSetting: (key, value, opts) => {
+        if (opts?.internal || BOOKKEEPING_SETTING_KEYS.has(key)) {
+          applySetting(key, value);
+          return;
+        }
+        changePreference(key, value, get()[key], () => applySetting(key, value));
+      },
+
+      resetToDefaults: () => {
+        set(DEFAULT_SETTINGS);
+        applyFontSize(DEFAULT_SETTINGS.fontSize);
+        applyDensity(DEFAULT_SETTINGS.density, DEFAULT_SETTINGS.interfaceLayout);
+        applyInterfaceLayout(DEFAULT_SETTINGS.interfaceLayout, DEFAULT_SETTINGS.density);
+        applyAnimations(DEFAULT_SETTINGS.animationsEnabled);
+        void settingsHooks.onSettingsReset.emit({});
+      },
+
+      exportSettings: (opts) => {
+        const json = buildExport();
+        if (!opts?.forSync) {
+          void settingsHooks.onSettingsExport.emit({ keys: Object.keys(JSON.parse(json)) });
+        }
+        return json;
       },
 
       importSettings: (json: string, opts?: { serverAccountId?: string; keepCrossAccountViews?: boolean }) => {
@@ -1095,14 +1161,20 @@ export const useSettingsStore = create<SettingsState>()(
             settings.protocolOpenMode = settings.protocolMailtoOpenMode;
           }
 
-          // Apply settings
+          // Apply settings, noting which keys were taken over for the
+          // onSettingsImport hook.
+          const imported: string[] = [];
+          const put = (key: string, patch: Record<string, unknown>) => {
+            set(patch as Partial<SettingsState>);
+            imported.push(key);
+          };
           Object.keys(settings).forEach((key) => {
             if (key in DEFAULT_SETTINGS) {
               if (key === 'subAddressDelimiter' && !isValidSubAddressDelimiter(settings[key])) {
                 return;
               }
               if (key === 'sendDelaySeconds' && ![0, 10, 30, 60].includes(settings[key])) {
-                set({ sendDelaySeconds: 0 });
+                put(key, { sendDelaySeconds: 0 });
                 return;
               }
               // Validity of the zone id itself is checked at use time
@@ -1128,7 +1200,7 @@ export const useSettingsStore = create<SettingsState>()(
               // unknown criterion from a newer/older client must never get
               // through (an unsupportedSort refusal empties the folder).
               if (key === 'messageListOrder') {
-                set({ messageListOrder: sanitizeSortLevels(settings[key]) });
+                put(key, { messageListOrder: sanitizeSortLevels(settings[key]) });
                 return;
               }
               if (key === 'messageListOrderScope' && settings[key] !== 'inbox' && settings[key] !== 'all') {
@@ -1155,10 +1227,10 @@ export const useSettingsStore = create<SettingsState>()(
                 if (Object.prototype.hasOwnProperty.call(incoming, opts.serverAccountId)) {
                   merged[opts.serverAccountId] = incoming[opts.serverAccountId];
                 }
-                set({ [key]: merged });
+                put(key, { [key]: merged });
                 return;
               }
-              set({ [key]: settings[key] });
+              put(key, { [key]: settings[key] });
             }
           });
 
@@ -1187,6 +1259,15 @@ export const useSettingsStore = create<SettingsState>()(
             { merge: Boolean(opts?.serverAccountId) }
           );
 
+          // A load from the server reports itself as a sync (loadFromServer);
+          // only a file import the user picked is an import.
+          if (!opts?.serverAccountId) {
+            if (settings.theme) imported.push('theme');
+            if (settings.locale) imported.push('locale');
+            if (settings.templates !== undefined) imported.push('templates');
+            void settingsHooks.onSettingsImport.emit({ keys: imported });
+          }
+
           return true;
         } catch (error) {
           console.error('Failed to import settings:', error);
@@ -1195,23 +1276,25 @@ export const useSettingsStore = create<SettingsState>()(
       },
 
       // Folder icon methods
+      // These map-valued preferences go through updateSetting so plugins see
+      // them like any other preference change.
       setFolderIcon: (mailboxId: string, icon: string) => {
-        set({ folderIcons: { ...get().folderIcons, [mailboxId]: icon } });
+        get().updateSetting('folderIcons', { ...get().folderIcons, [mailboxId]: icon });
       },
 
       removeFolderIcon: (mailboxId: string) => {
         const { [mailboxId]: _, ...rest } = get().folderIcons;
-        set({ folderIcons: rest });
+        get().updateSetting('folderIcons', rest);
       },
 
       // Shared-calendar color override methods
       setSharedCalendarColor: (key: string, color: string) => {
-        set({ sharedCalendarColors: { ...get().sharedCalendarColors, [key]: color } });
+        get().updateSetting('sharedCalendarColors', { ...get().sharedCalendarColors, [key]: color });
       },
 
       removeSharedCalendarColor: (key: string) => {
         const { [key]: _, ...rest } = get().sharedCalendarColors;
-        set({ sharedCalendarColors: rest });
+        get().updateSetting('sharedCalendarColors', rest);
       },
 
       // Trusted senders methods
@@ -1223,6 +1306,7 @@ export const useSettingsStore = create<SettingsState>()(
         const current = get().trustedSenders;
         if (!current.includes(emailAddress)) {
           set({ trustedSenders: [...current, emailAddress] });
+          void settingsHooks.onTrustedSenderChange.emit({ email: emailAddress, trusted: true });
         }
       },
 
@@ -1231,9 +1315,10 @@ export const useSettingsStore = create<SettingsState>()(
         const trimmed = email.trim();
         const angleMatch = trimmed.match(/^(.+?)\s*<([^>]+)>$/);
         const emailAddress = (angleMatch ? angleMatch[2] : trimmed).toLowerCase().trim();
-        set({
-          trustedSenders: get().trustedSenders.filter(e => e !== emailAddress)
-        });
+        const current = get().trustedSenders;
+        if (!current.includes(emailAddress)) return;
+        set({ trustedSenders: current.filter(e => e !== emailAddress) });
+        void settingsHooks.onTrustedSenderChange.emit({ email: emailAddress, trusted: false });
       },
 
       isSenderTrusted: (email: string) => {
@@ -1283,23 +1368,21 @@ export const useSettingsStore = create<SettingsState>()(
       addSidebarApp: (app: SidebarApp) => {
         const current = get().sidebarApps;
         if (current.some(a => a.id === app.id)) return;
-        set({ sidebarApps: [...current, app] });
+        get().updateSetting('sidebarApps', [...current, app]);
       },
 
       updateSidebarApp: (id: string, updates: Partial<Omit<SidebarApp, 'id'>>) => {
-        set({
-          sidebarApps: get().sidebarApps.map(a =>
-            a.id === id ? { ...a, ...updates } : a
-          ),
-        });
+        get().updateSetting('sidebarApps', get().sidebarApps.map(a =>
+          a.id === id ? { ...a, ...updates } : a
+        ));
       },
 
       removeSidebarApp: (id: string) => {
-        set({ sidebarApps: get().sidebarApps.filter(a => a.id !== id) });
+        get().updateSetting('sidebarApps', get().sidebarApps.filter(a => a.id !== id));
       },
 
       reorderSidebarApps: (apps: SidebarApp[]) => {
-        set({ sidebarApps: apps });
+        get().updateSetting('sidebarApps', apps);
       },
 
       // Settings sync methods
@@ -1402,6 +1485,7 @@ export const useSettingsStore = create<SettingsState>()(
             writeSettingsOwner(accountId);
             pushTemplatesAfterLoad = localTemplatesAhead(settings);
             syncLog('Settings loaded from server successfully');
+            void settingsHooks.onSettingsSync.emit({ direction: 'pulled' });
             // The per-account preferred sender identity (#507) is re-applied by
             // applyPreferredIdentity() in auth-store, invoked from the
             // loadFromServer().finally() of every login / switch / restore path,
@@ -1635,6 +1719,15 @@ function applyAnimations(enabled: boolean) {
   }
 }
 
+// Tag definitions change from the settings editor, from plugins (host-api
+// writes the store directly) and from imports and server loads. Watching the
+// list catches every path once instead of hooking each writer.
+useSettingsStore.subscribe((state, prev) => {
+  if (state.emailKeywords === prev.emailKeywords) return;
+  if (JSON.stringify(state.emailKeywords) === JSON.stringify(prev.emailKeywords)) return;
+  void settingsHooks.onKeywordChange.emit({ keywords: toKeywordViews(state.emailKeywords) });
+});
+
 // Initialize settings on load
 if (typeof window !== 'undefined') {
   const store = useSettingsStore.getState();
@@ -1648,7 +1741,7 @@ if (typeof window !== 'undefined') {
     pendingSync = {
       username: syncUsername,
       serverUrl: syncServerUrl,
-      settings: JSON.parse(useSettingsStore.getState().exportSettings()),
+      settings: JSON.parse(useSettingsStore.getState().exportSettings({ forSync: true })),
     };
     if (syncTimeout) clearTimeout(syncTimeout);
     syncTimeout = setTimeout(async () => {
diff --git a/stores/task-store.ts b/stores/task-store.ts
index e595d413f..57833328a 100644
--- a/stores/task-store.ts
+++ b/stores/task-store.ts
@@ -2,6 +2,8 @@ import { create } from 'zustand';
 import type { CalendarTask } from '@/lib/jmap/types';
 import type { IJMAPClient } from '@/lib/jmap/client-interface';
 import { debug } from '@/lib/debug';
+import { taskHooks } from '@/lib/plugin-hooks';
+import { taskToView } from '@/lib/plugin-projection';
 
 export type TaskViewFilter = 'all' | 'pending' | 'completed' | 'overdue';
 
@@ -17,7 +19,8 @@ interface TaskStore {
   setFilter: (filter: TaskViewFilter) => void;
   setShowCompleted: (show: boolean) => void;
   fetchTasks: (client: IJMAPClient, calendarIds?: string[]) => Promise<void>;
-  createTask: (client: IJMAPClient, task: Partial<CalendarTask>) => Promise<CalendarTask>;
+  /** Resolves to null when a plugin stopped the create. */
+  createTask: (client: IJMAPClient, task: Partial<CalendarTask>) => Promise<CalendarTask | null>;
   updateTask: (client: IJMAPClient, id: string, updates: Partial<CalendarTask>) => Promise<void>;
   deleteTask: (client: IJMAPClient, id: string) => Promise<void>;
   toggleTaskComplete: (client: IJMAPClient, task: CalendarTask) => Promise<void>;
@@ -33,8 +36,16 @@ export const useTaskStore = create<TaskStore>((set, get) => ({
   error: null,
   setTasks: (tasks) => set({ tasks }),
   setSelectedTaskId: (id) => set({ selectedTaskId: id }),
-  setFilter: (filter) => set({ filter }),
-  setShowCompleted: (show) => set({ showCompleted: show }),
+  setFilter: (filter) => {
+    if (get().filter === filter) return;
+    set({ filter });
+    void taskHooks.onTaskFilterChange.emit({ filter, showCompleted: get().showCompleted });
+  },
+  setShowCompleted: (show) => {
+    if (get().showCompleted === show) return;
+    set({ showCompleted: show });
+    void taskHooks.onTaskFilterChange.emit({ filter: get().filter, showCompleted: show });
+  },
 
   fetchTasks: async (client, calendarIds) => {
     debug.log('tasks', 'TaskStore/fetchTasks start', { calendarIds: calendarIds || 'all' });
@@ -50,6 +61,7 @@ export const useTaskStore = create<TaskStore>((set, get) => ({
         });
       });
       set({ tasks, isLoading: false });
+      if (taskHooks.onTasksLoaded.size > 0) void taskHooks.onTasksLoaded.emit(tasks.map(taskToView));
     } catch (error) {
       debug.error('TaskStore/fetchTasks failed', error);
       set({ isLoading: false, error: 'Failed to fetch tasks' });
@@ -58,32 +70,44 @@ export const useTaskStore = create<TaskStore>((set, get) => ({
 
   createTask: async (client, task) => {
     debug.log('tasks', 'TaskStore/createTask', task);
+    if (!(await taskHooks.onBeforeTaskCreate.intercept(taskToView({ id: '', ...task } as CalendarTask)))) return null;
     const created = await client.createCalendarTask(task);
     debug.log('tasks', 'TaskStore/createTask result', { id: created.id, uid: created.uid, title: created.title });
     set({ tasks: [...get().tasks, created] });
+    void taskHooks.onTaskCreate.emit(taskToView(created));
     return created;
   },
 
   updateTask: async (client, id, updates) => {
+    if (!(await taskHooks.onBeforeTaskUpdate.intercept({ taskId: id, patch: updates }))) return;
+    const before = get().tasks.find(t => t.id === id);
     const newId = await client.updateCalendarTask(id, updates);
     if (newId && newId !== id) {
       // Moved into a calendar of another account: the server recreated it
       // under a new id, so reload rather than patch the old entry. (#1204)
       set({ selectedTaskId: get().selectedTaskId === id ? newId : get().selectedTaskId });
       await get().fetchTasks(client);
+      const moved = get().tasks.find(t => t.id === newId)
+        ?? ({ ...before, ...updates, id: newId } as CalendarTask);
+      void taskHooks.onTaskUpdate.emit(taskToView(moved));
       return;
     }
+    const updated = { ...(before ?? { id }), ...updates, updated: new Date().toISOString() } as CalendarTask;
     set({
-      tasks: get().tasks.map(t => t.id === id ? { ...t, ...updates, updated: new Date().toISOString() } : t),
+      tasks: get().tasks.map(t => t.id === id ? updated : t),
     });
+    void taskHooks.onTaskUpdate.emit(taskToView(updated));
   },
 
   deleteTask: async (client, id) => {
+    const title = get().tasks.find(t => t.id === id)?.title || '';
+    if (!(await taskHooks.onBeforeTaskDelete.intercept({ taskId: id, title }))) return;
     await client.deleteCalendarTask(id);
     set({
       tasks: get().tasks.filter(t => t.id !== id),
       selectedTaskId: get().selectedTaskId === id ? null : get().selectedTaskId,
     });
+    void taskHooks.onTaskDelete.emit({ taskId: id, title });
   },
 
   toggleTaskComplete: async (client, task) => {
@@ -95,6 +119,9 @@ export const useTaskStore = create<TaskStore>((set, get) => ({
     set({
       tasks: get().tasks.map(t => t.id === task.id ? { ...t, ...updates, updated: new Date().toISOString() } : t),
     });
+    // A toggle is reported as onTaskToggleComplete only, not also as
+    // onTaskUpdate, so a plugin that listens to both sees each change once.
+    void taskHooks.onTaskToggleComplete.emit({ taskId: task.id, complete: newProgress === 'completed' });
   },
 
   clearTasks: () => set({ tasks: [], selectedTaskId: null, error: null }),
diff --git a/stores/template-store.ts b/stores/template-store.ts
index 894d0add6..ae3185496 100644
--- a/stores/template-store.ts
+++ b/stores/template-store.ts
@@ -11,6 +11,8 @@ import {
 } from '@/lib/template-utils';
 import { generateUUID } from '@/lib/utils';
 import { registerTemplateSyncBridge } from './settings-store';
+import { templateHooks } from '@/lib/plugin-hooks';
+import { templateToView } from '@/lib/plugin-projection';
 
 const MAX_RECENT = 5;
 
@@ -71,6 +73,7 @@ export const useTemplateStore = create<TemplateStore>()(
         set((state) => ({
           templates: [...state.templates, template],
         }));
+        void templateHooks.onTemplateCreate.emit(templateToView(template));
         return template;
       },
 
@@ -82,9 +85,11 @@ export const useTemplateStore = create<TemplateStore>()(
               : t
           ),
         }));
+        emitTemplateUpdate(id);
       },
 
       deleteTemplate: (id) => {
+        if (!get().templates.some((t) => t.id === id)) return;
         set((state) => ({
           templates: state.templates.filter((t) => t.id !== id),
           recentTemplateIds: state.recentTemplateIds.filter((rid) => rid !== id),
@@ -93,6 +98,7 @@ export const useTemplateStore = create<TemplateStore>()(
             [id]: new Date().toISOString(),
           },
         }));
+        void templateHooks.onTemplateDelete.emit({ templateId: id });
       },
 
       duplicateTemplate: (id, nameSuffix) => {
@@ -113,6 +119,7 @@ export const useTemplateStore = create<TemplateStore>()(
         set((state) => ({
           templates: [...state.templates, duplicate],
         }));
+        void templateHooks.onTemplateCreate.emit(templateToView(duplicate));
         return duplicate;
       },
 
@@ -122,6 +129,7 @@ export const useTemplateStore = create<TemplateStore>()(
             t.id === id ? { ...t, isFavorite: !t.isFavorite, updatedAt: new Date().toISOString() } : t
           ),
         }));
+        emitTemplateUpdate(id);
       },
 
       recordUsage: (id) => {
@@ -169,6 +177,7 @@ export const useTemplateStore = create<TemplateStore>()(
           set((state) => ({
             templates: [...state.templates, ...result.templates],
           }));
+          void templateHooks.onTemplatesImport.emit({ count: result.templates.length });
         }
         return { count: result.templates.length, errors: result.errors };
       },
@@ -200,6 +209,41 @@ export const useTemplateStore = create<TemplateStore>()(
   )
 );
 
+function emitTemplateUpdate(id: string): void {
+  const template = useTemplateStore.getState().templates.find((t) => t.id === id);
+  if (template) void templateHooks.onTemplateUpdate.emit(templateToView(template));
+}
+
+export interface RenderedTemplate {
+  subject: string;
+  html: string;
+  text: string;
+}
+
+/**
+ * Hands a template about to be inserted into the composer to the
+ * onTemplateRender plugins. Returns null when no plugin listens, so the
+ * composer keeps its own rendering; otherwise the plugins' version, with any
+ * field a plugin returned as a non-string kept from the input.
+ */
+export async function renderTemplateWithPlugins(
+  templateId: string,
+  rendered: RenderedTemplate,
+): Promise<RenderedTemplate | null> {
+  if (templateHooks.onTemplateRender.size === 0) return null;
+  const result = await templateHooks.onTemplateRender.transform(rendered, { templateId }) as Partial<RenderedTemplate> | null;
+  return {
+    subject: typeof result?.subject === 'string' ? result.subject : rendered.subject,
+    html: typeof result?.html === 'string' ? result.html : rendered.html,
+    text: typeof result?.text === 'string' ? result.text : rendered.text,
+  };
+}
+
+/** Tells plugins a template was inserted into the composer. */
+export function notifyTemplateApplied(template: EmailTemplate): void {
+  void templateHooks.onTemplateApply.emit(templateToView(template));
+}
+
 // Every tab keeps its own in-memory copy and writes the whole list back to
 // localStorage on any change, so a second tab that never saw a template
 // created in the first one would overwrite it (and push the shorter list).
diff --git a/stores/theme-store.ts b/stores/theme-store.ts
index e9ad9da78..5e31ac3fa 100644
--- a/stores/theme-store.ts
+++ b/stores/theme-store.ts
@@ -6,6 +6,7 @@ import {
   injectThemeCSS,
   removeThemeCSS,
   sanitizeThemeCSS,
+  sanitizeSkinCSS,
   injectThemeSkinCSS,
   removeThemeSkinCSS,
 } from '@/lib/theme-loader';
@@ -353,10 +354,12 @@ export const useThemeStore = create<ThemeState>()(
 
               if (!local) {
                 // Download and install new server theme
-                const css = await downloadThemeCSS(st.id);
+                const css = await downloadThemeAsset(st, 'css');
                 if (!css) continue;
+                const skin = st.hasSkin ? await downloadThemeAsset(st, 'skin') : null;
 
                 const sanitized = sanitizeThemeCSS(css);
+                const sanitizedSkin = skin ? sanitizeSkinCSS(skin).css : undefined;
                 const theme: InstalledTheme = {
                   id: st.id,
                   name: st.name,
@@ -369,9 +372,12 @@ export const useThemeStore = create<ThemeState>()(
                   builtIn: false,
                   managed: true,
                   forceEnabled: st.forceEnabled,
+                  contentHash: st.contentHash,
+                  ...(sanitizedSkin ? { skin: sanitizedSkin } : {}),
                 };
 
                 await pluginStorage.saveThemeCSS(st.id, sanitized.css);
+                if (sanitizedSkin) await pluginStorage.saveThemeSkin(st.id, sanitizedSkin);
                 set(state => {
                   if (state.installedThemes.some(t => t.id === st.id)) {
                     return {};
@@ -383,15 +389,25 @@ export const useThemeStore = create<ThemeState>()(
 
               } else if (!local.builtIn) {
                 let css = local.css;
+                let skin = local.skin;
+                // The hash catches a re-upload of the same version.
+                const changed = local.version !== st.version
+                  || (!!st.contentHash && local.contentHash !== st.contentHash);
 
-                if (local.version !== st.version || !css) {
-                  const downloadedCss = await downloadThemeCSS(st.id);
+                if (changed || !css) {
+                  const downloadedCss = await downloadThemeAsset(st, 'css');
                   if (!downloadedCss) continue;
 
                   const sanitized = sanitizeThemeCSS(downloadedCss);
                   css = sanitized.css;
                   await pluginStorage.saveThemeCSS(st.id, sanitized.css);
                 }
+                if (changed) {
+                  const downloadedSkin = st.hasSkin ? await downloadThemeAsset(st, 'skin') : null;
+                  skin = downloadedSkin ? sanitizeSkinCSS(downloadedSkin).css : undefined;
+                  if (skin) await pluginStorage.saveThemeSkin(st.id, skin);
+                  else await pluginStorage.deleteThemeSkin(st.id);
+                }
 
                 const updatedTheme = {
                   ...local,
@@ -400,9 +416,11 @@ export const useThemeStore = create<ThemeState>()(
                   author: st.author,
                   description: st.description || '',
                   css,
+                  skin,
                   variants: st.variants as ThemeVariant[],
                   managed: true,
                   forceEnabled: st.forceEnabled,
+                  contentHash: st.contentHash,
                 };
 
                 set(state => ({
@@ -418,6 +436,29 @@ export const useThemeStore = create<ThemeState>()(
               }
             }
 
+            // A managed theme the server no longer lists was deleted or
+            // disabled by the admin. Without this it stayed installed, and
+            // its local forceEnabled flag kept forcing it on forever.
+            const serverIds = new Set(serverThemes.map(t => t.id));
+            const stale = get().installedThemes.filter(t => t.managed && !t.builtIn && !serverIds.has(t.id));
+            if (stale.length > 0) {
+              const staleIds = new Set(stale.map(t => t.id));
+              const activeId = get().activeThemeId;
+              if (activeId && staleIds.has(activeId)) {
+                removeThemeCSS();
+                removeThemeSkinCSS();
+                set({ activeThemeId: null });
+              }
+              for (const id of staleIds) {
+                void pluginStorage.deleteThemeCSS(id);
+                void pluginStorage.deleteThemeSkin(id);
+                void pluginStorage.deletePreview(id);
+              }
+              set(state => ({
+                installedThemes: state.installedThemes.filter(t => !staleIds.has(t.id)),
+              }));
+            }
+
             set(state => ({
               installedThemes: dedupeInstalledThemes(state.installedThemes),
             }));
@@ -564,6 +605,8 @@ interface ServerThemeInfo {
   description: string;
   variants: string[];
   forceEnabled: boolean;
+  hasSkin?: boolean;
+  contentHash?: string;
 }
 
 function dedupeInstalledThemes(themes: InstalledTheme[]): InstalledTheme[] {
@@ -589,13 +632,26 @@ function dedupeInstalledThemes(themes: InstalledTheme[]): InstalledTheme[] {
   return [...byId.values()];
 }
 
-async function downloadThemeCSS(themeId: string): Promise<string | null> {
+async function downloadThemeAsset(theme: ServerThemeInfo, kind: 'css' | 'skin'): Promise<string | null> {
+  // The content hash in the URL keeps a browser cache from serving the
+  // previous upload.
+  const version = theme.contentHash ? `?v=${encodeURIComponent(theme.contentHash)}` : '';
   try {
-    const res = await apiFetch(`/api/admin/themes/${encodeURIComponent(themeId)}/css`);
+    const res = await apiFetch(`/api/admin/themes/${encodeURIComponent(theme.id)}/${kind}${version}`);
     if (!res.ok) return null;
     return await res.text();
   } catch {
-    console.warn(`[theme-store] Failed to download CSS for theme "${themeId}"`);
+    console.warn(`[theme-store] Failed to download ${kind} for theme "${theme.id}"`);
     return null;
   }
-}
\ No newline at end of file
+}
+// Plugins hear about every change of scheme or theme, whichever path made it
+// (settings, the system switching to dark, a forced admin theme).
+useThemeStore.subscribe((state, prev) => {
+  if (state.theme !== prev.theme || state.resolvedTheme !== prev.resolvedTheme) {
+    void themeHooks.onThemeChange.emit({ theme: state.theme, resolved: state.resolvedTheme });
+  }
+  if (state.activeThemeId !== prev.activeThemeId) {
+    void themeHooks.onCustomThemeChange.emit({ themeId: state.activeThemeId });
+  }
+});
diff --git a/stores/toast-store.ts b/stores/toast-store.ts
index 65b18f287..682d1e34f 100644
--- a/stores/toast-store.ts
+++ b/stores/toast-store.ts
@@ -1,6 +1,8 @@
 import { create } from "zustand";
 import { Toast, ToastAction } from "@/components/ui/toast";
 import { generateUUID } from "@/lib/utils";
+import { toastHooks } from "@/lib/plugin-hooks";
+import { recordNotification } from "@/stores/notification-center-store";
 
 interface ToastStore {
   toasts: Toast[];
@@ -11,7 +13,7 @@ interface ToastStore {
   clearToasts: () => void;
 }
 
-export const useToastStore = create<ToastStore>((set) => ({
+export const useToastStore = create<ToastStore>((set, get) => ({
   toasts: [],
 
   addToast: (toast) => {
@@ -29,6 +31,13 @@ export const useToastStore = create<ToastStore>((set) => ({
     set((state) => ({
       toasts: [...state.toasts, newToast],
     }));
+    void toastHooks.onToastShow.emit({
+      id, type: toast.type, title: toast.title, message: toast.message ?? "",
+    });
+    // Errors and warnings stay in the bell's list after the toast is gone.
+    if (toast.type === "error" || toast.type === "warning") {
+      recordNotification({ level: toast.type, title: toast.title, body: toast.message ?? "" });
+    }
     return id;
   },
 
@@ -39,9 +48,11 @@ export const useToastStore = create<ToastStore>((set) => ({
   },
 
   removeToast: (id) => {
+    if (!get().toasts.some((t) => t.id === id)) return;
     set((state) => ({
       toasts: state.toasts.filter((toast) => toast.id !== id),
     }));
+    void toastHooks.onToastDismiss.emit({ id });
   },
 
   clearToasts: () => {
diff --git a/stores/ui-store.ts b/stores/ui-store.ts
index 12b48a13f..fb0882a4b 100644
--- a/stores/ui-store.ts
+++ b/stores/ui-store.ts
@@ -1,6 +1,7 @@
 "use client";
 
 import { create } from "zustand";
+import { uiHooks } from "@/lib/plugin-hooks";
 
 export type ActiveView = "sidebar" | "list" | "viewer";
 
@@ -97,6 +98,7 @@ export const useUIStore = create<UIState>((set, get) => ({
 
   resetSidebarWidth: () => {
     set({ sidebarWidth: SIDEBAR_DEFAULT });
+    reportColumnWidths(get());
     const { emailListWidth, emailListHeight } = get();
     try {
       localStorage.setItem("column-widths", JSON.stringify({ sidebarWidth: SIDEBAR_DEFAULT, emailListWidth, emailListHeight }));
@@ -105,6 +107,7 @@ export const useUIStore = create<UIState>((set, get) => ({
 
   resetEmailListWidth: () => {
     set({ emailListWidth: EMAIL_LIST_DEFAULT });
+    reportColumnWidths(get());
     const { sidebarWidth, emailListHeight } = get();
     try {
       localStorage.setItem("column-widths", JSON.stringify({ sidebarWidth, emailListWidth: EMAIL_LIST_DEFAULT, emailListHeight }));
@@ -113,6 +116,7 @@ export const useUIStore = create<UIState>((set, get) => ({
 
   resetEmailListHeight: () => {
     set({ emailListHeight: EMAIL_LIST_HEIGHT_DEFAULT });
+    reportColumnWidths(get());
     const { sidebarWidth, emailListWidth } = get();
     try {
       localStorage.setItem("column-widths", JSON.stringify({ sidebarWidth, emailListWidth, emailListHeight: EMAIL_LIST_HEIGHT_DEFAULT }));
@@ -121,6 +125,7 @@ export const useUIStore = create<UIState>((set, get) => ({
 
   persistColumnWidths: () => {
     const { sidebarWidth, emailListWidth, emailListHeight } = get();
+    reportColumnWidths({ sidebarWidth, emailListWidth, emailListHeight });
     try {
       localStorage.setItem("column-widths", JSON.stringify({ sidebarWidth, emailListWidth, emailListHeight }));
     } catch { /* localStorage may be unavailable */ }
@@ -147,6 +152,7 @@ export const useUIStore = create<UIState>((set, get) => ({
   goBack: () => {
     const { activeView, isMobile } = get();
     if (!isMobile) return;
+    void uiHooks.onMobileBack.emit({});
 
     if (activeView === "viewer") {
       set({ activeView: "list" });
@@ -155,3 +161,41 @@ export const useUIStore = create<UIState>((set, get) => ({
     }
   },
 }));
+
+type ColumnWidths = Pick<UIState, "sidebarWidth" | "emailListWidth" | "emailListHeight">;
+
+const COLUMN_NAMES: Record<keyof ColumnWidths, string> = {
+  sidebarWidth: "sidebar",
+  emailListWidth: "email-list",
+  emailListHeight: "email-list-height",
+};
+
+let reportedWidths: ColumnWidths | null = null;
+
+// Called when a resize ends (widths are saved then), not on every pixel of
+// the drag. Reports only the columns that changed since the last report.
+function reportColumnWidths(widths: ColumnWidths): void {
+  const before = reportedWidths;
+  reportedWidths = { sidebarWidth: widths.sidebarWidth, emailListWidth: widths.emailListWidth, emailListHeight: widths.emailListHeight };
+  if (!before) return;
+  for (const key of Object.keys(COLUMN_NAMES) as (keyof ColumnWidths)[]) {
+    if (widths[key] !== before[key]) {
+      void uiHooks.onColumnResize.emit({ column: COLUMN_NAMES[key], width: widths[key] });
+    }
+  }
+}
+
+function deviceType(s: Pick<UIState, "isMobile" | "isTablet">): "mobile" | "tablet" | "desktop" {
+  return s.isMobile ? "mobile" : s.isTablet ? "tablet" : "desktop";
+}
+
+// Plugins hear about layout changes, whichever control or effect made them.
+useUIStore.subscribe((state, prev) => {
+  if (!reportedWidths) {
+    reportedWidths = { sidebarWidth: prev.sidebarWidth, emailListWidth: prev.emailListWidth, emailListHeight: prev.emailListHeight };
+  }
+  if (state.activeView !== prev.activeView) void uiHooks.onViewChange.emit({ view: state.activeView });
+  if (state.sidebarOpen !== prev.sidebarOpen) void uiHooks.onSidebarToggle.emit({ open: state.sidebarOpen });
+  if (state.sidebarCollapsed !== prev.sidebarCollapsed) void uiHooks.onSidebarCollapse.emit({ collapsed: state.sidebarCollapsed });
+  if (deviceType(state) !== deviceType(prev)) void uiHooks.onDeviceTypeChange.emit({ deviceType: deviceType(state) });
+});
diff --git a/stores/vacation-store.ts b/stores/vacation-store.ts
index cacebd65b..9fd8de1c6 100644
--- a/stores/vacation-store.ts
+++ b/stores/vacation-store.ts
@@ -5,6 +5,8 @@ import { readVacationFilters, syncVacationWithFilters, type VacationFilters } fr
 import { withVacationPeriod } from '@/lib/sieve/vacation-forward';
 import { currentStoreEpoch } from '@/lib/store-epoch';
 import { debug } from '@/lib/debug';
+import { vacationHooks } from '@/lib/plugin-hooks';
+import { vacationToView } from '@/lib/plugin-projection';
 
 /** What the vacation card sets for forwarding; the period comes from the vacation. */
 export type VacationForwardSettings = Pick<VacationForward, 'enabled' | 'to' | 'keepCopy'>;
@@ -46,7 +48,11 @@ interface VacationStore {
   isSupported: boolean;
 
   fetchVacationResponse: (client: IJMAPClient, accountId?: string) => Promise<void>;
-  /** Throws VacationFiltersError when only the filters script part could not be saved. */
+  /**
+   * Saves the out-of-office reply. Resolves false when a plugin stopped the
+   * change (onBeforeVacationUpdate), true once it was saved. Throws
+   * VacationFiltersError when only the filters script part could not be saved.
+   */
   updateVacationResponse: (client: IJMAPClient, updates: {
     isEnabled?: boolean;
     fromDate?: string | null;
@@ -58,7 +64,7 @@ interface VacationStore {
     forward?: VacationForwardSettings | null;
     /** null lets everyone have the auto-reply, leaving it out keeps it as it is. */
     audience?: VacationAudience | null;
-  }, accountId?: string) => Promise<void>;
+  }, accountId?: string) => Promise<boolean>;
   setSupported: (supported: boolean) => void;
   clearState: () => void;
 }
@@ -114,6 +120,9 @@ export const useVacationStore = create<VacationStore>()((set, get) => ({
         if (filters) isEnabled = isEnabled || filters.includesVacation;
       }
       if (stale()) return;
+      if (vacationHooks.onVacationLoaded.size > 0) {
+        void vacationHooks.onVacationLoaded.emit(vacationToView({ ...vacation, isEnabled }));
+      }
       set({
         isEnabled,
         fromDate: vacation.fromDate,
@@ -145,8 +154,20 @@ export const useVacationStore = create<VacationStore>()((set, get) => ({
     const generation = loadGeneration;
     const epoch = currentStoreEpoch();
     const superseded = () => generation !== loadGeneration || currentStoreEpoch() !== epoch;
-    set({ isSaving: true, error: null });
     const { forward: forwardSettings, audience, ...vacationUpdates } = updates;
+    const before = get();
+    const next = vacationToView({
+      id: 'singleton',
+      isEnabled: before.isEnabled,
+      fromDate: before.fromDate,
+      toDate: before.toDate,
+      subject: before.subject,
+      textBody: before.textBody,
+      htmlBody: before.htmlBody,
+      ...vacationUpdates,
+    });
+    if (!(await vacationHooks.onBeforeVacationUpdate.intercept(next))) return false;
+    set({ isSaving: true, error: null });
     try {
       await client.setVacationResponse(vacationUpdates, accountId);
     } catch (error) {
@@ -200,7 +221,10 @@ export const useVacationStore = create<VacationStore>()((set, get) => ({
     set((current) => (superseded()
       ? { ...current, isSaving: false }
       : { ...current, ...vacationUpdates, ...filtersState, isSaving: false }));
+    // The reply itself is saved even when its filters part failed.
+    void vacationHooks.onVacationUpdate.emit(next);
     if (filtersError) throw filtersError;
+    return true;
   },
 
   setSupported: (supported) => set({ isSupported: supported }),