chore: Release

Reviewed-on: #48

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",
@@ -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",
 ]
 
@@ -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"
@@ -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.8.3"
 dependencies = [
  "itertools 0.14.0",
  "log",
@@ -2902,14 +2980,14 @@ dependencies = [
 
 [[package]]
 name = "letterbox-procmail2notmuch"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "anyhow",
 ]
 
 [[package]]
 name = "letterbox-server"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -2952,7 +3030,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-shared"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "build-info",
  "letterbox-notmuch",
@@ -2961,7 +3039,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-web"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "build-info",
  "build-info-build",
@@ -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"
@@ -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"
@@ -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",
@@ -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.8.3"
 repository = "https://git.z.xinu.tv/wathiede/letterbox"
 
 [profile.dev]

server/Cargo.toml

@@ -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.8.3", path = "../notmuch", registry = "xinu" }
+letterbox-shared = { version = "0.8.3", path = "../shared", registry = "xinu" }
 
 [build-dependencies]
 build-info-build = "0.0.39"

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.8.3", 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.8.3", path = "../shared", registry = "xinu" }
+letterbox-notmuch = { version = "0.8.3", path = "../notmuch", registry = "xinu" }
+seed_hooks = { version = "0.4.0", registry = "xinu" }
 
 [package.metadata.wasm-pack.profile.release]
 wasm-opt = ['-Os']

web/src/view/mod.rs

@@ -7,7 +7,7 @@ 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,
@@ -60,6 +60,7 @@ mod tw_classes {
         "accent-green-600",
         "appearance-none",
         "checked:appearance-auto",
+        "indeterminate:appearance-auto",
         "rounded",
         "border",
         "border-neutral-500",
@@ -135,7 +136,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 +189,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 +311,71 @@ 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() {
+        info!(
+            "setting tristate to {indeterminate}, current {}",
+            tri.indeterminate()
+        );
+        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 => "invisible")],
             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"],
@@ -877,6 +902,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![
@@ -1021,9 +1047,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);