Merge branch 'main' into feature/scheduled-send

# Conflicts:
#	app/(main)/[locale]/page.tsx
#	components/email/email-list.tsx
#	components/email/email-viewer.tsx

app/(main)/[locale]/login/page.tsx

@@ -11,7 +11,7 @@ import { useAccountStore } from "@/stores/account-store";
 import { useThemeStore } from "@/stores/theme-store";
 import { useShallow } from "zustand/react/shallow";
 import { useConfig } from "@/hooks/use-config";
-import { apiFetch, getPathPrefix } from "@/lib/browser-navigation";
+import { apiFetch, getPathPrefix, withBasePath } from "@/lib/browser-navigation";
 import { cn } from "@/lib/utils";
 import { AlertCircle, Loader2, X, Info, Eye, EyeOff, LogIn, Sun, Moon, Monitor, Check, Shield, Play, Copy } from "lucide-react";
 import { discoverOAuth, type OAuthMetadata } from "@/lib/oauth/discovery";
@@ -722,7 +722,7 @@ export default function LoginPage() {
             <div className="px-8 pt-12 pb-4 text-center">
               <div className="inline-flex items-center justify-center w-20 h-20 mb-6">
                 <img
-                  src={resolvedTheme === 'dark' ? loginLogoDarkUrl : loginLogoLightUrl}
+                  src={withBasePath(resolvedTheme === 'dark' ? loginLogoDarkUrl : loginLogoLightUrl)}
                   alt={appName}
                   className="max-w-20 max-h-20 object-contain"
                 />
@@ -872,7 +872,7 @@ export default function LoginPage() {
           <div className="px-8 pt-10 pb-6 text-center">
             <div className="inline-flex items-center justify-center w-16 h-16 mb-5">
               <img
-                src={resolvedTheme === 'dark' ? loginLogoDarkUrl : loginLogoLightUrl}
+                src={withBasePath(resolvedTheme === 'dark' ? loginLogoDarkUrl : loginLogoLightUrl)}
                 alt={appName}
                 className="max-w-16 max-h-16 object-contain"
               />

app/(main)/[locale]/page.tsx

@@ -15,7 +15,7 @@ import { ThreadGroup, Email, isUnifiedMailboxId, UNIFIED_ROLE_BY_ID } from "@/li
 import { useAccountStore } from "@/stores/account-store";
 import type { UnifiedAccountClient } from "@/lib/unified-mailbox";
 import { KeyboardShortcutsModal } from "@/components/keyboard-shortcuts-modal";
-import { useEmailStore } from "@/stores/email-store";
+import { useEmailStore, buildUnifiedAccountClients } from "@/stores/email-store";
 import { toast } from "@/stores/toast-store";
 import { useAuthStore, redirectToLogin } from "@/stores/auth-store";
 import { useSettingsStore } from "@/stores/settings-store";
@@ -342,47 +342,22 @@ export default function Home() {
   const activeEmails = isScheduledView ? scheduledEmails : emails;
   const activeHasMore = isScheduledView ? scheduledHasMore : hasMoreEmails;
   const activeIsLoading = isScheduledView ? isLoadingScheduled : isLoading;
+  const includeGroupInUnified = useSettingsStore((s) => s.includeGroupInUnified);
   const accounts = useAccountStore((s) => s.accounts);
   const connectedAccountsSignature = useMemo(
     () => accounts.filter((a) => a.isConnected).map((a) => a.id).sort().join(","),
     [accounts],
   );
 
-  const buildUnifiedAccounts = useCallback((): UnifiedAccountClient[] => {
-    const connected = useAccountStore.getState().accounts.filter((a) => a.isConnected);
-    const clients = useAuthStore.getState().getAllConnectedClients();
-    const result: UnifiedAccountClient[] = [];
-    for (const account of connected) {
-      const accountClient = clients.get(account.id);
-      if (!accountClient) continue;
-      result.push({
-        accountId: account.id,
-        accountLabel: account.label || account.email,
-        client: accountClient,
-        mailboxes: [],
-      });
-    }
-    return result;
+  // Builds the populated UnifiedAccountClient[] used by the unified-view
+  // effects and one-shot actions in this page. Reads the includeGroup
+  // setting at call time so the latest toggle value is always honored.
+  const buildPopulatedUnifiedAccounts = useCallback(async (): Promise<UnifiedAccountClient[]> => {
+    return buildUnifiedAccountClients({
+      includeGroup: useSettingsStore.getState().includeGroupInUnified,
+    });
   }, []);
 
-  const populateUnifiedAccountMailboxes = useCallback(
-    async (list: UnifiedAccountClient[]): Promise<UnifiedAccountClient[]> => {
-      const populated = await Promise.all(
-        list.map(async (entry) => {
-          try {
-            const mailboxes = await entry.client.getMailboxes();
-            return { ...entry, mailboxes };
-          } catch (err) {
-            debug.error('Failed to load mailboxes for unified account', entry.accountId, err);
-            return entry;
-          }
-        }),
-      );
-      return populated;
-    },
-    [],
-  );
-
   const getMailtoProtocolAccounts = useCallback(() => {
     const connectedClients = useAuthStore.getState().getAllConnectedClients();
     return useAccountStore.getState().accounts.filter((account) =>
@@ -1004,12 +979,12 @@ export default function Home() {
   useEffect(() => {
     if (!enableUnifiedMailbox && !isEmbedded) return;
     if (!isAuthenticated || !client) return;
-    const built = buildUnifiedAccounts();
-    if (built.length < 2) return;
-    populateUnifiedAccountMailboxes(built).then((populated) => {
-      refreshUnifiedCounts(populated);
+    buildPopulatedUnifiedAccounts().then((built) => {
+      const hasGroupEntry = built.some((b) => b.isShared);
+      if (built.length < 2 && !hasGroupEntry && !isEmbedded) return;
+      refreshUnifiedCounts(built);
     });
-  }, [enableUnifiedMailbox, isEmbedded, isAuthenticated, client, mailboxes, connectedAccountsSignature, buildUnifiedAccounts, populateUnifiedAccountMailboxes, refreshUnifiedCounts]);
+  }, [enableUnifiedMailbox, includeGroupInUnified, isEmbedded, isAuthenticated, client, mailboxes, connectedAccountsSignature, buildPopulatedUnifiedAccounts, refreshUnifiedCounts]);
 
   // System-notification click handler. The push SW navigates the user back
   // here with `?email=<id>` (specific email it built the toast from) or
@@ -1656,8 +1631,7 @@ export default function Home() {
         setTabletListVisible(true);
       }
 
-      const built = buildUnifiedAccounts();
-      const populated = await populateUnifiedAccountMailboxes(built);
+      const populated = await buildPopulatedUnifiedAccounts();
       await fetchUnifiedEmailsAction(populated, role);
       refreshUnifiedCounts(populated);
       return;
@@ -2004,8 +1978,7 @@ export default function Home() {
     if (isUnifiedView) {
       const role = useEmailStore.getState().unifiedRole;
       if (role) {
-        const built = buildUnifiedAccounts();
-        const populated = await populateUnifiedAccountMailboxes(built);
+        const populated = await buildPopulatedUnifiedAccounts();
         await fetchUnifiedEmailsAction(populated, role);
       }
       return;
@@ -2180,7 +2153,7 @@ export default function Home() {
   const isHorizontalMailLayout = mailLayout === 'horizontal' && !isMobile && !isTablet;
   const hasViewerContent = showComposer || Boolean(conversationThread) || Boolean(selectedEmail);
   const shouldCollapseListPane = (isTablet && !tabletListVisible) || (!isMobile && isFocusedMailLayout && hasViewerContent);
-  const shouldHideViewerPane = !isMobile && !hasViewerContent && (isEmbedded || isFocusedMailLayout);
+  const shouldHideViewerPane = !isMobile && !hasViewerContent && isFocusedMailLayout;
   const shouldHideHorizontalViewerPane = isHorizontalMailLayout && !hasViewerContent;
 
   // Handle email selection with mobile view switching