@bobfrankston/mailx 1.0.203 → 1.0.205

package/client/.msger-window.json

@@ -1 +1 @@
-{"height":1344,"width":2151,"x":375,"y":51}
+{"height":1344,"width":2151,"x":476,"y":58}

package/client/app.js

@@ -341,6 +341,7 @@ async function openCompose(mode) {
     else if (msg && mode === "forward") {
         init.subject = `Fwd: ${cleanSubject}`;
         init.bodyHtml = forwardBody(msg);
+        init.fromAddress = detectReplyFrom();
     }
     // Store init data for compose window to pick up
     sessionStorage.setItem("composeInit", JSON.stringify(init));
@@ -897,6 +898,28 @@ document.addEventListener("keydown", (e) => {
                 row.classList.toggle("unread", !newFlags.includes("\\Seen"));
         }).catch(() => { });
     }
+    // Arrow keys — navigate message list
+    if (e.key === "ArrowDown" || e.key === "ArrowUp") {
+        const active = document.activeElement;
+        if (active && (active.tagName === "INPUT" || active.tagName === "TEXTAREA" || active.tagName === "SELECT"))
+            return;
+        const body = document.getElementById("ml-body");
+        if (!body)
+            return;
+        const selected = body.querySelector(".ml-row.selected");
+        if (!selected) {
+            const first = body.querySelector(".ml-row");
+            if (first)
+                first.click();
+            return;
+        }
+        const next = (e.key === "ArrowDown" ? selected.nextElementSibling : selected.previousElementSibling);
+        if (next?.classList.contains("ml-row")) {
+            e.preventDefault();
+            next.click();
+            next.scrollIntoView({ block: "nearest" });
+        }
+    }
 });
 // ── View menu ──
 const viewBtn = document.getElementById("btn-view");

package/client/components/message-viewer.js

@@ -290,10 +290,11 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
         else {
             bodyEl.innerHTML = `<div class="mv-empty">No content</div>`;
         }
-        // Attachments
+        // Attachments — always clear first to avoid stale chips from previous message
+        attEl.innerHTML = "";
+        attEl.hidden = true;
         if (msg.attachments?.length) {
             attEl.hidden = false;
-            attEl.innerHTML = "";
             for (let i = 0; i < msg.attachments.length; i++) {
                 const att = msg.attachments[i];
                 const chip = document.createElement("a");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.203",
+  "version": "1.0.205",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -24,7 +24,7 @@
     "@bobfrankston/iflow-node": "^0.1.2",
     "@bobfrankston/miscinfo": "^1.0.8",
     "@bobfrankston/oauthsupport": "^1.0.22",
-    "@bobfrankston/msger": "^0.1.255",
+    "@bobfrankston/msger": "^0.1.266",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",

package/packages/mailx-imap/providers/gmail-api.js

@@ -144,7 +144,7 @@ export class GmailApiProvider {
         if (options.source && msg.raw) {
             // Gmail returns URL-safe base64 — convert to standard base64 then decode
             const base64 = msg.raw.replace(/-/g, "+").replace(/_/g, "/");
-            source = Buffer.from(base64, "base64").toString("utf-8");
+            source = new TextDecoder().decode(Uint8Array.from(atob(base64), c => c.charCodeAt(0)));
         }
         const fromRaw = getHeader(headers, "From");
         const toRaw = getHeader(headers, "To");

package/packages/mailx-settings/index.js

@@ -321,6 +321,7 @@ function normalizeAccount(acct, globalName) {
         syncContacts: acct.syncContacts ?? (provider?.imap.auth === "oauth2"),
         relayDomains: acct.relayDomains,
         deliveredToPrefix: acct.deliveredToPrefix,
+        identityDomains: acct.identityDomains,
     };
 }
 // ── Defaults ──

package/packages/mailx-store-web/android-bootstrap.js

@@ -14,7 +14,7 @@
 import { WebMailxDB } from "./db.js";
 import { WebMessageStore } from "./web-message-store.js";
 import { WebMailxService } from "./web-service.js";
-import { loadAccounts, saveAccounts, clearSettings } from "./web-settings.js";
+import { loadAccounts, loadAccountsFromCloud, saveAccounts, clearSettings, setGDriveTokenProvider, setGDriveFolderId } from "./web-settings.js";
 import { GmailApiWebProvider } from "./gmail-api-web.js";
 // ── State ──
 let db;
@@ -363,6 +363,19 @@ function createNativeTokenProvider(email) {
         return token.access_token;
     };
 }
+// ── GDrive folder lookup ──
+async function findGDriveMailxFolder(tokenProvider) {
+    const token = await tokenProvider();
+    const q = encodeURIComponent("name='mailx' and mimeType='application/vnd.google-apps.folder' and trashed=false");
+    const res = await fetch(`https://www.googleapis.com/drive/v3/files?q=${q}&fields=files(id,name)&spaces=drive`, { headers: { "Authorization": `Bearer ${token}` } });
+    if (!res.ok) {
+        console.warn(`[gdrive] Folder search failed: ${res.status}`);
+        return null;
+    }
+    const data = await res.json();
+    const folder = data.files?.[0];
+    return folder?.id || null;
+}
 // ── Initialization ──
 async function waitForNativeBridge(timeoutMs = 5000) {
     if (window._nativeBridge)
@@ -392,18 +405,52 @@ export async function initAndroid() {
     bodyStore = new WebMessageStore();
     syncManager = new AndroidSyncManager(db, bodyStore);
     service = new WebMailxService(db, bodyStore, syncManager);
-    const accounts = await loadAccounts();
+    let accounts = await loadAccounts();
     console.log(`[android] ${accounts.length} account(s) found`);
+    // Find a Gmail account to use as the GDrive token provider
+    let gmailTokenProvider = null;
     for (const account of accounts) {
         if (!account.enabled)
             continue;
-        // Set up OAuth token provider for Gmail accounts via Android AccountManager
         const domain = account.email?.split("@")[1]?.toLowerCase() || "";
         if (domain === "gmail.com" || domain === "googlemail.com") {
-            syncManager.setTokenProvider(account.id, createNativeTokenProvider(account.email));
+            const tp = createNativeTokenProvider(account.email);
+            syncManager.setTokenProvider(account.id, tp);
+            if (!gmailTokenProvider)
+                gmailTokenProvider = tp;
         }
         await syncManager.addAccount(account);
     }
+    // Connect to GDrive using the Gmail token — read shared accounts.jsonc
+    if (gmailTokenProvider) {
+        setGDriveTokenProvider(gmailTokenProvider);
+        try {
+            const folderId = await findGDriveMailxFolder(gmailTokenProvider);
+            if (folderId) {
+                setGDriveFolderId(folderId);
+                console.log(`[android] GDrive mailx folder: ${folderId}`);
+                // Re-read accounts directly from GDrive (bypass cache to pick up bob.ma etc.)
+                const gdriveAccounts = await loadAccountsFromCloud();
+                if (gdriveAccounts.length > accounts.length) {
+                    console.log(`[android] GDrive has ${gdriveAccounts.length} accounts (was ${accounts.length})`);
+                    accounts = gdriveAccounts;
+                    // Register any new accounts
+                    for (const account of accounts) {
+                        if (!account.enabled)
+                            continue;
+                        const domain = account.email?.split("@")[1]?.toLowerCase() || "";
+                        if (domain === "gmail.com" || domain === "googlemail.com") {
+                            syncManager.setTokenProvider(account.id, createNativeTokenProvider(account.email));
+                        }
+                        await syncManager.addAccount(account);
+                    }
+                }
+            }
+        }
+        catch (e) {
+            console.warn(`[android] GDrive access failed: ${e.message}`);
+        }
+    }
     installBridge();
     setTimeout(() => {
         syncManager.syncAll().catch(e => console.error(`[android] Sync error: ${e.message}`));

package/packages/mailx-store-web/web-settings.d.ts

@@ -42,6 +42,8 @@ declare const DEFAULT_ALLOWLIST: {
 };
 /** Load accounts — first from IndexedDB cache, then GDrive */
 export declare function loadAccounts(): Promise<AccountConfig[]>;
+/** Load accounts directly from GDrive, bypassing local cache */
+export declare function loadAccountsFromCloud(): Promise<AccountConfig[]>;
 /** Save accounts to IndexedDB and GDrive */
 export declare function saveAccounts(accounts: AccountConfig[]): Promise<void>;
 /** Load preferences */

package/packages/mailx-store-web/web-settings.js

@@ -260,6 +260,20 @@ export async function loadAccounts() {
     }
     return [];
 }
+/** Load accounts directly from GDrive, bypassing local cache */
+export async function loadAccountsFromCloud() {
+    const content = await gDriveRead("accounts.jsonc");
+    if (content) {
+        await idbWrite("accounts.jsonc", content);
+        try {
+            const data = JSON.parse(content);
+            const raw = data.accounts || (Array.isArray(data) ? data : []);
+            return raw.map((a) => normalizeAccount(a, data.name));
+        }
+        catch { /* parse error */ }
+    }
+    return [];
+}
 /** Save accounts to IndexedDB and GDrive */
 export async function saveAccounts(accounts) {
     const content = JSON.stringify({ accounts }, null, 2);

package/packages/mailx-types/index.d.ts

@@ -33,6 +33,7 @@ export interface AccountConfig {
     syncContacts?: boolean; /** Sync contacts even when account is disabled (contacts-only Gmail) */
     relayDomains?: string[]; /** Domains to skip in Delivered-To chain (e.g., ["m.connectivity.xyz"]) */
     deliveredToPrefix?: string[]; /** Prefixes to strip from Delivered-To to get clean alias (e.g., ["bobf-ma-", "bobf-"]) — order matters, longest first */
+    identityDomains?: string[]; /** Domains where Delivered-To address should become the reply From (e.g., ["bob.ma", "bobf.frankston.com"]) */
 }
 /** Standard IMAP special-use folder types */
 export type SpecialUse = "inbox" | "sent" | "drafts" | "trash" | "junk" | "archive" | "all";