chore: Release

Show original/delivered To if no xinu.tv addresses in To/CC fields

Cargo.lock

@@ -533,6 +533,15 @@ dependencies = [
  "generic-array 0.12.4",
 ]
 
+[[package]]
+name = "block-buffer"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
+dependencies = [
+ "generic-array 0.14.7",
+]
+
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -661,21 +670,24 @@ dependencies = [
 
 [[package]]
 name = "cacher"
-version = "0.1.4"
+version = "0.1.5"
 source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/"
-checksum = "108857065e4cdee5bc7bb002c04464dd02e4865dc63c8c13151985f9c942ab2a"
+checksum = "e674e5436692a954b7567f241a156091e543551f9882c9bc96db295c89ed681c"
 dependencies = [
  "async-trait",
  "bitcode",
  "log",
  "mime_guess",
  "redis",
- "rusoto_core",
- "rusoto_credential",
- "rusoto_s3",
+ "rusoto_core 0.42.0",
+ "rusoto_core 0.48.0",
+ "rusoto_credential 0.42.0",
+ "rusoto_credential 0.48.0",
+ "rusoto_s3 0.42.0",
+ "rusoto_s3 0.48.0",
  "serde",
  "sqlx",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tokio 1.43.0",
  "tracing",
  "urlencoding",
@@ -775,9 +787,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.30"
+version = "4.5.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d"
+checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -785,9 +797,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.30"
+version = "4.5.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c"
+checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1131,6 +1143,16 @@ dependencies = [
  "subtle 1.0.0",
 ]
 
+[[package]]
+name = "crypto-mac"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e"
+dependencies = [
+ "generic-array 0.14.7",
+ "subtle 2.6.1",
+]
+
 [[package]]
 name = "css-inline"
 version = "0.14.4"
@@ -1382,6 +1404,15 @@ dependencies = [
  "generic-array 0.12.4",
 ]
 
+[[package]]
+name = "digest"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
+dependencies = [
+ "generic-array 0.14.7",
+]
+
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -1401,7 +1432,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
 dependencies = [
  "libc",
- "redox_users",
+ "redox_users 0.3.5",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "dirs-next"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+dependencies = [
+ "cfg-if 1.0.0",
+ "dirs-sys-next",
+]
+
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+dependencies = [
+ "libc",
+ "redox_users 0.4.6",
  "winapi 0.3.9",
 ]
 
@@ -1465,9 +1517,9 @@ checksum = "b2972feb8dffe7bc8c5463b1dacda1b0dfbed3710e50f977d965429692d74cd8"
 
 [[package]]
 name = "either"
-version = "1.13.0"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "b7914353092ddf589ad78f25c5c1c21b7f80b0ff8621e7c814c3485b5306da9d"
 dependencies = [
  "serde",
 ]
@@ -1500,7 +1552,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1954,6 +2006,18 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "gloo-timers"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "gloo-utils"
 version = "0.1.7"
@@ -2207,10 +2271,20 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695"
 dependencies = [
- "crypto-mac",
+ "crypto-mac 0.7.0",
  "digest 0.8.1",
 ]
 
+[[package]]
+name = "hmac"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
+dependencies = [
+ "crypto-mac 0.11.0",
+ "digest 0.9.0",
+]
+
 [[package]]
 name = "hmac"
 version = "0.12.1"
@@ -2492,6 +2566,19 @@ dependencies = [
  "tokio-io",
 ]
 
+[[package]]
+name = "hyper-tls"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+dependencies = [
+ "bytes 1.10.0",
+ "hyper 0.14.32",
+ "native-tls",
+ "tokio 1.43.0",
+ "tokio-native-tls",
+]
+
 [[package]]
 name = "hyper-tls"
 version = "0.6.0"
@@ -2799,7 +2886,7 @@ checksum = "e19b23d53f35ce9f56aebc7d1bb4e6ac1e9c0db7ac85c8d1760c04379edced37"
 dependencies = [
  "hermit-abi 0.4.0",
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2817,15 +2904,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.14.0"
@@ -2887,7 +2965,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-notmuch"
-version = "0.8.2"
+version = "0.9.1"
 dependencies = [
  "itertools 0.14.0",
  "log",
@@ -2902,14 +2980,14 @@ dependencies = [
 
 [[package]]
 name = "letterbox-procmail2notmuch"
-version = "0.8.2"
+version = "0.9.1"
 dependencies = [
  "anyhow",
 ]
 
 [[package]]
 name = "letterbox-server"
-version = "0.8.2"
+version = "0.9.1"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -2952,7 +3030,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-shared"
-version = "0.8.2"
+version = "0.9.1"
 dependencies = [
  "build-info",
  "letterbox-notmuch",
@@ -2961,7 +3039,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-web"
-version = "0.8.2"
+version = "0.9.1"
 dependencies = [
  "build-info",
  "build-info-build",
@@ -2994,9 +3072,9 @@ checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25"
 
 [[package]]
 name = "libc"
-version = "0.2.169"
+version = "0.2.170"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
 
 [[package]]
 name = "libgit2-sys"
@@ -3016,6 +3094,16 @@ version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
 
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.8.0",
+ "libc",
+]
+
 [[package]]
 name = "libsqlite3-sys"
 version = "0.30.1"
@@ -3220,6 +3308,17 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 
+[[package]]
+name = "md-5"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15"
+dependencies = [
+ "block-buffer 0.9.0",
+ "digest 0.9.0",
+ "opaque-debug 0.3.1",
+]
+
 [[package]]
 name = "md-5"
 version = "0.10.6"
@@ -3601,6 +3700,12 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 
+[[package]]
+name = "opaque-debug"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+
 [[package]]
 name = "openssl"
 version = "0.10.71"
@@ -3723,21 +3828,6 @@ version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fb3a2f78c2d55362cd6c313b8abedfbc0142ab3c2676822068fd2ab7d51f9b7"
 
-[[package]]
-name = "opentelemetry-stdout"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eb0e5a5132e4b80bf037a78e3e12c8402535199f5de490d0c38f7eac71bc831"
-dependencies = [
- "async-trait",
- "chrono",
- "futures-util",
- "opentelemetry",
- "opentelemetry_sdk",
- "serde",
- "thiserror 2.0.11",
-]
-
 [[package]]
 name = "opentelemetry_sdk"
 version = "0.28.0"
@@ -4356,7 +4446,7 @@ dependencies = [
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4498,13 +4588,12 @@ dependencies = [
 
 [[package]]
 name = "redis"
-version = "0.27.6"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d8f99a4090c89cc489a94833c901ead69bfbf3877b4867d5482e321ee875bc"
+checksum = "9568894e8bdefd16512bca9e286a9d2abc27773609aa4eb7f428497d64df4373"
 dependencies = [
  "arc-swap",
  "combine",
- "itertools 0.13.0",
  "itoa 1.0.14",
  "num-bigint",
  "percent-encoding",
@@ -4550,6 +4639,17 @@ dependencies = [
  "rust-argon2",
 ]
 
+[[package]]
+name = "redox_users"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
+dependencies = [
+ "getrandom 0.2.15",
+ "libredox",
+ "thiserror 1.0.69",
+]
+
 [[package]]
 name = "ref-cast"
 version = "1.0.23"
@@ -4811,8 +4911,8 @@ dependencies = [
  "hyper-tls 0.3.2",
  "lazy_static",
  "log",
- "rusoto_credential",
- "rusoto_signature",
+ "rusoto_credential 0.42.0",
+ "rusoto_signature 0.42.0",
  "rustc_version 0.2.3",
  "serde",
  "serde_derive",
@@ -4823,6 +4923,31 @@ dependencies = [
  "xml-rs",
 ]
 
+[[package]]
+name = "rusoto_core"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1db30db44ea73551326269adcf7a2169428a054f14faf9e1768f2163494f2fa2"
+dependencies = [
+ "async-trait",
+ "base64 0.13.1",
+ "bytes 1.10.0",
+ "crc32fast",
+ "futures 0.3.31",
+ "http 0.2.12",
+ "hyper 0.14.32",
+ "hyper-tls 0.5.0",
+ "lazy_static",
+ "log",
+ "rusoto_credential 0.48.0",
+ "rusoto_signature 0.48.0",
+ "rustc_version 0.4.1",
+ "serde",
+ "serde_json",
+ "tokio 1.43.0",
+ "xml-rs",
+]
+
 [[package]]
 name = "rusoto_credential"
 version = "0.42.0"
@@ -4843,6 +4968,24 @@ dependencies = [
  "tokio-timer",
 ]
 
+[[package]]
+name = "rusoto_credential"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee0a6c13db5aad6047b6a44ef023dbbc21a056b6dab5be3b79ce4283d5c02d05"
+dependencies = [
+ "async-trait",
+ "chrono",
+ "dirs-next",
+ "futures 0.3.31",
+ "hyper 0.14.32",
+ "serde",
+ "serde_json",
+ "shlex 1.3.0",
+ "tokio 1.43.0",
+ "zeroize",
+]
+
 [[package]]
 name = "rusoto_s3"
 version = "0.42.0"
@@ -4851,7 +4994,20 @@ checksum = "3fedcadf3d73c2925b05d547b66787f2219c5e727a98c893fff5cf2197dbd678"
 dependencies = [
  "bytes 0.4.12",
  "futures 0.1.31",
- "rusoto_core",
+ "rusoto_core 0.42.0",
+ "xml-rs",
+]
+
+[[package]]
+name = "rusoto_s3"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7aae4677183411f6b0b412d66194ef5403293917d66e70ab118f07cc24c5b14d"
+dependencies = [
+ "async-trait",
+ "bytes 1.10.0",
+ "futures 0.3.31",
+ "rusoto_core 0.48.0",
  "xml-rs",
 ]
 
@@ -4871,7 +5027,7 @@ dependencies = [
  "log",
  "md5",
  "percent-encoding",
- "rusoto_credential",
+ "rusoto_credential 0.42.0",
  "rustc_version 0.2.3",
  "serde",
  "sha2 0.8.2",
@@ -4879,6 +5035,32 @@ dependencies = [
  "tokio 0.1.22",
 ]
 
+[[package]]
+name = "rusoto_signature"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5ae95491c8b4847931e291b151127eccd6ff8ca13f33603eb3d0035ecb05272"
+dependencies = [
+ "base64 0.13.1",
+ "bytes 1.10.0",
+ "chrono",
+ "digest 0.9.0",
+ "futures 0.3.31",
+ "hex",
+ "hmac 0.11.0",
+ "http 0.2.12",
+ "hyper 0.14.32",
+ "log",
+ "md-5 0.9.1",
+ "percent-encoding",
+ "pin-project-lite",
+ "rusoto_credential 0.48.0",
+ "rustc_version 0.4.1",
+ "serde",
+ "sha2 0.9.9",
+ "tokio 1.43.0",
+]
+
 [[package]]
 name = "rust-argon2"
 version = "0.8.3"
@@ -4947,7 +5129,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5059,9 +5241,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scraper"
-version = "0.22.0"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc3d051b884f40e309de6c149734eab57aa8cc1347992710dc80bcc1c2194c15"
+checksum = "527e65d9d888567588db4c12da1087598d0f6f8b346cc2c5abc91f05fc2dffe2"
 dependencies = [
  "cssparser 0.34.0",
  "ego-tree",
@@ -5118,7 +5300,7 @@ dependencies = [
  "futures 0.3.31",
  "getrandom 0.2.15",
  "gloo-file",
- "gloo-timers",
+ "gloo-timers 0.2.6",
  "gloo-utils 0.1.7",
  "indexmap 1.9.3",
  "js-sys",
@@ -5134,12 +5316,12 @@ dependencies = [
 
 [[package]]
 name = "seed_hooks"
-version = "0.1.16"
+version = "0.4.1"
 source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/"
-checksum = "bd9fae7f24af67cee5936ae32b446493975845298a9f5c44224f9d6dd273bd2c"
+checksum = "c97e6e53b75f87dfa0719dd6e43374744f89b1be5683e2604f2b5d611877f625"
 dependencies = [
  "atomic_hooks",
- "gloo-timers",
+ "gloo-timers 0.3.0",
  "seed",
  "wasm-bindgen",
  "web-sys",
@@ -5343,7 +5525,20 @@ dependencies = [
  "block-buffer 0.7.3",
  "digest 0.8.1",
  "fake-simd",
- "opaque-debug",
+ "opaque-debug 0.2.3",
+]
+
+[[package]]
+name = "sha2"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
+dependencies = [
+ "block-buffer 0.9.0",
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "digest 0.9.0",
+ "opaque-debug 0.3.1",
 ]
 
 [[package]]
@@ -5594,7 +5789,7 @@ dependencies = [
  "hmac 0.12.1",
  "itoa 1.0.14",
  "log",
- "md-5",
+ "md-5 0.10.6",
  "memchr",
  "once_cell",
  "percent-encoding",
@@ -5634,7 +5829,7 @@ dependencies = [
  "home",
  "itoa 1.0.14",
  "log",
- "md-5",
+ "md-5 0.10.6",
  "memchr",
  "once_cell",
  "rand 0.8.5",
@@ -6010,7 +6205,7 @@ dependencies = [
  "getrandom 0.3.1",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -7086,7 +7281,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -7339,9 +7534,9 @@ checksum = "c5b940ebc25896e71dd073bad2dbaa2abfe97b0a391415e22ad1326d9c54e3c4"
 
 [[package]]
 name = "xtracing"
-version = "0.2.0"
+version = "0.3.0"
 source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/"
-checksum = "6d9d55f38994882e502c7a992e0d31314819d88eae517b45a79612562c506150"
+checksum = "2229a7a9341c59bdf81ff1b58b135e92e1afc8749cde68fb1595968d88aebd6f"
 dependencies = [
  "chrono",
  "console-subscriber",
@@ -7351,7 +7546,6 @@ dependencies = [
  "opentelemetry",
  "opentelemetry-otlp",
  "opentelemetry-resource-detectors",
- "opentelemetry-stdout",
  "opentelemetry_sdk",
  "thiserror 2.0.11",
  "tokio 1.43.0",

Cargo.toml

@@ -8,7 +8,7 @@ authors = ["Bill Thiede <git@xinu.tv>"]
 edition = "2021"
 license = "UNLICENSED"
 publish = ["xinu"]
-version = "0.8.2"
+version = "0.9.1"
 repository = "https://git.z.xinu.tv/wathiede/letterbox"
 
 [profile.dev]

notmuch/src/lib.rs

@@ -271,6 +271,12 @@ pub struct Headers {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub bcc: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(alias = "Delivered-To")]
+    pub delivered_to: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(alias = "X-Original-To")]
+    pub x_original_to: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub reply_to: Option<String>,
     pub date: String,
 }
@@ -628,33 +634,54 @@ impl Notmuch {
         let ts: ThreadSet = serde::de::Deserialize::deserialize(&mut deserializer)?;
         deserializer.end()?;
         let mut r = HashMap::new();
-        for t in ts.0 {
-            for tn in t.0 {
-                let Some(msg) = tn.0 else {
-                    continue;
-                };
-                let mut addrs = vec![];
-                let hdr = msg.headers.to;
+        fn collect_from_thread_node(
+            r: &mut HashMap<String, usize>,
+            tn: &ThreadNode,
+        ) -> Result<(), NotmuchError> {
+            let Some(msg) = &tn.0 else {
+                return Ok(());
+            };
+            let mut addrs = vec![];
+            let hdr = &msg.headers.to;
+            if let Some(to) = hdr {
+                addrs.push(to);
+            } else {
+                let hdr = &msg.headers.x_original_to;
                 if let Some(to) = hdr {
                     addrs.push(to);
+                } else {
+                    let hdr = &msg.headers.delivered_to;
+                    if let Some(to) = hdr {
+                        addrs.push(to);
+                    };
                 };
-                let hdr = msg.headers.cc;
-                if let Some(cc) = hdr {
-                    addrs.push(cc);
-                };
-                for recipient in addrs {
-                    mailparse::addrparse(&recipient)?
-                        .into_inner()
-                        .iter()
-                        .for_each(|a| {
-                            let mailparse::MailAddr::Single(si) = a else {
-                                return;
-                            };
-                            let addr = &si.addr;
-                            if addr == "couchmoney@gmail.com" || addr.ends_with("@xinu.tv") {
-                                *r.entry(addr.clone()).or_default() += 1;
-                            }
-                        });
+            };
+            let hdr = &msg.headers.cc;
+            if let Some(cc) = hdr {
+                addrs.push(cc);
+            };
+            for recipient in addrs {
+                mailparse::addrparse(&recipient)?
+                    .into_inner()
+                    .iter()
+                    .for_each(|a| {
+                        let mailparse::MailAddr::Single(si) = a else {
+                            return;
+                        };
+                        let addr = &si.addr;
+
+                        if addr == "couchmoney@gmail.com" || addr.ends_with("@xinu.tv") {
+                            *r.entry(addr.to_lowercase()).or_default() += 1;
+                        }
+                    });
+            }
+            Ok(())
+        }
+        for t in ts.0 {
+            for tn in t.0 {
+                collect_from_thread_node(&mut r, &tn)?;
+                for sub_tn in tn.1 {
+                    collect_from_thread_node(&mut r, &sub_tn)?;
                 }
             }
         }

server/Cargo.toml

@@ -35,7 +35,7 @@ regex = "1.11.1"
 reqwest = { version = "0.12.7", features = ["blocking"] }
 rocket = { version = "0.5.0-rc.2", features = ["json"] }
 rocket_cors = "0.6.0"
-scraper = "0.22.0"
+scraper = "0.23.0"
 serde = { version = "1.0.147", features = ["derive"] }
 serde_json = "1.0.87"
 sqlx = { version = "0.8.2", features = ["postgres", "runtime-tokio", "time"] }
@@ -47,9 +47,9 @@ url = "2.5.2"
 urlencoding = "2.1.3"
 #xtracing = { path = "../../xtracing" }
 #xtracing = { git = "http://git-private.h.xinu.tv/wathiede/xtracing.git" }
-xtracing = { version = "0.2.0", registry = "xinu" }
-letterbox-notmuch = { version = "0.8.2", path = "../notmuch", registry = "xinu" }
-letterbox-shared = { version = "0.8.2", path = "../shared", registry = "xinu" }
+xtracing = { version = "0.3.0", registry = "xinu" }
+letterbox-notmuch = { version = "0.9.1", path = "../notmuch", registry = "xinu" }
+letterbox-shared = { version = "0.9.1", path = "../shared", registry = "xinu" }
 
 [build-dependencies]
 build-info-build = "0.0.39"

server/src/graphql.rs

@@ -95,6 +95,10 @@ pub struct Message {
     pub to: Vec<Email>,
     // All CC headers found in email
     pub cc: Vec<Email>,
+    // X-Original-To header found in email
+    pub x_original_to: Option<Email>,
+    // Delivered-To header found in email
+    pub delivered_to: Option<Email>,
     // First Subject header found in email
     pub subject: Option<String>,
     // Parsed Date header, if found and valid
@@ -286,7 +290,7 @@ impl QueryRoot {
         Ok(letterbox_shared::build_version(bi))
     }
     #[instrument(skip_all, fields(query=query))]
-    #[instrument(skip_all, fields(query=query, request_id=request_id()))]
+    #[instrument(skip_all, fields(query=query, rid=request_id()))]
     async fn count<'ctx>(&self, ctx: &Context<'ctx>, query: String) -> Result<usize, Error> {
         let nm = ctx.data_unchecked::<Notmuch>();
         let pool = ctx.data_unchecked::<PgPool>();
@@ -306,10 +310,44 @@ impl QueryRoot {
         info!("count {newsreader_query:?} newsreader count {newsreader_count} notmuch count {notmuch_count} tantivy count {tantivy_count} total {total}");
         Ok(total)
     }
+    async fn catchup<'ctx>(
+        &self,
+        ctx: &Context<'ctx>,
+        query: String,
+    ) -> Result<Vec<String>, Error> {
+        let nm = ctx.data_unchecked::<Notmuch>();
+        let pool = ctx.data_unchecked::<PgPool>();
+        let query: Query = query.parse()?;
+        // TODO: implement optimized versions of fetching just IDs
+        let newsreader_fut = newsreader_search(pool, None, None, None, None, &query);
+        let notmuch_fut = notmuch_search(nm, None, None, None, None, &query);
+        let (newsreader_results, notmuch_results) = join!(newsreader_fut, notmuch_fut);
+
+        let newsreader_results = newsreader_results?;
+        let notmuch_results = notmuch_results?;
+        info!(
+            "newsreader_results ({}) notmuch_results ({})",
+            newsreader_results.len(),
+            notmuch_results.len(),
+        );
+
+        let results: Vec<_> = newsreader_results
+            .into_iter()
+            .chain(notmuch_results)
+            .collect();
+        let ids = results
+            .into_iter()
+            .map(|r| match r {
+                ThreadSummaryCursor::Newsreader(_, ts) => ts.thread,
+                ThreadSummaryCursor::Notmuch(_, ts) => ts.thread,
+            })
+            .collect();
+        Ok(ids)
+    }
 
     // TODO: this function doesn't get parallelism, possibly because notmuch is sync and blocks,
     // rewrite that with tokio::process:Command
-    #[instrument(skip_all, fields(query=query, request_id=request_id()))]
+    #[instrument(skip_all, fields(query=query, rid=request_id()))]
     async fn search<'ctx>(
         &self,
         ctx: &Context<'ctx>,
@@ -467,7 +505,7 @@ impl QueryRoot {
         .await?)
     }
 
-    #[instrument(skip_all, fields(request_id=request_id()))]
+    #[instrument(skip_all, fields(rid=request_id()))]
     async fn tags<'ctx>(&self, ctx: &Context<'ctx>) -> FieldResult<Vec<Tag>> {
         let nm = ctx.data_unchecked::<Notmuch>();
         let pool = ctx.data_unchecked::<PgPool>();
@@ -476,7 +514,7 @@ impl QueryRoot {
         tags.append(&mut nm::tags(nm, needs_unread)?);
         Ok(tags)
     }
-    #[instrument(skip_all, fields(thread_id=thread_id, request_id=request_id()))]
+    #[instrument(skip_all, fields(thread_id=thread_id, rid=request_id()))]
     async fn thread<'ctx>(&self, ctx: &Context<'ctx>, thread_id: String) -> Result<Thread, Error> {
         let nm = ctx.data_unchecked::<Notmuch>();
         let cacher = ctx.data_unchecked::<FilesystemCacher>();
@@ -553,7 +591,7 @@ async fn tantivy_search(
 pub struct Mutation;
 #[Object]
 impl Mutation {
-    #[instrument(skip_all, fields(query=query, unread=unread, request_id=request_id()))]
+    #[instrument(skip_all, fields(query=query, unread=unread, rid=request_id()))]
     async fn set_read_status<'ctx>(
         &self,
         ctx: &Context<'ctx>,
@@ -572,7 +610,7 @@ impl Mutation {
         nm::set_read_status(nm, &query, unread).await?;
         Ok(true)
     }
-    #[instrument(skip_all, fields(query=query, tag=tag, request_id=request_id()))]
+    #[instrument(skip_all, fields(query=query, tag=tag, rid=request_id()))]
     async fn tag_add<'ctx>(
         &self,
         ctx: &Context<'ctx>,
@@ -584,7 +622,7 @@ impl Mutation {
         nm.tag_add(&tag, &query)?;
         Ok(true)
     }
-    #[instrument(skip_all, fields(query=query, tag=tag, request_id=request_id()))]
+    #[instrument(skip_all, fields(query=query, tag=tag, rid=request_id()))]
     async fn tag_remove<'ctx>(
         &self,
         ctx: &Context<'ctx>,
@@ -607,7 +645,7 @@ impl Mutation {
 
         Ok(true)
     }
-    #[instrument(skip_all, fields(request_id=request_id()))]
+    #[instrument(skip_all, fields(rid=request_id()))]
     async fn refresh<'ctx>(&self, ctx: &Context<'ctx>) -> Result<bool, Error> {
         let nm = ctx.data_unchecked::<Notmuch>();
         let cacher = ctx.data_unchecked::<FilesystemCacher>();

server/src/lib.rs

@@ -682,7 +682,7 @@ fn compute_offset_limit(
     first: Option<i32>,
     last: Option<i32>,
 ) -> (i32, i32) {
-    let default_page_size = 100;
+    let default_page_size = 10000;
     match (after, before, first, last) {
         // Reasonable defaults
         (None, None, None, None) => (0, default_page_size),
@@ -773,7 +773,19 @@ impl Query {
         for uid in &self.uids {
             parts.push(uid.clone());
         }
-        parts.extend(self.remainder.clone());
+        for r in &self.remainder {
+            // Rewrite "to:" to include ExtraTo:. ExtraTo: is configured in
+            // notmuch-config to index Delivered-To and X-Original-To headers.
+            if r.starts_with("to:") {
+                parts.push("(".to_string());
+                parts.push(r.to_string());
+                parts.push("OR".to_string());
+                parts.push(r.replace("to:", "ExtraTo:"));
+                parts.push(")".to_string());
+            } else {
+                parts.push(r.to_string());
+            }
+        }
         parts.join(" ")
     }
 }

server/src/nm.rs

@@ -196,6 +196,8 @@ pub async fn thread(
 
         let to = email_addresses(&path, &m, "to")?;
         let cc = email_addresses(&path, &m, "cc")?;
+        let delivered_to = email_addresses(&path, &m, "delivered-to")?.pop();
+        let x_original_to = email_addresses(&path, &m, "x-original-to")?.pop();
         let subject = m.headers.get_first_value("subject");
         let timestamp = m
             .headers
@@ -315,6 +317,8 @@ pub async fn thread(
             body,
             path,
             attachments,
+            delivered_to,
+            x_original_to,
         });
     }
     messages.reverse();

shared/Cargo.toml

@@ -12,5 +12,5 @@ version.workspace = true
 
 [dependencies]
 build-info = "0.0.39"
-letterbox-notmuch = { version = "0.8.2", path = "../notmuch", registry = "xinu" }
+letterbox-notmuch = { version = "0.9.1", path = "../notmuch", registry = "xinu" }
 serde = { version = "1.0.147", features = ["derive"] }

web/Cargo.toml

@@ -33,9 +33,9 @@ wasm-bindgen = "=0.2.100"
 uuid = { version = "1.13.1", features = [
   "js",
 ] } # direct dep to set js feature, prevents Rng issues
-letterbox-shared = { version = "0.8.2", path = "../shared", registry = "xinu" }
-letterbox-notmuch = { version = "0.8.2", path = "../notmuch", registry = "xinu" }
-seed_hooks = { version = "0.1.13", registry = "xinu" }
+letterbox-shared = { version = "0.9.1", path = "../shared", registry = "xinu" }
+letterbox-notmuch = { version = "0.9.1", path = "../notmuch", registry = "xinu" }
+seed_hooks = { version = "0.4.0", registry = "xinu" }
 
 [package.metadata.wasm-pack.profile.release]
 wasm-opt = ['-Os']

web/graphql/catchup.graphql

@@ -0,0 +1,3 @@
+query CatchupQuery($query: String!) {
+    catchup(query: $query)
+}

web/graphql/schema.json

@@ -671,6 +671,30 @@
                 }
               }
             },
+            {
+              "args": [],
+              "deprecationReason": null,
+              "description": null,
+              "isDeprecated": false,
+              "name": "xOriginalTo",
+              "type": {
+                "kind": "OBJECT",
+                "name": "Email",
+                "ofType": null
+              }
+            },
+            {
+              "args": [],
+              "deprecationReason": null,
+              "description": null,
+              "isDeprecated": false,
+              "name": "deliveredTo",
+              "type": {
+                "kind": "OBJECT",
+                "name": "Email",
+                "ofType": null
+              }
+            },
             {
               "args": [],
               "deprecationReason": null,
@@ -1268,6 +1292,45 @@
                 }
               }
             },
+            {
+              "args": [
+                {
+                  "defaultValue": null,
+                  "description": null,
+                  "name": "query",
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              ],
+              "deprecationReason": null,
+              "description": null,
+              "isDeprecated": false,
+              "name": "catchup",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              }
+            },
             {
               "args": [
                 {

web/graphql/show_thread.graphql

@@ -31,6 +31,14 @@ query ShowThreadQuery($threadId: String!) {
           name
           addr
         }
+        xOriginalTo {
+          name
+          addr
+        }
+        deliveredTo {
+          name
+          addr
+        }
         timestamp
         body {
           __typename

web/src/graphql.rs

@@ -12,6 +12,14 @@ use serde::{de::DeserializeOwned, Serialize};
 )]
 pub struct FrontPageQuery;
 
+#[derive(GraphQLQuery)]
+#[graphql(
+    schema_path = "graphql/schema.json",
+    query_path = "graphql/catchup.graphql",
+    response_derives = "Debug"
+)]
+pub struct CatchupQuery;
+
 #[derive(GraphQLQuery)]
 #[graphql(
     schema_path = "graphql/schema.json",

web/src/state.rs

@@ -53,6 +53,7 @@ pub fn init(url: Url, orders: &mut impl Orders<Msg>) -> Model {
             client: version,
             server: None,
         },
+        catchup: None,
     }
 }
 
@@ -182,9 +183,9 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
         }
         Msg::GoToSearchResults => {
             let url = urls::search(&model.query, 0);
-            info!("GoToSearchRestuls Start");
+            info!("GoToSearchResults Start");
             orders.request_url(url);
-            info!("GoToSearchRestuls End");
+            info!("GoToSearchResults End");
         }
 
         Msg::UpdateQuery(query) => model.query = query,
@@ -390,6 +391,38 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
         Msg::ShowThreadResult(bad) => {
             error!("show_thread_query error: {bad:#?}");
         }
+        Msg::CatchupRequest { query } => {
+            orders.perform_cmd(async move {
+                Msg::CatchupResult(
+                    send_graphql::<_, graphql::catchup_query::ResponseData>(
+                        graphql::CatchupQuery::build_query(graphql::catchup_query::Variables {
+                            query,
+                        }),
+                    )
+                    .await,
+                )
+            });
+        }
+        Msg::CatchupResult(Ok(graphql_client::Response {
+            data: Some(data), ..
+        })) => {
+            let items = data.catchup;
+            if items.is_empty() {
+                orders.send_msg(Msg::GoToSearchResults);
+                model.catchup = None;
+            } else {
+                orders.request_url(urls::thread(&items[0]));
+                model.catchup = Some(Catchup {
+                    items: items
+                        .into_iter()
+                        .map(|id| CatchupItem { id, seen: false })
+                        .collect(),
+                });
+            }
+        }
+        Msg::CatchupResult(bad) => {
+            error!("catchup_query error: {bad:#?}");
+        }
         Msg::SelectionSetNone => {
             if let Context::SearchResult {
                 selected_threads, ..
@@ -504,7 +537,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             });
         }
         Msg::WindowScrolled => {
-            info!("WindowScrolled");
             if let Some(el) = model.content_el.get() {
                 let ih = window()
                     .inner_height()
@@ -513,7 +545,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
                     .value_of();
 
                 let r = el.get_bounding_client_rect();
-                info!("r {r:?} ih {ih}");
                 if r.height() < ih {
                     // The whole content fits in the window, no scrollbar
                     orders.send_msg(Msg::SetProgress(0.));
@@ -554,8 +585,70 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             }
             model.versions.server = Some(version);
         }
+
+        Msg::CatchupStart => {
+            let query = if model.query.contains("is:unread") {
+                model.query.to_string()
+            } else {
+                format!("{} is:unread", model.query)
+            };
+            info!("starting catchup mode w/ {}", query);
+            orders.send_msg(Msg::CatchupRequest { query });
+        }
+        Msg::CatchupKeepUnread => {
+            if let Some(thread_id) = current_thread_id(&model.context) {
+                orders.send_msg(Msg::SetUnread(thread_id, true));
+            };
+            orders.send_msg(Msg::CatchupNext);
+        }
+        Msg::CatchupMarkAsRead => {
+            if let Some(thread_id) = current_thread_id(&model.context) {
+                orders.send_msg(Msg::SetUnread(thread_id, false));
+            };
+            orders.send_msg(Msg::CatchupNext);
+        }
+        Msg::CatchupNext => {
+            let Some(catchup) = &mut model.catchup else {
+                orders.send_msg(Msg::GoToSearchResults);
+                return;
+            };
+            let Some(idx) = catchup.items.iter().position(|i| !i.seen) else {
+                orders.send_msg(Msg::GoToSearchResults);
+                return;
+            };
+            catchup.items[idx].seen = true;
+            if idx < catchup.items.len() - 1 {
+                orders.request_url(urls::thread(&catchup.items[idx + 1].id));
+                return;
+            } else {
+                orders.send_msg(Msg::GoToSearchResults);
+                return;
+            };
+        }
+        Msg::CatchupExit => {
+            model.catchup = None;
+        }
     }
 }
+
+fn current_thread_id(context: &Context) -> Option<String> {
+    match context {
+        Context::ThreadResult {
+            thread:
+                ShowThreadQueryThread::EmailThread(ShowThreadQueryThreadOnEmailThread {
+                    thread_id, ..
+                }),
+            ..
+        } => Some(thread_id.clone()),
+        Context::ThreadResult {
+            thread:
+                ShowThreadQueryThread::NewsPost(ShowThreadQueryThreadOnNewsPost { thread_id, .. }),
+            ..
+        } => Some(thread_id.clone()),
+        _ => None,
+    }
+}
+
 // `Model` describes our app state.
 pub struct Model {
     pub query: String,
@@ -565,6 +658,7 @@ pub struct Model {
     pub read_completion_ratio: f64,
     pub content_el: ElRef<HtmlElement>,
     pub versions: Version,
+    pub catchup: Option<Catchup>,
 }
 
 #[derive(Debug)]
@@ -601,6 +695,15 @@ pub enum Context {
     },
 }
 
+pub struct Catchup {
+    pub items: Vec<CatchupItem>,
+}
+
+pub struct CatchupItem {
+    pub id: String,
+    pub seen: bool,
+}
+
 pub struct Tag {
     pub name: String,
     pub bg_color: String,
@@ -651,10 +754,14 @@ pub enum Msg {
     ShowThreadResult(
         Result<graphql_client::Response<graphql::show_thread_query::ResponseData>, gloo_net::Error>,
     ),
+    CatchupRequest {
+        query: String,
+    },
+    CatchupResult(
+        Result<graphql_client::Response<graphql::catchup_query::ResponseData>, gloo_net::Error>,
+    ),
 
-    #[allow(dead_code)]
     SelectionSetNone,
-    #[allow(dead_code)]
     SelectionSetAll,
     SelectionAddTag(String),
     #[allow(dead_code)]
@@ -673,4 +780,10 @@ pub enum Msg {
     WindowScrolled,
     SetProgress(f64),
     UpdateServerVersion(String),
+
+    CatchupStart,
+    CatchupKeepUnread,
+    CatchupMarkAsRead,
+    CatchupNext,
+    CatchupExit,
 }

web/src/view/mod.rs

@@ -1,4 +1,4 @@
-use std::{cmp::Ordering, collections::HashSet};
+use std::{cell::RefCell, cmp::Ordering, collections::HashSet};
 
 use chrono::{DateTime, Datelike, Duration, Local, Utc};
 use human_format::{Formatter, Scales};
@@ -7,12 +7,12 @@ use letterbox_shared::compute_color;
 use log::{debug, error, info};
 use seed::{prelude::*, *};
 use seed_hooks::{state_access::CloneState, topo, use_state, StateAccessEventHandlers};
-use web_sys::HtmlElement;
+use web_sys::{HtmlElement, HtmlInputElement};
 
 use crate::{
     api::urls,
     graphql::{front_page_query::*, show_thread_query::*},
-    state::{unread_query, Context, Model, Msg, RefreshingState, Tag},
+    state::{unread_query, CatchupItem, Context, Model, Msg, RefreshingState, Tag, Version},
 };
 
 // TODO(wathiede): create a QueryString enum that wraps single and multiple message ids and thread
@@ -60,6 +60,7 @@ mod tw_classes {
         "accent-green-600",
         "appearance-none",
         "checked:appearance-auto",
+        "indeterminate:appearance-auto",
         "rounded",
         "border",
         "border-neutral-500",
@@ -67,24 +68,82 @@ mod tw_classes {
 }
 
 pub fn view(model: &Model) -> Node<Msg> {
-    let content = match &model.context {
-        Context::None => div![h1!["Loading"]],
+    match &model.context {
+        Context::None => normal_view(
+            div![h1!["Loading"]],
+            &model.versions,
+            &model.query,
+            &model.refreshing_state,
+            model.read_completion_ratio,
+            &model.tags,
+        ),
         Context::ThreadResult {
             thread: ShowThreadQueryThread::EmailThread(thread_data),
             open_messages,
-        } => thread(thread_data, open_messages, &model.content_el),
+        } => {
+            if let Some(catchup) = &model.catchup {
+                catchup_view(
+                    thread(thread_data, open_messages, &model.content_el),
+                    &catchup.items,
+                    model.read_completion_ratio,
+                )
+            } else {
+                normal_view(
+                    thread(thread_data, open_messages, &model.content_el),
+                    &model.versions,
+                    &model.query,
+                    &model.refreshing_state,
+                    model.read_completion_ratio,
+                    &model.tags,
+                )
+            }
+        }
         Context::ThreadResult {
             thread: ShowThreadQueryThread::NewsPost(post),
             ..
-        } => news_post(post, &model.content_el),
+        } => {
+            if let Some(catchup) = &model.catchup {
+                catchup_view(
+                    news_post(post, &model.content_el),
+                    &catchup.items,
+                    model.read_completion_ratio,
+                )
+            } else {
+                normal_view(
+                    news_post(post, &model.content_el),
+                    &model.versions,
+                    &model.query,
+                    &model.refreshing_state,
+                    model.read_completion_ratio,
+                    &model.tags,
+                )
+            }
+        }
         Context::SearchResult {
             query,
             results,
             count,
             pager,
             selected_threads,
-        } => search_results(&query, results.as_slice(), *count, pager, selected_threads),
-    };
+        } => normal_view(
+            search_results(&query, results.as_slice(), *count, pager, selected_threads),
+            &model.versions,
+            &model.query,
+            &model.refreshing_state,
+            model.read_completion_ratio,
+            &model.tags,
+        ),
+    }
+}
+
+fn normal_view(
+    content: Node<Msg>,
+    versions: &Version,
+    query: &str,
+    refreshing_state: &RefreshingState,
+    read_completion_ratio: f64,
+    tags: &Option<Vec<Tag>>,
+) -> Node<Msg> {
     div![
         C![
             "relative",
@@ -97,19 +156,77 @@ pub fn view(model: &Model) -> Node<Msg> {
         ],
         div![
             C!["w-full", "lg:w-48", "flex-none", "flex", "flex-col"],
-            tags(model),
-            versions(&model.versions)
+            view_tags(tags),
+            view_versions(&versions)
         ],
         div![
             // TODO: This "overflow-hidden" is a hack because I can't figure out
             // how to prevent the search input box on mobile for growing it's
             // parent wider
             C!["flex-auto", "flex", "flex-col", "overflow-hidden"],
-            view_header(&model.query, &model.refreshing_state, true),
+            view_header(query, refreshing_state, true),
             content,
-            view_header(&model.query, &model.refreshing_state, false),
+            view_header(query, refreshing_state, false),
         ],
-        reading_progress(model.read_completion_ratio),
+        reading_progress(read_completion_ratio),
+    ]
+}
+
+fn catchup_view(
+    content: Node<Msg>,
+    items: &[CatchupItem],
+    read_completion_ratio: f64,
+) -> Node<Msg> {
+    div![
+        C!["w-full", "relative", "text-white"],
+        div![
+            C![
+                "fixed",
+                "top-0",
+                "right-0",
+                "left-0",
+                "p-4",
+                "border-b",
+                "border-gray-500",
+                "bg-black",
+            ],
+            div![
+                C!["absolute", "right-4", "text-gray-500"],
+                span![i![C!["fas", "fa-x"]]],
+                ev(Ev::Click, move |_| Msg::CatchupExit)
+            ],
+            h1![
+                C!["text-center"],
+                format!("{} left ", items.iter().filter(|i| !i.seen).count(),)
+            ]
+        ],
+        div![C!["mt-12", "mb-4"], content],
+        div![
+            C![
+                "fixed",
+                "bottom-0",
+                "left-0",
+                "right-0",
+                "flex",
+                "justify-center",
+                "gap-4",
+                "p-4",
+                "border-t",
+                "border-gray-500",
+                "bg-black",
+            ],
+            button![
+                C![&tw_classes::BUTTON],
+                "Keep unread",
+                ev(Ev::Click, move |_| Msg::CatchupKeepUnread)
+            ],
+            button![
+                C![&tw_classes::BUTTON, "bg-green-500"],
+                "Mark as read",
+                ev(Ev::Click, move |_| Msg::CatchupMarkAsRead)
+            ]
+        ],
+        reading_progress(read_completion_ratio)
     ]
 }
 
@@ -135,7 +252,6 @@ fn search_results(
             tags.remove(idx);
         };
         let is_unread = unread_idx.is_some();
-        // TODO: add check-all button, and tristate indicator
         div![
             C![
                 "flex",
@@ -189,11 +305,12 @@ fn search_results(
         ]
     });
     let show_bulk_edit = !selected_threads.is_empty();
+    let all_selected = selected_threads.len() == results.len();
     div![
         C!["flex", "flex-col", "flex-auto", "p-4"],
-        search_toolbar(count, pager, show_bulk_edit),
+        search_toolbar(count, pager, show_bulk_edit, all_selected),
         div![rows],
-        search_toolbar(count, pager, show_bulk_edit),
+        search_toolbar(count, pager, show_bulk_edit, all_selected),
     ]
 }
 
@@ -310,47 +427,77 @@ fn human_age(timestamp: i64) -> String {
     datetime
 }
 
+#[topo::nested]
 fn search_toolbar(
     count: usize,
     pager: &FrontPageQuerySearchPageInfo,
     show_bulk_edit: bool,
+    all_selected: bool,
 ) -> Node<Msg> {
+    let indeterminate = show_bulk_edit && !all_selected;
+    let tristate_el: ElRef<HtmlInputElement> = use_state(|| Default::default()).get();
+    let tri = el_ref(&tristate_el);
+    if let Some(tri) = tri.get() {
+        tri.set_indeterminate(indeterminate);
+    }
     nav![
-        C!["p-4", "flex", "w-full", "justify-between"],
+        C!["py-4", "flex", "w-full", "justify-between"],
         div![
-            C!["gap-2", "flex"],
-            IF!(show_bulk_edit =>
+            C!["gap-2", "flex", IF!(show_bulk_edit => "hidden")],
+            div![button![
+                C![&tw_classes::BUTTON],
+                attrs! {At::Title => "Mark as read"},
+                span![i![C!["far", "fa-eye"]]],
+                span![C!["pl-2", "hidden", "md:inline"], "Catch-up"],
+                ev(Ev::Click, |_| Msg::CatchupStart)
+            ]],
+        ],
+        div![
+            C!["gap-2", "flex", IF!(!show_bulk_edit => "hidden")],
             div![
-                    button![
-                        C![&tw_classes::BUTTON, "rounded-r-none"],
-                        attrs!{At::Title => "Mark as read"},
-                        span![i![C!["far", "fa-envelope-open"]]],
-                        span![C!["pl-2", "hidden", "md:inline"], "Read"],
-                        ev(Ev::Click, |_| Msg::SelectionMarkAsRead)
-                    ],
-                    button![
-                        C![&tw_classes::BUTTON, "rounded-l-none"],
-                        attrs!{At::Title => "Mark as unread"},
-                        span![i![C!["far", "fa-envelope"]]],
-                        span![C!["pl-2", "hidden", "md:inline"], "Unread"],
-                        ev(Ev::Click, |_| Msg::SelectionMarkAsUnread)
-                    ]
-            ]),
-            IF!(show_bulk_edit =>
+                C!["flex", "items-center", "mr-4"],
+                input![
+                    tri,
+                    C![&tw_classes::CHECKBOX],
+                    attrs! {
+                        At::Type=>"checkbox",
+                        At::Checked=>all_selected,
+                    }
+                ],
+                ev(Ev::Input, move |_| {
+                    if all_selected {
+                        Msg::SelectionSetNone
+                    } else {
+                        Msg::SelectionSetAll
+                    }
+                }),
+            ],
             div![
-                    button![
-                        C![&tw_classes::BUTTON, "text-red-500"],
-                        attrs!{At::Title => "Mark as spam"},
-                        span![i![C!["far", "fa-hand"]]],
-                        span![C!["pl-2", "hidden", "md:inline"], "Spam"],
-                        ev(Ev::Click, |_|
-                            Msg::MultiMsg(vec![
-                                Msg::SelectionAddTag("Spam".to_string()),
-                                Msg::SelectionMarkAsRead
-                            ])
-                        )
+                button![
+                    C![&tw_classes::BUTTON, "rounded-r-none"],
+                    attrs! {At::Title => "Mark as read"},
+                    span![i![C!["far", "fa-envelope-open"]]],
+                    span![C!["pl-2", "hidden", "md:inline"], "Read"],
+                    ev(Ev::Click, |_| Msg::SelectionMarkAsRead)
+                ],
+                button![
+                    C![&tw_classes::BUTTON, "rounded-l-none"],
+                    attrs! {At::Title => "Mark as unread"},
+                    span![i![C!["far", "fa-envelope"]]],
+                    span![C!["pl-2", "hidden", "md:inline"], "Unread"],
+                    ev(Ev::Click, |_| Msg::SelectionMarkAsUnread)
                 ]
-            ]),
+            ],
+            div![button![
+                C![&tw_classes::BUTTON, "text-red-500"],
+                attrs! {At::Title => "Mark as spam"},
+                span![i![C!["far", "fa-hand"]]],
+                span![C!["pl-2", "hidden", "md:inline"], "Spam"],
+                ev(Ev::Click, |_| Msg::MultiMsg(vec![
+                    Msg::SelectionAddTag("Spam".to_string()),
+                    Msg::SelectionMarkAsRead
+                ]))
+            ]],
         ],
         div![
             C!["flex", "gap-2", "items-center"],
@@ -459,6 +606,53 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
     let is_unread = has_unread(&msg.tags);
     let avatar = render_avatar(photo_url, &from, true);
     let unknown = "UNKNOWN".to_string();
+    let to_xinu = RefCell::new(false);
+    let to_addrs: Vec<_> = msg
+        .to
+        .iter()
+        .map(|to| {
+            let ShowThreadQueryThreadOnEmailThreadMessagesTo { name, addr } = to;
+            span![
+                addr.as_ref().map(|addr| {
+                    if addr.ends_with("xinu.tv") {
+                        *to_xinu.borrow_mut() = true;
+                    }
+                    attrs! {
+                        At::Title => addr
+                    }
+                }),
+                name.as_ref()
+                    .unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown)),
+                " ",
+                addr.as_ref().map(|addr| copy_text_widget(&addr)),
+                " "
+            ]
+        })
+        .collect();
+    let cc_addrs: Vec<_> = msg
+        .cc
+        .iter()
+        .map(|cc| {
+            let ShowThreadQueryThreadOnEmailThreadMessagesCc { name, addr } = cc;
+            span![
+                addr.as_ref().map(|addr| {
+                    if addr.ends_with("xinu.tv") {
+                        *to_xinu.borrow_mut() = true;
+                    }
+                    attrs! {
+                                At::Title => addr
+                    }
+                }),
+                name.as_ref()
+                    .unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown)),
+                " ",
+                addr.as_ref().map(|addr| copy_text_widget(&addr)),
+                " "
+            ]
+        })
+        .collect();
+    let show_x_original_to = !*to_xinu.borrow() && msg.x_original_to.is_some();
+    let show_delivered_to = !*to_xinu.borrow() && !show_x_original_to && msg.delivered_to.is_some();
     div![
         C!["flex", "p-4", "bg-neutral-800"],
         div![avatar],
@@ -480,8 +674,28 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
                     "To: "
                 ],
                 span![
-                    msg.to.iter().map(|to| {
-                        let ShowThreadQueryThreadOnEmailThreadMessagesTo { name, addr } = to;
+                to_addrs
+                ]
+            ]),
+            IF!(!msg.cc.is_empty() =>div![
+                C!["text-xs"],
+                span![
+                    C!["font-semibold"],
+                    "CC: "
+                ],
+                span![
+                    cc_addrs
+                ]
+            ]),
+            IF!(show_x_original_to => div![
+                C!["text-xs"],
+                span![
+                    C!["font-semibold"],
+                    "Original To: "
+                ],
+                span![
+                    msg.x_original_to.as_ref().map(|to| {
+                        let ShowThreadQueryThreadOnEmailThreadMessagesXOriginalTo { name, addr } = to;
                         span![
                             addr.as_ref().map(|addr| attrs! {
                                 At::Title => addr
@@ -494,15 +708,15 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
                     })
                 ]
             ]),
-            IF!(!msg.cc.is_empty() =>div![
+            IF!(show_delivered_to => div![
                 C!["text-xs"],
                 span![
                     C!["font-semibold"],
-                    "CC: "
+                    "Delivered To: "
                 ],
                 span![
-                    msg.cc.iter().map(|cc| {
-                        let ShowThreadQueryThreadOnEmailThreadMessagesCc { name, addr } = cc;
+                    msg.delivered_to.as_ref().map(|to| {
+                        let ShowThreadQueryThreadOnEmailThreadMessagesDeliveredTo { name, addr } = to;
                         span![
                             addr.as_ref().map(|addr| attrs! {
                                 At::Title => addr
@@ -556,6 +770,51 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
     let is_unread = has_unread(&msg.tags);
     let avatar = render_avatar(photo_url, &from, false);
     let unknown = "UNKNOWN".to_string();
+    let to_xinu = RefCell::new(false);
+    let to_addrs: Vec<_> = msg
+        .to
+        .iter()
+        .enumerate()
+        .map(|(i, to)| {
+            let ShowThreadQueryThreadOnEmailThreadMessagesTo { name, addr } = to;
+            span![
+                addr.as_ref().map(|addr| {
+                    if addr.ends_with("xinu.tv") {
+                        *to_xinu.borrow_mut() = true;
+                    }
+                    attrs! {
+                        At::Title => addr
+                    }
+                }),
+                if i > 0 { ", " } else { "" },
+                name.as_ref()
+                    .unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown))
+            ]
+        })
+        .collect();
+    let cc_addrs: Vec<_> = msg
+        .cc
+        .iter()
+        .enumerate()
+        .map(|(i, cc)| {
+            let ShowThreadQueryThreadOnEmailThreadMessagesCc { name, addr } = cc;
+            span![
+                addr.as_ref().map(|addr| {
+                    if addr.ends_with("xinu.tv") {
+                        *to_xinu.borrow_mut() = true;
+                    }
+                    attrs! {
+                        At::Title => addr
+                    }
+                }),
+                if i > 0 { ", " } else { "" },
+                name.as_ref()
+                    .unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown))
+            ]
+        })
+        .collect();
+    let show_x_original_to = !*to_xinu.borrow() && msg.x_original_to.is_some();
+    let show_delivered_to = !*to_xinu.borrow() && !show_x_original_to && msg.delivered_to.is_some();
     div![
         C!["flex", "p-4", "bg-neutral-800"],
         div![avatar],
@@ -576,16 +835,7 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
                     "To: "
                 ],
                 span![
-                    msg.to.iter().enumerate().map(|(i, to)| {
-                        let ShowThreadQueryThreadOnEmailThreadMessagesTo { name, addr } = to;
-                        span![
-                            addr.as_ref().map(|addr| attrs! {
-                                At::Title => addr
-                            }),
-                            if i > 0 { ", " } else { "" },
-                            name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown))
-                        ]
-                    })
+                    to_addrs
                 ],
                 " "
             ]),
@@ -595,17 +845,46 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
                     C!["font-semibold"],
                     "CC: "
                 ],
-                msg.cc.iter().enumerate().map(|(i,cc)| {
-                    let ShowThreadQueryThreadOnEmailThreadMessagesCc { name, addr } = cc;
-                    span![
-                        addr.as_ref().map(|addr| attrs! {
-                            At::Title => addr
-                        }),
-                        if i > 0 { ", " } else { "" },
-                        name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown))
-                    ]
-                })
-            ])
+                cc_addrs
+            ]),
+            IF!(show_x_original_to => div![
+                C!["text-xs"],
+                span![
+                    C!["font-semibold"],
+                    "Original To: "
+                ],
+                span![
+                    msg.x_original_to.as_ref().map(|to| {
+                        let ShowThreadQueryThreadOnEmailThreadMessagesXOriginalTo { name, addr } = to;
+                        span![
+                            addr.as_ref().map(|addr| attrs! {
+                                At::Title => addr
+                            }),
+                            name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown)),
+                            " ",
+                        ]
+                    })
+                ]
+            ]),
+            IF!(show_delivered_to => div![
+                C!["text-xs"],
+                span![
+                    C!["font-semibold"],
+                    "Delivered To: "
+                ],
+                span![
+                    msg.delivered_to.as_ref().map(|to| {
+                        let ShowThreadQueryThreadOnEmailThreadMessagesDeliveredTo { name, addr } = to;
+                        span![
+                            addr.as_ref().map(|addr| attrs! {
+                                At::Title => addr
+                            }),
+                            name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown)),
+                            " ",
+                        ]
+                    })
+                ]
+            ]),
         ],
         span![
             C!["text-right"],
@@ -877,6 +1156,7 @@ fn view_header(
         false
     };
     let query = Url::decode_uri_component(query).unwrap_or("".to_string());
+
     nav![
         C!["flex", "px-4", "pt-4", "overflow-hidden"],
         a![
@@ -923,8 +1203,13 @@ fn view_header(
     ]
 }
 
-pub fn tags(model: &Model) -> Node<Msg> {
-    fn view_tag(display_name: &str, indent: usize, t: &Tag, search_unread: bool) -> Node<Msg> {
+pub fn view_tags(tags: &Option<Vec<Tag>>) -> Node<Msg> {
+    fn inner_view_tag(
+        display_name: &str,
+        indent: usize,
+        t: &Tag,
+        search_unread: bool,
+    ) -> Node<Msg> {
         // Hacky, but necessary for tailwind to see all the classes we're using
         let indent_cls = match indent {
             0 => "",
@@ -977,7 +1262,10 @@ pub fn tags(model: &Model) -> Node<Msg> {
             .take_while(|(a, b)| a == b)
             .count()
     }
-    fn view_tags<'a>(tags: impl Iterator<Item = &'a Tag>, search_unread: bool) -> Vec<Node<Msg>> {
+    fn inner_view_tags<'a>(
+        tags: impl Iterator<Item = &'a Tag>,
+        search_unread: bool,
+    ) -> Vec<Node<Msg>> {
         let mut tag_els = Vec::new();
         let mut last = Vec::new();
         for t in tags {
@@ -987,7 +1275,7 @@ pub fn tags(model: &Model) -> Node<Msg> {
                 // Synthesize fake tags for proper indenting.
                 for i in n..parts.len() - 1 {
                     let display_name = parts[n];
-                    tag_els.push(view_tag(
+                    tag_els.push(inner_view_tag(
                         &display_name,
                         n,
                         &Tag {
@@ -1001,13 +1289,12 @@ pub fn tags(model: &Model) -> Node<Msg> {
                 n = parts.len() - 1;
             }
             let display_name = parts[n];
-            tag_els.push(view_tag(&display_name, n, t, search_unread));
+            tag_els.push(inner_view_tag(&display_name, n, t, search_unread));
             last = parts;
         }
         tag_els
     }
-    let mut unread = model
-        .tags
+    let mut unread = tags
         .as_ref()
         .map(|tags| tags.iter().filter(|t| t.unread > 0).collect())
         .unwrap_or(Vec::new());
@@ -1021,9 +1308,6 @@ pub fn tags(model: &Model) -> Node<Msg> {
         } else {
             a.name.cmp(&b.name)
         };
-        if a.name.starts_with('@') || b.name.starts_with('@') {
-            info!("a {} < b {} = {r:?}", a.name, b.name,);
-        }
         return r;
     });
     let tags_open = use_state(|| false);
@@ -1031,7 +1315,7 @@ pub fn tags(model: &Model) -> Node<Msg> {
     aside![
         C!["p-2"],
         IF!(!unread.is_empty() => p![C!["uppercase", "font-bold"], "Unread"]),
-        IF!(!unread.is_empty() => div![C!["flex","flex-col"], view_tags(unread.into_iter(), true)]),
+        IF!(!unread.is_empty() => div![C!["flex","flex-col"], inner_view_tags(unread.into_iter(), true)]),
         p![
             span![C!["uppercase", "font-bold", "pr-2"], "Tags"],
             IF!(!force_tags_open =>
@@ -1046,7 +1330,7 @@ pub fn tags(model: &Model) -> Node<Msg> {
             tags_open.on_click(|t| *t = !*t)
         ],
         div![
-            IF!(force_tags_open||tags_open.get() => model.tags.as_ref().map(|tags| view_tags(tags.iter(),false))),
+            IF!(force_tags_open||tags_open.get() => tags.as_ref().map(|t| inner_view_tags(t.iter(),false))),
         ]
     ]
 }
@@ -1221,7 +1505,6 @@ fn render_news_post_header(post: &ShowThreadQueryThreadOnNewsPost) -> Node<Msg>
 }
 fn reading_progress(ratio: f64) -> Node<Msg> {
     let percent = ratio * 100.;
-    info!("percent {percent}");
     div![
         C![
             "fixed",
@@ -1240,7 +1523,7 @@ fn reading_progress(ratio: f64) -> Node<Msg> {
         ]
     ]
 }
-pub fn versions(versions: &crate::state::Version) -> Node<Msg> {
+pub fn view_versions(versions: &Version) -> Node<Msg> {
     debug!("versions {versions:?}");
     aside![
         C!["p-2"],