50 changed files with 2049 additions and 5973 deletions
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@ -1,40 +0,0 @@
-# Copilot/AI Agent Instructions for Letterbox
-
-## Project Overview
- **Letterbox** is a Rust monorepo for a mail/newsreader system with a web frontend and a Rocket/GraphQL backend.
- Major crates: `server` (backend, Rocket+async-graphql), `web` (Seed-based WASM frontend), `notmuch` (mail integration), `shared` (common types), `procmail2notmuch` (migration/utility).
- Data flows: Email/news data is indexed and queried via the backend, exposed to the frontend via GraphQL. SQLx/Postgres is used for persistence. Notmuch and custom SQL are both used for mail storage/search.
-
-## Key Workflows
- **Development**: Use `dev.sh` to launch a tmux session with live-reloading for both frontend (`trunk serve`) and backend (`cargo watch ... run`).
- **Build/Release**: Use `just patch|minor|major` for versioned releases (runs SQLx prepare, bumps versions, pushes). `Makefile`'s `release` target does similar steps.
- **Frontend**: In `web/`, use `cargo make serve` and `cargo make watch` for local dev. See `web/README.md` for Seed-specific details.
- **Backend**: In `server/`, run with `cargo run` or via the tmux/dev.sh workflow. SQL migrations are in `server/migrations/`.
-
-## Project Conventions & Patterns
- **GraphQL**: All API boundaries are defined in `server/src/graphql.rs`. Use the `Query`, `Mutation`, and `Subscription` roots. Types are defined with `async-graphql` derive macros.
- **HTML Sanitization**: See `server/src/lib.rs` for custom HTML/CSS sanitization and transformation logic (e.g., `Transformer` trait, `sanitize_html`).
- **Tag/Query Parsing**: The `Query` struct in `server/src/lib.rs` parses user queries into filters for notmuch/newsreader/tantivy.
- **Shared Types**: Use the `shared` crate for types and helpers shared between frontend and backend.
- **Custom SQL**: Raw SQL queries are in `server/sql/`. Use these for complex queries not handled by SQLx macros.
- **Feature Flags**: The `tantivy` feature enables full-text search via Tantivy. Check for `#[cfg(feature = "tantivy")]` in backend code.
-
-## Integration Points
- **Notmuch**: Integrated via the `notmuch` crate for mail indexing/search.
- **Postgres**: Used for newsreader and other persistent data (see `server/migrations/`).
- **GraphQL**: All client-server communication is via GraphQL endpoints defined in the backend.
- **Seed/Trunk**: Frontend is built with Seed (Rust/WASM) and served via Trunk.
-
-## Examples
- To add a new GraphQL query, update `server/src/graphql.rs` and expose it in the `QueryRoot`.
- To add a new frontend page, add a module in `web/src/` and register it in the Seed app's router.
- To run the full dev environment: `./dev.sh` (requires tmux, trunk, cargo-watch, etc.).
-
-## References
- See `web/README.md` for frontend/Seed workflow details.
- See `Justfile` and `Makefile` for release/versioning automation.
- See `server/src/lib.rs` and `server/src/graphql.rs` for backend architecture and conventions.
- See `server/sql/` for custom SQL queries.
-
---
-If any conventions or workflows are unclear, please ask for clarification or check the referenced files for examples.
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@ -8,7 +8,7 @@ authors = ["Bill Thiede <git@xinu.tv>"]
 edition = "2021"
 license = "UNLICENSED"
 publish = ["xinu"]
-version = "0.17.55"
+version = "0.17.27"
 repository = "https://git.z.xinu.tv/wathiede/letterbox"

 [profile.dev]
--- a/procmail2notmuch/Cargo.toml
+++ b/procmail2notmuch/Cargo.toml
@ -13,8 +13,8 @@ version.workspace = true
 [dependencies]
 anyhow = "1.0.98"
 clap = { version = "4.5.37", features = ["derive", "env"] }
-letterbox-notmuch = { version = "0.17", registry = "xinu" }
-letterbox-shared = { version = "0.17", registry = "xinu" }
+letterbox-notmuch = { version = "0.17.9", registry = "xinu" }
+letterbox-shared = { version = "0.17.9", registry = "xinu" }
 serde = { version = "1.0.219", features = ["derive"] }
 sqlx = { version = "0.8.5", features = ["postgres", "runtime-tokio"] }
 tokio = { version = "1.44.2", features = ["rt", "macros", "rt-multi-thread"] }
--- a/renovate.json
+++ b/renovate.json
@ -3,11 +3,4 @@
  "extends": [
    "config:recommended"
  ]
-  ,
-  "packageRules": [
-    {
-      "matchPackageNames": ["wasm-bindgen"],
-      "enabled": false
-    }
-  ]
 }
--- a/server/.sqlx/query-126e16a4675e8d79f330b235f9e1b8614ab1e1526e4e69691c5ebc70d54a42ef.json
+++ b/server/.sqlx/query-126e16a4675e8d79f330b235f9e1b8614ab1e1526e4e69691c5ebc70d54a42ef.json
@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\nSELECT\n  url\nFROM email_photo ep\nJOIN email_address ea\nON ep.id = ea.email_photo_id\nWHERE\n  address = $1\n    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "url",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "126e16a4675e8d79f330b235f9e1b8614ab1e1526e4e69691c5ebc70d54a42ef"
+}
--- a/server/.sqlx/query-3d271b404f06497a5dcde68cf6bf07291d70fa56058ea736ac24e91d33050c04.json
+++ b/server/.sqlx/query-3d271b404f06497a5dcde68cf6bf07291d70fa56058ea736ac24e91d33050c04.json
@ -1,6 +1,6 @@
 {
  "db_name": "PostgreSQL",
-  "query": "SELECT\n    p.id,\n    link,\n    clean_summary\nFROM\n    post AS p\nINNER JOIN feed AS f ON p.site = f.slug -- necessary to weed out nzb posts\nWHERE\n    search_summary IS NULL\n    -- TODO remove AND link ~ '^<'\nORDER BY\n    ROW_NUMBER() OVER (PARTITION BY site ORDER BY date DESC)\nLIMIT 1000;\n",
+  "query": "SELECT\n    p.id,\n    link,\n    clean_summary\nFROM\n    post AS p\nINNER JOIN feed AS f ON p.site = f.slug -- necessary to weed out nzb posts\nWHERE\n    search_summary IS NULL\n    -- TODO remove AND link ~ '^<'\nORDER BY\n    ROW_NUMBER() OVER (PARTITION BY site ORDER BY date DESC)\nLIMIT 100;\n",
  "describe": {
    "columns": [
      {
@ -28,5 +28,5 @@
      true
    ]
  },
-  "hash": "cf369e3d5547f400cb54004dd03783ef6998a000aec91c50a79405dcf1c53b17"
+  "hash": "3d271b404f06497a5dcde68cf6bf07291d70fa56058ea736ac24e91d33050c04"
 }
--- a/server/.sqlx/query-6c5b0a96f45f78795732ea428cc01b4eab28b7150aa37387e7439a6b0b58e88c.json
+++ b/server/.sqlx/query-6c5b0a96f45f78795732ea428cc01b4eab28b7150aa37387e7439a6b0b58e88c.json
@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT rule as \"rule: Json<Rule>\"\n        FROM email_rule\n        ORDER BY sort_order\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "rule: Json<Rule>",
+        "type_info": "Jsonb"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "6c5b0a96f45f78795732ea428cc01b4eab28b7150aa37387e7439a6b0b58e88c"
+}
--- a/server/.sqlx/query-77f79f981a9736d18ffd4b87d3aec34d6a048162154a3aba833370c58a860795.json
+++ b/server/.sqlx/query-77f79f981a9736d18ffd4b87d3aec34d6a048162154a3aba833370c58a860795.json
@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM snooze WHERE id = $1",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "77f79f981a9736d18ffd4b87d3aec34d6a048162154a3aba833370c58a860795"
-}
--- a/server/.sqlx/query-c8383663124a5cc5912b54553f18f7064d33087ebfdf3c0c1c43cbe6d3577084.json
+++ b/server/.sqlx/query-c8383663124a5cc5912b54553f18f7064d33087ebfdf3c0c1c43cbe6d3577084.json
@ -1,26 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\nSELECT id, message_id\nFROM snooze\nWHERE wake < NOW();\n    ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 1,
-        "name": "message_id",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "c8383663124a5cc5912b54553f18f7064d33087ebfdf3c0c1c43cbe6d3577084"
-}
--- a/server/.sqlx/query-effd0d0d91e6ad84546f7177f1fd39d4fad736b471eb5e55fd5ac74f7adff664.json
+++ b/server/.sqlx/query-effd0d0d91e6ad84546f7177f1fd39d4fad736b471eb5e55fd5ac74f7adff664.json
@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        INSERT INTO snooze (message_id, wake)\n        VALUES ($1, $2)\n        ON CONFLICT (message_id) DO UPDATE\n        SET wake = $2\n    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Timestamptz"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "effd0d0d91e6ad84546f7177f1fd39d4fad736b471eb5e55fd5ac74f7adff664"
-}
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@ -12,41 +12,35 @@ version.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-chrono-tz = "0.10"
-html2text = "0.16"
 ammonia = "4.1.0"
 anyhow = "1.0.98"
-askama = { version = "0.14.0", features = ["derive"] }
-async-graphql = { version = "7", features = ["log", "chrono"] }
+async-graphql = { version = "7", features = ["log"] }
 async-graphql-axum = "7.0.16"
 async-trait = "0.1.88"
 axum = { version = "0.8.3", features = ["ws"] }
 axum-macros = "0.5.0"
-build-info = "0.0.42"
+build-info = "0.0.41"
 cacher = { version = "0.2.0", registry = "xinu" }
 chrono = "0.4.40"
 clap = { version = "4.5.37", features = ["derive"] }
-css-inline = "0.18.0"
-flate2 = "1.1.2"
+css-inline = "0.16.0"
 futures = "0.3.31"
 headers = "0.4.0"
 html-escape = "0.2.13"
-ical = "0.11"
-letterbox-notmuch = { path = "../notmuch", version = "0.17", registry = "xinu" }
-letterbox-shared = { path = "../shared", version = "0.17", registry = "xinu" }
+letterbox-notmuch = { path = "../notmuch", version = "0.17.27", registry = "xinu" }
+letterbox-shared = { path = "../shared", version = "0.17.27", registry = "xinu" }
 linkify = "0.10.0"
 lol_html = "2.3.0"
 mailparse = "0.16.1"
 maplit = "1.0.2"
 memmap = "0.7.0"
-quick-xml = { version = "0.38.1", features = ["serialize"] }
 regex = "1.11.1"
 reqwest = { version = "0.12.15", features = ["blocking"] }
-scraper = "0.25.0"
+scraper = "0.23.1"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
-sqlx = { version = "0.8.5", features = ["postgres", "runtime-tokio", "chrono"] }
-tantivy = { version = "0.25.0", optional = true }
+sqlx = { version = "0.8.5", features = ["postgres", "runtime-tokio", "time"] }
+tantivy = { version = "0.24.1", optional = true }
 thiserror = "2.0.12"
 tokio = "1.44.2"
 tower-http = { version = "0.6.2", features = ["trace"] }
@ -56,11 +50,9 @@ urlencoding = "2.1.3"
 #xtracing = { git = "http://git-private.h.xinu.tv/wathiede/xtracing.git" }
 #xtracing = { path = "../../xtracing" }
 xtracing = { version = "0.3.2", registry = "xinu" }
-zip = "6.0.0"
-

 [build-dependencies]
-build-info-build = "0.0.42"
+build-info-build = "0.0.41"

 [features]
 #default = [ "tantivy" ]
--- a/server/build.rs
+++ b/server/build.rs
@ -2,5 +2,4 @@ fn main() {
    // Calling `build_info_build::build_script` collects all data and makes it available to `build_info::build_info!`
    // and `build_info::format!` in the main program.
    build_info_build::build_script();
-    println!("cargo:rerun-if-changed=templates");
 }
--- a/server/migrations/20250630023836_snooze.down.sql
+++ b/server/migrations/20250630023836_snooze.down.sql
@ -1,2 +0,0 @@
-- Add down migration script here
-DROP TABLE IF EXISTS snooze;
--- a/server/migrations/20250630023836_snooze.up.sql
+++ b/server/migrations/20250630023836_snooze.up.sql
@ -1,6 +0,0 @@
-- Add up migration script here
-CREATE TABLE IF NOT EXISTS snooze (
-    id integer NOT NULL GENERATED ALWAYS AS IDENTITY,
-    message_id text NOT NULL UNIQUE,
-    wake timestamptz NOT NULL
-);
--- a/server/sql/label_unprocessed.sql
+++ b/server/sql/label_unprocessed.sql
@ -1 +0,0 @@
-SELECT rule as "rule: Json<Rule>" FROM email_rule ORDER BY sort_order
--- a/server/sql/need-search-summary.sql
+++ b/server/sql/need-search-summary.sql
@ -10,4 +10,4 @@ WHERE
    -- TODO remove AND link ~ '^<'
 ORDER BY
    ROW_NUMBER() OVER (PARTITION BY site ORDER BY date DESC)
-LIMIT 1000;
+LIMIT 100;
--- a/server/sql/photo_url_for_email_address.sql
+++ b/server/sql/photo_url_for_email_address.sql
@ -1 +0,0 @@
-SELECT url FROM email_photo ep JOIN email_address ea ON ep.id = ea.email_photo_id WHERE address = $1
--- a/server/src/bin/letterbox-server.rs
+++ b/server/src/bin/letterbox-server.rs
@ -119,10 +119,9 @@ async fn download_attachment(
    } else {
        format!("id:{}", id)
    };
-    info!("download attachment message id '{mid}' idx '{idx}'");
+    info!("download attachment {mid} {idx}");
    let idx: Vec<_> = idx
        .split('.')
-        .filter(|s| !s.is_empty())
        .map(|s| s.parse().expect("not a usize"))
        .collect();
    let attachment = attachment_bytes(&nm, &mid, &idx)?;
--- a/server/src/email_extract.rs
+++ b/server/src/email_extract.rs
--- a/server/src/error.rs
+++ b/server/src/error.rs
@ -39,12 +39,4 @@ pub enum ServerError {
    QueryParseError(#[from] QueryParserError),
    #[error("impossible: {0}")]
    InfaillibleError(#[from] Infallible),
-    #[error("askama error: {0}")]
-    AskamaError(#[from] askama::Error),
-    #[error("xml error: {0}")]
-    XmlError(#[from] quick_xml::Error),
-    #[error("xml encoding error: {0}")]
-    XmlEncodingError(#[from] quick_xml::encoding::EncodingError),
-    #[error("html to text error: {0}")]
-    Html2TextError(#[from] html2text::Error),
 }
--- a/server/src/graphql.rs
+++ b/server/src/graphql.rs
@ -7,7 +7,6 @@ use async_graphql::{
    Union,
 };
 use cacher::FilesystemCacher;
-use chrono::{DateTime, Utc};
 use futures::stream;
 use letterbox_notmuch::Notmuch;
 use serde::{Deserialize, Serialize};
@ -238,24 +237,6 @@ impl Body {
            content_tree: "".to_string(),
        })
    }
-
-    pub fn to_html(&self) -> Option<String> {
-        match self {
-            Body::Html(h) => Some(h.html.clone()),
-            Body::PlainText(p) => Some(format!("<pre>{}</pre>", html_escape::encode_text(&p.text))),
-            Body::UnhandledContentType(u) => {
-                Some(format!("<pre>{}</pre>", html_escape::encode_text(&u.text)))
-            }
-        }
-    }
-
-    pub fn to_html_content_tree(&self) -> Option<String> {
-        match self {
-            Body::Html(h) => Some(h.content_tree.clone()),
-            Body::PlainText(p) => Some(p.content_tree.clone()),
-            Body::UnhandledContentType(u) => Some(u.content_tree.clone()),
-        }
-    }
 }

 #[derive(Debug, SimpleObject)]
@ -629,42 +610,6 @@ impl MutationRoot {
        nm.tag_remove(&tag, &query)?;
        Ok(true)
    }
-    #[instrument(skip_all, fields(query=query, wake_time=wake_time.to_string(), rid=request_id()))]
-    async fn snooze<'ctx>(
-        &self,
-        ctx: &Context<'ctx>,
-        query: String,
-        wake_time: DateTime<Utc>,
-    ) -> Result<bool, Error> {
-        info!("TODO snooze {query} until {wake_time})");
-        let pool = ctx.data_unchecked::<PgPool>();
-        sqlx::query!(
-            r#"
-        INSERT INTO snooze (message_id, wake)
-        VALUES ($1, $2)
-        ON CONFLICT (message_id) DO UPDATE
-        SET wake = $2
-    "#,
-            query,
-            wake_time
-        )
-        .execute(pool)
-        .await?;
-
-        let nm = ctx.data_unchecked::<Notmuch>();
-        let pool = ctx.data_unchecked::<PgPool>();
-        #[cfg(feature = "tantivy")]
-        let tantivy = ctx.data_unchecked::<TantivyConnection>();
-
-        let unread = false;
-        let query: Query = query.parse()?;
-        newsreader::set_read_status(pool, &query, unread).await?;
-        #[cfg(feature = "tantivy")]
-        tantivy.reindex_thread(pool, &query).await?;
-        nm::set_read_status(nm, &query, unread).await?;
-
-        Ok(true)
-    }
    /// Drop and recreate tantivy index. Warning this is slow
    #[cfg(feature = "tantivy")]
    async fn drop_and_load_index<'ctx>(&self, ctx: &Context<'ctx>) -> Result<bool, Error> {
@ -676,18 +621,6 @@ impl MutationRoot {

        Ok(true)
    }
-    #[instrument(skip_all, fields(rid=request_id()))]
-    async fn label_unprocessed<'ctx>(
-        &self,
-        ctx: &Context<'ctx>,
-        limit: Option<usize>,
-    ) -> Result<bool, Error> {
-        let nm = ctx.data_unchecked::<Notmuch>();
-        let pool = ctx.data_unchecked::<PgPool>();
-        label_unprocessed(&nm, &pool, false, limit, "tag:unprocessed").await?;
-        Ok(true)
-    }
-
    #[instrument(skip_all, fields(rid=request_id()))]
    async fn refresh<'ctx>(&self, ctx: &Context<'ctx>) -> Result<bool, Error> {
        let nm = ctx.data_unchecked::<Notmuch>();
@ -697,10 +630,7 @@ impl MutationRoot {
        newsreader::refresh(pool, cacher).await?;

        // Process email labels
-        label_unprocessed(&nm, &pool, false, Some(1000), "tag:unprocessed").await?;
-
-        // Look for snoozed messages and mark unread
-        wakeup(&nm, &pool).await?;
+        label_unprocessed(&nm, &pool, false, Some(10), "tag:unprocessed").await?;

        #[cfg(feature = "tantivy")]
        {
@ -722,33 +652,6 @@ impl SubscriptionRoot {

 pub type GraphqlSchema = Schema<QueryRoot, MutationRoot, SubscriptionRoot>;

-#[instrument(name = "wakeup", skip_all)]
-pub async fn wakeup(nm: &Notmuch, pool: &PgPool) -> Result<(), Error> {
-    for row in sqlx::query!(
-        r#"
-SELECT id, message_id
-FROM snooze
-WHERE wake < NOW();
-    "#
-    )
-    .fetch_all(pool)
-    .await?
-    {
-        let query: Query = row.message_id.parse()?;
-        info!("need to wake {query}");
-        let unread = true;
-        newsreader::set_read_status(pool, &query, unread).await?;
-        #[cfg(feature = "tantivy")]
-        tantivy.reindex_thread(pool, &query).await?;
-        nm::set_read_status(nm, &query, unread).await?;
-
-        sqlx::query!("DELETE FROM snooze WHERE id = $1", row.id)
-            .execute(pool)
-            .await?;
-    }
-    Ok(())
-}
-
 #[instrument(skip_all, fields(query=query))]
 pub async fn compute_catchup_ids(
    nm: &Notmuch,
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@ -1,5 +1,4 @@
 pub mod config;
-pub mod email_extract;
 pub mod error;
 pub mod graphql;
 pub mod newsreader;
@ -19,7 +18,6 @@ use std::{

 use async_trait::async_trait;
 use cacher::{Cacher, FilesystemCacher};
-use chrono::NaiveDateTime;
 use css_inline::{CSSInliner, InlineError, InlineOptions};
 pub use error::ServerError;
 use linkify::{LinkFinder, LinkKind};
@ -31,6 +29,7 @@ use maplit::{hashmap, hashset};
 use regex::Regex;
 use reqwest::StatusCode;
 use scraper::{Html, Selector};
+use sqlx::types::time::PrimitiveDateTime;
 use thiserror::Error;
 use tracing::{debug, error, info, warn};
 use url::Url;
@ -754,7 +753,6 @@ pub struct Query {
    pub is_notmuch: bool,
    pub is_newsreader: bool,
    pub is_tantivy: bool,
-    pub is_snoozed: bool,
    pub corpus: Option<Corpus>,
 }

@ -778,9 +776,6 @@ impl fmt::Display for Query {
        if self.is_newsreader {
            write!(f, "is:news ")?;
        }
-        if self.is_snoozed {
-            write!(f, "is:snoozed ")?;
-        }
        match self.corpus {
            Some(c) => write!(f, "corpus:{c:?}")?,
            _ => (),
@ -837,7 +832,6 @@ impl FromStr for Query {
        let mut is_notmuch = false;
        let mut is_newsreader = false;
        let mut is_tantivy = false;
-        let mut is_snoozed = false;
        let mut corpus = None;
        for word in s.split_whitespace() {
            if word == "is:unread" {
@ -877,8 +871,6 @@ impl FromStr for Query {
                is_newsreader = true;
            } else if word == "is:newsreader" {
                is_newsreader = true;
-            } else if word == "is:snoozed" {
-                is_snoozed = true;
            } else {
                remainder.push(word.to_string());
            }
@ -897,14 +889,13 @@ impl FromStr for Query {
            is_notmuch,
            is_newsreader,
            is_tantivy,
-            is_snoozed,
            corpus,
        })
    }
 }
 pub struct ThreadSummaryRecord {
    pub site: Option<String>,
-    pub date: Option<NaiveDateTime>,
+    pub date: Option<PrimitiveDateTime>,
    pub is_read: Option<bool>,
    pub title: Option<String>,
    pub uid: String,
@ -922,7 +913,11 @@ async fn thread_summary_from_row(r: ThreadSummaryRecord) -> ThreadSummary {
    title = clean_title(&title).await.expect("failed to clean title");
    ThreadSummary {
        thread: format!("{NEWSREADER_THREAD_PREFIX}{}", r.uid),
-        timestamp: r.date.expect("post missing date").and_utc().timestamp() as isize,
+        timestamp: r
+            .date
+            .expect("post missing date")
+            .assume_utc()
+            .unix_timestamp() as isize,
        date_relative: format!("{:?}", r.date),
        //date_relative: "TODO date_relative".to_string(),
        matched: 0,
--- a/server/src/newsreader.rs
+++ b/server/src/newsreader.rs
@ -6,7 +6,7 @@ use letterbox_shared::compute_color;
 use maplit::hashmap;
 use scraper::Selector;
 use sqlx::postgres::PgPool;
-use tracing::{error, info, instrument, warn};
+use tracing::{error, info, instrument};
 use url::Url;

 use crate::{
@ -86,10 +86,6 @@ pub async fn search(
    query: &Query,
 ) -> Result<Vec<(i32, ThreadSummary)>, async_graphql::Error> {
    info!("search({after:?} {before:?} {first:?} {last:?} {query:?}");
-    if query.is_snoozed {
-        warn!("TODO implement snooze for newsreader::search");
-        return Ok(Vec::new());
-    }
    if !is_newsreader_query(query) {
        return Ok(Vec::new());
    }
@ -215,7 +211,11 @@ pub async fn thread(
    }
    let title = clean_title(&r.title.unwrap_or("NO TITLE".to_string())).await?;
    let is_read = r.is_read.unwrap_or(false);
-    let timestamp = r.date.expect("post missing date").and_utc().timestamp();
+    let timestamp = r
+        .date
+        .expect("post missing date")
+        .assume_utc()
+        .unix_timestamp();
    Ok(Thread::News(NewsPost {
        thread_id,
        is_read,
--- a/server/src/nm.rs
+++ b/server/src/nm.rs
@ -1,31 +1,35 @@
 use std::{
    collections::{HashMap, HashSet},
    fs::File,
-    io::{Cursor, Read},
 };

 use letterbox_notmuch::Notmuch;
 use letterbox_shared::{compute_color, Rule};
-use mailparse::{parse_mail, MailHeader, MailHeaderMap};
+use mailparse::{parse_content_type, parse_mail, MailHeader, MailHeaderMap, ParsedMail};
 use memmap::MmapOptions;
 use sqlx::{types::Json, PgPool};
 use tracing::{error, info, info_span, instrument, warn};
-use zip::ZipArchive;

 use crate::{
    compute_offset_limit,
-    email_extract::*,
    error::ServerError,
    graphql::{
-        Attachment, Body, Corpus, EmailThread, Header, Html, Message, PlainText, Tag, Thread,
-        ThreadSummary, UnhandledContentType,
+        Attachment, Body, Corpus, DispositionType, Email, EmailThread, Header, Html, Message,
+        PlainText, Tag, Thread, ThreadSummary, UnhandledContentType,
    },
    linkify_html, InlineStyle, Query, SanitizeHtml, Transformer,
 };

-const APPLICATION_GZIP: &'static str = "application/gzip";
-const APPLICATION_ZIP: &'static str = "application/zip";
-const MULTIPART_REPORT: &'static str = "multipart/report";
+const IMAGE_JPEG: &'static str = "image/jpeg";
+const IMAGE_PJPEG: &'static str = "image/pjpeg";
+const IMAGE_PNG: &'static str = "image/png";
+const MESSAGE_RFC822: &'static str = "message/rfc822";
+const MULTIPART_ALTERNATIVE: &'static str = "multipart/alternative";
+const MULTIPART_MIXED: &'static str = "multipart/mixed";
+const MULTIPART_RELATED: &'static str = "multipart/related";
+const TEXT_HTML: &'static str = "text/html";
+const TEXT_PLAIN: &'static str = "text/plain";
+
 const MAX_RAW_MESSAGE_SIZE: usize = 100_000;

 fn is_notmuch_query(query: &Query) -> bool {
@ -64,10 +68,6 @@ pub async fn search(
    last: Option<i32>,
    query: &Query,
 ) -> Result<Vec<(i32, ThreadSummary)>, async_graphql::Error> {
-    if query.is_snoozed {
-        warn!("TODO implement snooze for nm::search");
-        return Ok(Vec::new());
-    }
    if !is_notmuch_query(query) {
        return Ok(Vec::new());
    }
@ -169,8 +169,7 @@ pub async fn thread(
    // display names (that default to the most commonly seen name).
    let mut messages = Vec::new();
    for (path, id) in std::iter::zip(nm.files(&thread_id)?, nm.message_ids(&thread_id)?) {
-        let mut html_report_summary: Option<String> = None;
-        let tags = nm.tags_for_query(&format!("id:{}", id))?;
+        let tags = nm.tags_for_query(&format!("id:{id}"))?;
        let file = File::open(&path)?;
        let mmap = unsafe { MmapOptions::new().map(&file)? };
        let m = parse_mail(&mmap)?;
@ -308,109 +307,8 @@ pub async fn thread(
            .collect();
        // TODO(wathiede): parse message and fill out attachments
        let attachments = extract_attachments(&m, &id)?;
-
-        let mut final_body = body;
-        let mut raw_report_content: Option<String> = None;
-
-        // Append TLS report if available
-        if m.ctype.mimetype.as_str() == MULTIPART_REPORT {
-            if let Ok(Body::Html(_html_body)) = extract_report(&m, &mut part_addr) {
-                // Extract raw JSON for pretty printing
-                if let Some(sp) = m
-                    .subparts
-                    .iter()
-                    .find(|sp| sp.ctype.mimetype.as_str() == "application/tlsrpt+gzip")
-                {
-                    if let Ok(gz_bytes) = sp.get_body_raw() {
-                        let mut decoder = flate2::read::GzDecoder::new(&gz_bytes[..]);
-                        let mut buffer = Vec::new();
-                        if decoder.read_to_end(&mut buffer).is_ok() {
-                            if let Ok(json_str) = String::from_utf8(buffer) {
-                                raw_report_content = Some(json_str);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        // Append DMARC report if available
-        if m.ctype.mimetype.as_str() == APPLICATION_ZIP {
-            if let Ok(Body::Html(html_body)) = extract_zip(&m) {
-                html_report_summary = Some(html_body.html);
-                // Extract raw XML for pretty printing
-                if let Ok(zip_bytes) = m.get_body_raw() {
-                    if let Ok(mut archive) = ZipArchive::new(Cursor::new(&zip_bytes)) {
-                        for i in 0..archive.len() {
-                            if let Ok(mut file) = archive.by_index(i) {
-                                let name = file.name().to_lowercase();
-                                if is_dmarc_report_filename(&name) {
-                                    let mut xml = String::new();
-                                    use std::io::Read;
-                                    if file.read_to_string(&mut xml).is_ok() {
-                                        raw_report_content = Some(xml);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if m.ctype.mimetype.as_str() == APPLICATION_GZIP {
-            // Call extract_gzip to get the HTML summary and also to determine if it's a DMARC report
-            if let Ok((Body::Html(html_body), _)) = extract_gzip(&m) {
-                html_report_summary = Some(html_body.html);
-                // If extract_gzip successfully parsed a DMARC report, then extract the raw content
-                if let Ok(gz_bytes) = m.get_body_raw() {
-                    let mut decoder = flate2::read::GzDecoder::new(&gz_bytes[..]);
-                    let mut xml = String::new();
-                    use std::io::Read;
-                    if decoder.read_to_string(&mut xml).is_ok() {
-                        raw_report_content = Some(xml);
-                    }
-                }
-            }
-        }
-
-        let mut current_html = final_body.to_html().unwrap_or_default();
-
-        if let Some(html_summary) = html_report_summary {
-            current_html.push_str(&html_summary);
-        }
-
-        if let Some(raw_content) = raw_report_content {
-            let pretty_printed_content = if m.ctype.mimetype.as_str() == MULTIPART_REPORT {
-                // Pretty print JSON
-                if let Ok(parsed_json) = serde_json::from_str::<serde_json::Value>(&raw_content) {
-                    serde_json::to_string_pretty(&parsed_json).unwrap_or(raw_content)
-                } else {
-                    raw_content
-                }
-            } else {
-                // DMARC reports are XML
-                // Pretty print XML
-                match pretty_print_xml_with_trimming(&raw_content) {
-                    Ok(pretty_xml) => pretty_xml,
-                    Err(e) => {
-                        error!("Failed to pretty print XML: {:?}", e);
-                        raw_content
-                    }
-                }
-            };
-            current_html.push_str(&format!(
-                "\n<pre>{}</pre>",
-                html_escape::encode_text(&pretty_printed_content)
-            ));
-        }
-        final_body = Body::Html(Html {
-            html: current_html,
-            content_tree: final_body.to_html_content_tree().unwrap_or_default(),
-        });
-
        messages.push(Message {
-            id: format!("id:{}", id),
+            id: format!("id:{id}"),
            from,
            to,
            cc,
@ -418,7 +316,7 @@ pub async fn thread(
            tags,
            timestamp,
            headers,
-            body: final_body,
+            body,
            path,
            attachments,
            delivered_to,
@ -441,17 +339,65 @@ pub async fn thread(
    }))
 }

+fn email_addresses(
+    _path: &str,
+    m: &ParsedMail,
+    header_name: &str,
+) -> Result<Vec<Email>, ServerError> {
+    let mut addrs = Vec::new();
+    for header_value in m.headers.get_all_values(header_name) {
+        match mailparse::addrparse(&header_value) {
+            Ok(mal) => {
+                for ma in mal.into_inner() {
+                    match ma {
+                        mailparse::MailAddr::Group(gi) => {
+                            if !gi.group_name.contains("ndisclosed") {}
+                        }
+                        mailparse::MailAddr::Single(s) => addrs.push(Email {
+                            name: s.display_name,
+                            addr: Some(s.addr),
+                            photo_url: None,
+                        }), //println!("Single: {s}"),
+                    }
+                }
+            }
+            Err(_) => {
+                let v = header_value;
+                if v.matches('@').count() == 1 {
+                    if v.matches('<').count() == 1 && v.ends_with('>') {
+                        let idx = v.find('<').unwrap();
+                        let addr = &v[idx + 1..v.len() - 1].trim();
+                        let name = &v[..idx].trim();
+                        addrs.push(Email {
+                            name: Some(name.to_string()),
+                            addr: Some(addr.to_string()),
+                            photo_url: None,
+                        });
+                    }
+                } else {
+                    addrs.push(Email {
+                        name: Some(v),
+                        addr: None,
+                        photo_url: None,
+                    });
+                }
+            }
+        }
+    }
+    Ok(addrs)
+}
+
 pub fn cid_attachment_bytes(nm: &Notmuch, id: &str, cid: &str) -> Result<Attachment, ServerError> {
    let files = nm.files(id)?;
    let Some(path) = files.first() else {
-        warn!("failed to find files for message {}", id);
+        warn!("failed to find files for message {id}");
        return Err(ServerError::PartNotFound);
    };
    let file = File::open(&path)?;
    let mmap = unsafe { MmapOptions::new().map(&file)? };
    let m = parse_mail(&mmap)?;
    if let Some(attachment) = walk_attachments(&m, |sp, _cur_idx| {
-        info!("{} {:?}", cid, get_content_id(&sp.headers));
+        info!("{cid} {:?}", get_content_id(&sp.headers));
        if let Some(h_cid) = get_content_id(&sp.headers) {
            let h_cid = &h_cid[1..h_cid.len() - 1];
            if h_cid == cid {
@ -472,18 +418,12 @@ pub fn cid_attachment_bytes(nm: &Notmuch, id: &str, cid: &str) -> Result<Attachm
 pub fn attachment_bytes(nm: &Notmuch, id: &str, idx: &[usize]) -> Result<Attachment, ServerError> {
    let files = nm.files(id)?;
    let Some(path) = files.first() else {
-        warn!("failed to find files for message {}", id);
+        warn!("failed to find files for message {id}");
        return Err(ServerError::PartNotFound);
    };
    let file = File::open(&path)?;
    let mmap = unsafe { MmapOptions::new().map(&file)? };
    let m = parse_mail(&mmap)?;
-    if idx.is_empty() {
-        let Some(attachment) = extract_attachment(&m, id, &[]) else {
-            return Err(ServerError::PartNotFound);
-        };
-        return Ok(attachment);
-    }
    if let Some(attachment) = walk_attachments(&m, |sp, cur_idx| {
        if cur_idx == idx {
            let attachment = extract_attachment(&sp, id, idx).unwrap_or(Attachment {
@ -499,6 +439,452 @@ pub fn attachment_bytes(nm: &Notmuch, id: &str, idx: &[usize]) -> Result<Attachm
    Err(ServerError::PartNotFound)
 }

+fn extract_body(m: &ParsedMail, part_addr: &mut Vec<String>) -> Result<Body, ServerError> {
+    let body = m.get_body()?;
+    let ret = match m.ctype.mimetype.as_str() {
+        TEXT_PLAIN => return Ok(Body::text(body)),
+        TEXT_HTML => return Ok(Body::html(body)),
+        MULTIPART_MIXED => extract_mixed(m, part_addr),
+        MULTIPART_ALTERNATIVE => extract_alternative(m, part_addr),
+        MULTIPART_RELATED => extract_related(m, part_addr),
+        _ => extract_unhandled(m),
+    };
+    if let Err(err) = ret {
+        error!("Failed to extract body: {err:?}");
+        return Ok(extract_unhandled(m)?);
+    }
+    ret
+}
+
+fn extract_unhandled(m: &ParsedMail) -> Result<Body, ServerError> {
+    let msg = format!(
+        "Unhandled body content type:\n{}\n{}",
+        render_content_type_tree(m),
+        m.get_body()?,
+    );
+    Ok(Body::UnhandledContentType(UnhandledContentType {
+        text: msg,
+        content_tree: render_content_type_tree(m),
+    }))
+}
+
+// multipart/alternative defines multiple representations of the same message, and clients should
+// show the fanciest they can display. For this program, the priority is text/html, text/plain,
+// then give up.
+fn extract_alternative(m: &ParsedMail, part_addr: &mut Vec<String>) -> Result<Body, ServerError> {
+    let handled_types = vec![
+        MULTIPART_ALTERNATIVE,
+        MULTIPART_MIXED,
+        MULTIPART_RELATED,
+        TEXT_HTML,
+        TEXT_PLAIN,
+    ];
+    for sp in &m.subparts {
+        if sp.ctype.mimetype.as_str() == MULTIPART_ALTERNATIVE {
+            return extract_alternative(sp, part_addr);
+        }
+    }
+    for sp in &m.subparts {
+        if sp.ctype.mimetype.as_str() == MULTIPART_MIXED {
+            return extract_mixed(sp, part_addr);
+        }
+    }
+    for sp in &m.subparts {
+        if sp.ctype.mimetype.as_str() == MULTIPART_RELATED {
+            return extract_related(sp, part_addr);
+        }
+    }
+    for sp in &m.subparts {
+        if sp.ctype.mimetype.as_str() == TEXT_HTML {
+            let body = sp.get_body()?;
+            return Ok(Body::html(body));
+        }
+    }
+    for sp in &m.subparts {
+        if sp.ctype.mimetype.as_str() == TEXT_PLAIN {
+            let body = sp.get_body()?;
+            return Ok(Body::text(body));
+        }
+    }
+    Err(ServerError::StringError(format!(
+        "extract_alternative failed to find suitable subpart, searched: {:?}",
+        handled_types
+    )))
+}
+
+// multipart/mixed defines multiple types of context all of which should be presented to the user
+// 'serially'.
+fn extract_mixed(m: &ParsedMail, part_addr: &mut Vec<String>) -> Result<Body, ServerError> {
+    //todo!("add some sort of visual indicator there are unhandled types, i.e. .ics files");
+    let handled_types = vec![
+        IMAGE_JPEG,
+        IMAGE_PJPEG,
+        IMAGE_PNG,
+        MESSAGE_RFC822,
+        MULTIPART_ALTERNATIVE,
+        MULTIPART_RELATED,
+        TEXT_HTML,
+        TEXT_PLAIN,
+    ];
+    let mut unhandled_types: Vec<_> = m
+        .subparts
+        .iter()
+        .map(|sp| sp.ctype.mimetype.as_str())
+        .filter(|mt| !handled_types.contains(&mt))
+        .collect();
+    unhandled_types.sort();
+    if !unhandled_types.is_empty() {
+        warn!("{MULTIPART_MIXED} contains the following unhandled mimetypes {unhandled_types:?}");
+    }
+    let mut parts = Vec::new();
+    for (idx, sp) in m.subparts.iter().enumerate() {
+        part_addr.push(idx.to_string());
+        match sp.ctype.mimetype.as_str() {
+            MESSAGE_RFC822 => parts.push(extract_rfc822(&sp, part_addr)?),
+            MULTIPART_RELATED => parts.push(extract_related(sp, part_addr)?),
+            MULTIPART_ALTERNATIVE => parts.push(extract_alternative(sp, part_addr)?),
+            TEXT_PLAIN => parts.push(Body::text(sp.get_body()?)),
+            TEXT_HTML => parts.push(Body::html(sp.get_body()?)),
+            IMAGE_PJPEG | IMAGE_JPEG | IMAGE_PNG => {
+                let pcd = sp.get_content_disposition();
+                let filename = pcd
+                    .params
+                    .get("filename")
+                    .map(|s| s.clone())
+                    .unwrap_or("".to_string());
+                // Only add inline images, attachments are handled as an attribute of the top level Message and rendered separate client-side.
+                if pcd.disposition == mailparse::DispositionType::Inline {
+                    // TODO: make URL generation more programatic based on what the frontend has
+                    // mapped
+                    parts.push(Body::html(format!(
+                        r#"<img src="/api/view/attachment/{}/{}/{filename}">"#,
+                        part_addr[0],
+                        part_addr
+                            .iter()
+                            .skip(1)
+                            .map(|i| i.to_string())
+                            .collect::<Vec<_>>()
+                            .join(".")
+                    )));
+                }
+            }
+            mt => parts.push(unhandled_html(MULTIPART_MIXED, mt)),
+        }
+        part_addr.pop();
+    }
+    Ok(flatten_body_parts(&parts))
+}
+
+fn unhandled_html(parent_type: &str, child_type: &str) -> Body {
+    Body::Html(Html {
+        html: format!(
+            r#"
+<div class="p-4 error">
+Unhandled mimetype {child_type} in a {parent_type} message
+</div>
+    "#
+        ),
+        content_tree: String::new(),
+    })
+}
+fn flatten_body_parts(parts: &[Body]) -> Body {
+    let html = parts
+        .iter()
+        .map(|p| match p {
+            Body::PlainText(PlainText { text, .. }) => {
+                format!(
+                    r#"<p class="view-part-text-plain font-mono whitespace-pre-line">{}</p>"#,
+                    // Trim newlines to prevent excessive white space at the beginning/end of
+                    // presenation. Leave tabs and spaces incase plain text attempts to center a
+                    // header on the first line.
+                    linkify_html(&html_escape::encode_text(text).trim_matches('\n'))
+                )
+            }
+            Body::Html(Html { html, .. }) => html.clone(),
+            Body::UnhandledContentType(UnhandledContentType { text, .. }) => {
+                error!("text len {}", text.len());
+                format!(
+                    r#"<p class="view-part-unhandled">{}</p>"#,
+                    // Trim newlines to prevent excessive white space at the beginning/end of
+                    // presenation. Leave tabs and spaces incase plain text attempts to center a
+                    // header on the first line.
+                    linkify_html(&html_escape::encode_text(text).trim_matches('\n'))
+                )
+            }
+        })
+        .collect::<Vec<_>>()
+        .join("\n");
+
+    info!("flatten_body_parts {}", parts.len());
+    Body::html(html)
+}
+
+fn extract_related(m: &ParsedMail, part_addr: &mut Vec<String>) -> Result<Body, ServerError> {
+    // TODO(wathiede): collect related things and change return type to new Body arm.
+    let handled_types = vec![
+        MULTIPART_ALTERNATIVE,
+        TEXT_HTML,
+        TEXT_PLAIN,
+        IMAGE_JPEG,
+        IMAGE_PJPEG,
+        IMAGE_PNG,
+    ];
+    let mut unhandled_types: Vec<_> = m
+        .subparts
+        .iter()
+        .map(|sp| sp.ctype.mimetype.as_str())
+        .filter(|mt| !handled_types.contains(&mt))
+        .collect();
+    unhandled_types.sort();
+    if !unhandled_types.is_empty() {
+        warn!("{MULTIPART_RELATED} contains the following unhandled mimetypes {unhandled_types:?}");
+    }
+
+    for (i, sp) in m.subparts.iter().enumerate() {
+        if sp.ctype.mimetype == IMAGE_PNG
+            || sp.ctype.mimetype == IMAGE_JPEG
+            || sp.ctype.mimetype == IMAGE_PJPEG
+        {
+            info!("sp.ctype {:#?}", sp.ctype);
+            //info!("sp.headers {:#?}", sp.headers);
+            if let Some(cid) = sp.headers.get_first_value("Content-Id") {
+                let mut part_id = part_addr.clone();
+                part_id.push(i.to_string());
+                info!("cid: {cid} part_id {part_id:?}");
+            }
+        }
+    }
+    for sp in &m.subparts {
+        if sp.ctype.mimetype == MULTIPART_ALTERNATIVE {
+            return extract_alternative(m, part_addr);
+        }
+    }
+    for sp in &m.subparts {
+        if sp.ctype.mimetype == TEXT_HTML {
+            let body = sp.get_body()?;
+            return Ok(Body::html(body));
+        }
+    }
+    for sp in &m.subparts {
+        if sp.ctype.mimetype == TEXT_PLAIN {
+            let body = sp.get_body()?;
+            return Ok(Body::text(body));
+        }
+    }
+    Err(ServerError::StringError(format!(
+        "extract_related failed to find suitable subpart, searched: {:?}",
+        handled_types
+    )))
+}
+
+fn walk_attachments<T, F: Fn(&ParsedMail, &[usize]) -> Option<T> + Copy>(
+    m: &ParsedMail,
+    visitor: F,
+) -> Option<T> {
+    let mut cur_addr = Vec::new();
+    walk_attachments_inner(m, visitor, &mut cur_addr)
+}
+
+fn walk_attachments_inner<T, F: Fn(&ParsedMail, &[usize]) -> Option<T> + Copy>(
+    m: &ParsedMail,
+    visitor: F,
+    cur_addr: &mut Vec<usize>,
+) -> Option<T> {
+    for (idx, sp) in m.subparts.iter().enumerate() {
+        cur_addr.push(idx);
+        let val = visitor(sp, &cur_addr);
+        if val.is_some() {
+            return val;
+        }
+        let val = walk_attachments_inner(sp, visitor, cur_addr);
+        if val.is_some() {
+            return val;
+        }
+        cur_addr.pop();
+    }
+    None
+}
+
+// TODO(wathiede): make this walk_attachments that takes a closure.
+// Then implement one closure for building `Attachment` and imlement another that can be used to
+// get the bytes for serving attachments of HTTP
+fn extract_attachments(m: &ParsedMail, id: &str) -> Result<Vec<Attachment>, ServerError> {
+    let mut attachments = Vec::new();
+    for (idx, sp) in m.subparts.iter().enumerate() {
+        if let Some(attachment) = extract_attachment(sp, id, &[idx]) {
+            // Filter out inline attachements, they're flattened into the body of the message.
+            if attachment.disposition == DispositionType::Attachment {
+                attachments.push(attachment);
+            }
+        }
+    }
+    Ok(attachments)
+}
+
+fn extract_attachment(m: &ParsedMail, id: &str, idx: &[usize]) -> Option<Attachment> {
+    let pcd = m.get_content_disposition();
+    let pct = m
+        .get_headers()
+        .get_first_value("Content-Type")
+        .map(|s| parse_content_type(&s));
+    let filename = match (
+        pcd.params.get("filename").map(|f| f.clone()),
+        pct.map(|pct| pct.params.get("name").map(|f| f.clone())),
+    ) {
+        // Use filename from Content-Disposition
+        (Some(filename), _) => filename,
+        // Use filename from Content-Type
+        (_, Some(Some(name))) => name,
+        // No known filename, assume it's not an attachment
+        _ => return None,
+    };
+    info!("filename {filename}");
+
+    // TODO: grab this from somewhere
+    let content_id = None;
+    let bytes = match m.get_body_raw() {
+        Ok(bytes) => bytes,
+        Err(err) => {
+            error!("failed to get body for attachment: {err}");
+            return None;
+        }
+    };
+    return Some(Attachment {
+        id: id.to_string(),
+        idx: idx
+            .iter()
+            .map(|i| i.to_string())
+            .collect::<Vec<_>>()
+            .join("."),
+        disposition: pcd.disposition.into(),
+        filename: Some(filename),
+        size: bytes.len(),
+        // TODO: what is the default for ctype?
+        // TODO: do we want to use m.ctype.params for anything?
+        content_type: Some(m.ctype.mimetype.clone()),
+        content_id,
+        bytes,
+    });
+}
+fn email_address_strings(emails: &[Email]) -> Vec<String> {
+    emails
+        .iter()
+        .map(|e| e.to_string())
+        .inspect(|e| info!("e {e}"))
+        .collect()
+}
+
+fn extract_rfc822(m: &ParsedMail, part_addr: &mut Vec<String>) -> Result<Body, ServerError> {
+    fn extract_headers(m: &ParsedMail) -> Result<Body, ServerError> {
+        let path = "<in-memory>";
+        let from = email_address_strings(&email_addresses(path, &m, "from")?).join(", ");
+        let to = email_address_strings(&email_addresses(path, &m, "to")?).join(", ");
+        let cc = email_address_strings(&email_addresses(path, &m, "cc")?).join(", ");
+        let date = m.headers.get_first_value("date").unwrap_or(String::new());
+        let subject = m
+            .headers
+            .get_first_value("subject")
+            .unwrap_or(String::new());
+        let text = format!(
+            r#"
+---------- Forwarded message ----------
+From: {from}
+To: {to}
+CC: {cc}
+Date: {date}
+Subject: {subject}
+"#
+        );
+        Ok(Body::text(text))
+    }
+    let inner_body = m.get_body()?;
+    let inner_m = parse_mail(inner_body.as_bytes())?;
+    let headers = extract_headers(&inner_m)?;
+    let body = extract_body(&inner_m, part_addr)?;
+
+    Ok(flatten_body_parts(&[headers, body]))
+}
+
+pub fn get_attachment_filename(header_value: &str) -> &str {
+    info!("get_attachment_filename {header_value}");
+    // Strip last "
+    let v = &header_value[..header_value.len() - 1];
+    if let Some(idx) = v.rfind('"') {
+        &v[idx + 1..]
+    } else {
+        ""
+    }
+}
+
+pub fn get_content_type<'a>(headers: &[MailHeader<'a>]) -> Option<String> {
+    if let Some(v) = headers.get_first_value("Content-Type") {
+        if let Some(idx) = v.find(';') {
+            return Some(v[..idx].to_string());
+        } else {
+            return Some(v);
+        }
+    }
+    None
+}
+
+fn get_content_id<'a>(headers: &[MailHeader<'a>]) -> Option<String> {
+    headers.get_first_value("Content-Id")
+}
+
+fn render_content_type_tree(m: &ParsedMail) -> String {
+    const WIDTH: usize = 4;
+    const SKIP_HEADERS: [&str; 4] = [
+        "Authentication-Results",
+        "DKIM-Signature",
+        "Received",
+        "Received-SPF",
+    ];
+    fn render_ct_rec(m: &ParsedMail, depth: usize) -> String {
+        let mut parts = Vec::new();
+        let msg = format!("{} {}", "-".repeat(depth * WIDTH), m.ctype.mimetype);
+        parts.push(msg);
+        for sp in &m.subparts {
+            parts.push(render_ct_rec(sp, depth + 1))
+        }
+        parts.join("\n")
+    }
+    fn render_rec(m: &ParsedMail, depth: usize) -> String {
+        let mut parts = Vec::new();
+        let msg = format!("{} {}", "-".repeat(depth * WIDTH), m.ctype.mimetype);
+        parts.push(msg);
+        let indent = " ".repeat(depth * WIDTH);
+        if !m.ctype.charset.is_empty() {
+            parts.push(format!("{indent} Character Set: {}", m.ctype.charset));
+        }
+        for (k, v) in m.ctype.params.iter() {
+            parts.push(format!("{indent} {k}: {v}"));
+        }
+        if !m.headers.is_empty() {
+            parts.push(format!("{indent} == headers =="));
+            for h in &m.headers {
+                if h.get_key().starts_with('X') {
+                    continue;
+                }
+                if SKIP_HEADERS.contains(&h.get_key().as_str()) {
+                    continue;
+                }
+
+                parts.push(format!("{indent} {}: {}", h.get_key_ref(), h.get_value()));
+            }
+        }
+        for sp in &m.subparts {
+            parts.push(render_rec(sp, depth + 1))
+        }
+        parts.join("\n")
+    }
+    format!(
+        "Outline:\n{}\n\nDetailed:\n{}\n\nNot showing headers:\n  {}\n  X.*",
+        render_ct_rec(m, 1),
+        render_rec(m, 1),
+        SKIP_HEADERS.join("\n  ")
+    )
+}
+
 #[instrument(name="nm::set_read_status", skip_all, fields(query=%query, unread=unread))]
 pub async fn set_read_status<'ctx>(
    nm: &Notmuch,
@ -510,7 +896,7 @@ pub async fn set_read_status<'ctx>(
        .iter()
        .filter(|uid| is_notmuch_thread_or_id(uid))
        .collect();
-    info!("set_read_status({} {:?})", unread, uids);
+    info!("set_read_status({unread} {uids:?})");
    for uid in uids {
        if unread {
            nm.tag_add("unread", uid)?;
@ -525,12 +911,21 @@ async fn photo_url_for_email_address(
    pool: &PgPool,
    addr: &str,
 ) -> Result<Option<String>, ServerError> {
-    let row =
-        sqlx::query_as::<_, (String,)>(include_str!("../sql/photo_url_for_email_address.sql"))
-            .bind(addr)
-            .fetch_optional(pool)
-            .await?;
-    Ok(row.map(|r| r.0))
+    let row = sqlx::query!(
+        r#"
+SELECT
+  url
+FROM email_photo ep
+JOIN email_address ea
+ON ep.id = ea.email_photo_id
+WHERE
+  address = $1
+    "#,
+        addr
+    )
+    .fetch_optional(pool)
+    .await?;
+    Ok(row.map(|r| r.url))
 }

 /*
@ -554,17 +949,20 @@ pub async fn label_unprocessed(
    use futures::StreamExt;
    let ids = nm.message_ids(query)?;
    info!(
-        "Processing {:?} of {} messages with '{}'",
-        limit,
-        ids.len(),
-        query
+        "Processing {limit:?} of {} messages with '{query}'",
+        ids.len()
    );
-    let rules: Vec<_> =
-        sqlx::query_as::<_, (Json<Rule>,)>(include_str!("../sql/label_unprocessed.sql"))
-            .fetch(pool)
-            .map(|r| r.unwrap().0 .0)
-            .collect()
-            .await;
+    let rules: Vec<_> = sqlx::query!(
+        r#"
+        SELECT rule as "rule: Json<Rule>"
+        FROM email_rule
+        ORDER BY sort_order
+        "#,
+    )
+    .fetch(pool)
+    .map(|r| r.unwrap().rule.0)
+    .collect()
+    .await;
    /*
        use letterbox_shared::{Match, MatchType};
        let rules = vec![Rule {
@ -585,11 +983,11 @@ pub async fn label_unprocessed(
    let mut add_mutations = HashMap::new();
    let mut rm_mutations = HashMap::new();
    for id in ids {
-        let id = format!("id:{}", id);
+        let id = format!("id:{id}");
        let files = nm.files(&id)?;
        // Only process the first file path is multiple files have the same id
        let Some(path) = files.iter().next() else {
-            error!("No files for message-ID {}", id);
+            error!("No files for message-ID {id}");
            let t = "Letterbox/Bad";
            nm.tag_add(t, &id)?;
            let t = "unprocessed";
@ -597,12 +995,12 @@ pub async fn label_unprocessed(
            continue;
        };
        let file = File::open(&path)?;
-        info!("parsing {}", path);
+        info!("parsing {path}");
        let mmap = unsafe { MmapOptions::new().map(&file)? };
        let m = match info_span!("parse_mail", path = path).in_scope(|| parse_mail(&mmap)) {
            Ok(m) => m,
            Err(err) => {
-                error!("Failed to parse {}: {}", path, err);
+                error!("Failed to parse {path}: {err}");
                let t = "Letterbox/Bad";
                nm.tag_add(t, &id)?;
                let t = "unprocessed";
@ -614,8 +1012,7 @@ pub async fn label_unprocessed(
        if matched_rule {
            if dryrun {
                info!(
-                    "\nAdd tags: {:?}\nTo: {} From: {} Subject: {}\n",
-                    add_tags,
+                    "\nAdd tags: {add_tags:?}\nTo: {} From: {} Subject: {}\n",
                    m.headers.get_first_value("to").expect("no from header"),
                    m.headers.get_first_value("from").expect("no from header"),
                    m.headers
@ -670,7 +1067,7 @@ pub async fn label_unprocessed(
    }
    info!("Adding {} distinct labels", add_mutations.len());
    for (tag, ids) in add_mutations.iter() {
-        info!("  {}: {}", tag, ids.len());
+        info!("  {tag}: {}", ids.len());
        if !dryrun {
            let ids: Vec<_> = ids.iter().map(|s| s.as_str()).collect();
            info_span!("tags_add", tag = tag, count = ids.len())
@ -679,7 +1076,7 @@ pub async fn label_unprocessed(
    }
    info!("Removing {} distinct labels", rm_mutations.len());
    for (tag, ids) in rm_mutations.iter() {
-        info!("  {}: {}", tag, ids.len());
+        info!("  {tag}: {}", ids.len());
        if !dryrun {
            let ids: Vec<_> = ids.iter().map(|s| s.as_str()).collect();
            info_span!("tags_remove", tag = tag, count = ids.len())
@ -695,7 +1092,7 @@ fn find_tags<'a, 'b>(rules: &'a [Rule], headers: &'b [MailHeader]) -> (bool, Has
    for rule in rules {
        for hdr in headers {
            if rule.is_match(&hdr.get_key(), &hdr.get_value()) {
-                //info!("Matched {:?}", rule);
+                //info!("Matched {rule:?}");
                matched_rule = true;
                add_tags.insert(rule.tag.as_str());
                if rule.stop_on_match {
@ -704,118 +1101,5 @@ fn find_tags<'a, 'b>(rules: &'a [Rule], headers: &'b [MailHeader]) -> (bool, Has
            }
        }
    }
-    (matched_rule, add_tags)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    const REPORT_V1: &str = r#"
-    {
-        "organization-name": "Google Inc.",
-        "date-range": {
-            "start-datetime": "2025-08-09T00:00:00Z",
-            "end-datetime": "2025-08-09T23:59:59Z"
-        },
-        "contact-info": "smtp-tls-reporting@google.com",
-        "report-id": "2025-08-09T00:00:00Z_xinu.tv",
-        "policies": [
-            {
-                "policy": {
-                    "policy-type": "sts",
-                    "policy-string": [
-                        "version: STSv1",
-                        "mode: testing",
-                        "mx: mail.xinu.tv",
-                        "max_age: 86400"
-                    ],
-                    "policy-domain": "xinu.tv"
-                },
-                "summary": {
-                    "total-successful-session-count": 20,
-                    "total-failure-session-count": 0
-                }
-            }
-        ]
-    }
-    "#;
-
-    // The following constants are kept for future test expansion, but are currently unused.
-    /*
-    const REPORT_V2: &str = r#"
-    {
-        "organization-name": "Google Inc.",
-        "date-range": {
-            "start-datetime": "2025-08-09T00:00:00Z",
-            "end-datetime": "2025-08-09T23:59:59Z"
-        },
-        "contact-info": "smtp-tls-reporting@google.com",
-        "report-id": "2025-08-09T00:00:00Z_xinu.tv",
-        "policies": [
-            {
-                "policy": {
-                    "policy-type": "sts",
-                    "policy-string": [
-                        "version: STSv1",
-                        "mode": "testing",
-                        "mx": "mail.xinu.tv",
-                        "max_age": "86400"
-                    ],
-                    "policy-domain": "xinu.tv",
-                    "mx-host": [
-                        "mail.xinu.tv"
-                    ]
-                },
-                "summary": {
-                    "total-successful-session-count": 3,
-                    "total-failure-session-count": 0
-                }
-            }
-        ]
-    }
-    "#;
-
-    const REPORT_V3: &str = r#"
-    {
-        "organization-name": "Google Inc.",
-        "date-range": {
-            "start-datetime": "2025-08-09T00:00:00Z",
-            "end-datetime": "2025-08-09T23:59:59Z"
-        },
-        "contact-info": "smtp-tls-reporting@google.com",
-        "report-id": "2025-08-09T00:00:00Z_xinu.tv",
-        "policies": [
-            {
-                "policy": {
-                    "policy-type": "sts",
-                    "policy-string": [
-                        "version: STSv1",
-                        "mode": "testing",
-                        "mx": "mail.xinu.tv",
-                        "max_age": "86400"
-                    ],
-                    "policy-domain": "xinu.tv",
-                    "mx-host": [
-                        {
-                            "hostname": "mail.xinu.tv",
-                            "failure-count": 0,
-                            "result-type": "success"
-                        }
-                    ]
-                },
-                "summary": {
-                    "total-successful-session-count": 3,
-                    "total-failure-session-count": 0
-                }
-            }
-        ]
-    }
-    "#;
-    */
-
-    #[test]
-    fn test_parse_tls_report_v1() {
-        let _report: TlsRpt = serde_json::from_str(REPORT_V1).unwrap();
-    }
+    return (matched_rule, add_tags);
 }
--- a/server/templates/dmarc_report.html
+++ b/server/templates/dmarc_report.html
@ -1,99 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>DMARC Report</title>
-</head>
-<body>
-    {% if report.report_metadata.is_some() %}
-        {% let meta = report.report_metadata.as_ref().unwrap() %}
-        <b>Reporter:</b> {{ meta.org_name }}<br>
-        <b>Contact:</b> {{ meta.email }}<br>
-        <b>Report ID:</b> {{ meta.report_id }}<br>
-        {% if meta.date_range.is_some() %}
-            {% let dr = meta.date_range.as_ref().unwrap() %}
-            <b>Date range:</b>
-            {{ dr.begin }}
-            to
-            {{ dr.end }}
-            <br>
-        {% endif %}
-    {% endif %}
-
-    {% if report.policy_published.is_some() %}
-        {% let pol = report.policy_published.as_ref().unwrap() %}
-        <b>Policy Published:</b>
-        <ul>
-            <li>Domain: {{ pol.domain }}</li>
-            <li>ADKIM: {{ pol.adkim }}</li>
-            <li>ASPF: {{ pol.aspf }}</li>
-            <li>Policy: {{ pol.p }}</li>
-            <li>Subdomain Policy: {{ pol.sp }}</li>
-            <li>Percent: {{ pol.pct }}</li>
-        </ul>
-    {% endif %}
-
-    {% if report.record.is_some() %}
-        <b>Records:</b>
-        <table style="border-collapse:collapse;width:100%;font-size:0.95em;">
-            <thead>
-                <tr style="background:#f0f0f0;">
-                    <th style="border:1px solid #bbb;padding:4px 8px;">Source IP</th>
-                    <th style="border:1px solid #bbb;padding:4px 8px;">Count</th>
-                    <th style="border:1px solid #bbb;padding:4px 8px;">Header From</th>
-                    {% if report.has_envelope_to %}
-                    <th style="border:1px solid #bbb;padding:4px 8px;">Envelope To</th>
-                    {% endif %}
-                    <th style="border:1px solid #bbb;padding:4px 8px;">Disposition</th>
-                    <th style="border:1px solid #bbb;padding:4px 8px;">DKIM</th>
-                    <th style="border:1px solid #bbb;padding:4px 8px;">SPF</th>
-                    <th style="border:1px solid #bbb;padding:4px 8px;">Auth Results</th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for rec in report.record.as_ref().unwrap() %}
-                    <tr>
-                        <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.source_ip }}</td>
-                        <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.count }}</td>
-                        <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.header_from }}</td>
-                        {% if report.has_envelope_to %}
-                        <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.envelope_to }}</td>
-                        {% endif %}
-                        <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.disposition }}</td>
-                        <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.dkim }}</td>
-                        <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.spf }}</td>
-                        <td style="border:1px solid #bbb;padding:4px 8px;">
-                            {% if rec.auth_results.is_some() %}
-                                {% let auth = rec.auth_results.as_ref().unwrap() %}
-                                {% for dkimres in auth.dkim %}
-                                        <span style="white-space:nowrap;">
-                                            DKIM: domain=<b>{{ dkimres.domain }}</b>
-                                            selector=<b>{{ dkimres.selector }}</b>
-                                            result=<b>{{ dkimres.result }}</b>
-                                        </span><br>
-                                    {% endfor %}
-
-                                {% for spfres in auth.spf %}
-                                        <span style="white-space:nowrap;">
-                                            SPF: domain=<b>{{ spfres.domain }}</b>
-                                            scope=<b>{{ spfres.scope }}</b>
-                                            result=<b>{{ spfres.result }}</b>
-                                        </span><br>
-                                    {% endfor %}
-
-                            {% for reason in rec.reason %}
-                                <span style="white-space:nowrap;">Reason: {{ reason }}</span><br>
-                            {% endfor %}
-
-                            {% endif %}
-                        </td>
-                    </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-    {% endif %}
-
-    {% if report.report_metadata.is_none() && report.policy_published.is_none() && report.record.is_none() %}
-        <p>No DMARC summary found.</p>
-    {% endif %}
-</body>
-</html>
--- a/server/templates/ical_summary.html
+++ b/server/templates/ical_summary.html
@ -1,109 +0,0 @@
-<style>
-    .ical-flex {
-        display: flex;
-        flex-direction: row;
-        flex-wrap: wrap;
-        align-items: stretch;
-        gap: 0.5em;
-        max-width: 700px;
-        width: 100%;
-    }
-
-    .ical-flex .summary-block {
-        flex: 1 1 0%;
-    }
-
-    .ical-flex .calendar-block {
-        flex: none;
-        margin-left: auto;
-    }
-
-    @media (max-width: 599px) {
-        .ical-flex {
-            flex-direction: column;
-        }
-
-        .ical-flex>div.summary-block {
-            margin-bottom: 0.5em;
-            margin-left: 0;
-        }
-
-        .ical-flex>div.calendar-block {
-            margin-left: 0;
-        }
-    }
-</style>
-<div class="ical-flex">
-    <div class="summary-block"
-        style="background:#f7f7f7; border-radius:8px; box-shadow:0 2px 8px #bbb; padding:16px 18px; margin:0 0 8px 0; min-width:220px; max-width:700px; font-size:15px; color:#222;">
-        <div
-            style="display: flex; flex-direction: row; flex-wrap: wrap; align-items: flex-start; gap: 0.5em; width: 100%;">
-            <div style="flex: 1 1 220px; min-width: 180px;">
-                <div style="font-size:17px; font-weight:bold; margin-bottom:8px; color:#333;"><b>Summary:</b> {{ summary
-                    }}</div>
-                <div style="margin-bottom:4px;"><b>Start:</b> {{ local_fmt_start }}</div>
-                <div style="margin-bottom:4px;"><b>End:</b> {{ local_fmt_end }}</div>
-                {% if !recurrence_display.is_empty() %}
-                <div style="margin-bottom:4px;">
-                    <b>Repeats:</b> {{ recurrence_display }}
-                </div>
-                {% endif %}
-                {% if !organizer_cn.is_empty() %}
-                <div style="margin-bottom:4px;"><b>Organizer:</b> {{ organizer_cn }}</div>
-                {% elif !organizer.is_empty() %}
-                <div style="margin-bottom:4px;"><b>Organizer:</b> {{ organizer }}</div>
-                {% endif %}
-            </div>
-            {% if all_days.len() > 0 %}
-            <div class="calendar-block" style="flex: none; margin-left: auto; min-width: 180px;">
-                <table class="ical-month"
-                    style="border-collapse:collapse; min-width:220px; background:#fff; box-shadow:0 2px 8px #bbb; font-size:14px; margin:0;">
-                    <caption
-                        style="caption-side:top; text-align:center; font-weight:bold; font-size:16px; padding-bottom:8px 0;">
-                        {{ caption }}</caption>
-                    <thead>
-                        <tr>
-                            {% for wd in ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"] %}
-                            <th
-                                style="padding:4px 6px; border-bottom:1px solid #ccc; color:#666; font-weight:600; background:#f7f7f7">
-                                {{ wd }}</th>
-                            {% endfor %}
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for week in all_days|batch(7) %}
-                        <tr>
-                            {% for day in week %}
-                            {% if event_days.contains(day) %}
-                            <td
-                                data-event-day="{{ day.format("%Y-%m-%d") }}"
-                                style="background:#ffd700; color:#222; font-weight:bold; border:1px solid #aaa; border-radius:4px; text-align:center;">
-                                {{ day.day() }}
-                            </td>
-                            {% elif today.is_some() && today.unwrap() == day %}
-                            <td
-                                style="border:2px solid #2196f3; border-radius:4px; text-align:center; background:#e3f2fd; color:#222; box-shadow:0 0 0 2px #2196f3;">
-                                {{ day.day() }}
-                            </td>
-                            {% else %}
-                            <td style="border:1px solid #eee; text-align:center;background:#f7f7f7;color:#bbb;">
-                                {{ day.day() }}
-                            </td>
-                            {% endif %}
-                            {% endfor %}
-                        </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-            {% endif %}
-        </div>
-    </div>
-</div>
-{% if !description_paragraphs.is_empty() %}
-<div style="max-width:700px; width:100%;">
-    {% for p in description_paragraphs %}
-    <p style="margin: 0 0 8px 0; color:#444;">{{ p }}</p>
-    {% endfor %}
-</div>
-{% endif %}
--- a/server/templates/tls_report.html
+++ b/server/templates/tls_report.html
@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title>TLS Report</title>
-</head>
-
-<body>
-    <h3>TLS Report Summary:</h3>
-    <p>Organization: {{ report.organization_name }}</p>
-    <p>Date Range: {{ report.date_range.start_datetime }} to {{ report.date_range.end_datetime }}</p>
-    <p>Contact: {{ report.contact_info }}</p>
-    <p>Report ID: {{ report.report_id }}</p>
-
-    <h4><b>Policies:</b></h4>
-    {% for policy in report.policies %}
-    <h5><b>Policy Domain:</b> {{ policy.policy.policy_domain }}</h5>
-    <ul>
-        <li><b>Policy Type:</b> {{ policy.policy.policy_type }}</li>
-        <li><b>Policy String:</b> {{ policy.policy.policy_string | join(", ") }}</li>
-        <li><b>Successful Sessions:</b> {{ policy.summary.total_successful_session_count }}</li>
-        <li><b>Failed Sessions:</b> {{ policy.summary.total_failure_session_count }}</li>
-    </ul>
-
-    <ul>
-        {% for mx_host in policy.policy.mx_host %}
-        <li><b>Hostname:</b> {{ mx_host.hostname }}, <b>Failures:</b> {{ mx_host.failure_count }}, <b>Result:</b> {{
-            mx_host.result_type }}</li>
-        {% endfor %}
-    </ul>
-
-    <ul>
-        {% for detail in policy.failure_details %}
-        <li><b>Result:</b> {{ detail.result_type }}, <b>Sending IP:</b> {{ detail.sending_mta_ip }}, <b>Failed
-                Sessions:</b> {{ detail.failed_session_count }}
-            {% if detail.failure_reason_code != "" %}
-            (<b>Reason:</b> {{ detail.failure_reason_code }})
-            {% endif %}
-        </li>
-        (<b>Receiving IP:</b> {{ detail.receiving_ip }})
-        (<b>Receiving MX:</b> {{ detail.receiving_mx_hostname }})
-        (<b>Additional Info:</b> {{ detail.additional_info }})
-        {% endfor %}
-    </ul>
-    {% endfor %}
-</body>
-
-</html>
--- a/server/testdata/dmarc-example-no-envelope-to.xml
+++ b/server/testdata/dmarc-example-no-envelope-to.xml
@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<feedback>
-    <version>1.0</version>
-    <report_metadata>
-        <org_name>google.com</org_name>
-        <email>noreply-dmarc-support@google.com</email>
-        <extra_contact_info>https://support.google.com/a/answer/2466580</extra_contact_info>
-        <report_id>5142106658860834914</report_id>
-        <date_range>
-            <begin>1755302400</begin>
-            <end>1755388799</end>
-        </date_range>
-    </report_metadata>
-    <policy_published>
-        <domain>xinu.tv</domain>
-        <adkim>s</adkim>
-        <aspf>s</aspf>
-        <p>quarantine</p>
-        <sp>reject</sp>
-        <pct>100</pct>
-        <np>reject</np>
-    </policy_published>
-    <record>
-        <row>
-            <source_ip>74.207.253.222</source_ip>
-            <count>1</count>
-            <policy_evaluated>
-                <disposition>none</disposition>
-                <dkim>pass</dkim>
-                <spf>pass</spf>
-            </policy_evaluated>
-        </row>
-        <identifiers>
-            <header_from>xinu.tv</header_from>
-        </identifiers>
-        <auth_results>
-            <dkim>
-                <domain>xinu.tv</domain>
-                <result>pass</result>
-                <selector>mail</selector>
-            </dkim>
-            <spf>
-                <domain>xinu.tv</domain>
-                <result>pass</result>
-            </spf>
-        </auth_results>
-    </record>
-</feedback>
--- a/server/testdata/dmarc-example.xml
+++ b/server/testdata/dmarc-example.xml
@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-<feedback xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <version>1.0</version>
-    <report_metadata>
-        <org_name>Outlook.com</org_name>
-        <email>dmarcreport@microsoft.com</email>
-        <report_id>e6c5a2ce6e074d7d8cd041a0d6f32a3d</report_id>
-        <date_range>
-            <begin>1755302400</begin>
-            <end>1755388800</end>
-        </date_range>
-    </report_metadata>
-    <policy_published>
-        <domain>xinu.tv</domain>
-        <adkim>s</adkim>
-        <aspf>s</aspf>
-        <p>quarantine</p>
-        <sp>reject</sp>
-        <pct>100</pct>
-        <fo>1</fo>
-    </policy_published>
-    <record>
-        <row>
-            <source_ip>74.207.253.222</source_ip>
-            <count>1</count>
-            <policy_evaluated>
-                <disposition>none</disposition>
-                <dkim>pass</dkim>
-                <spf>pass</spf>
-            </policy_evaluated>
-        </row>
-        <identifiers>
-            <envelope_to>msn.com</envelope_to>
-            <envelope_from>xinu.tv</envelope_from>
-            <header_from>xinu.tv</header_from>
-        </identifiers>
-        <auth_results>
-            <dkim>
-                <domain>xinu.tv</domain>
-                <selector>mail</selector>
-                <result>pass</result>
-            </dkim>
-            <spf>
-                <domain>xinu.tv</domain>
-                <scope>mfrom</scope>
-                <result>pass</result>
-            </spf>
-        </auth_results>
-    </record>
-    <record>
-        <row>
-            <source_ip>74.207.253.222</source_ip>
-            <count>1</count>
-            <policy_evaluated>
-                <disposition>none</disposition>
-                <dkim>pass</dkim>
-                <spf>pass</spf>
-            </policy_evaluated>
-        </row>
-        <identifiers>
-            <envelope_to>hotmail.com</envelope_to>
-            <envelope_from>xinu.tv</envelope_from>
-            <header_from>xinu.tv</header_from>
-        </identifiers>
-        <auth_results>
-            <dkim>
-                <domain>xinu.tv</domain>
-                <selector>mail</selector>
-                <result>pass</result>
-            </dkim>
-            <spf>
-                <domain>xinu.tv</domain>
-                <scope>mfrom</scope>
-                <result>pass</result>
-            </spf>
-        </auth_results>
-    </record>
-</feedback>
--- a/server/testdata/google-calendar-example-2.eml
+++ b/server/testdata/google-calendar-example-2.eml
@ -1,167 +0,0 @@
-Return-Path: <couchmoney+caf_=gmail=xinu.tv@gmail.com>
-Delivered-To: bill@xinu.tv
-Received: from phx.xinu.tv [74.207.253.222]
-	by nixos-01.h.xinu.tv with IMAP (fetchmail-6.5.1)
-	for <wathiede@localhost> (single-drop); Mon, 25 Aug 2025 14:29:47 -0700 (PDT)
-Received: from phx.xinu.tv
-	by phx.xinu.tv with LMTP
-	id TPD3E8vVrGjawyMAJR8clQ
-	(envelope-from <couchmoney+caf_=gmail=xinu.tv@gmail.com>)
-	for <bill@xinu.tv>; Mon, 25 Aug 2025 14:29:47 -0700
-X-Original-To: gmail@xinu.tv
-Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::12e; helo=mail-lf1-x12e.google.com; envelope-from=couchmoney+caf_=gmail=xinu.tv@gmail.com; receiver=xinu.tv 
-Authentication-Results: phx.xinu.tv;
-	dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20230601 header.b=4sz9KOqm
-Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e])
-	by phx.xinu.tv (Postfix) with ESMTPS id 2F9058B007
-	for <gmail@xinu.tv>; Mon, 25 Aug 2025 14:29:45 -0700 (PDT)
-Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-55f4969c95aso994593e87.0
-        for <gmail@xinu.tv>; Mon, 25 Aug 2025 14:29:45 -0700 (PDT)
-ARC-Seal: i=2; a=rsa-sha256; t=1756157384; cv=pass;
-        d=google.com; s=arc-20240605;
-        b=Y2CP7y9twLnWB5v8iyzZCw0vp33wQBS0qzltdtzX2NIWFhHu6MEp2XH8cONssaGrEN
-         kyjXajT7uaEpn6G8H6/NB9v9Vo2yk5Lq2f+RhODMYoocYs9YY9NJI4ZxMph0UeMO6RkQ
-         m+HH0iIeC2Mzgj1Bzq4qFEwb397YIijoxx+1RxyA2D3cwSuZtERSvFOEkHqv9ziWxBcD
-         u3tvySEuzjyQFU6bxfkax6sZljSRGzfj0iZJAl/Fw5tUgrhndQ55O5RDe4NfPNj0cw/3
-         XDELzsnepBgnW8Jpqpnh7iK6XMFSf4sPQmyiMCMDNVYtmm6hYFNo3/dOpgaPn/ImRr8j
-         d9lw==
-ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
-        h=to:from:subject:date:message-id:auto-submitted:reply-to
-         :mime-version:dkim-signature:delivered-to;
-        bh=RJDaNO07yMMdVMfY1VnSbfmQtoKb6bs6XzWwF6+91ZY=;
-        fh=xB02AmI2fnPF5rMnM90IwqQ6Il76V+xMgSnSW+E42fE=;
-        b=H7Ze4a8zoCYB77xcnUnFTogJ/utYS/USzTL/7eS3nA6OPbD+zWRiiVmbSfQcNK7d25
-         LapXyYnRJKgc8sqqQ6XO26STA8xx/9G620pdTytChIzKsmm/T5cdlf1M8DJ+NlwkzzSG
-         6Xe5I0MuXSKzBDMmcBcMlY9+mp61eZNo/cGT34MfZvLDS7JCs5uQYy2gRyajCKzRddEP
-         NBfMgnP1Ag9B5KkpJr4QfA2IWoNlj/qom/bRcdcdjwQ3gwDeiG8rdrEwBt9juwqk8d95
-         C0LnVKfrXAZgolmJpljyIFb1IMMyBUIQhK+7cXFhV1AD6Laz0df9gmPWp5mGZz9qlYaY
-         BqJA==;
-        darn=xinu.tv
-ARC-Authentication-Results: i=2; mx.google.com;
-       dkim=pass header.i=@google.com header.s=20230601 header.b=4sz9KOqm;
-       spf=pass (google.com: domain of 3odssaaoscuanoeqnnkpiuugcvvnguejqqnu.qtieqwejoqpgaiockn.eqo@calendar-server.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3OdSsaAoSCuANOEQNNKPIUUGCVVNGUEJQQNU.QTIEQWEJOQPGaIOCKN.EQO@calendar-server.bounces.google.com;
-       dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com;
-       dara=pass header.i=@gmail.com
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20230601; t=1756157384; x=1756762184;
-        h=to:from:subject:date:message-id:auto-submitted:reply-to
-         :mime-version:dkim-signature:delivered-to:x-forwarded-for
-         :x-forwarded-to:x-gm-message-state:from:to:cc:subject:date
-         :message-id:reply-to;
-        bh=RJDaNO07yMMdVMfY1VnSbfmQtoKb6bs6XzWwF6+91ZY=;
-        b=m95okwnmqNvW4GhCfY8yZvCu5NxuhHCL2+A54SlIrRudednXK05YGzjZ5LOuCAaY1g
-         htpRv2cGHBj2mEnHh+3GIX5vQCmXw2ptzOGzfYe9TwavuKPkkKPiSD5wA1fk8quqHDOD
-         4XDM7dsn3xewJ+6GQyc6NPBQq53hmpAojbLXnmNtAIyfAvuxtHP1G+GSO+ZIApgg56K6
-         TaYrwqnRx66P8B2Ze111LCdnmOOLzweJ1muYyavPdCtTG5BbJgqzaI67bQhuUNZDhVbP
-         FdtT4Q7WzNt30JHCVIAkkHejD9Fh/mYSmETXpD+ISvZJ47DNnLP4RXjmmAWcHJkKsh+q
-         v3QQ==
-X-Forwarded-Encrypted: i=2; AJvYcCUeIjyIxPoWuMqg9l5aomQv7Z9wLYkwDIS1FYz7bNmHs1Cs0CSHG8Y5B0iU/nlo9xRenTW/Xw==@xinu.tv
-X-Gm-Message-State: AOJu0Yznjr5TC7UpZJk74jrsJzMBwx6/39s9e5ufIA5/FmHZ6I1bEdTc
-	vqpeeLdzSZTI2uZiR7zzKHiwmNJHt/LncR9kDR5f0I6b3MZuXpAgr0aKYdXw7B+b+h7D7uMM3Tm
-	JF9ccf09JxIzRzeRI9Vb52PUs4SIeiIU9J80QY53UqN/Rx8XMF+ncRSX5d4V4pQ==
-X-Received: by 2002:a05:6512:110e:b0:55f:3bab:f204 with SMTP id 2adb3069b0e04-55f3babf35emr3087055e87.31.1756156987711;
-        Mon, 25 Aug 2025 14:23:07 -0700 (PDT)
-X-Forwarded-To: gmail@xinu.tv
-X-Forwarded-For: couchmoney@gmail.com gmail@xinu.tv
-Delivered-To: couchmoney@gmail.com
-Received: by 2002:a05:6504:6116:b0:2b8:eb6f:82ec with SMTP id i22csp44357ltt;
-        Mon, 25 Aug 2025 14:23:06 -0700 (PDT)
-X-Received: by 2002:a05:6e02:164e:b0:3ed:94a6:2edb with SMTP id e9e14a558f8ab-3ed94a63097mr41416195ab.21.1756156986122;
-        Mon, 25 Aug 2025 14:23:06 -0700 (PDT)
-ARC-Seal: i=1; a=rsa-sha256; t=1756156986; cv=none;
-        d=google.com; s=arc-20240605;
-        b=Nu0W/67J2nYqDAXf27QdfmUyuA6TGJwusKLaHRaE05YdEu/FWLfUk2ATV+g3iUQ19b
-         wh7awaA5kemxwiBqAy5kjjlXqlDrkK0Ow2fANdc6lRKvlRNJRYUnojMkP8w/v4Nv8YQj
-         Wci0HMhL4ni/yeqXeoaj1yKtwJU5MvRMxZZC7TinlCHKF5+MqgD8VNax8OTDOqxYvSDi
-         aIlyUBTial0AiP/K+3bsoIWEc2RoyBBBNIe88C4s1fcv17GCGn5RkN3lYtr+nwvp5wNE
-         fKxPCYMtXkNyv8jgjmgxKLcYBDK0B4Zo+ghMWXZneDWo3qotDVkr0GBC3J2N7BcZpjCA
-         XEDA==
-ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
-        h=to:from:subject:date:message-id:auto-submitted:reply-to
-         :mime-version:dkim-signature;
-        bh=RJDaNO07yMMdVMfY1VnSbfmQtoKb6bs6XzWwF6+91ZY=;
-        fh=mbzrMIWIgWMC0ni1xEx+ViW4J0RLAdLdPT2cX81nTlk=;
-        b=NvhrlkKGEVx63UMsx510U8ePUo7OgRQBWxZ4BIpQWg6Fk0jJPaZgRoEpUdZ747et1P
-         rWTx/yVaEUHBqWtt0I4ktiD8Hr4cVqAwKvtiN32JpkGCsVBjYBWqxEalWIOg6abn8xLE
-         7x9j4GqD/cQhd3DiS6UtADsJ67MjjzLpGkskvxo67vKRGCfSLCKdbna2LO5TtoZ7fKO7
-         i+dhDol6IIgA2Sg+PZlzq6gbZTaFbglUNI7uOwz0fNWjhHH4ZfmPEycYxJ9bTuPISrqS
-         BkXxGQFkvlg42NHWt5L8aPzrx8OMoYfTniIqU19GeEFEVUbmzYCg/twZ0f5nxugHWDbD
-         PMvQ==;
-        dara=google.com
-ARC-Authentication-Results: i=1; mx.google.com;
-       dkim=pass header.i=@google.com header.s=20230601 header.b=4sz9KOqm;
-       spf=pass (google.com: domain of 3odssaaoscuanoeqnnkpiuugcvvnguejqqnu.qtieqwejoqpgaiockn.eqo@calendar-server.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3OdSsaAoSCuANOEQNNKPIUUGCVVNGUEJQQNU.QTIEQWEJOQPGaIOCKN.EQO@calendar-server.bounces.google.com;
-       dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com;
-       dara=pass header.i=@gmail.com
-Received: from mail-sor-f73.google.com (mail-sor-f73.google.com. [209.85.220.73])
-        by mx.google.com with SMTPS id ca18e2360f4ac-886c8fc41ebsor461233039f.7.2025.08.25.14.23.05
-        for <couchmoney@gmail.com>
-        (Google Transport Security);
-        Mon, 25 Aug 2025 14:23:06 -0700 (PDT)
-Received-SPF: pass (google.com: domain of 3odssaaoscuanoeqnnkpiuugcvvnguejqqnu.qtieqwejoqpgaiockn.eqo@calendar-server.bounces.google.com designates 209.85.220.73 as permitted sender) client-ip=209.85.220.73;
-Authentication-Results: mx.google.com;
-       dkim=pass header.i=@google.com header.s=20230601 header.b=4sz9KOqm;
-       spf=pass (google.com: domain of 3odssaaoscuanoeqnnkpiuugcvvnguejqqnu.qtieqwejoqpgaiockn.eqo@calendar-server.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3OdSsaAoSCuANOEQNNKPIUUGCVVNGUEJQQNU.QTIEQWEJOQPGaIOCKN.EQO@calendar-server.bounces.google.com;
-       dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com;
-       dara=pass header.i=@gmail.com
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=google.com; s=20230601; t=1756156985; x=1756761785; dara=google.com;
-        h=to:from:subject:date:message-id:auto-submitted:reply-to
-         :mime-version:from:to:cc:subject:date:message-id:reply-to;
-        bh=RJDaNO07yMMdVMfY1VnSbfmQtoKb6bs6XzWwF6+91ZY=;
-        b=4sz9KOqmGGwObcaR0iSSMVeeMvZHqMzvY4cw++RddJd0V48WoyPPI5q1oMeGiVZ6fm
-         eEWVr8xH9/T1JUqUZXJHY6CPixN9nTpLvZlpikG1KOFv5+I5DNVX/O5i6M5C/yIPRVGv
-         ja0ygA7WTL48IkHV7+PTPwHmhF8zv1/BeNdko4BSywfql64J6NMM5RnOAejTIf5AR/IL
-         CW7H2IcmiOGBHfgMApQljg3wB+WgUel7RXZfMnHCbSlmynJ6bDJ4tq7uU16GLpnI6qAe
-         s9w8cOpFPiQk8uKEqdc682XxKlwqYdh07RWO/EdlZ8WeSoxMfU6YZL7c1s6xxK2c9sT7
-         8Xxg==
-X-Google-Smtp-Source: AGHT+IFJwttd47Uo06h0EKkogFtVf4poWcHfmodh4dZqSviwYROSgnnyI2ZJSibXGnOUHiLIfAwFn6KP9CzXMoyncWSb
-MIME-Version: 1.0
-X-Received: by 2002:a05:6602:14c9:b0:884:47f0:b89f with SMTP id
- ca18e2360f4ac-886bd0f2960mr1726062839f.3.1756156985586; Mon, 25 Aug 2025
- 14:23:05 -0700 (PDT)
-Reply-To: tconvertino@gmail.com
-Auto-Submitted: auto-generated
-Message-ID: <calendar-43033c42-cc1e-4014-a5e8-c4552d41247e@google.com>
-Date: Mon, 25 Aug 2025 21:23:05 +0000
-Subject: New event: McClure BLT @ Monthly from 7:30am to 8:30am on the second
- Thursday from Thu Sep 11 to Fri Jan 30, 2026 (PDT) (tconvertino@gmail.com)
-From: "lmcollings@seattleschools.org (Google Calendar)" <calendar-notification@google.com>
-To: couchmoney@gmail.com
-Content-Type: multipart/alternative; boundary="0000000000004bc1be063d372904"
-
--0000000000004bc1be063d372904
-Content-Type: text/plain; charset="UTF-8"; format=flowed; delsp=yes
-Content-Transfer-Encoding: base64
-
-TWNDbHVyZSBCTFQNCk1vbnRobHkgZnJvbSA3OjMwYW0gdG8gODozMGFtIG9uIHRoZSBzZWNvbmQg
-VGh1cnNkYXkgZnJvbSBUaHVyc2RheSBTZXAgMTEgIA0KdG8gRnJpZGF5IEphbiAzMCwgMjAyNg0K
-UGFjaWZpYyBUaW1lIC0gTG9zIEFuZ2VsZXMNCg0KTG9jYXRpb24NCk1jQ2x1cmUgTGlicmFyeQkN
-Cmh0dHBzOi8vd3d3Lmdvb2dsZS5jb20vbWFwcy9zZWFyY2gvTWNDbHVyZStMaWJyYXJ5P2hsPWVu
-DQoNCg0KDQpCTFQgd2lsbCBtZWV0IG9uIHRoZSAybmQgVGh1cnNkYXkgb2YgZXZlcnkgbW9udGgg
-dW50aWwgSmFudWFyeSB3aGVuIHdlICANCmJlZ2luIGxvb2tpbmcgYXQgYnVkZ2V0LiBBZGRpdGlv
-bmFsIG1lZXRpbmdzIG1heSBhbHNvIGJlIHNjaGVkdWxlZCBlYXJsaWVyICANCmlmIG5lZWRlZC4N
-ClRoYW5rcywNCk1jQ2x1cmUgQkxUDQoNCg0KDQpPcmdhbml6ZXINCmxtY29sbGluZ3NAc2VhdHRs
-ZXNjaG9vbHMub3JnDQpsbWNvbGxpbmdzQHNlYXR0bGVzY2hvb2xzLm9yZw0KDQpHdWVzdHMNCmxt
-Y29sbGluZ3NAc2VhdHRsZXNjaG9vbHMub3JnIC0gb3JnYW5pemVyDQp0Y29udmVydGlub0BnbWFp
-bC5jb20gLSBjcmVhdG9yDQptYW5kcy5hbmRydXNAZ21haWwuY29tDQphbXNjaHVtZXJAc2VhdHRs
-ZXNjaG9vbHMub3JnDQphcGplbm5pbmdzQHNlYXR0bGVzY2hvbHMub3JnDQpsbWJsYXVAc2VhdHRs
-ZXNjaG9vbHMub3JnDQptbmxhbmRpc0BzZWF0dGxlc2Nob29scy5vcmcNCnRtYnVyY2hhcmR0QHNl
-YXR0bGVzY2hvb2xzLm9yZw0KbWNjbHVyZWFsbHN0YWZmQHNlYXR0bGVzY2hvbHMub3JnIC0gb3B0
-aW9uYWwNClZpZXcgYWxsIGd1ZXN0IGluZm8gIA0KaHR0cHM6Ly9jYWxlbmRhci5nb29nbGUuY29t
-L2NhbGVuZGFyL3I/ZWlkPVh6WXdjVE13WXpGbk5qQnZNekJsTVdrMk1HODBZV016WnpZd2NtbzRa
-M0JzT0RoeWFqSmpNV2c0TkhNelpHZzVae1l3Y3pNd1l6Rm5OakJ2TXpCak1XYzNORG96T0dkb2Fq
-WXhNR3RoWjNFeE5qUnhhemhuY0djMk5HOHpNR014WnpZd2J6TXdZekZuTmpCdk16QmpNV2MyTUc4
-ek1tTXhaell3YnpNd1l6Rm5PR2R4TTJGalNXODNOSUF6YVdReGJUY3hNbXBqWkRGck5qVXhNamhq
-TVcwM01USnFNbWRvYnpnMGN6TTJaSEJwTmprek1DQjBZMjl1ZG1WeWRHbHViMEJ0JmVzPTENCg0K
-fn4vL35+DQpJbnZpdGF0aW9uIGZyb20gR29vZ2xlIENhbGVuZGFyOiBodHRwczovL2NhbGVuZGFy
-Lmdvb2dsZS5jb20vY2FsZW5kYXIvDQoNCllvdSBhcmUgcmVjZWl2aW5nIHRoaXMgZW1haWwgYmVj
-YXVzZSB5b3UgYXJlIHN1YnNjcmliZWQgdG8gY2FsZW5kYXIgIA0Kbm90aWZpY2F0aW9ucy4gVG8g
-c3RvcCByZWNlaXZpbmcgdGhlc2UgZW1haWxzLCBnbyB0byAgDQpodHRwczovL2NhbGVuZGFyLmdv
-b2dsZS5jb20vY2FsZW5kYXIvci9zZXR0aW5ncywgc2VsZWN0IHRoaXMgY2FsZW5kYXIsIGFuZCANCmNoYW5nZSAiT3RoZXIgbm90aWZpY2F0aW9ucyIuDQoNCkZvcndhcmRpbmcgdGhpcyBpbnZp
-dGF0aW9uIGNvdWxkIGFsbG93IGFueSByZWNpcGllbnQgdG8gc2VuZCBhIHJlc3BvbnNlIHRvICAN
-CnRoZSBvcmdhbml6ZXIsIGJlIGFkZGVkIHRvIHRoZSBndWVzdCBsaXN0LCBpbnZpdGUgb3RoZXJz
-IHJlZ2FyZGxlc3Mgb2YgIA0KdGhlaXIgb3duIGludml0YXRpb24gc3RhdHVzLCBvciBtb2RpZnkg
-eW91ciBSU1ZQLg0KDQpMZWFybiBtb3JlIGh0dHBzOi8vc3VwcG9ydC5nb29nbGUuY29tL2NhbGVu
-ZGFyL2Fuc3dlci8zNzEzNSNmb3J3YXJkaW5nDQo=
--0000000000004bc1be063d372904--
--- a/server/testdata/google-calendar-example-3.eml
+++ b/server/testdata/google-calendar-example-3.eml
@ -1,206 +0,0 @@
-Return-Path: <couchmoney+caf_=gmail=xinu.tv@gmail.com>
-Delivered-To: bill@xinu.tv
-Received: from phx.xinu.tv [74.207.253.222]
-	by nixos-01.h.xinu.tv with IMAP (fetchmail-6.5.1)
-	for <wathiede@localhost> (single-drop); Thu, 28 Aug 2025 12:11:15 -0700 (PDT)
-Received: from phx.xinu.tv
-	by phx.xinu.tv with LMTP
-	id 1gVrANOpsGg9TSQAJR8clQ
-	(envelope-from <couchmoney+caf_=gmail=xinu.tv@gmail.com>)
-	for <bill@xinu.tv>; Thu, 28 Aug 2025 12:11:15 -0700
-X-Original-To: gmail@xinu.tv
-Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::230; helo=mail-lj1-x230.google.com; envelope-from=couchmoney+caf_=gmail=xinu.tv@gmail.com; receiver=xinu.tv 
-Authentication-Results: phx.xinu.tv;
-	dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20230601 header.b=RjBRlfFL;
-	dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=HaiL0lRL
-Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230])
-	by phx.xinu.tv (Postfix) with ESMTPS id B4E848B007
-	for <gmail@xinu.tv>; Thu, 28 Aug 2025 12:11:13 -0700 (PDT)
-Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-336a85b8fc5so8142611fa.3
-        for <gmail@xinu.tv>; Thu, 28 Aug 2025 12:11:13 -0700 (PDT)
-ARC-Seal: i=2; a=rsa-sha256; t=1756408272; cv=pass;
-        d=google.com; s=arc-20240605;
-        b=Nq93fJSEgPuxWsaf3dc6cCKbOP/bXMQJfmuZJBvrid99GipahJY/Ka4SGoLc8HBMH2
-         Ip9YDLG2Lblqz/N1KOud9gnAmQ6Zg4hfPZGvhUfCGaXbCi2lOhRlfx6QM0lM1B8rAXaA
-         S3Lt2qFFXrVBlvaJePwI+wVpc1wPbvd5PblaaUTYUVJeYSfdPtgNAy0Aehty9TF0Jo2h
-         9yrzCWMJ6kMTpsDw7sfDSnv7s43Q3jOPzXDjHdJfrK8aUXGQenwT+1acJkIw78wBFt3R
-         IG5CBLIKmwDpjquJzRPkEjHiNDRxhaKaCShTCVLTjmrYgbHXPM/gUewaKLfeIuTzOVuA
-         mnkw==
-ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
-        h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
-         :mime-version:dkim-signature:dkim-signature:delivered-to;
-        bh=lgr/fFBrye/qM438Us9TAp1/DYWNuYxn2NUL4vzX/SU=;
-        fh=twOWSYT+4sbeBuT1oeA5xzauBIj0SLZH5qI1YanOQio=;
-        b=FBstDUezbqJRRRxTwlKY4UXNSJ4z9aZdvb9KOlxXfFLCzUh3r5w+9P4+a/uH1Uw65g
-         xbxzPRgMduPWgKDAweqXk9SGX3mjqF0oyd5yhGTiU/jpHg6ZLXf//g45zJqRjfMnRi8I
-         vbEEAxUKyhPfbrQ8/byfq/isJHFiR0Vjr2U0HOqcctRgCTfrZr1b14jRVopjVqhk37ef
-         KapCbmTbBLznJLQH6jfi4LvKpSlJDW6l7R/CC4WtAzgcmHyA9nfjM4+egLg15giMpn3a
-         549c+jYBFgsjblhmyFw05dGSpUvP+jJeKTcFnlZe6yU7Qjnqhs6TlV/Jm8HAkPH1zdS5
-         XDAw==;
-        darn=xinu.tv
-ARC-Authentication-Results: i=2; mx.google.com;
-       dkim=pass header.i=@google.com header.s=20230601 header.b=RjBRlfFL;
-       dkim=pass header.i=@gmail.com header.s=20230601 header.b=HaiL0lRL;
-       spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com;
-       dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
-       dara=pass header.i=@gmail.com
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20230601; t=1756408272; x=1757013072;
-        h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
-         :mime-version:dkim-signature:dkim-signature:delivered-to
-         :x-forwarded-for:x-forwarded-to:x-gm-message-state:from:to:cc
-         :subject:date:message-id:reply-to;
-        bh=lgr/fFBrye/qM438Us9TAp1/DYWNuYxn2NUL4vzX/SU=;
-        b=VJaqGIpPE1gxGhbAl1Np3yZR/0QPEs/C6KtFdnsaH9ubxFrDOeF4uIygqAUN9YFmll
-         YZsN4G0iexB097atKRIXLrreE3pH3cOY56ym94fWRZGythS0MRZlw40QoHLLf3joTC6D
-         WHtaNcea0hO3V6l/6gKlOffJ/cv2GnyPi0Sv7neOC5v18VTxZwZn+Wp+pTPpWFcmvQ4J
-         IMSV0vNgIRrYJaItUt1d59B9Ah+0bcyd7jJ0TDRVvN97S8iSlSIw6NMwxjZMuyJSWO7X
-         5zm8xA+H+L8+pLMmGKfdBYxhNo/ibdwda+w/ECKIjdnFtbreGbYLsUnkLdPeumQ6LXs/
-         Q2mg==
-X-Forwarded-Encrypted: i=2; AJvYcCXpJ2X9EF2q2d4efhhe9B8o7LcuPPe25tZZwgkhfxerDzSbY0obB8Eik41xltO5i7k4ANaJKQ==@xinu.tv
-X-Gm-Message-State: AOJu0Yz5+coY8ftW9IS5OD7ZbkwXnD43Mcp5BZjn5I2cv4v+u+ilxOi+
-	0DKABW1HVFh3MqQ/Z9nU+svpDl4kHa5lTr5siCXHTf0Wpo4LT3UsILyLUvwua0tsx9da14Gl6Fb
-	R1xVSmax6VR4PgZzrnOKZZx1x1re2RaTFGMAaA0Ei5ua3bZpn8axccwggYc94Jw==
-X-Received: by 2002:a2e:a984:0:b0:336:7b24:2af7 with SMTP id 38308e7fff4ca-3367b242dd2mr36540291fa.17.1756408271464;
-        Thu, 28 Aug 2025 12:11:11 -0700 (PDT)
-X-Forwarded-To: gmail@xinu.tv
-X-Forwarded-For: couchmoney@gmail.com gmail@xinu.tv
-Delivered-To: couchmoney@gmail.com
-Received: by 2002:a05:6504:955:b0:2b8:eb6f:82ec with SMTP id k21csp1133490lts;
-        Thu, 28 Aug 2025 12:11:10 -0700 (PDT)
-X-Received: by 2002:a05:6602:3c3:b0:86d:9ec7:267e with SMTP id ca18e2360f4ac-886bd155520mr3955796839f.4.1756408269941;
-        Thu, 28 Aug 2025 12:11:09 -0700 (PDT)
-ARC-Seal: i=1; a=rsa-sha256; t=1756408269; cv=none;
-        d=google.com; s=arc-20240605;
-        b=Gvk+jquchLt+hySEph55datOhigiuAMXW4mgi5vTVp51rzJ7PB+rH7vx23tj1QAB+0
-         RIOZTaB67H8yFXwAUNZWd1GMnpocZR+tI4bMxbKzDYd7zgaTzSSa2InDROhqOhHqBpX8
-         eWD23F+xRon/qEYQd0YEjZVt20WvKzpvjbpvCyWpq7Z4y376KoJArxsspsKZlALrCfKq
-         cyt9B/EKr3ZmAzRiswiH7KY/iHd1qYgtYy0tYGNtjU0nZ+5fK/tVlw+lJuLtt+aA+ZCy
-         o5y8Y5/thdSJsT159u+bV5eICZWC5kGnztNsXg0Nr2H22XzUC1epWZvJkZW2j+SXQm5k
-         Wdew==
-ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
-        h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
-         :mime-version:dkim-signature:dkim-signature;
-        bh=lgr/fFBrye/qM438Us9TAp1/DYWNuYxn2NUL4vzX/SU=;
-        fh=mbzrMIWIgWMC0ni1xEx+ViW4J0RLAdLdPT2cX81nTlk=;
-        b=hra/E01IWuIFrWtk3uTcoj04apbHeQcQBSINqYDpr3cO7rXknIvpeXoWLvk0EIJI5y
-         syt60ekwVnsX/qb2F1HbN896dm97QrEGIwAiJyN2oTFauLoYObpcuhPS317hU4+YubO+
-         RLUntXsPK2qiifmPCOMPD6wACQB9YXpOPHrrl5x/yZlria1Tfg3XQcZIYsWcU/Qil94x
-         GtK+i82uzPXEQ0fVieEgJaZtmrW7OFEpPjd1KGp6sYtGvOxUfxVKl5MhLrCqfcLN9fd7
-         Xren0S32b/IsZA8ASdFca3CNjaAL2Ajlatb39XN17txnKrpQje/ReiVkm9wwo194NwCp
-         3dfQ==;
-        dara=google.com
-ARC-Authentication-Results: i=1; mx.google.com;
-       dkim=pass header.i=@google.com header.s=20230601 header.b=RjBRlfFL;
-       dkim=pass header.i=@gmail.com header.s=20230601 header.b=HaiL0lRL;
-       spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com;
-       dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
-       dara=pass header.i=@gmail.com
-Received: from mail-sor-f73.google.com (mail-sor-f73.google.com. [209.85.220.73])
-        by mx.google.com with SMTPS id ca18e2360f4ac-88711b2248fsor90547939f.5.2025.08.28.12.11.09
-        for <couchmoney@gmail.com>
-        (Google Transport Security);
-        Thu, 28 Aug 2025 12:11:09 -0700 (PDT)
-Received-SPF: pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) client-ip=209.85.220.73;
-Authentication-Results: mx.google.com;
-       dkim=pass header.i=@google.com header.s=20230601 header.b=RjBRlfFL;
-       dkim=pass header.i=@gmail.com header.s=20230601 header.b=HaiL0lRL;
-       spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com;
-       dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
-       dara=pass header.i=@gmail.com
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=google.com; s=20230601; t=1756408269; x=1757013069; dara=google.com;
-        h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
-         :mime-version:from:to:cc:subject:date:message-id:reply-to;
-        bh=lgr/fFBrye/qM438Us9TAp1/DYWNuYxn2NUL4vzX/SU=;
-        b=RjBRlfFLVsAeeTCwo5Z3c1Y5G+pvz4XSTyHiVKUHmxClmpM30ZeHTVLl36njuM/7rx
-         mFwbzGk80zXgGpZyc7qnhSIVxXeMv4iex2UIc1D7Rcw3CF4q/HPlulcD9uVnsxRvng5Z
-         6PVcBQH3qGn0zvDDb0QHEcuDed4sNd/4wkYMOchxlp1TfdrbMZdCI+EXwTyvGgbVjd+/
-         erPyF5JZL/UJx7+gWoXSE7yJkPQrKYiv4LApu0STV4iSOEL8XsTQ4nZiZHSLeeKr0y7w
-         TUWhjfOCgD/YTZW5PTuFBW+lI03Ny19iGHbQNwKrLLcGwW7TJ2PYBR90vsIfaJtG5RM6
-         MP1w==
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20230601; t=1756408269; x=1757013069; dara=google.com;
-        h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
-         :mime-version:from:to:cc:subject:date:message-id:reply-to;
-        bh=lgr/fFBrye/qM438Us9TAp1/DYWNuYxn2NUL4vzX/SU=;
-        b=HaiL0lRLeUjb1Rw8g5U5npEElUjhuKY2dPzOaldvum7ZqfY26X35u8SQTxCXWcSsGp
-         RKrlHykB6fjjPSjSGBB+uKe98anrorlvgkhUluES0LzmAZ6STVlPUfPHb/RreJQ7Ol1r
-         N7oNIEg5EnGia1g6rWliSMHY7Fb4sQzMaS2P+qhtq0OFzB6F57atJAwTUWaspDHycfdh
-         S8ji+q7DEiLq1LfXIxj+WwenT/iRFIJsfmvXsHgQiKMoYGdENfAGZPdo7W0sTEK3TkWz
-         xFOny/4bQmx/49F4C1HnLsHoBi0j6sezIQsc+U83vvChFXXrELQrK5PiJL+UOCLZo48R
-         RJDQ==
-X-Google-Smtp-Source: AGHT+IG3ta6ofCYBa0SfJ7K3lq1EjsCnjr+BZDRz/SVLQfyo54CcUFgE5iTTB5E+h//QXT9iTojhKpMp6QZ4QB+5HAcs
-MIME-Version: 1.0
-X-Received: by 2002:a05:6602:1544:b0:887:6a2:6054 with SMTP id
- ca18e2360f4ac-88706a263famr584022039f.9.1756408269509; Thu, 28 Aug 2025
- 12:11:09 -0700 (PDT)
-Reply-To: tconvertino@gmail.com
-Sender: Google Calendar <calendar-notification@google.com>
-Auto-Submitted: auto-generated
-Message-ID: <calendar-8ecdd8ef-29ed-4f61-857d-1215ab585aba@google.com>
-Date: Thu, 28 Aug 2025 19:11:09 +0000
-Subject: New event: Dentist appt @ Tue Sep 23, 2025 3pm - 4pm (PDT) (tconvertino@gmail.com)
-From: tconvertino@gmail.com
-To: couchmoney@gmail.com
-Content-Type: multipart/alternative; boundary="000000000000fc1bff063d71aa4b"
-X-Spamd-Result: default: False [-0.80 / 15.00];
-	ARC_ALLOW(-1.00)[google.com:s=arc-20240605:i=2];
-	URI_COUNT_ODD(1.00)[1];
-	DMARC_POLICY_ALLOW(-0.50)[gmail.com,none];
-	R_DKIM_ALLOW(-0.20)[google.com:s=20230601,gmail.com:s=20230601];
-	R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36];
-	MIME_BASE64_TEXT(0.10)[];
-	MANY_INVISIBLE_PARTS(0.10)[2];
-	MIME_GOOD(-0.10)[multipart/alternative,text/plain];
-	FREEMAIL_TO(0.00)[gmail.com];
-	RCVD_COUNT_THREE(0.00)[3];
-	FORGED_SENDER(0.00)[tconvertino@gmail.com,couchmoney@gmail.com];
-	FROM_NEQ_ENVFROM(0.00)[tconvertino@gmail.com,couchmoney@gmail.com];
-	MIME_TRACE(0.00)[0:+,1:+,2:~];
-	FREEMAIL_ENVFROM(0.00)[gmail.com];
-	RCPT_COUNT_ONE(0.00)[1];
-	FREEMAIL_REPLYTO(0.00)[gmail.com];
-	FREEMAIL_FROM(0.00)[gmail.com];
-	URIBL_BLOCKED(0.00)[mail-lj1-x230.google.com:rdns,mail-lj1-x230.google.com:helo];
-	TAGGED_FROM(0.00)[caf_=gmail=xinutv];
-	HAS_REPLYTO(0.00)[tconvertino@gmail.com];
-	NEURAL_HAM(-0.00)[-0.995];
-	FWD_GOOGLE(0.00)[couchmoney@gmail.com];
-	TO_DN_NONE(0.00)[];
-	FORGED_SENDER_FORWARDING(0.00)[];
-	RCVD_TLS_LAST(0.00)[];
-	TO_DOM_EQ_FROM_DOM(0.00)[];
-	FROM_NO_DN(0.00)[];
-	ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US];
-	DKIM_TRACE(0.00)[google.com:+,gmail.com:+];
-	MISSING_XM_UA(0.00)[];
-	REPLYTO_EQ_FROM(0.00)[]
-X-Rspamd-Server: phx
-X-Rspamd-Action: no action
-X-Rspamd-Queue-Id: B4E848B007
-X-TUID: eMNiZ49uiDPB
-
--000000000000fc1bff063d71aa4b
-Content-Type: text/plain; charset="UTF-8"; format=flowed; delsp=yes
-Content-Transfer-Encoding: base64
-
-RGVudGlzdCBhcHB0DQpUdWVzZGF5IFNlcCAyMywgMjAyNSDii4UgM3BtIOKAkyA0cG0NClBhY2lm
-aWMgVGltZSAtIExvcyBBbmdlbGVzDQoNCg0KDQpPcmdhbml6ZXINCnRjb252ZXJ0aW5vQGdtYWls
-LmNvbQ0KdGNvbnZlcnRpbm9AZ21haWwuY29tDQoNCn5+Ly9+fg0KSW52aXRhdGlvbiBmcm9tIEdv
-b2dsZSBDYWxlbmRhcjogaHR0cHM6Ly9jYWxlbmRhci5nb29nbGUuY29tL2NhbGVuZGFyLw0KDQpZ
-b3UgYXJlIHJlY2VpdmluZyB0aGlzIGVtYWlsIGJlY2F1c2UgeW91IGFyZSBzdWJzY3JpYmVkIHRv
-IGNhbGVuZGFyICANCm5vdGlmaWNhdGlvbnMuIFRvIHN0b3AgcmVjZWl2aW5nIHRoZXNlIGVtYWls
-cywgZ28gdG8gIA0KaHR0cHM6Ly9jYWxlbmRhci5nb29nbGUuY29tL2NhbGVuZGFyL3Ivc2V0dGlu
-Z3MsIHNlbGVjdCB0aGlzIGNhbGVuZGFyLCBhbmQgIA0KY2hhbmdlICJPdGhlciBub3RpZmljYXRp
-b25zIi4NCg0KRm9yd2FyZGluZyB0aGlzIGludml0YXRpb24gY291bGQgYWxsb3cgYW55IHJlY2lw
-aWVudCB0byBzZW5kIGEgcmVzcG9uc2UgdG8gIA0KdGhlIG9yZ2FuaXplciwgYmUgYWRkZWQgdG8g
-dGhlIGd1ZXN0IGxpc3QsIGludml0ZSBvdGhlcnMgcmVnYXJkbGVzcyBvZiAgDQp0aGVpciBvd24g
-aW52aXRhdGlvbiBzdGF0dXMsIG9yIG1vZGlmeSB5b3VyIFJTVlAuDQoNCkxlYXJuIG1vcmUgaHR0
-cHM6Ly9zdXBwb3J0Lmdvb2dsZS5jb20vY2FsZW5kYXIvYW5zd2VyLzM3MTM1I2ZvcndhcmRpbmcN
-Cg==
--000000000000fc1bff063d71aa4b
-Content-Type: text/html; charset="UTF-8"
-Content-Transfer-Encoding: quoted-printable
-
-<!doctype html><html xmlns=3D"http://www.w3.org/1999/xhtml" xmlns:v=3D"urn:="...truncated for brevity...
--- a/server/testdata/google-calendar-example-thursday.eml
+++ b/server/testdata/google-calendar-example-thursday.eml
@ -1,175 +0,0 @@
-Return-Path: <couchmoney+caf_=gmail=xinu.tv@gmail.com>
-Delivered-To: bill@xinu.tv
-Received: from phx.xinu.tv [74.207.253.222]
-	by nixos-01.h.xinu.tv with IMAP (fetchmail-6.5.1)
-	for <wathiede@localhost> (single-drop); Thu, 11 Sep 2025 12:27:35 -0700 (PDT)
-Received: from phx.xinu.tv
-	by phx.xinu.tv with LMTP
-	id CqRrBqciw2hiKicAJR8clQ
-	(envelope-from <couchmoney+caf_=gmail=xinu.tv@gmail.com>)
-	for <bill@xinu.tv>; Thu, 11 Sep 2025 12:27:35 -0700
-X-Original-To: gmail@xinu.tv
-Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::130; helo=mail-lf1-x130.google.com; envelope-from=couchmoney+caf_=gmail=xinu.tv@gmail.com; receiver=xinu.tv 
-Authentication-Results: phx.xinu.tv;
-	dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20230601 header.b=dc+iKaXd;
-	dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=kf8o8wAd
-Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130])
-	by phx.xinu.tv (Postfix) with ESMTPS id D7E2D80037
-	for <gmail@xinu.tv>; Thu, 11 Sep 2025 12:27:33 -0700 (PDT)
-Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-55f716e25d9so1141446e87.1
-        for <gmail@xinu.tv>; Thu, 11 Sep 2025 12:27:33 -0700 (PDT)
-ARC-Seal: i=2; a=rsa-sha256; t=1757618852; cv=pass;
-        d=google.com; s=arc-20240605;
-        b=MZ+1JfQuPR9luCCxiZNUeqSEpjt1vLuM3bTRCaal/W0NBxkCH0y5v9WfPR0KJ2BPb1
-         Rtnt/5ayDtmsLf8l6yTTVsBlFYW70ehqXWMD10MMcDEMvnib4KKDAacGaSmijAK4cYGq
-         FOU9CGNY986OMXMk54TD9NF3fkKDIKcAoh81D6at5/DE3Puuxofq0vZmtmVqQBNKG169
-         REkhcDpkXTMs/4rJpmZwXp2HbjD84avusBwSlYIQUWsBgO4g7THHjoR4Uk56cek9aEds
-         ip8IkTO6KRFe6u8FebQsZ/Q9sSAK3pheMExWFVMha9Y0XhACVOZiV600zRCPS9MNHhYw
-         XEaA==
-ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
-        h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
-         :mime-version:dkim-signature:dkim-signature:delivered-to;
-        bh=mVNsDGUAhSGrAIoTy8PIfvCBxBB4yaBy/VZH8i3gPl4=;
-        fh=WnbwIlqFRbBot/H7TyqablNBDgXRuegsgjC3piothTI=;
-        b=aYMo5f7VI2b4CiAvLELRJ9zM3dF7ZH8FEqmoAtCcfPHrT9kLLCnriuyXG1R6sC3eoR
-         ++boT29xoScVroIlfcI77Ty7N5X1fawOABkVDWWt7z5w4WhiesT0klxw5nINj9hnLBiK
-         22nrMevpRpFtmuDO7cle78lSAFZoZuyv+aXCK9RnLKvIm2JuXRrvU8LivxbbpNB4gNl0
-         hE1jsGuZm1SOJ54SRLwwa4HpSiOJV2x2txTtPCzmvE/LZvNESPjfi3Y2u7gaR87OzkNs
-         gNi5Xoc+D908zBsmcYKpUYiQcPL79s3DfNwYFIs/rR8Z2xgaHbFD/YmqRUmCEeNLv7o2
-         RR8g==;
-        darn=xinu.tv
-ARC-Authentication-Results: i=2; mx.google.com;
-       dkim=pass header.i=@google.com header.s=20230601 header.b=dc+iKaXd;
-       dkim=pass header.i=@gmail.com header.s=20230601 header.b=kf8o8wAd;
-       spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com;
-       dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
-       dara=pass header.i=@gmail.com
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20230601; t=1757618852; x=1758223652;
-        h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
-         :mime-version:dkim-signature:dkim-signature:delivered-to
-         :x-forwarded-for:x-forwarded-to:x-gm-message-state:from:to:cc
-         :subject:date:message-id:reply-to;
-        bh=mVNsDGUAhSGrAIoTy8PIfvCBxBB4yaBy/VZH8i3gPl4=;
-        b=GKJkb+LmE79XIMEhHRvoCodKS+GBTOCShzMe06Q+zKxUZFHi6XMg8GqteuXQO9LVbw
-         nPUVN4QO2Hvqch0xzjbc0ryyMOD0u7HqpDUAEZCzamFXIfsX6hZXKLhFqy4YomtsG3os
-         TCOWBGLqwu7KalfOVg2p+csOR68i0mGyBII1sKcL9vUv9kIQJZxQKHGkuIc48cf6tbUB
-         L+mkVbMwXLSbpuTJszPmIVZV5o0K52KN+2QoLcmXGfw0mUOnjNI0oSovdbPg4SSDZ3cw
-         iIsC9vjvtCSFS3pf+Fp807s+Zjh5P6xeSxGU57qhC+HT9kTzIioh5EqKnGqcskDTqrI1
-         uCiQ==
-X-Forwarded-Encrypted: i=2; AJvYcCUfSSA2sT31daRt2+W7dAD9YPx1gqa4JFpVuqCtxVtjqbKfKhOX/EcDQiECQ4BEWjmAP+IqTQ==@xinu.tv
-X-Gm-Message-State: AOJu0Ywn7D0BjTaGiM/UFG0WhGuyYGfpLijg+ouhrOaGZzSREyTcRa37
-	XA3bzQ/LKTpzWhhh01GMwnigmELbWdIVr/BeRLVCuJdh+m+JBMgnAjBTIDs9RF3/xfR7rpG7VOB
-	6k+ugF+8QRKB4BcL2t8MvfJD03CkrzuhhvUtFTRHopcSZrkqzh8GOJayq42VveQ==
-X-Received: by 2002:a05:6512:3b24:b0:55f:6580:818c with SMTP id 2adb3069b0e04-57050fe2fa3mr165340e87.46.1757618851553;
-        Thu, 11 Sep 2025 12:27:31 -0700 (PDT)
-X-Forwarded-To: gmail@xinu.tv
-X-Forwarded-For: couchmoney@gmail.com gmail@xinu.tv
-Delivered-To: couchmoney@gmail.com
-Received: by 2002:a05:6504:d09:b0:2c3:f6c4:ad72 with SMTP id c9csp3388833lty;
-        Thu, 11 Sep 2025 12:27:29 -0700 (PDT)
-X-Received: by 2002:a05:6602:36ce:b0:889:b536:779b with SMTP id ca18e2360f4ac-8903378d714mr78653239f.7.1757618849269;
-        Thu, 11 Sep 2025 12:27:29 -0700 (PDT)
-ARC-Seal: i=1; a=rsa-sha256; t=1757618849; cv=none;
-        d=google.com; s=arc-20240605;
-        b=Ln2bufZfSNhR/NmMPrG2QFdtvupjJtLDQnFvsL8HTPn+Dlrt5ff+6k6Wpupab/5mS7
-         hXjtVD0jnryGUiM5h+SNjxwzNPM3PBoueTpAzzBkjHQqMxJVpspgsGJUVOWAVRBWtWo
-         39qFyoP0vhzGRWDAuAFV+4VDhsvH7GL8lTrZCSMzrngTadmEdJ5haUIQOa50KFUn5HrK
-         1r12gayb+TaGaWfQfDo0Me689T8MQnS0ITUuzgvFxfgHZBz3h+IPnC0hrlhdziGovETo
-         GvHzgCCtiVzu6rop6VMLjLuAYmmT9+jZ3GjSRb+078C9cJR17YpguOC14Cyv4od1Tf7y
-         RFiQ==;
-        dara=google.com
-ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
-        h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
-         :mime-version:dkim-signature:dkim-signature;
-        bh=mVNsDGUAhSGrAIoTy8PIfvCBxBB4yaBy/VZH8i3gPl4=;
-        fh=mbzrMIWIgWMC0ni1xEx+ViW4J0RLAdLdPT2cX81nTlk=;
-        b=JRkHr3CKSkCrafdLzBRtaBOGNl3/0ZSTtgubaNXtvhAiIqRqiQYocfLnVM6N/9sH7O
-         byTXYaRoaRLw/35WM+QTFGP3zUGRkM3eO4UVS/utVIss1IVLDjfmZHalqLYl8RokW5br
-         89Z/xYIyjTE7WUdy6uMSrExCNm5VWjO/qcMKsE5s5oDbXdSLaUYxLTurICM3LQksGkCY
-         wiAWaDDqK14+uhEhW5AyEnebDSYhL9U8UadIv+eK6Ng9q1kwOUzxICRQXEyUtnKhaDKJ
-         eZ1Qe1mp1CjCulr+I15fz3VwUJ6W1cv6cytcxPbu4p5GPn2gb2hS1eR81HVTL6V1Sp5G
-         NdDQ==;
-        dara=google.com
-ARC-Authentication-Results: i=1; mx.google.com;
-       dkim=pass header.i=@google.com header.s=20230601 header.b=dc+iKaXd;
-       dkim=pass header.i=@gmail.com header.s=20230601 header.b=kf8o8wAd;
-       spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com;
-       dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
-       dara=pass header.i=@gmail.com
-Received: from mail-sor-f73.google.com (mail-sor-f73.google.com. [209.85.220.73])
-        by mx.google.com with SMTPS id ca18e2360f4ac-88f2ea1122asor117632339f.3.2025.09.11.12.27.29
-        for <couchmoney@gmail.com>
-        (Google Transport Security);
-        Thu, 11 Sep 2025 12:27:29 -0700 (PDT)
-Received-SPF: pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) client-ip=209.85.220.73;
-Authentication-Results: mx.google.com;
-       dkim=pass header.i=@google.com header.s=20230601 header.b=dc+iKaXd;
-       dkim=pass header.i=@gmail.com header.s=20230601 header.b=kf8o8wAd;
-       spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com;
-       dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
-       dara=pass header.i=@gmail.com
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=google.com; s=20230601; t=1757618849; x=1758223649; dara=google.com;
-        h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
-         :mime-version:from:to:cc:subject:date:message-id:reply-to;
-        bh=mVNsDGUAhSGrAIoTy8PIfvCBxBB4yaBy/VZH8i3gPl4=;
-        b=dc+iKaXdFyqu6K0MIgk848QuwpQXvwzwlEVkxmjuCWvn9DzanMbYn5QJRyRTKilRna
-         BZ7gJSPriHUHcJd4fVKgGuCaQg0TxenCwm+0R64oB1xcDLfonayo/nCrFqEcCLHNmi7x
-         lTyWGJ0rLw6nKazxtcCdIbDhVgiE7/fXNI89w6XFp6pcKLl48yFIoCG1f6uY4iQ7QqNU
-         hLHzjmlzjTi58xFLao7SizZ0lr7E5cHXKHp1Ls/hkDzzcY0Y+O5+3r+NQw4MtpHTcY6/
-         kQlg6OhyMx8PTu4cuepQKXLHV4aFaNJbDQTp8wew4xPIgi7pm2p6hb6C3GgwY6ptOvLd
-         wuag==
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20230601; t=1757618849; x=1758223649; dara=google.com;
-        h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
-         :mime-version:from:to:cc:subject:date:message-id:reply-to;
-        bh=mVNsDGUAhSGrAIoTy8PIfvCBxBB4yaBy/VZH8i3gPl4=;
-        b=kf8o8wAd5DSU/NC7SDiuIoohCu+/7wTjWyQqDYbBjUFGaBaYdj6aD5JWNQ1KEA2W8o
-         E+Qy2ymyrzodKa1eOsQX2UDAYKOKpdxMWvx1u19+SC3Dp8DP4puRMrL2ObiSEMLCuOvz
-         Mxmkd+ZUP72EhVuQwK1iSm04/cjQaMsSiPhvSBaxXMaaarwlKeOoCoIo+qC/Z9emiBBv
-         Gk0sQcLA+CByvsxuvD9GInSA0rdoZ0ijhSb0Y475Hieam1QQqy/fhe8lgujzhXNFoIbR
-         5EA9GE0VV9PDoNanaT+u954YeOFBL2YZ5gm2gHltw8tBI98LKnC42Pa3qyMznBa2dI2Q
-         A0RQ==
-X-Google-Smtp-Source: AGHT+IGmC5/03nTVMeYJBoq1R/BiA19iH0DFaZyyImB3W8mtgjdn+XqIFK1fC8aTwWRXQmsr71Xo0cmkgx6hjPvicQ/d
-MIME-Version: 1.0
-X-Received: by 2002:a05:6602:380d:b0:887:4c93:f12c with SMTP id
- ca18e2360f4ac-8903596aca3mr58994639f.17.1757618848817; Thu, 11 Sep 2025
- 12:27:28 -0700 (PDT)
-Reply-To: tconvertino@gmail.com
-Sender: Google Calendar <calendar-notification@google.com>
-Auto-Submitted: auto-generated
-Message-ID: <calendar-01d5e8a0-fad7-450b-9758-a16472bf2aa8@google.com>
-Date: Thu, 11 Sep 2025 19:27:28 +0000
-Subject: Canceled event: Scout Babysits @ Thu Sep 11, 2025 6pm - 9pm (PDT) (Family)
-From: tconvertino@gmail.com
-To: couchmoney@gmail.com
-Content-Type: multipart/mixed; boundary="000000000000226b77063e8b878d"
-
--000000000000226b77063e8b878d
-Content-Type: text/calendar; charset="UTF-8"; method=CANCEL
-Content-Transfer-Encoding: 7bit
-
-BEGIN:VCALENDAR
-PRODID:-//Google Inc//Google Calendar 70.9054//EN
-VERSION:2.0
-CALSCALE:GREGORIAN
-METHOD:CANCEL
-X-GOOGLE-CALID:g66m0feuqsao8l1c767pvvcg4k@group.calendar.google.com
-BEGIN:VEVENT
-DTSTART:20250912T010000Z
-DTEND:20250912T040000Z
-DTSTAMP:20250911T192728Z
-UID:4ang6172d1t7782sn2hmi30fgi@google.com
-CREATED:20250901T224707Z
-DESCRIPTION:
-LAST-MODIFIED:20250911T192728Z
-LOCATION:
-SEQUENCE:1
-STATUS:CANCELLED
-SUMMARY:Scout Babysits
-TRANSP:OPAQUE
-END:VEVENT
-END:VCALENDAR
-
--000000000000226b77063e8b878d--
--- a/server/testdata/google-calendar-example.eml
+++ b/server/testdata/google-calendar-example.eml
@ -1,169 +0,0 @@
-Return-Path: <couchmoney+caf_=gmail=xinu.tv@gmail.com>
-Delivered-To: bill@xinu.tv
-Received: from phx.xinu.tv [74.207.253.222]
-	by nixos-01.h.xinu.tv with IMAP (fetchmail-6.4.39)
-	for <wathiede@localhost> (single-drop); Mon, 02 Jun 2025 07:06:34 -0700 (PDT)
-Received: from phx.xinu.tv
-	by phx.xinu.tv with LMTP
-	id qDo+FuqvPWh51xIAJR8clQ
-	(envelope-from <couchmoney+caf_=gmail=xinu.tv@gmail.com>)
-	for <bill@xinu.tv>; Mon, 02 Jun 2025 07:06:34 -0700
-X-Original-To: gmail@xinu.tv
-Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::130; helo=mail-lf1-x130.google.com; envelope-from=couchmoney+caf_=gmail=xinu.tv@gmail.com; receiver=xinu.tv 
-Authentication-Results: phx.xinu.tv;
-	dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20230601 header.b=zT2yUtVH;
-	dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=nmJW8N67
-Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130])
-	by phx.xinu.tv (Postfix) with ESMTPS id 912AC80034
-	for <gmail@xinu.tv>; Mon, 02 Jun 2025 07:06:32 -0700 (PDT)
-Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-54e7967cf67so5267078e87.0
-        for <gmail@xinu.tv>; Mon, 02 Jun 2025 07:06:32 -0700 (PDT)
-ARC-Seal: i=2; a=rsa-sha256; t=1748873190; cv=pass;
-        d=google.com; s=arc-20240605;
-        b=W3s0wT+CV1W21AldY9lfxPlKRbc7XMoorEnilNq5iGjlw18vDM6eFPb+btqaGAPOPe
-         CMyGeinsFPuql+S7u6HgjZcf9ZFH71sKoFoQytm30hAXB76GO06qi1jRW6o0miuGt/j/
-         bb8qWAiAsGr34mHIbE5fBdkNOGcqW85oI78GolLqpROgn/42boEYxiGAQjybPtO4L84J
-         wP2RBkHiQQGXUjL6b02tozCji1w2XdfYqtW8RteUs1pqYdXl4GUilMLt5C0d2bhSGksS
-         3tMTFjuycbaj+F6QFCkQfEsHx/I7GjuD4mToLcYpzrNnmZZUidAoKuh+uin0cEVvnQ1j
-         V8aA==
-ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
-        h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
-         :mime-version:dkim-signature:dkim-signature:delivered-to;
-        bh=dgRmOj3aABlB3SNw+xxlI8L9ugJFZ1WMJrtLw/W8tnA=;
-        fh=5zy5Gi9ngAea7dC9ZKKPh/BZlFmotJq74g9KHrEIwaE=;
-        b=QTAjqit0gYnuGa1lbO9RUXOVpyutliNo+tG6irWFsjGhnvMkis2KdLb6saYPnLCG7F
-         rSRXvw0HwuaJfXAV3XvIT0pxTg3PXYnc8kt/F8OtG+LiakJbMV1soj8OJ+5lZPKFmvna
-         i2T5mJjEknZsc9qWYmaAEVqIg71jhPH5CjJyehNhsIJ1/O9CH4VF8L0yv9KUMAA4tzog
-         LfI+SpOE2z/wYuMDxi2Ld3FgaVCQgkMM2Tlys8P0DjCaewWeaZFmZKIEEZUbKWbrivTa
-         RSO+Us+9yrt8hDdJuvtf9eXsGvuZtdj/2APRts/0cd7SFAQqRd0DnhGIHoXR74YVHaqi
-         U7IQ==;
-        darn=xinu.tv
-ARC-Authentication-Results: i=2; mx.google.com;
-       dkim=pass header.i=@google.com header.s=20230601 header.b=zT2yUtVH;
-       dkim=pass header.i=@gmail.com header.s=20230601 header.b=nmJW8N67;
-       spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com;
-       dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
-       dara=pass header.i=@gmail.com
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20230601; t=1748873190; x=1749477990;
-        h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
-         :mime-version:dkim-signature:dkim-signature:delivered-to
-         :x-forwarded-for:x-forwarded-to:x-gm-message-state:from:to:cc
-         :subject:date:message-id:reply-to;
-        bh=dgRmOj3aABlB3SNw+xxlI8L9ugJFZ1WMJrtLw/W8tnA=;
-        b=dBjp6JdmFUj0jKPDo9r2/xvfVSvxKaF15UYwYU7itdM18qpCnrgQdHMP2ST7EQBxou
-         58yZfVjrx84gg9phedpVSg4SaBaPIhXsLuUeVQZtPd7J3WYiH4+OGcecjV+cD0dG0TUi
-         o/FbZULNl3REysvoAj+AwUL/ny2FnNU4PIhkeSq+d6iNztkexIKLS8qWqHosenPlVX+E
-         Z7OGQZpK6m1LB5UbCsaODQq5wbNIxlOxqTP1rCHe/hHk53ljiNegzaOS31mVvp1n8/g1
-         pWIZltyZORs0zi6U9+mNd9ZbaeQjHqBrcb2bsTxCD+u0DBuF2RjLguS/feaB25TG8LAg
-         szYg==
-X-Forwarded-Encrypted: i=2; AJvYcCXfGRAIDqrPsT1vzTMSiuMrlTj/DbRrr+8w7X+iLRH2XK/n8MZhV3UaT0Zia6c6jMrf3s3eHA==@xinu.tv
-X-Gm-Message-State: AOJu0YxOQEmNiUg4NKf4NM1BgQMqTJaFM6txPnL6u74ff1dZvoSgTC4d
-	TtJJqfdHsajxloSGDsSPqIQ/M/Se/sfymEExFQxDXYA/XasA6+sdye/Ihl9QekGJK9jet1VtQ3r
-	dcg89xnFcxezg3ji6xH8jnSULlp350K9K7LR0LfTQqg6e/BEKEF8XDaNgmJC+RQ==
-X-Received: by 2002:a05:6512:2246:b0:553:35bb:f7b7 with SMTP id 2adb3069b0e04-55342f92776mr2472199e87.32.1748873190333;
-        Mon, 02 Jun 2025 07:06:30 -0700 (PDT)
-X-Forwarded-To: gmail@xinu.tv
-X-Forwarded-For: couchmoney@gmail.com gmail@xinu.tv
-Delivered-To: couchmoney@gmail.com
-Received: by 2002:ab3:7457:0:b0:2b1:14e:dc2b with SMTP id g23csp2818972lti;
-        Mon, 2 Jun 2025 07:06:29 -0700 (PDT)
-X-Received: by 2002:a05:6602:6a8b:b0:86c:f898:74b8 with SMTP id ca18e2360f4ac-86d0521552emr1082401939f.10.1748873188734;
-        Mon, 02 Jun 2025 07:06:28 -0700 (PDT)
-ARC-Seal: i=1; a=rsa-sha256; t=1748873188; cv=none;
-        d=google.com; s=arc-20240605;
-        b=d2PNXrTE3VYjml3FmbC5rBW6XnsyuyVO3lPyM6VoVKFcvZ7a8tDRB+sh1ibo0D5Nvg
-         3i/Qon0RV401WFb9NQf5P048wpj19G8bOGPZUKMioBZcSxkr1RwH/GW6GBvGS+d+iqbW
-         43KWc6Px7RGOEeYfp8D88CuJ/5kMcsLMfDV1FRHo6T+chVY6c9fQkHjRreSGQcFXglt5
-         yaCpFKkAODO7rSHl2OW2kQ6eGgR0tUjb95+jdZXoU0GS3119CBYK9n9UhNaeXHIk/Zyy
-         f08r4Ce/m3Y6ISr4ovXxDeYNpeeUN1HT3XVyCVQJHjfWrHypKTiOt4q6yBhCgOgZTXJq
-         pL5A==;
-ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
-        h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
-         :mime-version:dkim-signature:dkim-signature;
-        bh=dgRmOj3aABlB3SNw+xxlI8L9ugJFZ1WMJrtLw/W8tnA=;
-        fh=mbzrMIWIgWMC0ni1xEx+ViW4J0RLAdLdPT2cX81nTlk=;
-        b=YiMakYeE05UctWy9sW90/a3l1Hk1pAPv0+fpk5vmWrADcMwwI8cHVqBp+Nxds5psWa
-         a/zrw9UlxV4HgjLUP+ella/pK8XxK+sitKg0IhPOntwKbq1KfTNheufh4HtWj5yWedHE
-         sO/dVs6z/EW/gWrfBK/3JMgsnz3HrHmaoJ6caCaGI6t5jHxEXI+eJc5zILY+n0MdivkX
-         tJOo0L1s/k6MAdyLr4/IVqpxdhXbUPq44twCBNheHd8T5w1DC9ZXcr54X79fW8Vzbm8/
-         A++H3gnZRGtOayRySYQl04LFLk4YsisdhsKuaJV+WKYCW58wQqJT04mrVkx+m96qr1q0
-         BQtw==;
-        dara=google.com
-ARC-Authentication-Results: i=1; mx.google.com;
-       dkim=pass header.i=@google.com header.s=20230601 header.b=zT2yUtVH;
-       dkim=pass header.i=@gmail.com header.s=20230601 header.b=nmJW8N67;
-       spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com;
-       dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
-       dara=pass header.i=@gmail.com
-Received: from mail-sor-f73.google.com (mail-sor-f73.google.com. [209.85.220.73])
-        by mx.google.com with SMTPS id ca18e2360f4ac-86d0213d491sor465078439f.8.2025.06.02.07.06.28
-        for <couchmoney@gmail.com>
-        (Google Transport Security);
-        Mon, 02 Jun 2025 07:06:28 -0700 (PDT)
-Received-SPF: pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) client-ip=209.85.220.73;
-Authentication-Results: mx.google.com;
-       dkim=pass header.i=@google.com header.s=20230601 header.b=zT2yUtVH;
-       dkim=pass header.i=@gmail.com header.s=20230601 header.b=nmJW8N67;
-       spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com;
-       dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
-       dara=pass header.i=@gmail.com
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=google.com; s=20230601; t=1748873188; x=1749477988; dara=google.com;
-        h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
-         :mime-version:from:to:cc:subject:date:message-id:reply-to;
-        bh=dgRmOj3aABlB3SNw+xxlI8L9ugJFZ1WMJrtLw/W8tnA=;
-        b=zT2yUtVHhNy5fFiy6YKzfYCQPlCnufAEoWmbvjvj7mFNYUlLJHZ5FUeNnDs06Z1icR
-         bSVtejKixrz4hjFh9KeKvV9EQNGU7UFgySwqdy6szm+sHZQj+iJAXy85A1QaL6+0Swup
-         2y8QsjVJ96uugM0SaAYZqe+lmLBk6zFWqkg0U37vgwOupAcNsNBd7tos7cxO5eK6Aops
-         FJjr9JAD+ddX03ngH9zfnvlNV/+qbmiP6Hs8OmaJtZof2GLucpHgqUpIdolCh7F72v4p
-         DibO4RShI/IQCw9ejZxhRPBPWQwIdOYLjD/sDunX63M4NCS/63jZfhwqsAVgtmN/cUGq
-         spHQ==
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20230601; t=1748873188; x=1749477988; dara=google.com;
-        h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
-         :mime-version:from:to:cc:subject:date:message-id:reply-to;
-        bh=dgRmOj3aABlB3SNw+xxlI8L9ugJFZ1WMJrtLw/W8tnA=;
-        b=nmJW8N67IylgMNprzzf/IC7V2r7xeY0+8Bl0KcAak6Xly+IhVv3nyccvgdKsp+8Ccd
-         NcikfVOtCsE3gTqviReUbTAKy7PyClAbBTEHC0Ne71549BN+v8zX64RpGDFJGX5pJMG5
-         r0Ak88nxzjWkvDLhlnHmWdt/NggdQEI6T7oP4VZo0f0/Ym7g1WJhSItfdIhSRDNzK3ed
-         WPRXUIb1sW3+N0My4Os6L4IA9kdRk5z0qpQxtsIL9N0dzv4q18q6eH3KfTzVPr59PsYT
-         uSgkWoLQZdfA70MMlIRU5CnGbVDRH4TO/ib433vIblOmtLTkQ4EaOTzncbs0tovVes4z
-         evsQ==
-X-Google-Smtp-Source: AGHT+IETNpLvkLm7t8VAdDcEcVtxFCttPh/uVZhoQCRlhUNlx9bmg67olJiD9EOND8g0z43NnM8iK4FxezZondExIawx
-MIME-Version: 1.0
-X-Received: by 2002:a05:6602:4183:b0:864:4a1b:dfc5 with SMTP id
- ca18e2360f4ac-86d052154eamr1431889339f.9.1748873188195; Mon, 02 Jun 2025
- 07:06:28 -0700 (PDT)
-Reply-To: tconvertino@gmail.com
-Sender: Google Calendar <calendar-notification@google.com>
-Auto-Submitted: auto-generated
-Message-ID: <calendar-093be1c9-5d94-4994-8bc5-7daa1cfae47b@google.com>
-Date: Mon, 02 Jun 2025 14:06:28 +0000
-Subject: New event: Tamara and Scout in Alaska @ Tue Jun 24 - Mon Jun 30, 2025 (tconvertino@gmail.com)
-From: tconvertino@gmail.com
-To: couchmoney@gmail.com
-Content-Type: multipart/alternative; boundary="00000000000023c70606369745e9"
-
--00000000000023c70606369745e9
-Content-Type: text/plain; charset="UTF-8"; format=flowed; delsp=yes
-Content-Transfer-Encoding: base64
-
-VGFtYXJhIGFuZCBTY291dCBpbiBBbGFza2ENClR1ZXNkYXkgSnVuIDI0IOKAkyBNb25kYXkgSnVu
-IDMwLCAyMDI1DQoNCg0KDQpPcmdhbml6ZXINCnRjb252ZXJ0aW5vQGdtYWlsLmNvbQ0KdGNvbnZl
-cnRpbm9AZ21haWwuY29tDQoNCn5+Ly9+fg0KSW52aXRhdGlvbiBmcm9tIEdvb2dsZSBDYWxlbmRh
-cjogaHR0cHM6Ly9jYWxlbmRhci5nb29nbGUuY29tL2NhbGVuZGFyLw0KDQpZb3UgYXJlIHJlY2Vp
-dmluZyB0aGlzIGVtYWlsIGJlY2F1c2UgeW91IGFyZSBzdWJzY3JpYmVkIHRvIGNhbGVuZGFyICAN
-Cm5vdGlmaWNhdGlvbnMuIFRvIHN0b3AgcmVjZWl2aW5nIHRoZXNlIGVtYWlscywgZ28gdG8gIA0K
-aHR0cHM6Ly9jYWxlbmRhci5nb29nbGUuY29tL2NhbGVuZGFyL3Ivc2V0dGluZ3MsIHNlbGVjdCB0
-aGlzIGNhbGVuZGFyLCBhbmQgIA0KY2hhbmdlICJPdGhlciBub3RpZmljYXRpb25zIi4NCg0KRm9y
-d2FyZGluZyB0aGlzIGludml0YXRpb24gY291bGQgYWxsb3cgYW55IHJlY2lwaWVudCB0byBzZW5k
-IGEgcmVzcG9uc2UgdG8gIA0KdGhlIG9yZ2FuaXplciwgYmUgYWRkZWQgdG8gdGhlIGd1ZXN0IGxp
-c3QsIGludml0ZSBvdGhlcnMgcmVnYXJkbGVzcyBvZiAgDQp0aGVpciBvd24gaW52aXRhdGlvbiBz
-dGF0dXMsIG9yIG1vZGlmeSB5b3VyIFJTVlAuDQoNCkxlYXJuIG1vcmUgaHR0cHM6Ly9zdXBwb3J0
-Lmdvb2dsZS5jb20vY2FsZW5kYXIvYW5zd2VyLzM3MTM1I2ZvcndhcmRpbmcNCg==
--00000000000023c70606369745e9
-Content-Type: text/html; charset="UTF-8"
-Content-Transfer-Encoding: quoted-printable
-
-<!doctype html><html xmlns=3D"http://www.w3.org/1999/xhtml" xmlns:v=3D"urn:="...truncated for brevity...
--- a/server/testdata/ical-example-1.ics
+++ b/server/testdata/ical-example-1.ics
@ -1,57 +0,0 @@
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:Microsoft Exchange Server 2010
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Pacific Standard Time
-BEGIN:STANDARD
-DTSTART:16010101T020000
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=11
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:16010101T020000
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=2SU;BYMONTH=3
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-ORGANIZER;CN=Bill Thiede:mailto:wthiede@nvidia.com
-ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Bill:mailt
- o:couchmoney@gmail.com
-DESCRIPTION;LANGUAGE=en-US:\n
-UID:040000008200E00074C5B7101A82E00800000000A1458AEA8E4DDB01000000000000000
- 010000000988BC323BE65A8458B718B5EF8FE8152
-SUMMARY;LANGUAGE=en-US:dentist night guard 
-DTSTART;TZID=Pacific Standard Time:20250108T080000
-DTEND;TZID=Pacific Standard Time:20250108T090000
-CLASS:PUBLIC
-PRIORITY:5
-DTSTAMP:20241213T184408Z
-TRANSP:OPAQUE
-STATUS:CONFIRMED
-SEQUENCE:0
-LOCATION;LANGUAGE=en-US:
-X-MICROSOFT-CDO-APPT-SEQUENCE:0
-X-MICROSOFT-CDO-OWNERAPPTID:2123132523
-X-MICROSOFT-CDO-BUSYSTATUS:TENTATIVE
-X-MICROSOFT-CDO-INTENDEDSTATUS:BUSY
-X-MICROSOFT-CDO-ALLDAYEVENT:FALSE
-X-MICROSOFT-CDO-IMPORTANCE:1
-X-MICROSOFT-CDO-INSTTYPE:0
-X-MICROSOFT-ONLINEMEETINGEXTERNALLINK:
-X-MICROSOFT-ONLINEMEETINGCONFLINK:
-X-MICROSOFT-DONOTFORWARDMEETING:FALSE
-X-MICROSOFT-DISALLOW-COUNTER:FALSE
-X-MICROSOFT-REQUESTEDATTENDANCEMODE:DEFAULT
-X-MICROSOFT-ISRESPONSEREQUESTED:TRUE
-X-MICROSOFT-LOCATIONS:[]
-BEGIN:VALARM
-DESCRIPTION:REMINDER
-TRIGGER;RELATED=START:-PT5M
-ACTION:DISPLAY
-END:VALARM
-END:VEVENT
-END:VCALENDAR
--- a/server/testdata/ical-example-2.ics
+++ b/server/testdata/ical-example-2.ics
@ -1,30 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//Google Inc//Google Calendar 70.9054//EN
-VERSION:2.0
-CALSCALE:GREGORIAN
-METHOD:REPLY
-X-GOOGLE-CALID:g66m0feuqsao8l1c767pvvcg4k@group.calendar.google.com
-BEGIN:VEVENT
-DTSTART:20250813T010000Z
-DTEND:20250813T030000Z
-DTSTAMP:20250801T022550Z
-ORGANIZER;CN=Family:mailto:g66m0feuqsao8l1c767pvvcg4k@group.calendar.google
- .com
-UID:6os3ap346th6ab9nckp30b9kc8sm2bb160q3gb9l6lgm6or160rjee1mco@google.com
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED;CN=superm
- atute@gmail.com;X-NUM-GUESTS=0:mailto:supermatute@gmail.com
-X-GOOGLE-CONFERENCE:https://meet.google.com/dcu-hykx-vym
-CREATED:20250801T015712Z
-DESCRIPTION:-::~:~::~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~
- :~:~:~:~:~:~:~:~::~:~::-\nJoin with Google Meet: https://meet.google.com/dc
- u-hykx-vym\n\nLearn more about Meet at: https://support.google.com/a/users/
- answer/9282720\n\nPlease do not edit this section.\n-::~:~::~:~:~:~:~:~:~:~
- :~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~::~:~::-
-LAST-MODIFIED:20250801T022549Z
-LOCATION:
-SEQUENCE:0
-STATUS:CONFIRMED
-SUMMARY:[tenative] dinner w/ amatute
-TRANSP:OPAQUE
-END:VEVENT
-END:VCALENDAR
--- a/server/testdata/ical-multiday.ics
+++ b/server/testdata/ical-multiday.ics
@ -1,9 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SUMMARY:Multi-day Event
-DTSTART;VALUE=DATE:20250828
-DTEND;VALUE=DATE:20250831
-DESCRIPTION:This event spans multiple days.
-END:VEVENT
-END:VCALENDAR
--- a/server/testdata/ical-straddle-real.ics
+++ b/server/testdata/ical-straddle-real.ics
@ -1,36 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//Google Inc//Google Calendar 70.9054//EN
-VERSION:2.0
-CALSCALE:GREGORIAN
-METHOD:REQUEST
-BEGIN:VEVENT
-DTSTART;VALUE=DATE:20250830
-DTEND;VALUE=DATE:20250902
-DTSTAMP:20250819T183713Z
-ORGANIZER;CN=Bill Thiede:mailto:couchmoney@gmail.com
-UID:37kplskaimjnhdnt8r5ui9pv7f@google.com
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=
- TRUE;CN=bill@xinu.tv;X-NUM-GUESTS=0:mailto:bill@xinu.tv
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED;RSVP=TRUE
- ;CN=Bill Thiede;X-NUM-GUESTS=0:mailto:couchmoney@gmail.com
-X-MICROSOFT-CDO-OWNERAPPTID:1427505964
-CREATED:20250819T183709Z
-DESCRIPTION:
-LAST-MODIFIED:20250819T183709Z
-LOCATION:
-SEQUENCE:0
-STATUS:CONFIRMED
-SUMMARY:Test Straddle Month
-TRANSP:TRANSPARENT
-BEGIN:VALARM
-ACTION:DISPLAY
-DESCRIPTION:This is an event reminder
-TRIGGER:-P0DT0H30M0S
-END:VALARM
-BEGIN:VALARM
-ACTION:DISPLAY
-DESCRIPTION:This is an event reminder
-TRIGGER:-P0DT7H30M0S
-END:VALARM
-END:VEVENT
-END:VCALENDAR
--- a/server/testdata/ical-straddle.ics
+++ b/server/testdata/ical-straddle.ics
@ -1,13 +0,0 @@
-
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Test Recurring Event//EN
-BEGIN:VEVENT
-UID:recurring-test-1@example.com
-DTSTART;VALUE=DATE:20250804
-DTEND;VALUE=DATE:20250805
-RRULE:FREQ=WEEKLY;BYDAY=MO,WE,FR;UNTIL=20250825T000000Z
-SUMMARY:Test Recurring Event (Mon, Wed, Fri)
-DESCRIPTION:This event recurs every Monday, Wednesday, and Friday in August 2025.
-END:VEVENT
-END:VCALENDAR
--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@ -11,8 +11,8 @@ version.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-build-info = "0.0.42"
-letterbox-notmuch = { path = "../notmuch", version = "0.17", registry = "xinu" }
+build-info = "0.0.41"
+letterbox-notmuch = { path = "../notmuch", version = "0.17.27", registry = "xinu" }
 regex = "1.11.1"
 serde = { version = "1.0.219", features = ["derive"] }
 sqlx = "0.8.5"
--- a/web/Cargo.toml
+++ b/web/Cargo.toml
@ -9,10 +9,10 @@ repository.workspace = true
 version.workspace = true

 [build-dependencies]
-build-info-build = "0.0.42"
+build-info-build = "0.0.41"

 [dev-dependencies]
-#wasm-bindgen-test = "0.3.50"
+wasm-bindgen-test = "0.3.50"

 [dependencies]
 console_error_panic_hook = "0.1.7"
@ -24,16 +24,16 @@ serde = { version = "1.0.219", features = ["derive"] }
 itertools = "0.14.0"
 serde_json = { version = "1.0.140", features = ["unbounded_depth"] }
 chrono = "0.4.40"
-graphql_client = "0.15.0"
+graphql_client = "0.14.0"
 thiserror = "2.0.12"
 gloo-net = { version = "0.6.0", features = ["json", "serde_json"] }
 human_format = "1.1.0"
-build-info = "0.0.42"
+build-info = "0.0.41"
 wasm-bindgen = "=0.2.100"
 uuid = { version = "1.16.0", features = [
  "js",
 ] } # direct dep to set js feature, prevents Rng issues
-letterbox-shared = { path = "../shared/", version = "0.17", registry = "xinu" }
+letterbox-shared = { path = "../shared/", version = "0.17.27", registry = "xinu" }
 seed_hooks = { version = "0.4.1", registry = "xinu" }
 strum_macros = "0.27.1"
 gloo-console = "0.3.0"
--- a/web/graphql/schema.json
+++ b/web/graphql/schema.json
@ -51,7 +51,7 @@
        },
        {
          "args": [],
-          "description": "Indicates that an Input Object is a OneOf Input Object (and thus requires exactly one of its field be provided)",
+          "description": "Indicates that an Input Object is a OneOf Input Object (and thus requires\n                        exactly one of its field be provided)",
          "locations": [
            "INPUT_OBJECT"
          ],
@ -107,14 +107,12 @@
        }
      ],
      "mutationType": {
-        "name": "MutationRoot"
+        "name": "Mutation"
      },
      "queryType": {
        "name": "QueryRoot"
      },
-      "subscriptionType": {
-        "name": "SubscriptionRoot"
-      },
+      "subscriptionType": null,
      "types": [
        {
          "description": null,
@ -316,16 +314,6 @@
          "name": "Corpus",
          "possibleTypes": null
        },
-        {
-          "description": "Implement the DateTime<Utc> scalar\n\nThe input/output is a string in RFC3339 format.",
-          "enumValues": null,
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "kind": "SCALAR",
-          "name": "DateTime",
-          "possibleTypes": null
-        },
        {
          "description": null,
          "enumValues": [
@ -981,51 +969,6 @@
                }
              }
            },
-            {
-              "args": [
-                {
-                  "defaultValue": null,
-                  "description": null,
-                  "name": "query",
-                  "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  }
-                },
-                {
-                  "defaultValue": null,
-                  "description": null,
-                  "name": "wakeTime",
-                  "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "DateTime",
-                      "ofType": null
-                    }
-                  }
-                }
-              ],
-              "deprecationReason": null,
-              "description": null,
-              "isDeprecated": false,
-              "name": "snooze",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Boolean",
-                  "ofType": null
-                }
-              }
-            },
            {
              "args": [],
              "deprecationReason": null,
@ -1046,7 +989,7 @@
          "inputFields": null,
          "interfaces": [],
          "kind": "OBJECT",
-          "name": "MutationRoot",
+          "name": "Mutation",
          "possibleTypes": null
        },
        {
@ -1531,33 +1474,6 @@
          "name": "String",
          "possibleTypes": null
        },
-        {
-          "description": null,
-          "enumValues": null,
-          "fields": [
-            {
-              "args": [],
-              "deprecationReason": null,
-              "description": null,
-              "isDeprecated": false,
-              "name": "values",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
-              }
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "kind": "OBJECT",
-          "name": "SubscriptionRoot",
-          "possibleTypes": null
-        },
        {
          "description": null,
          "enumValues": null,
--- a/web/graphql/snooze.graphql
+++ b/web/graphql/snooze.graphql
@ -1,4 +0,0 @@
-
-mutation SnoozeMutation($query: String!, $wakeTime: DateTime!) {
-  snooze(query: $query, wakeTime: $wakeTime)
-} 
--- a/web/graphql/update_schema.sh
+++ b/web/graphql/update_schema.sh
@ -1,4 +1,4 @@
 DEV_HOST=localhost
 DEV_PORT=9345
-graphql-client introspect-schema http://${DEV_HOST:?}:${DEV_PORT:?}/api/graphql/ --output schema.json
+graphql-client introspect-schema http://${DEV_HOST:?}:${DEV_PORT:?}/api/graphql --output schema.json
 git diff schema.json
--- a/web/index.html
+++ b/web/index.html
@ -4,8 +4,8 @@
 <head>
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/7.0.1/css/all.min.css"
-    integrity="sha512-2SwdPD6INVrV/lHTZbO2nodKhrnDdJK9/kg2XD1r9uGqPo1cUbujc+IYdlYdEErWNu69gVcYgdxlmVmzTWnetw=="
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css"
+    integrity="sha512-Evv84Mr4kqVGRNSgIGL/F/aIDqQb7xQ2vcrdIwxfjThSH8CSR7PBEakCr51Ck+w+/U6swU2Im1vVX0SVk9ABhg=="
    crossorigin="anonymous" referrerpolicy="no-referrer" />
  <link rel="icon" href="https://static.xinu.tv/favicon/letterbox.svg" />
  <!-- tall thin font for user icon -->
@ -16,7 +16,6 @@
  <link data-trunk rel="css" href="static/vars.css" />
  <link data-trunk rel="tailwind-css" href="./src/tailwind.css" />
  <link data-trunk rel="css" href="static/overrides.css" />
-  <link data-trunk rel="css" href="static/email-specific.css" />
 </head>

 <body>
--- a/web/src/graphql.rs
+++ b/web/src/graphql.rs
@ -1,9 +1,7 @@
-use chrono::Utc;
 use gloo_net::{http::Request, Error};
 use graphql_client::GraphQLQuery;
 use serde::{de::DeserializeOwned, Serialize};

-type DateTime = chrono::DateTime<Utc>;
 // The paths are relative to the directory where your `Cargo.toml` is located.
 // Both json and the GraphQL schema language are supported as sources for the schema
 #[derive(GraphQLQuery)]
@ -54,14 +52,6 @@ pub struct AddTagMutation;
 )]
 pub struct RemoveTagMutation;

-#[derive(GraphQLQuery)]
-#[graphql(
-    schema_path = "graphql/schema.json",
-    query_path = "graphql/snooze.graphql",
-    response_derives = "Debug"
-)]
-pub struct SnoozeMutation;
-
 #[derive(GraphQLQuery)]
 #[graphql(
    schema_path = "graphql/schema.json",
--- a/web/src/state.rs
+++ b/web/src/state.rs
@ -1,6 +1,5 @@
 use std::collections::HashSet;

-use chrono::{DateTime, Utc};
 use graphql_client::GraphQLQuery;
 use letterbox_shared::WebsocketMessage;
 use log::{debug, error, info, warn};
@ -260,29 +259,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
                Msg::GoToSearchResults
            });
        }
-        Msg::Snooze(query, wake_time) => {
-            let is_catchup = model.catchup.is_some();
-            orders.skip().perform_cmd(async move {
-                let res: Result<
-                    graphql_client::Response<graphql::snooze_mutation::ResponseData>,
-                    gloo_net::Error,
-                > = send_graphql(graphql::SnoozeMutation::build_query(
-                    graphql::snooze_mutation::Variables {
-                        query: query.clone(),
-                        wake_time,
-                    },
-                ))
-                .await;
-                if let Err(e) = res {
-                    error!("Failed to snooze {query} until {wake_time}: {e}");
-                }
-                if is_catchup {
-                    Msg::CatchupMarkAsRead
-                } else {
-                    Msg::GoToSearchResults
-                }
-            });
-        }

        Msg::FrontPageRequest {
            query,
@ -291,7 +267,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
            first,
            last,
        } => {
-            model.refreshing_state = RefreshingState::Loading;
            let (after, before, first, last) = match (after.as_ref(), before.as_ref(), first, last)
            {
                // If no pagination set, set reasonable defaults
@ -317,32 +292,25 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
            });
        }
        Msg::FrontPageResult(Err(e)) => {
-            let msg = format!("error FrontPageResult: {e:?}");
-            error!("{msg}");
-            model.refreshing_state = RefreshingState::Error(msg);
+            error!("error FrontPageResult: {e:?}");
        }
        Msg::FrontPageResult(Ok(graphql_client::Response {
            data: None,
            errors: None,
            ..
        })) => {
-            let msg = format!("FrontPageResult no data or errors, should not happen");
-            error!("{msg}");
-            model.refreshing_state = RefreshingState::Error(msg);
+            error!("FrontPageResult no data or errors, should not happen");
        }
        Msg::FrontPageResult(Ok(graphql_client::Response {
            data: None,
            errors: Some(e),
            ..
        })) => {
-            let msg = format!("FrontPageResult error: {e:?}");
-            error!("{msg}");
-            model.refreshing_state = RefreshingState::Error(msg);
+            error!("FrontPageResult error: {e:?}");
        }
        Msg::FrontPageResult(Ok(graphql_client::Response {
            data: Some(data), ..
        })) => {
-            model.refreshing_state = RefreshingState::None;
            model.tags = Some(
                data.tags
                    .into_iter()
@ -382,7 +350,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
        }

        Msg::ShowThreadRequest { thread_id } => {
-            model.refreshing_state = RefreshingState::Loading;
            orders.skip().perform_cmd(async move {
                Msg::ShowThreadResult(
                    send_graphql(graphql::ShowThreadQuery::build_query(
@ -395,7 +362,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
        Msg::ShowThreadResult(Ok(graphql_client::Response {
            data: Some(data), ..
        })) => {
-            model.refreshing_state = RefreshingState::None;
            model.tags = Some(
                data.tags
                    .into_iter()
@ -435,12 +401,9 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
            orders.send_msg(Msg::WindowScrolled);
        }
        Msg::ShowThreadResult(bad) => {
-            let msg = format!("show_thread_query error: {bad:#?}");
-            error!("{msg}");
-            model.refreshing_state = RefreshingState::Error(msg);
+            error!("show_thread_query error: {bad:#?}");
        }
        Msg::CatchupRequest { query } => {
-            model.refreshing_state = RefreshingState::Loading;
            orders.perform_cmd(async move {
                Msg::CatchupResult(
                    send_graphql::<_, graphql::catchup_query::ResponseData>(
@ -455,7 +418,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
        Msg::CatchupResult(Ok(graphql_client::Response {
            data: Some(data), ..
        })) => {
-            model.refreshing_state = RefreshingState::None;
            let items = data.catchup;
            if items.is_empty() {
                orders.send_msg(Msg::GoToSearchResults);
@ -471,9 +433,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
            }
        }
        Msg::CatchupResult(bad) => {
-            let msg = format!("catchup_query error: {bad:#?}");
-            error!("{msg}");
-            model.refreshing_state = RefreshingState::Error(msg);
+            error!("catchup_query error: {bad:#?}");
        }
        Msg::SelectionSetNone => {
            if let Context::SearchResult {
@ -853,7 +813,6 @@ pub enum Msg {
    SetUnread(String, bool),
    AddTag(String, String),
    RemoveTag(String, String),
-    Snooze(String, DateTime<Utc>),

    FrontPageRequest {
        query: String,
--- a/web/src/view/mod.rs
+++ b/web/src/view/mod.rs
@ -78,16 +78,13 @@ mod tw_classes {
 }

 pub fn view(model: &Model) -> Node<Msg> {
-    let is_loading = match model.refreshing_state {
-        RefreshingState::Loading => true,
-        _ => false,
-    };
    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 {
@ -96,23 +93,17 @@ pub fn view(model: &Model) -> Node<Msg> {
        } => {
            if let Some(catchup) = &model.catchup {
                catchup_view(
-                    thread(thread_data, open_messages, &model.content_el, true, 0.),
+                    thread(thread_data, open_messages, &model.content_el, true),
                    &catchup.items,
-                    is_loading,
                    model.read_completion_ratio,
                )
            } else {
                normal_view(
-                    thread(
-                        thread_data,
-                        open_messages,
-                        &model.content_el,
-                        false,
-                        model.read_completion_ratio,
-                    ),
+                    thread(thread_data, open_messages, &model.content_el, false),
                    &model.versions,
                    &model.query,
                    &model.refreshing_state,
+                    model.read_completion_ratio,
                    &model.tags,
                )
            }
@ -123,17 +114,17 @@ pub fn view(model: &Model) -> Node<Msg> {
        } => {
            if let Some(catchup) = &model.catchup {
                catchup_view(
-                    news_post(post, &model.content_el, true, 0.),
+                    news_post(post, &model.content_el, true),
                    &catchup.items,
-                    is_loading,
                    model.read_completion_ratio,
                )
            } else {
                normal_view(
-                    news_post(post, &model.content_el, false, model.read_completion_ratio),
+                    news_post(post, &model.content_el, false),
                    &model.versions,
                    &model.query,
                    &model.refreshing_state,
+                    model.read_completion_ratio,
                    &model.tags,
                )
            }
@ -149,6 +140,7 @@ pub fn view(model: &Model) -> Node<Msg> {
            &model.versions,
            &model.query,
            &model.refreshing_state,
+            model.read_completion_ratio,
            &model.tags,
        ),
    }
@ -159,6 +151,7 @@ fn normal_view(
    versions: &Version,
    query: &str,
    refreshing_state: &RefreshingState,
+    read_completion_ratio: f64,
    tags: &Option<Vec<Tag>>,
 ) -> Node<Msg> {
    div![
@ -185,13 +178,13 @@ fn normal_view(
            content,
            view_header(query, refreshing_state, false),
        ],
+        reading_progress(read_completion_ratio),
    ]
 }

 fn catchup_view(
    content: Node<Msg>,
    items: &[CatchupItem],
-    is_loading: bool,
    read_completion_ratio: f64,
 ) -> Node<Msg> {
    div![
@ -207,35 +200,14 @@ fn catchup_view(
                "border-gray-500",
                "bg-black/50",
            ],
-            div![
-                C!["absolute", "top-0", "left-4", "text-green-200", "p-4"],
-                IF!(is_loading=>span![i![C!["animate-spin", "fas", "fa-spinner"]]])
-            ],
-            h1![
-                C!["text-center"],
-                format!("{} left ", items.iter().filter(|i| !i.seen).count(),)
-            ],
            div![
                C!["absolute", "top-0", "right-4", "text-gray-500", "p-4"],
                span![i![C!["fas", "fa-x"]]],
                ev(Ev::Click, move |_| Msg::CatchupExit)
            ],
-            div![
-                C![
-                    "absolute",
-                    "left-0",
-                    "right-0",
-                    "bottom-0",
-                    "w-full",
-                    "h-1",
-                    "bg-gray-200"
-                ],
-                div![
-                    C!["h-1", "bg-green-500"],
-                    style! {
-                        St::Width => format!("{}%", read_completion_ratio*100.)
-                    }
-                ]
+            h1![
+                C!["text-center"],
+                format!("{} left ", items.iter().filter(|i| !i.seen).count(),)
            ]
        ],
        div![C!["mt-12", "mb-20"], content],
@ -275,6 +247,7 @@ fn catchup_view(
                ev(Ev::Click, |_| Msg::CatchupMarkAsRead)
            ]
        ],
+        reading_progress(read_completion_ratio)
    ]
 }

@ -351,8 +324,8 @@ fn search_results(
                    attrs! {
                        At::Href => urls::thread(&tid)
                    },
-                    div![C!["line-clamp-2"], title_break, &r.subject],
-                    span![C!["line-clamp-2", "text-xs"], pretty_authors(&r.authors)],
+                    div![title_break, &r.subject],
+                    span![C!["text-xs"], pretty_authors(&r.authors)],
                    div![
                        C!["flex", "flex-wrap", "justify-between"],
                        span![tags_chiclet(&tags)],
@ -754,19 +727,15 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
        C!["flex", "p-4", "bg-neutral-800"],
        div![avatar],
        div![
-            C!["px-4", "flex-1"],
-            div![
-                C!["flex"],
-                div![
-                    C!["font-semibold", "text-sm", "flex-1"],
-                    from_detail.as_ref().map(|addr| attrs! {
-                        At::Title => addr
-                    }),
-                    &from,
-                    " ",
-                    from_detail.as_ref().map(|text| copy_text_widget(&text))
-                ],
-                snooze_buttons(msg.timestamp, &id),
+            C!["px-4", "mr-auto"],
+            span![
+                C!["font-semibold", "text-sm"],
+                from_detail.as_ref().map(|addr| attrs! {
+                    At::Title => addr
+                }),
+                &from,
+                " ",
+                from_detail.as_ref().map(|text| copy_text_widget(&text))
            ],
            IF!(!msg.to.is_empty() =>div![
                C!["text-xs"],
@ -932,22 +901,13 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
        .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();
-    let common_style = C!["text-sm", "pr-2", "text-gray-500"];
    div![
-        C!["flex", "bg-neutral-800"],
-        div![C!["self-center"], avatar],
+        C!["flex", "p-4", "bg-neutral-800"],
+        div![avatar],
        div![
-            C![
-                "mx-2",
-                "flex-1",
-                "flex",
-                "flex-nowrap",
-                "items-center",
-                "truncate",
-            ],
-            div![
-                C!["font-semibold", "text-white"],
-                &common_style,
+            C!["px-4", "mr-auto"],
+            span![
+                C!["font-semibold", "text-sm"],
                from_detail.as_ref().map(|addr| attrs! {
                    At::Title => addr
                }),
@ -955,7 +915,7 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
            ],
            " ",
            IF!(!msg.to.is_empty() => div![
-                &common_style,
+                C!["text-xs"],
                span![
                    C!["font-semibold"],
                    "To: "
@ -966,7 +926,7 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
                " "
            ]),
            IF!(!msg.cc.is_empty() => div![
-                &common_style,
+                C!["text-xs", "max-w-full", "overflow-clip", "text-ellipsis"],
                span![
                    C!["font-semibold"],
                    "CC: "
@ -974,7 +934,7 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
                cc_addrs
            ]),
            IF!(show_x_original_to => div![
-                &common_style,
+                C!["text-xs"],
                span![
                    C!["font-semibold"],
                    "Original To: "
@ -993,7 +953,7 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
                ]
            ]),
            IF!(show_delivered_to => div![
-                &common_style,
+                C!["text-xs"],
                span![
                    C!["font-semibold"],
                    "Delivered To: "
@ -1012,25 +972,27 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
                ]
            ]),
        ],
-        msg.timestamp.map(|ts| div![
-            C!["text-xs", "text-nowrap", "justify-self-end", "self-center"],
-            human_age(ts)
-        ]),
-        div![
-            i![C![
-                "m-2",
-                "read-status",
-                "far",
-                if is_unread {
-                    "fa-envelope"
-                } else {
-                    "fa-envelope-open"
-                },
-            ]],
-            ev(Ev::Click, move |e| {
-                e.stop_propagation();
-                Msg::SetUnread(id, !is_unread)
-            })
+        span![
+            C!["text-right"],
+            msg.timestamp
+                .map(|ts| div![C!["text-xs", "text-nowrap"], human_age(ts)]),
+            div![
+                C!["p-2"],
+                i![C![
+                    "mx-4",
+                    "read-status",
+                    "far",
+                    if is_unread {
+                        "fa-envelope"
+                    } else {
+                        "fa-envelope-open"
+                    },
+                ]],
+                ev(Ev::Click, move |e| {
+                    e.stop_propagation();
+                    Msg::SetUnread(id, !is_unread)
+                })
+            ],
        ]
    ]
 }
@ -1045,7 +1007,7 @@ fn message_render(msg: &ShowThreadQueryThreadOnEmailThreadMessages, open: bool)
    };
    let from = from.map(|f| f.replace('.', "-").replace('@', "-"));
    div![
-        C!["pb-1"],
+        C!["lg:mb-4"],
        div![
            if open {
                render_open_header(&msg)
@ -1063,7 +1025,7 @@ fn message_render(msg: &ShowThreadQueryThreadOnEmailThreadMessages, open: bool)
        ],
        IF!(open =>
        div![
-            C!["content", "bg-white", "text-black", "p-4", "min-w-full", "w-0","overflow-x-auto", from.map(|f|format!("from-{f}"))],
+            C!["content", "bg-white", "text-black", "p-4", "min-w-full", "w-0","overflow-x-auto", from],
            match &msg.body {
                ShowThreadQueryThreadOnEmailThreadMessagesBody::UnhandledContentType(
                    ShowThreadQueryThreadOnEmailThreadMessagesBodyOnUnhandledContentType { contents ,content_tree},
@ -1089,8 +1051,6 @@ fn message_render(msg: &ShowThreadQueryThreadOnEmailThreadMessages, open: bool)
                },
                ) => div![
                    C!["view-part-text-html"],
-                    // If there isn't any HTML tags, treat more like plain text
-                    IF!(!(contents.contains('<') && contents.contains('>')) => C!["whitespace-pre-line"]),
                    raw![contents],
                    IF!(!msg.attachments.is_empty() => render_attachements(&msg.attachments)),
                    view_content_tree(&content_tree),
@ -1175,7 +1135,6 @@ fn thread(
    open_messages: &HashSet<String>,
    content_el: &ElRef<HtmlElement>,
    catchup_mode: bool,
-    read_completion_ratio: f64,
 ) -> Node<Msg> {
    // TODO(wathiede): show per-message subject if it changes significantly from top-level subject
    let subject = if thread.subject.is_empty() {
@ -1260,8 +1219,7 @@ fn thread(
            el_ref(content_el),
            messages,
            IF!(!catchup_mode => click_to_top())
-        ],
-        reading_progress(read_completion_ratio)
+        ]
    ]
 }

@ -1404,7 +1362,7 @@ pub fn view_tags(tags: &Option<Vec<Tag>>) -> Node<Msg> {
                },
            ],
            a![
-                C![indent_cls, "grow", "truncate"],
+                C!["grow", "truncate"],
                attrs! {
                    At::Href => href
                },
@ -1505,7 +1463,6 @@ fn news_post(
    post: &ShowThreadQueryThreadOnNewsPost,
    content_el: &ElRef<HtmlElement>,
    catchup_mode: bool,
-    read_completion_ratio: f64,
 ) -> Node<Msg> {
    let subject = &post.title;
    set_title(subject);
@ -1593,7 +1550,6 @@ fn news_post(
            ]
        ],
        IF!(!catchup_mode => click_to_top()),
-        reading_progress(read_completion_ratio)
    ]
 }
 fn render_news_post_header(post: &ShowThreadQueryThreadOnNewsPost) -> Node<Msg> {
@ -1629,13 +1585,9 @@ fn render_news_post_header(post: &ShowThreadQueryThreadOnNewsPost) -> Node<Msg>
        C!["flex", "p-4", "bg-neutral-800"],
        div![favicon],
        div![
-            C!["px-4", "mr-auto", "flex-1"],
+            C!["px-4", "mr-auto"],
            div![
-                div![
-                    C!["flex"],
-                    div![C!["font-semibold", "text-sm", "flex-1"], from],
-                    snooze_buttons(Some(post.timestamp), &id),
-                ],
+                div![C!["font-semibold", "text-sm"], from],
                div![
                    C!["flex", "gap-2", "pt-2", "text-sm"],
                    a![
@ -1730,47 +1682,3 @@ fn click_to_top() -> Node<Msg> {
        ev(Ev::Click, |_| Msg::ScrollToTop)
    ]
 }
-
-fn snooze_buttons(timestamp: Option<i64>, id: &str) -> Node<Msg> {
-    div![
-        span![C!["px-2"], "⏰"],
-        button![
-            tw_classes::button(),
-            C!["rounded-r-none"],
-            "1d",
-            ev(Ev::Click, {
-                let id = id.to_string();
-                move |e| {
-                    e.stop_propagation();
-                    Msg::Snooze(id, Utc::now() + chrono::Days::new(1))
-                }
-            })
-        ],
-        button![
-            tw_classes::button(),
-            C!["rounded-none"],
-            "7d",
-            ev(Ev::Click, {
-                let id = id.to_string();
-                move |e| {
-                    e.stop_propagation();
-                    Msg::Snooze(id, Utc::now() + chrono::Days::new(7))
-                }
-            })
-        ],
-        timestamp.map(
-            |ts| chrono::DateTime::from_timestamp(ts, 0).map(|ts| button![
-                tw_classes::button(),
-                C!["rounded-l-none"],
-                "+6m",
-                ev(Ev::Click, {
-                    let id = id.to_string();
-                    move |e| {
-                        e.stop_propagation();
-                        Msg::Snooze(id, ts + chrono::Days::new(180))
-                    }
-                })
-            ])
-        ),
-    ]
-}
--- a/web/static/email-specific.css
+++ b/web/static/email-specific.css
@ -1,11 +0,0 @@
-.mail-thread .content.from-noreply-news-bloomberg-com a {
-  background-color: initial !important;
-}
-
-.mail-thread .content.from-noreply-news-bloomberg-com h2 {
-  margin: 0 !important;
-  padding: 0 !important;
-}
-.mail-thread .content.from-dmarcreport-microsoft-com div {
-  font-family:  ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important;
-}
--- a/web/static/overrides.css
+++ b/web/static/overrides.css
@ -57,6 +57,15 @@ html {
  margin-left: 2em;
 }

+.mail-thread .content .noreply-news-bloomberg-com a {
+  background-color: initial !important;
+}
+
+.mail-thread .content .noreply-news-bloomberg-com h2 {
+  margin: 0 !important;
+  padding: 0 !important;
+}
+
 /* Hackaday figures have unreadable black on dark grey */
 .news-post figcaption.wp-caption-text {
  background-color: initial !important;
				`@ -1 +0,0 @@`
				`SELECT rule as "rule: Json<Rule>" FROM email_rule ORDER BY sort_order`
				`@ -1 +0,0 @@`
				`SELECT url FROM email_photo ep JOIN email_address ea ON ep.id = ea.email_photo_id WHERE address = $1`