@bobfrankston/mailx 1.0.195 → 1.0.197

package/client/components/folder-tree.js

@@ -94,10 +94,11 @@ function buildTree(folders, delimiter, accountId) {
 }
 /** Sort: INBOX first, then special folders, then alphabetical */
 function sortFolders(nodes) {
-    const specialOrder = { inbox: 0, drafts: 1, sent: 2, outbox: 3, trash: 4, junk: 5, archive: 6 };
+    const specialOrder = { inbox: 0, sent: 1, outbox: 2, drafts: 3, trash: 4, junk: 5, archive: 6 };
+    const nameOrder = { inbox: 0, sent: 1, "sent items": 1, outbox: 2, drafts: 3, trash: 4, "deleted items": 4, junk: 5, "junk email": 5, "junk e-mail": 5, spam: 5, archive: 6 };
     nodes.sort((a, b) => {
-        const aOrder = specialOrder[a.specialUse] ?? (a.path.toLowerCase() === "outbox" ? 3 : 99);
-        const bOrder = specialOrder[b.specialUse] ?? (b.path.toLowerCase() === "outbox" ? 3 : 99);
+        const aOrder = specialOrder[a.specialUse] ?? nameOrder[a.name.toLowerCase()] ?? 99;
+        const bOrder = specialOrder[b.specialUse] ?? nameOrder[b.name.toLowerCase()] ?? 99;
         if (aOrder !== bOrder)
             return aOrder - bOrder;
         return a.name.localeCompare(b.name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.195",
+  "version": "1.0.197",
   "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.21",
-    "@bobfrankston/msger": "^0.1.246",
+    "@bobfrankston/msger": "^0.1.248",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",

package/packages/mailx-service/index.js

@@ -240,7 +240,7 @@ export class MailxService {
             }
         }
         const storePath = getStorePath();
-        const emlPath = `${storePath}/${accountId}/${envelope.folderId}/${envelope.uid}.eml`;
+        const emlPath = path.join(storePath, accountId, String(envelope.folderId), `${envelope.uid}.eml`);
         return {
             ...envelope, bodyHtml, bodyText, hasRemoteContent, remoteAllowed: allowRemote,
             attachments, emlPath, deliveredTo, returnPath, listUnsubscribe,
@@ -341,8 +341,11 @@ export class MailxService {
         const account = settings.accounts.find(a => a.id === msg.from);
         if (!account)
             throw new Error(`Unknown account: ${msg.from}`);
-        // Use custom From address if set (identity domain reply), but always wrap with account display name
-        const fromAddr = msg.fromAddress || account.email;
+        // Extract bare email from fromAddress (may be "Name <addr>" or just "addr")
+        let fromAddr = msg.fromAddress || account.email;
+        const angleMatch = fromAddr.match(/<([^>]+)>/);
+        if (angleMatch)
+            fromAddr = angleMatch[1];
         const fromHeader = `${account.name} <${fromAddr}>`;
         const to = msg.to.map((a) => a.name ? `${a.name} <${a.address}>` : a.address).join(", ");
         const cc = msg.cc?.map((a) => a.name ? `${a.name} <${a.address}>` : a.address).join(", ");