@bobfrankston/rmfmail 1.2.268 → 1.2.272

package/client/app.bundle.js

@@ -1382,9 +1382,20 @@ function displayNameClaimsOtherAddress(name, address) {
   const m = n.match(/[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}/g);
   if (!m)
     return null;
+  const realDomain = real.split("@").pop() || "";
   for (const claimed of m) {
-    if (claimed.toLowerCase() !== real)
-      return claimed;
+    if (claimed.toLowerCase() === real)
+      continue;
+    const claimedDomain = claimed.toLowerCase().split("@").pop() || "";
+    if (claimedDomain && realDomain) {
+      if (claimedDomain === realDomain)
+        continue;
+      if (claimedDomain.endsWith("." + realDomain))
+        continue;
+      if (realDomain.endsWith("." + claimedDomain))
+        continue;
+    }
+    return claimed;
   }
   return null;
 }
@@ -3493,6 +3504,9 @@ ${csp}
     html { height: 100%; overflow-y: auto; overflow-x: hidden; }
     body {
         font-family: system-ui, sans-serif;
+        /* 17.5px x the 1.15 default preview zoom = ~20.1px effective, which is
+           what COMPOSE_FONT_DEFAULT_PX (compose.ts) is set to match. Change one
+           and change the other, or reading and writing drift apart again. */
         font-size: 17.5px;
         line-height: 1.5;
         color: #1a1a2e;