From 05eb6bc6661b574f8e4da496de645356f6b3ae93 Mon Sep 17 00:00:00 2001
From: mdecimus <mauro@stalw.art>
Date: Fri, 21 Jun 2024 18:08:15 +0200
Subject: [PATCH] v0.1.6

---
 CHANGELOG.md                         |  18 +
 Cargo.lock                           | 184 +++++----
 Cargo.toml                           |   2 +-
 src/components/icon.rs               |  16 +
 src/components/layout/header.rs      |  35 +-
 src/components/layout/sidebar.rs     |   4 +-
 src/components/messages/alert.rs     |  16 +
 src/core/form.rs                     |   8 +-
 src/core/http.rs                     |   6 +
 src/core/url.rs                      |  14 +-
 src/main.rs                          |  34 +-
 src/pages/config/edit.rs             |  35 +-
 src/pages/config/mod.rs              |  11 +-
 src/pages/config/schema/imap.rs      | 178 ++++++++-
 src/pages/config/schema/server.rs    | 119 ++++++
 src/pages/config/schema/smtp.rs      | 165 +++++++-
 src/pages/config/schema/spamlists.rs |  13 +-
 src/pages/config/schema/store.rs     |   1 +
 src/pages/manage/mod.rs              |   1 +
 src/pages/manage/spam.rs             | 554 +++++++++++++++++++++++++++
 src/pages/queue/messages/list.rs     |   4 +-
 style/output.css                     |   4 +
 22 files changed, 1288 insertions(+), 134 deletions(-)
 create mode 100644 src/pages/manage/spam.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1dc1915..a9ba3cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.1.6] - 2024-06-22
+
+## Added
+- SPAM training and testing interfaces.
+- WebHooks management.
+- Filter hooks management.
+- IMAP special use folder configuration.
+- Display version number by hovering over the logo.
+- Logout button.
+
+### Changed
+- Show a modal when settings are saved successfully instead of an alert.
+
+### Fixed
+- Accept `reject` and `discard` as valid SPAM scores.
+- Redis cluster can't be configured.
+- Case-insensitive settings search.
+
 ## [0.1.5] - 2024-05-23
 
 ## Added
diff --git a/Cargo.lock b/Cargo.lock
index 115de02..87e6af1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -42,9 +42,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.83"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
 [[package]]
 name = "async-recursion"
@@ -156,15 +156,15 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "camino"
-version = "1.1.6"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c"
+checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239"
 
 [[package]]
 name = "cc"
-version = "1.0.97"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4"
+checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
 
 [[package]]
 name = "cfg-if"
@@ -345,9 +345,9 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.20.8"
+version = "0.20.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391"
+checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -355,9 +355,9 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.8"
+version = "0.20.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f"
+checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
 dependencies = [
  "fnv",
  "ident_case",
@@ -369,9 +369,9 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.20.8"
+version = "0.20.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
+checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
 dependencies = [
  "darling_core",
  "quote",
@@ -440,9 +440,9 @@ checksum = "669a445ee724c5c69b1b06fe0b63e70a1c84bc9bb7d9696cd4f4e3ec45050408"
 
 [[package]]
 name = "either"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
+checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
 
 [[package]]
 name = "equivalent"
@@ -797,9 +797,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "leptos"
-version = "0.6.11"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20f79fe71c41f5a0506c273f6698a1971bb994ef52a88aeaf4eccb159fcd1e11"
+checksum = "b5fae88b21265cbb847c891d7cf660e284a1282da15459691992be9358e906fb"
 dependencies = [
  "cfg-if",
  "leptos_config",
@@ -840,9 +840,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_config"
-version = "0.6.11"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3caa62f62e8e575051305ed6ac5648dc695f202c7220a98aca21cf4e9a978cf"
+checksum = "ec33b6f994829469ba7c62bfd5fb572a639071d0de715a41c2aa0df86301a4fa"
 dependencies = [
  "config",
  "regex",
@@ -853,9 +853,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_dom"
-version = "0.6.11"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96e84abb02efd711f0842ff3e444292bfa9963811c37e7be3980a052628ed63b"
+checksum = "867d2afc153cc0f1d6f775872d5dfc409385f4d8544831ee45f720d88f363e6b"
 dependencies = [
  "async-recursion",
  "cfg-if",
@@ -883,9 +883,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_hot_reload"
-version = "0.6.11"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4ee917deba2522a7f22ca826df84a8800d66ac918e58b489875e1f4fb8bc6b8"
+checksum = "ec5ce56051f2eff2c4736b7a2056177e67be19597b767ff72fbab20917a7422d"
 dependencies = [
  "anyhow",
  "camino",
@@ -901,9 +901,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_macro"
-version = "0.6.11"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31197c2c624c405bec5f1dc8dd5d903a6030d1f0b8e362a01a3a215fcbad5051"
+checksum = "019016cc0193831660a7794aa046e4c01617d97ccb2f403a5c10b21744391a71"
 dependencies = [
  "attribute-derive",
  "cfg-if",
@@ -924,9 +924,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_meta"
-version = "0.6.11"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00900e82a4ca892828db93fce1d4c009480ff3959406e6965aa937c8bab7403"
+checksum = "873ec368535d9971df4848ca21e91aa96fa00a6884258ab8f926db69ea97f547"
 dependencies = [
  "cfg-if",
  "indexmap",
@@ -938,15 +938,16 @@ dependencies = [
 
 [[package]]
 name = "leptos_reactive"
-version = "0.6.11"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057de706568ce8f1f223ae69f796c10ad0563ad270d10717e70c2b2d22eefa60"
+checksum = "076064e3c84e3aa12d4bad283e82ba5968675f5f9714d04a5c38f169cd4f26b5"
 dependencies = [
  "base64",
  "cfg-if",
  "futures",
  "indexmap",
  "js-sys",
+ "oco_ref",
  "paste",
  "pin-project",
  "rustc-hash",
@@ -964,9 +965,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_router"
-version = "0.6.11"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7fcc2a95a20c8f41adb39770e65c48ffe33cd9503b83669c54edd9b33ba8aa8"
+checksum = "d66db10225f0caf60b0183935b288791ac3494ca6e1306d415ea97287b6c2db5"
 dependencies = [
  "cfg-if",
  "gloo-net",
@@ -980,7 +981,7 @@ dependencies = [
  "send_wrapper",
  "serde",
  "serde_json",
- "serde_qs",
+ "serde_qs 0.13.0",
  "thiserror",
  "tracing",
  "wasm-bindgen",
@@ -990,9 +991,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_server"
-version = "0.6.11"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f197d9cbf7db3a09a5d6c561ad0547ad6bf4326bc6bc454171d5f6ee94f745a"
+checksum = "603064a2d7ac46dba4b3ed5397a475076f9738918dd605670869dfe877d5966c"
 dependencies = [
  "inventory",
  "lazy_static",
@@ -1006,9 +1007,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.154"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libm"
@@ -1078,9 +1079,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "minimal-lexical"
@@ -1113,6 +1114,16 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "oco_ref"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c51ebcefb2f0b9a5e0bea115532c8ae4215d1b01eff176d0f4ba4192895c2708"
+dependencies = [
+ "serde",
+ "thiserror",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.19.0"
@@ -1133,9 +1144,9 @@ checksum = "56d80efc4b6721e8be2a10a5df21a30fa0b470f1539e53d8b4e6e75faf938b63"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -1262,9 +1273,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -1361,18 +1372,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
 dependencies = [
  "bitflags",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1382,9 +1393,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1393,9 +1404,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "rstml"
@@ -1455,9 +1466,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.201"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
 dependencies = [
  "serde_derive",
 ]
@@ -1475,9 +1486,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.201"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1506,11 +1517,22 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "serde_qs"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd34f36fe4c5ba9654417139a9b3a20d2e1de6012ee678ad14d240c22c78d8d6"
+dependencies = [
+ "percent-encoding",
+ "serde",
+ "thiserror",
+]
+
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
 dependencies = [
  "serde",
 ]
@@ -1538,9 +1560,9 @@ dependencies = [
 
 [[package]]
 name = "server_fn"
-version = "0.6.11"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "536a5b959673643ee01e59ae41bf01425482c8070dee95d7061ee2d45296b59c"
+checksum = "b06e6e5467a2cd93ce1accfdfd8b859404f0b3b2041131ffd774fabf666b8219"
 dependencies = [
  "bytes",
  "ciborium",
@@ -1554,7 +1576,7 @@ dependencies = [
  "send_wrapper",
  "serde",
  "serde_json",
- "serde_qs",
+ "serde_qs 0.12.0",
  "server_fn_macro_default",
  "thiserror",
  "url",
@@ -1567,9 +1589,9 @@ dependencies = [
 
 [[package]]
 name = "server_fn_macro"
-version = "0.6.11"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "064dd9b256e78bf2886774f265cc34d2aefdd05b430c58c78a69eceef21b5e60"
+checksum = "09c216bb1c1ac890151397643c663c875a1836adf0b269be4e389cb1b48c173c"
 dependencies = [
  "const_format",
  "convert_case",
@@ -1581,9 +1603,9 @@ dependencies = [
 
 [[package]]
 name = "server_fn_macro_default"
-version = "0.6.11"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4ad11700cbccdbd313703916eb8c97301ee423c4a06e5421b77956fdcb36a9f"
+checksum = "00783df297ec85ea605779f2fef9cbec98981dffe2e01e1a9845c102ee1f1ae6"
 dependencies = [
  "server_fn_macro",
  "syn",
@@ -1642,9 +1664,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "strsim"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "subtle"
@@ -1654,9 +1676,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "2.0.63"
+version = "2.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704"
+checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1677,18 +1699,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.60"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.60"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1743,9 +1765,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "toml"
-version = "0.8.12"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -1755,18 +1777,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.12"
+version = "0.22.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
+checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
 dependencies = [
  "indexmap",
  "serde",
@@ -1867,9 +1889,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -2004,7 +2026,7 @@ dependencies = [
 
 [[package]]
 name = "webadmin"
-version = "0.1.5"
+version = "0.1.6"
 dependencies = [
  "ahash",
  "base64",
@@ -2122,9 +2144,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
 name = "winnow"
-version = "0.6.8"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d"
+checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
 dependencies = [
  "memchr",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index eb291c8..c5880ac 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ homepage = "https://stalw.art"
 keywords = ["web", "admin", "email", "mail", "server"]
 categories = ["email"]
 license = "AGPL-3.0-only"
-version = "0.1.5"
+version = "0.1.6"
 edition = "2021"
 resolver = "2"
 
diff --git a/src/components/icon.rs b/src/components/icon.rs
index 43662c7..38ffc31 100644
--- a/src/components/icon.rs
+++ b/src/components/icon.rs
@@ -562,3 +562,19 @@ pub fn IconWrench(
         </SvgWrapper>
     }
 }
+
+#[component]
+pub fn IconHeart(
+    #[prop(optional)] size: Option<usize>,
+    #[prop(attrs)] attrs: Vec<(&'static str, Attribute)>,
+) -> impl IntoView {
+    view! {
+        <SvgWrapper size attrs>
+            <path
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                d="M21 8.25c0-2.485-2.099-4.5-4.688-4.5-1.935 0-3.597 1.126-4.312 2.733-.715-1.607-2.377-2.733-4.313-2.733C5.1 3.75 3 5.765 3 8.25c0 7.22 9 12 9 12s9-4.78 9-12Z"
+            ></path>
+        </SvgWrapper>
+    }
+}
diff --git a/src/components/layout/header.rs b/src/components/layout/header.rs
index 1f558e4..77592f3 100644
--- a/src/components/layout/header.rs
+++ b/src/components/layout/header.rs
@@ -21,13 +21,20 @@
  * for more details.
 */
 
+use gloo_storage::{SessionStorage, Storage};
 use leptos::*;
 use leptos_router::use_navigate;
 
 use crate::{
-    components::icon::{IconAdjustmentsHorizontal, IconServer, IconUserCircle},
-    core::url::UrlBuilder,
+    components::icon::{
+        IconAdjustmentsHorizontal, IconHeart, IconPower, IconServer, IconUserCircle,
+    },
+    core::{
+        oauth::{use_authorization, AuthToken},
+        url::UrlBuilder,
+    },
     pages::config::edit::DEFAULT_SETTINGS_URL,
+    STATE_STORAGE_KEY, VERSION_NAME,
 };
 use web_sys::wasm_bindgen::JsCast;
 
@@ -38,7 +45,7 @@ pub fn Header(is_admin: MaybeSignal<bool>) -> impl IntoView {
             <nav class="flex basis-full items-center w-full mx-auto px-4 sm:px-6 md:px-8">
 
                 <div class="me-5 lg:me-0 lg:hidden">
-                    <img src="/logo.svg"/>
+                    <img src="/logo.svg" title=VERSION_NAME/>
                 </div>
 
                 <div class="w-full flex items-center justify-end ms-auto sm:justify-between sm:gap-x-3 sm:order-3">
@@ -141,6 +148,28 @@ pub fn Header(is_admin: MaybeSignal<bool>) -> impl IntoView {
                             <IconUserCircle/>
 
                         </a>
+                        <a
+                            class="w-[2.375rem] h-[2.375rem] inline-flex justify-center items-center gap-x-2 text-sm font-semibold rounded-full border border-transparent text-gray-800 hover:bg-gray-100 disabled:opacity-50 disabled:pointer-events-none dark:text-white dark:hover:bg-gray-700 dark:focus:outline-none dark:focus:ring-1 dark:focus:ring-gray-600"
+                            href="https://github.com/sponsors/stalwartlabs"
+                            target="_blank"
+                            title="Sponsor Stalwart open source"
+                        >
+                            <IconHeart/>
+
+                        </a>
+                        <a
+                            class="w-[2.375rem] h-[2.375rem] inline-flex justify-center items-center gap-x-2 text-sm font-semibold rounded-full border border-transparent text-gray-800 hover:bg-gray-100 disabled:opacity-50 disabled:pointer-events-none dark:text-white dark:hover:bg-gray-700 dark:focus:outline-none dark:focus:ring-1 dark:focus:ring-gray-600"
+                            title="Logout"
+                            on:click=move |_| {
+                                SessionStorage::delete(STATE_STORAGE_KEY);
+                                use_authorization().set(AuthToken::default());
+                                use_navigate()("/login", Default::default());
+                            }
+                        >
+
+                            <IconPower/>
+
+                        </a>
                     </div>
                 </div>
             </nav>
diff --git a/src/components/layout/sidebar.rs b/src/components/layout/sidebar.rs
index c6d380b..cf28b43 100644
--- a/src/components/layout/sidebar.rs
+++ b/src/components/layout/sidebar.rs
@@ -24,6 +24,8 @@
 use leptos::*;
 use leptos_router::use_location;
 
+use crate::VERSION_NAME;
+
 use super::MenuItem;
 
 #[component]
@@ -37,7 +39,7 @@ pub fn SideBar(menu_items: Vec<MenuItem>, show_sidebar: RwSignal<bool>) -> impl
             class:open=move || show_sidebar.get()
         >
             <div class="px-8">
-                <img src="/logo.svg" style="height: 25px;"/>
+                <img src="/logo.svg" style="height: 25px;" title=VERSION_NAME/>
             </div>
 
             <nav
diff --git a/src/components/messages/alert.rs b/src/components/messages/alert.rs
index a468370..926431e 100644
--- a/src/components/messages/alert.rs
+++ b/src/components/messages/alert.rs
@@ -227,6 +227,22 @@ impl Alert {
         self
     }
 
+    pub fn with_details_list<T, I>(mut self, details: T) -> Self
+    where
+        T: IntoIterator<Item = I>,
+        I: Into<String>,
+    {
+        let items = details
+            .into_iter()
+            .map(|item| {
+                view! { <li>{item.into()}</li> }
+            })
+            .collect_view();
+        self.details =
+            Some(view! { <ul class="list-disc space-y-1 ps-5">{items}</ul> }.into_view());
+        self
+    }
+
     pub fn close(&mut self) {
         self.typ = AlertType::None;
     }
diff --git a/src/core/form.rs b/src/core/form.rs
index 989c836..6ccd7ee 100644
--- a/src/core/form.rs
+++ b/src/core/form.rs
@@ -42,7 +42,7 @@ use super::schema::{InputCheck, Schema, Transformer, Validator};
 
 pub type ExternalSources = AHashMap<String, Vec<(String, String)>>;
 
-#[derive(Clone, PartialEq, Eq, Default)]
+#[derive(Clone, PartialEq, Eq, Default, Debug)]
 pub struct FormData {
     pub values: AHashMap<String, FormValue>,
     pub errors: AHashMap<String, FormError>,
@@ -164,6 +164,12 @@ impl FormData {
         self.errors.remove(id);
     }
 
+    pub fn reset(&mut self) {
+        self.values.clear();
+        self.errors.clear();
+        self.apply_defaults(false);
+    }
+
     pub fn array_value<'x>(&'x self, id: &str) -> Box<dyn Iterator<Item = &'x str> + 'x> {
         match self.values.get(id) {
             Some(FormValue::Array(values)) => Box::new(values.iter().map(|v| v.as_str())),
diff --git a/src/core/http.rs b/src/core/http.rs
index 2c59de0..726a2d0 100644
--- a/src/core/http.rs
+++ b/src/core/http.rs
@@ -21,6 +21,7 @@
  * for more details.
 */
 
+use ahash::AHashMap;
 use base64::{engine::general_purpose::STANDARD, Engine};
 use gloo_net::http::{Headers, Method, RequestBuilder};
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
@@ -103,6 +104,11 @@ impl<'x> HttpRequest {
         self
     }
 
+    pub fn with_parameters(mut self, params: AHashMap<String, String>) -> Self {
+        self.url = self.url.with_parameters(params);
+        self
+    }
+
     pub fn with_optional_parameter(
         mut self,
         key: &'static str,
diff --git a/src/core/url.rs b/src/core/url.rs
index 5f38516..dc5e659 100644
--- a/src/core/url.rs
+++ b/src/core/url.rs
@@ -21,11 +21,13 @@
  * for more details.
 */
 
+use std::borrow::Cow;
+
 use ahash::AHashMap;
 
 pub struct UrlBuilder {
     pub path: String,
-    pub params: AHashMap<&'static str, String>,
+    pub params: AHashMap<Cow<'static, str>, String>,
 }
 
 impl UrlBuilder {
@@ -51,7 +53,7 @@ impl UrlBuilder {
     }
 
     pub fn with_parameter(mut self, key: &'static str, value: impl Into<String>) -> Self {
-        self.params.insert(key, value.into());
+        self.params.insert(key.into(), value.into());
         self
     }
 
@@ -61,11 +63,17 @@ impl UrlBuilder {
         value: Option<impl Into<String>>,
     ) -> Self {
         if let Some(value) = value {
-            self.params.insert(key, value.into());
+            self.params.insert(key.into(), value.into());
         }
         self
     }
 
+    pub fn with_parameters(mut self, params: AHashMap<String, String>) -> Self {
+        self.params
+            .extend(params.into_iter().map(|(k, v)| (k.into(), v)));
+        self
+    }
+
     pub fn finish(self) -> String {
         if self.params.is_empty() {
             self.path
diff --git a/src/main.rs b/src/main.rs
index dddeb7d..ad38514 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -28,7 +28,7 @@ use std::{sync::Arc, time::Duration};
 use components::{
     icon::{
         IconAdjustmentsHorizontal, IconDocumentChartBar, IconDocumentText, IconKey, IconLockClosed,
-        IconQueueList, IconUserGroup, IconWrench,
+        IconQueueList, IconShieldCheck, IconUserGroup, IconWrench,
     },
     layout::MenuItem,
 };
@@ -36,7 +36,12 @@ use gloo_storage::{SessionStorage, Storage};
 use leptos::*;
 use leptos_meta::*;
 use leptos_router::*;
-use pages::config::edit::DEFAULT_SETTINGS_URL;
+use pages::{
+    config::edit::DEFAULT_SETTINGS_URL,
+    manage::spam::{SpamTest, SpamTrain},
+};
+
+pub static VERSION_NAME: &str = concat!("Stalwart Management UI v", env!("CARGO_PKG_VERSION"),);
 
 use crate::{
     components::{
@@ -71,8 +76,8 @@ pub const STATE_STORAGE_KEY: &str = "webadmin_state";
 pub const STATE_LOGIN_NAME_KEY: &str = "webadmin_login_name";
 
 fn main() {
-    console_error_panic_hook::set_once();
     _ = console_log::init_with_level(log::Level::Debug);
+    console_error_panic_hook::set_once();
     leptos::mount_to_body(|| view! { <App/> })
 }
 
@@ -222,7 +227,6 @@ pub fn App() -> impl IntoView {
                     <ProtectedRoute
                         path="/reports/:object/:id"
                         view=IncomingReportDisplay
-
                         redirect_path="/login"
                         condition=move || is_admin.get()
                     />
@@ -232,6 +236,18 @@ pub fn App() -> impl IntoView {
                         redirect_path="/login"
                         condition=move || is_admin.get()
                     />
+                    <ProtectedRoute
+                        path="/spam/train"
+                        view=SpamTrain
+                        redirect_path="/login"
+                        condition=move || is_admin.get()
+                    />
+                    <ProtectedRoute
+                        path="/spam/test"
+                        view=SpamTest
+                        redirect_path="/login"
+                        condition=move || is_admin.get()
+                    />
                     <ProtectedRoute
                         path="/maintenance"
                         view=Maintenance
@@ -340,6 +356,15 @@ impl LayoutBuilder {
             .route("/reports/arf")
             .insert()
             .insert()
+            .create("SPAM Filter")
+            .icon(view! { <IconShieldCheck/> })
+            .create("Train")
+            .route("/spam/train")
+            .insert()
+            .create("Test")
+            .route("/spam/test")
+            .insert()
+            .insert()
             .create("Logs")
             .icon(view! { <IconDocumentText/> })
             .route("/logs")
@@ -389,6 +414,7 @@ pub fn build_schemas() -> Arc<Schemas> {
         .build_imap()
         .build_sieve()
         .build_spam_lists()
+        .build_spam_manage()
         .build_password_change()
         .build_crypto()
         .build_authorize()
diff --git a/src/pages/config/edit.rs b/src/pages/config/edit.rs
index 195891a..d2378f3 100644
--- a/src/pages/config/edit.rs
+++ b/src/pages/config/edit.rs
@@ -42,7 +42,10 @@ use crate::{
             Form, FormButtonBar, FormElement, FormItem, FormSection,
         },
         icon::IconRefresh,
-        messages::alert::{use_alerts, Alert},
+        messages::{
+            alert::{use_alerts, Alert},
+            modal::{use_modals, Modal},
+        },
         skeleton::Skeleton,
         Color,
     },
@@ -82,6 +85,7 @@ pub fn SettingsEdit() -> impl IntoView {
     let auth = use_authorization();
     let alert = use_alerts();
     let params = use_params_map();
+    let modal = use_modals();
 
     let schemas = expect_context::<Arc<Schemas>>();
     let current_schema = create_memo(move |_| {
@@ -235,8 +239,6 @@ pub fn SettingsEdit() -> impl IntoView {
             let auth = auth.get();
             let schema = current_schema.get();
 
-            //let c = log::debug!("Saving changes: {:?}", changes);
-
             async move {
                 set_pending.set(true);
                 match HttpRequest::post("/api/settings")
@@ -262,9 +264,18 @@ pub fn SettingsEdit() -> impl IntoView {
                                     if result.errors.is_empty() {
                                         match schema.list_path() {
                                             Some(url) => use_navigate()(&url, Default::default()),
-                                            None => alert.set(Alert::success(
-                                                "Settings successfully saved and reloaded",
-                                            )),
+                                            None => {
+                                                modal.set(
+                                                    Modal::with_title("Settings reloaded")
+                                                        .with_message(concat!(
+                                                            "Your changes have been successfully ",
+                                                            "saved and all settings have been  ",
+                                                            "reloaded. You may now close ",
+                                                            "this window."
+                                                        ))
+                                                        .with_button("OK"),
+                                                );
+                                            }
                                         }
                                     } else {
                                         alert.set(Alert::from(result));
@@ -282,7 +293,17 @@ pub fn SettingsEdit() -> impl IntoView {
                             set_pending.set(false);
                             match schema.list_path() {
                                 Some(url) => use_navigate()(&url, Default::default()),
-                                None => alert.set(Alert::success("Settings successfully saved")),
+                                None => {
+                                    modal.set(
+                                        Modal::with_title("Settings saved")
+                                            .with_message(concat!(
+                                                "Your changes have been saved successfully. ",
+                                                "You may now reload the configuration ",
+                                                "to apply the updates."
+                                            ))
+                                            .with_button("OK"),
+                                    );
+                                }
                             }
                         }
                     }
diff --git a/src/pages/config/mod.rs b/src/pages/config/mod.rs
index cfb7b84..65a48cc 100644
--- a/src/pages/config/mod.rs
+++ b/src/pages/config/mod.rs
@@ -315,6 +315,10 @@ impl LayoutBuilder {
             .create("Logging & Tracing")
             .route("/tracing")
             .insert()
+            // Logging
+            .create("WebHooks")
+            .route("/web-hooks")
+            .insert()
             // Cache
             .create("Cache")
             .route("/cache/edit")
@@ -391,6 +395,9 @@ impl LayoutBuilder {
             .create("Milters")
             .route("/milter")
             .insert()
+            .create("Hooks")
+            .route("/filter-hooks")
+            .insert()
             .create("Pipes")
             .route("/pipe")
             .insert()
@@ -467,8 +474,8 @@ impl LayoutBuilder {
             .create("Authentication")
             .route("/imap-auth/edit")
             .insert()
-            .create("Settings")
-            .route("/imap-settings/edit")
+            .create("Folders")
+            .route("/imap-folders/edit")
             .insert()
             .create("Protocol Limits")
             .route("/imap-limits/edit")
diff --git a/src/pages/config/schema/imap.rs b/src/pages/config/schema/imap.rs
index 44f2a93..b818a35 100644
--- a/src/pages/config/schema/imap.rs
+++ b/src/pages/config/schema/imap.rs
@@ -123,18 +123,180 @@ impl Builder<Schemas, ()> {
             ])
             .build()
             .build()
-            // Settings
-            .new_schema("imap-settings")
-            .new_field("imap.folders.name.shared")
-            .label("Shared")
-            .help("Designates the name of the folder that will contain all shared folders")
+            // Folders
+            .new_schema("imap-folders")
+            .new_field("jmap.folders.inbox.name")
+            .label("Name")
+            .help("Default name for the inbox folder")
+            .default("Inbox")
+            .typ(Type::Input)
+            .input_check([Transformer::Trim], [])
+            .build()
+            .new_field("jmap.folders.inbox.create")
+            .label("Create automatically")
+            .help("Whether to create the inbox folder automatically")
+            .default("true")
+            .typ(Type::Boolean)
+            .build()
+            .new_field("jmap.folders.inbox.subscribe")
+            .label("Subscribe automatically")
+            .help("Whether to subscribe to the inbox folder automatically")
+            .default("true")
+            .typ(Type::Boolean)
+            .build()
+            .new_field("jmap.folders.trash.name")
+            .label("Name")
+            .help("Default name for the trash folder")
+            .default("Deleted Items")
+            .typ(Type::Input)
+            .input_check([Transformer::Trim], [])
+            .build()
+            .new_field("jmap.folders.trash.create")
+            .label("Create automatically")
+            .help("Whether to create the trash folder automatically")
+            .default("true")
+            .typ(Type::Boolean)
+            .build()
+            .new_field("jmap.folders.trash.subscribe")
+            .label("Subscribe automatically")
+            .help("Whether to subscribe to the trash folder automatically")
+            .default("true")
+            .typ(Type::Boolean)
+            .build()
+            .new_field("jmap.folders.junk.name")
+            .label("Name")
+            .help("Default name for the junk folder")
+            .default("Junk Mail")
+            .typ(Type::Input)
+            .input_check([Transformer::Trim], [])
+            .build()
+            .new_field("jmap.folders.junk.create")
+            .label("Create automatically")
+            .help("Whether to create the junk folder automatically")
+            .default("true")
+            .typ(Type::Boolean)
+            .build()
+            .new_field("jmap.folders.junk.subscribe")
+            .label("Subscribe automatically")
+            .help("Whether to subscribe to the junk folder automatically")
+            .default("true")
+            .typ(Type::Boolean)
+            .build()
+            .new_field("jmap.folders.drafts.name")
+            .label("Name")
+            .help("Default name for the drafts folder")
+            .default("Drafts")
+            .typ(Type::Input)
+            .input_check([Transformer::Trim], [])
+            .build()
+            .new_field("jmap.folders.drafts.create")
+            .label("Create automatically")
+            .help("Whether to create the drafts folder automatically")
+            .default("true")
+            .typ(Type::Boolean)
+            .build()
+            .new_field("jmap.folders.drafts.subscribe")
+            .label("Subscribe automatically")
+            .help("Whether to subscribe to the drafts folder automatically")
+            .default("true")
+            .typ(Type::Boolean)
+            .build()
+            .new_field("jmap.folders.sent.name")
+            .label("Name")
+            .help("Default name for the sent folder")
+            .default("Sent Items")
+            .typ(Type::Input)
+            .input_check([Transformer::Trim], [])
+            .build()
+            .new_field("jmap.folders.sent.create")
+            .label("Create automatically")
+            .help("Whether to create the sent folder automatically")
+            .default("true")
+            .typ(Type::Boolean)
+            .build()
+            .new_field("jmap.folders.sent.subscribe")
+            .label("Subscribe automatically")
+            .help("Whether to subscribe to the sent folder automatically")
+            .default("true")
+            .typ(Type::Boolean)
+            .build()
+            .new_field("jmap.folders.archive.name")
+            .label("Name")
+            .help("Default name for the archive folder")
+            .default("Archive")
+            .typ(Type::Input)
+            .input_check([Transformer::Trim], [])
+            .build()
+            .new_field("jmap.folders.archive.create")
+            .label("Create automatically")
+            .help("Whether to create the archive folder automatically")
+            .default("true")
+            .typ(Type::Boolean)
+            .build()
+            .new_field("jmap.folders.archive.subscribe")
+            .label("Subscribe automatically")
+            .help("Whether to subscribe to the archive folder automatically")
+            .default("true")
+            .typ(Type::Boolean)
+            .build()
+            .new_field("jmap.folders.shared.name")
+            .label("Name")
+            .help("Default name for the shared folder")
             .default("Shared Folders")
             .typ(Type::Input)
-            .input_check([Transformer::Trim], [Validator::Required])
+            .input_check([Transformer::Trim], [])
+            .build()
+            .new_form_section()
+            .title("Inbox")
+            .fields([
+                "jmap.folders.inbox.name",
+                "jmap.folders.inbox.create",
+                "jmap.folders.inbox.subscribe",
+            ])
+            .build()
+            .new_form_section()
+            .title("Trash")
+            .fields([
+                "jmap.folders.trash.name",
+                "jmap.folders.trash.create",
+                "jmap.folders.trash.subscribe",
+            ])
+            .build()
+            .new_form_section()
+            .title("Junk")
+            .fields([
+                "jmap.folders.junk.name",
+                "jmap.folders.junk.create",
+                "jmap.folders.junk.subscribe",
+            ])
+            .build()
+            .new_form_section()
+            .title("Drafts")
+            .fields([
+                "jmap.folders.drafts.name",
+                "jmap.folders.drafts.create",
+                "jmap.folders.drafts.subscribe",
+            ])
+            .build()
+            .new_form_section()
+            .title("Sent")
+            .fields([
+                "jmap.folders.sent.name",
+                "jmap.folders.sent.create",
+                "jmap.folders.sent.subscribe",
+            ])
+            .build()
+            .new_form_section()
+            .title("Archive")
+            .fields([
+                "jmap.folders.archive.name",
+                "jmap.folders.archive.create",
+                "jmap.folders.archive.subscribe",
+            ])
             .build()
             .new_form_section()
-            .title("Folder Names")
-            .fields(["imap.folders.name.shared"])
+            .title("Shared Folders")
+            .fields(["jmap.folders.shared.name"])
             .build()
             .build()
     }
diff --git a/src/pages/config/schema/server.rs b/src/pages/config/schema/server.rs
index a72907e..2703857 100644
--- a/src/pages/config/schema/server.rs
+++ b/src/pages/config/schema/server.rs
@@ -384,9 +384,128 @@ impl Builder<Schemas, ()> {
             .fields(["cluster.key", "cluster.heartbeat", "cluster.seed-nodes"])
             .build()
             .build()
+            // Web hooks
+            .new_schema("web-hooks")
+            .prefix("webhook")
+            .suffix("url")
+            .names("webhook", "webhooks")
+            .new_id_field()
+            .label("WebHook Id")
+            .help("Unique identifier for this webhook")
+            .build()
+            .new_field("url")
+            .label("Endpoint URL")
+            .help(concat!("URL of the webhook endpoint"))
+            .placeholder("https://127.0.0.1/webhook")
+            .typ(Type::Input)
+            .input_check([Transformer::Trim], [Validator::Required, Validator::IsUrl])
+            .build()
+            .new_field("allow-invalid-certs")
+            .label("Allow Invalid Certs")
+            .help(concat!(
+                "Whether Stalwart should connect to a webhook ",
+                "endpoint that has an invalid TLS certificate"
+            ))
+            .default("false")
+            .typ(Type::Boolean)
+            .input_check([], [Validator::Required])
+            .build()
+            .new_field("timeout")
+            .label("Timeout")
+            .help(concat!(
+                "Maximum amount of time that Stalwart will wait for a response ",
+                "from this webhook"
+            ))
+            .default("30s")
+            .typ(Type::Duration)
+            .input_check([], [Validator::Required])
+            .build()
+            .new_field("throttle")
+            .label("Throttle")
+            .help(concat!(
+                "The minimum amount of time that must pass between ",
+                "each request to the webhook endpoint"
+            ))
+            .default("1s")
+            .typ(Type::Duration)
+            .input_check([], [Validator::Required])
+            .build()
+            .new_field("signature-key")
+            .label("Signature Key")
+            .help(concat!(
+                "The HMAC key used to sign the webhook request body ",
+                "to prevent tampering"
+            ))
+            .typ(Type::Secret)
+            .build()
+            .new_field("headers")
+            .typ(Type::Array)
+            .label("HTTP Headers")
+            .help("The headers to be sent with webhook requests")
+            .build()
+            .new_field("auth.username")
+            .label("Username")
+            .help(concat!(
+                "The username to use when authenticating with the webhook endpoint"
+            ))
+            .typ(Type::Input)
+            .input_check([Transformer::Trim], [])
+            .build()
+            .new_field("auth.secret")
+            .label("Secret")
+            .help(concat!(
+                "The secret to use when authenticating with the webhook endpoint"
+            ))
+            .typ(Type::Secret)
+            .build()
+            .new_field("events")
+            .label("Events")
+            .help("Which events should trigger this webhook")
+            .typ(Type::Select {
+                multi: true,
+                source: Source::Static(WEBHOOK_EVENTS),
+            })
+            .build()
+            .new_form_section()
+            .title("WebHook settings")
+            .fields(["_id", "url", "signature-key", "allow-invalid-certs"])
+            .build()
+            .new_form_section()
+            .title("Authentication")
+            .fields(["auth.username", "auth.secret"])
+            .build()
+            .new_form_section()
+            .title("Triggers")
+            .fields(["events"])
+            .build()
+            .new_form_section()
+            .title("Options")
+            .fields(["throttle", "timeout", "headers"])
+            .build()
+            .list_title("WebHooks")
+            .list_subtitle("Manage WebHooks")
+            .list_fields(["_id", "url"])
+            .build()
     }
 }
 
+pub static WEBHOOK_EVENTS: &[(&str, &str)] = &[
+    ("auth.success", "Authentication success"),
+    ("auth.failure", "Authentication failure"),
+    ("auth.banned", "Authentication ban"),
+    ("auth.error", "Authentication error"),
+    ("message.accepted", "Message accepted"),
+    ("message.rejected", "Message rejected"),
+    ("message.appended", "Message appended"),
+    ("account.over-quota", "Account over quota"),
+    ("dsn", "Delivery status notification"),
+    ("double-bounce", "Double bounce"),
+    ("report.incoming.dmarc", "Incoming DMARC report"),
+    ("report.incoming.tls", "Incoming TLS report"),
+    ("report.incoming.arf", "Incoming ARF report"),
+    ("report.outgoing", "Outgoing report"),
+];
+
 impl Builder<Schemas, Schema> {
     pub fn add_network_fields(self, is_listener: bool) -> Self {
         let do_override: &'static [&'static str] =
diff --git a/src/pages/config/schema/smtp.rs b/src/pages/config/schema/smtp.rs
index a70513a..b09ebfe 100644
--- a/src/pages/config/schema/smtp.rs
+++ b/src/pages/config/schema/smtp.rs
@@ -1413,7 +1413,7 @@ impl Builder<Schemas, ()> {
             .build()
             // Milter
             .new_schema("milter")
-            .prefix("session.data.milter")
+            .prefix("session.milter")
             .suffix("hostname")
             .names("milter", "milters")
             .new_id_field()
@@ -1469,7 +1469,7 @@ impl Builder<Schemas, ()> {
             .new_field("allow-invalid-certs")
             .label("Allow Invalid Certs")
             .help(concat!(
-                "Whether Stalwart SMTP should accept connections to a Milter filter ",
+                "Whether Stalwart SMTP should connect to a Milter filter ",
                 "server that has an invalid TLS certificate"
             ))
             .default("false")
@@ -1480,7 +1480,7 @@ impl Builder<Schemas, ()> {
             .label("Connection")
             .help(concat!(
                 "Maximum amount of time that Stalwart SMTP will wait to establish ",
-                "a connection with a Milter server"
+                "a connection with this Milter server"
             ))
             .default("30s")
             .typ(Type::Duration)
@@ -1511,7 +1511,7 @@ impl Builder<Schemas, ()> {
             .help(concat!(
                 "Whether to respond with a temporary failure (typically a 4xx ",
                 "SMTP status code) when Stalwart encounters an error while ",
-                "communicating with a Milter server"
+                "communicating with this Milter server"
             ))
             .default("true")
             .typ(Type::Boolean)
@@ -1521,7 +1521,7 @@ impl Builder<Schemas, ()> {
             .label("Max Response")
             .help(concat!(
                 "Maximum size, in bytes, of a response that Stalwart will accept",
-                " from a Milter server"
+                " from this Milter server"
             ))
             .default("52428800")
             .typ(Type::Size)
@@ -1540,17 +1540,30 @@ impl Builder<Schemas, ()> {
             })
             .input_check([], [Validator::Required])
             .build()
-            .new_form_section()
-            .title("Milter settings")
-            .fields(["_id", "hostname", "port", "enable"])
+            .new_field("stages")
+            .label("Run on stages")
+            .help("Which SMTP stages to run the milter on")
+            .typ(Type::Select {
+                multi: true,
+                source: Source::Static(SMTP_STAGES),
+            })
+            .default("data")
             .build()
             .new_form_section()
-            .title("TLS")
-            .fields(["tls", "allow-invalid-certs"])
+            .title("Milter settings")
+            .fields([
+                "_id",
+                "hostname",
+                "port",
+                "enable",
+                "tls",
+                "allow-invalid-certs",
+            ])
             .build()
             .new_form_section()
             .title("Options")
             .fields([
+                "stages",
                 "options.max-response-size",
                 "options.version",
                 "options.tempfail-on-error",
@@ -1564,6 +1577,130 @@ impl Builder<Schemas, ()> {
             .list_subtitle("Manage Milter filters")
             .list_fields(["_id", "hostname", "port"])
             .build()
+            // Filter hooks
+            .new_schema("filter-hooks")
+            .prefix("session.hook")
+            .suffix("url")
+            .names("filter hook", "filter hooks")
+            .new_id_field()
+            .label("Hook Id")
+            .help("Unique identifier for this filter hook")
+            .build()
+            .new_field("enable")
+            .label("Enable")
+            .help("Expression that determines whether to enable this filter hook")
+            .default("true")
+            .typ(Type::Expression)
+            .input_check(
+                [],
+                [
+                    Validator::Required,
+                    Validator::IsValidExpression(has_rcpt_vars),
+                ],
+            )
+            .build()
+            .new_field("url")
+            .label("Endpoint URL")
+            .help(concat!("URL of the filter hook endpoint"))
+            .placeholder("https://127.0.0.1/filter")
+            .typ(Type::Input)
+            .input_check([Transformer::Trim], [Validator::Required, Validator::IsUrl])
+            .build()
+            .new_field("allow-invalid-certs")
+            .label("Allow Invalid Certs")
+            .help(concat!(
+                "Whether Stalwart SMTP should connect to a filter hook ",
+                "server that has an invalid TLS certificate"
+            ))
+            .default("false")
+            .typ(Type::Boolean)
+            .input_check([], [Validator::Required])
+            .build()
+            .new_field("timeout")
+            .label("Timeout")
+            .help(concat!(
+                "Maximum amount of time that Stalwart SMTP will wait for a response ",
+                "from this filter hook server"
+            ))
+            .default("30s")
+            .typ(Type::Duration)
+            .input_check([], [Validator::Required])
+            .build()
+            .new_field("options.tempfail-on-error")
+            .label("TempFail on Error")
+            .help(concat!(
+                "Whether to respond with a temporary failure (typically a 4xx ",
+                "SMTP status code) when Stalwart encounters an error while ",
+                "communicating with this Filter hook server"
+            ))
+            .default("true")
+            .typ(Type::Boolean)
+            .input_check([], [Validator::Required])
+            .build()
+            .new_field("options.max-response-size")
+            .label("Max Size")
+            .help(concat!(
+                "Maximum size, in bytes, of a response that Stalwart will accept",
+                " from this Filter hook server"
+            ))
+            .default("52428800")
+            .typ(Type::Size)
+            .input_check([], [Validator::Required])
+            .build()
+            .new_field("headers")
+            .typ(Type::Array)
+            .label("HTTP Headers")
+            .help("The headers to be sent with filter hook requests")
+            .build()
+            .new_field("auth.username")
+            .label("Username")
+            .help(concat!(
+                "The username to use when authenticating with the filter hook server"
+            ))
+            .typ(Type::Input)
+            .input_check([Transformer::Trim], [])
+            .build()
+            .new_field("auth.secret")
+            .label("Secret")
+            .help(concat!(
+                "The secret to use when authenticating with the filter hook server"
+            ))
+            .typ(Type::Secret)
+            .input_check([Transformer::Trim], [])
+            .build()
+            .new_field("stages")
+            .label("Run on stages")
+            .help("Which SMTP stages to run this filter hook on")
+            .typ(Type::Select {
+                multi: true,
+                source: Source::Static(SMTP_STAGES),
+            })
+            .default("data")
+            .build()
+            .new_form_section()
+            .title("Filter hook settings")
+            .fields(["_id", "url", "enable", "allow-invalid-certs"])
+            .build()
+            .new_form_section()
+            .title("Authentication")
+            .fields(["auth.username", "auth.secret"])
+            .build()
+            .new_form_section()
+            .title("Options")
+            .fields(["stages", "headers"])
+            .build()
+            .new_form_section()
+            .title("Response")
+            .fields([
+                "options.max-response-size",
+                "timeout",
+                "options.tempfail-on-error",
+            ])
+            .build()
+            .list_title("Filter hooks")
+            .list_subtitle("Manage Filter hooks")
+            .list_fields(["_id", "url"])
+            .build()
             // Pipes
             .new_schema("pipe")
             .names("pipe", "pipes")
@@ -1657,3 +1794,11 @@ pub const REQUIRE_OPTIONAL_CONSTANTS: &[&str] = &[
 pub const AGGREGATE_FREQ_CONSTANTS: &[&str] = &[
     "daily", "day", "hourly", "hour", "weekly", "week", "never", "disable", "false",
 ];
+
+pub static SMTP_STAGES: &[(&str, &str)] = &[
+    ("connect", "Connect"),
+    ("ehlo", "EHLO"),
+    ("mail", "MAIL FROM"),
+    ("rcpt", "RCPT TO"),
+    ("data", "DATA"),
+];
diff --git a/src/pages/config/schema/spamlists.rs b/src/pages/config/schema/spamlists.rs
index 676c97c..f6083de 100644
--- a/src/pages/config/schema/spamlists.rs
+++ b/src/pages/config/schema/spamlists.rs
@@ -396,16 +396,9 @@ impl Builder<Schemas, ()> {
             )
             .build()
             .new_value_field()
-            .label("Score")
-            .help("The score for the tag")
-            .input_check(
-                [Transformer::Trim],
-                [
-                    Validator::Required,
-                    Validator::MinValue((-100.0).into()),
-                    Validator::MaxValue(100.0.into()),
-                ],
-            )
+            .label("Score or action")
+            .help("The score for the tag or action to perform (reject or discard)")
+            .input_check([Transformer::Trim], [Validator::Required])
             .build()
             .new_form_section()
             .fields(["_id", "_value"])
diff --git a/src/pages/config/schema/store.rs b/src/pages/config/schema/store.rs
index 9e67c63..076cbaa 100644
--- a/src/pages/config/schema/store.rs
+++ b/src/pages/config/schema/store.rs
@@ -452,6 +452,7 @@ impl Builder<Schemas, ()> {
             .label("Min Wait")
             .help("Minimum time to wait between retries")
             .placeholder("500ms")
+            .build()
             .new_field("read-from-replicas")
             .label("Read from replicas")
             .help("Whether to read from replicas")
diff --git a/src/pages/manage/mod.rs b/src/pages/manage/mod.rs
index c1529d2..5a04f66 100644
--- a/src/pages/manage/mod.rs
+++ b/src/pages/manage/mod.rs
@@ -23,3 +23,4 @@
 
 pub mod logs;
 pub mod maintenance;
+pub mod spam;
diff --git a/src/pages/manage/spam.rs b/src/pages/manage/spam.rs
new file mode 100644
index 0000000..5bedf39
--- /dev/null
+++ b/src/pages/manage/spam.rs
@@ -0,0 +1,554 @@
+/*
+ * Copyright (c) 2024, Stalwart Labs Ltd.
+ *
+ * This file is part of Stalwart Mail Web-based Admin.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ * in the LICENSE file at the top-level directory of this distribution.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * You can be released from the requirements of the AGPLv3 license by
+ * purchasing a commercial license. Please contact licensing@stalw.art
+ * for more details.
+*/
+
+use std::{net::IpAddr, sync::Arc};
+
+use ahash::AHashMap;
+use leptos::*;
+use leptos_router::use_navigate;
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    components::{
+        form::{
+            button::Button,
+            input::{InputSwitch, InputText, TextArea},
+            select::Select,
+            stacked_input::StackedInput,
+            Form, FormButtonBar, FormElement, FormItem, FormSection,
+        },
+        messages::alert::{use_alerts, Alert},
+        Color,
+    },
+    core::{
+        form::FormValue,
+        http::{Error, HttpRequest},
+        oauth::use_authorization,
+        schema::{Builder, Schemas, Source, Transformer, Type, Validator},
+    },
+};
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(tag = "action")]
+#[serde(rename_all = "lowercase")]
+pub enum Response {
+    Accept {
+        modifications: Vec<Modification>,
+    },
+    Replace {
+        message: String,
+        modifications: Vec<Modification>,
+    },
+    Reject {
+        reason: String,
+    },
+    Discard,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(tag = "action")]
+#[serde(rename_all = "camelCase")]
+pub enum Modification {
+    SetEnvelope { name: Envelope, value: String },
+    AddHeader { name: String, value: String },
+}
+
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash, Serialize, Deserialize)]
+pub enum Envelope {
+    From,
+    To,
+    ByTimeAbsolute,
+    ByTimeRelative,
+    ByMode,
+    ByTrace,
+    Notify,
+    Orcpt,
+    Ret,
+    Envid,
+}
+
+#[component]
+pub fn SpamTest() -> impl IntoView {
+    let auth = use_authorization();
+    let alert = use_alerts();
+
+    let (pending, set_pending) = create_signal(false);
+
+    let mut data = expect_context::<Arc<Schemas>>().build_form("spam-test");
+    data.apply_defaults(false);
+    let data = data.into_signal();
+
+    let save_changes = create_action(
+        move |(variables, message): &(AHashMap<String, String>, String)| {
+            let auth = auth.get();
+            let variables = variables.clone();
+            let message = message.clone();
+
+            async move {
+                set_pending.set(true);
+                let result = HttpRequest::post("/api/sieve/spam-filter")
+                    .with_authorization(&auth)
+                    .with_parameters(variables)
+                    .with_raw_body(message)
+                    .send::<Response>()
+                    .await;
+
+                set_pending.set(false);
+
+                match result {
+                    Ok(
+                        Response::Accept { modifications }
+                        | Response::Replace { modifications, .. },
+                    ) => {
+                        alert.set(
+                            Alert::success("Message accepted by filter")
+                                .with_details_list(modifications.into_iter().filter_map(
+                                    |modification| {
+                                        if let Modification::AddHeader { name, value } =
+                                            modification
+                                        {
+                                            Some(format!("{name}: {value}"))
+                                        } else {
+                                            None
+                                        }
+                                    },
+                                ))
+                                .without_timeout(),
+                        );
+                    }
+                    Ok(Response::Reject { reason }) => {
+                        alert
+                            .set(Alert::warning("Message rejected by filter").with_details(reason));
+                    }
+                    Ok(Response::Discard) => {
+                        alert.set(Alert::warning("Message discarded by filter"));
+                    }
+                    Err(Error::Unauthorized) => {
+                        use_navigate()("/login", Default::default());
+                    }
+                    Err(err) => {
+                        alert.set(Alert::from(err));
+                    }
+                }
+            }
+        },
+    );
+
+    view! {
+        <Form title="">
+
+            <FormSection title="Test SPAM Filter".to_string()>
+                <FormItem label="IP Address" tooltip="IP address of the remote SMTP server">
+                    <InputText element=FormElement::new("remote_ip", data)/>
+                </FormItem>
+                <FormItem label="PTR Address" is_optional=true tooltip="Reverse IP lookup">
+                    <InputText element=FormElement::new("iprev.ptr", data)/>
+                </FormItem>
+                <FormItem label="EHLO Domain" tooltip="Hostname specified at the EHLO stage">
+                    <InputText element=FormElement::new("helo_domain", data)/>
+                </FormItem>
+            </FormSection>
+
+            <FormSection title="Envelope".to_string()>
+                <FormItem label="Sender" tooltip="Envelope return path address">
+                    <InputText element=FormElement::new("env_from", data)/>
+                </FormItem>
+                <FormItem label="To" tooltip="Message recipients">
+                    <StackedInput
+                        element=FormElement::new("env_to", data)
+                        add_button_text="Add".to_string()
+                    />
+                </FormItem>
+            </FormSection>
+
+            <FormSection title="Authentication Results".to_string()>
+                <FormItem label="SPF" tooltip="SPF authentication results">
+                    <Select element=FormElement::new("spf.result", data)/>
+                </FormItem>
+                <FormItem label="SPF EHLO" tooltip="SPF EHLO authentication results">
+                    <Select element=FormElement::new("spf_ehlo.result", data)/>
+                </FormItem>
+                <FormItem label="DKIM" tooltip="DKIM authentication results">
+                    <Select element=FormElement::new("dkim.result", data)/>
+                </FormItem>
+                <FormItem
+                    label="DKIM Domains"
+                    tooltip="Domain names passing DKIM validation"
+                    is_optional=true
+                >
+                    <InputText element=FormElement::new("dkim.domains", data)/>
+                </FormItem>
+                <FormItem label="ARC" tooltip="ARC authentication results">
+                    <Select element=FormElement::new("arc.result", data)/>
+                </FormItem>
+                <FormItem label="DMARC" tooltip="DMARC authentcation results">
+                    <Select element=FormElement::new("dmarc.result", data)/>
+                </FormItem>
+                <FormItem label="DMARC Policy" tooltip="DMARC policy of the sender domain">
+                    <Select element=FormElement::new("dmarc.policy", data)/>
+                </FormItem>
+                <FormItem label="Reverse IP" tooltip="Reverse IP validation results">
+                    <Select element=FormElement::new("iprev.result", data)/>
+                </FormItem>
+            </FormSection>
+
+            <FormSection title="Message".to_string()>
+                <FormItem label="Contents" tooltip="Message body">
+                    <TextArea element=FormElement::new("message", data)/>
+                </FormItem>
+                <FormItem label="Parameters" tooltip="SMTP BODY parameter">
+                    <Select element=FormElement::new("param.body", data)/>
+                </FormItem>
+                <FormItem label="">
+                    <InputSwitch
+                        label="SMTPUTF8"
+                        tooltip="Enable SMTPUTF8 support for the message"
+                        element=FormElement::new("param.smtputf8", data)
+                    />
+                </FormItem>
+            </FormSection>
+
+            <FormButtonBar>
+
+                <Button
+                    text="Test"
+                    color=Color::Blue
+                    on_click=Callback::new(move |_| {
+                        data.update(|data| {
+                            if data.validate_form() {
+                                let mut message = String::new();
+                                let mut variables = AHashMap::new();
+                                for (key, value) in data.values.iter() {
+                                    let value = match value {
+                                        FormValue::Value(value) if !value.is_empty() => value,
+                                        FormValue::Array(values) if !values.is_empty() => {
+                                            for (i, value) in values.iter().enumerate() {
+                                                variables.insert(format!("{key}_{i}"), value.clone());
+                                            }
+                                            continue;
+                                        }
+                                        _ => continue,
+                                    };
+                                    match key.as_str() {
+                                        "message" => {
+                                            message.clone_from(value);
+                                            continue;
+                                        }
+                                        "remote_ip" => {
+                                            if let Ok(ip) = value.parse::<IpAddr>() {
+                                                variables
+                                                    .insert(
+                                                        "remote_ip.reverse".to_string(),
+                                                        to_reverse_name(ip),
+                                                    );
+                                            }
+                                        }
+                                        _ => {}
+                                    }
+                                    variables.insert(key.clone(), value.clone());
+                                }
+                                save_changes.dispatch((variables, data.value("message").unwrap()));
+                            }
+                        });
+                    })
+
+                    disabled=pending
+                />
+            </FormButtonBar>
+
+        </Form>
+    }
+}
+
+#[component]
+pub fn SpamTrain() -> impl IntoView {
+    let auth = use_authorization();
+    let alert = use_alerts();
+
+    let (pending, set_pending) = create_signal(false);
+
+    let mut data = expect_context::<Arc<Schemas>>().build_form("spam-train");
+    data.apply_defaults(false);
+    let data = data.into_signal();
+
+    let save_changes = create_action(move |(train, message): &(String, String)| {
+        let auth = auth.get();
+        let train = train.clone();
+        let message = message.clone();
+
+        async move {
+            set_pending.set(true);
+            let result = HttpRequest::post("/api/sieve/train")
+                .with_authorization(&auth)
+                .with_parameter("train", train)
+                .with_raw_body(message)
+                .send::<Response>()
+                .await;
+
+            set_pending.set(false);
+
+            match result {
+                Ok(Response::Accept { .. }) => {
+                    data.update(|data| {
+                        data.reset();
+                    });
+                    alert.set(Alert::success("Training successful"));
+                }
+                Ok(Response::Reject { reason }) => {
+                    alert.set(Alert::warning("Training failed").with_details(reason));
+                }
+                Ok(_) => {
+                    alert.set(Alert::error("Unexpected server response"));
+                }
+                Err(Error::Unauthorized) => {
+                    use_navigate()("/login", Default::default());
+                }
+                Err(err) => {
+                    alert.set(Alert::from(err));
+                }
+            }
+        }
+    });
+
+    view! {
+        <Form title="Train SPAM filter" subtitle="Train the SPAM filter classifier">
+
+            <FormSection>
+                <FormItem label="Train">
+                    <Select element=FormElement::new("train", data)/>
+                </FormItem>
+                <FormItem label="Message">
+                    <TextArea element=FormElement::new("message", data)/>
+                </FormItem>
+
+            </FormSection>
+
+            <FormButtonBar>
+
+                <Button
+                    text="Train"
+                    color=Color::Blue
+                    on_click=Callback::new(move |_| {
+                        data.update(|data| {
+                            if data.validate_form() {
+                                save_changes
+                                    .dispatch((
+                                        data.value("train").unwrap(),
+                                        data.value("message").unwrap(),
+                                    ));
+                            }
+                        });
+                    })
+
+                    disabled=pending
+                />
+            </FormButtonBar>
+
+        </Form>
+    }
+}
+
+fn to_reverse_name(ip: IpAddr) -> String {
+    use std::fmt::Write;
+
+    match ip {
+        IpAddr::V4(ip) => {
+            let mut segments = String::with_capacity(15);
+            for octet in ip.octets().iter().rev() {
+                if !segments.is_empty() {
+                    segments.push('.');
+                }
+                let _ = write!(&mut segments, "{}", octet);
+            }
+            segments
+        }
+        IpAddr::V6(ip) => {
+            let mut segments = String::with_capacity(63);
+            for segment in ip.segments().iter().rev() {
+                for &p in format!("{segment:04x}").as_bytes().iter().rev() {
+                    if !segments.is_empty() {
+                        segments.push('.');
+                    }
+                    segments.push(char::from(p));
+                }
+            }
+            segments
+        }
+    }
+}
+
+impl Builder<Schemas, ()> {
+    pub fn build_spam_manage(self) -> Self {
+        self.new_schema("spam-test")
+            .new_field("message")
+            .typ(Type::Text)
+            .input_check([], [Validator::Required])
+            .build()
+            .new_field("remote_ip")
+            .typ(Type::Text)
+            .input_check(
+                [Transformer::Trim],
+                [Validator::Required, Validator::IsIpOrMask],
+            )
+            .build()
+            .new_field("iprev.ptr")
+            .typ(Type::Text)
+            .input_check([], [])
+            .build()
+            .new_field("helo_domain")
+            .typ(Type::Text)
+            .input_check([Transformer::Trim], [Validator::Required])
+            .build()
+            .new_field("env_from")
+            .typ(Type::Text)
+            .input_check([Transformer::Trim], [])
+            .build()
+            .new_field("env_to")
+            .typ(Type::Array)
+            .input_check([Transformer::Trim], [Validator::Required])
+            .build()
+            .new_field("dkim.domains")
+            .typ(Type::Text)
+            .input_check([Transformer::Trim], [])
+            .build()
+            .new_field("iprev.result")
+            .typ(Type::Select {
+                multi: false,
+                source: Source::Static(IPREV_RESULT),
+            })
+            .default("none")
+            .build()
+            .new_field("spf.result")
+            .typ(Type::Select {
+                multi: false,
+                source: Source::Static(SPF_RESULT),
+            })
+            .default("none")
+            .build()
+            .new_field("spf_ehlo.result")
+            .typ(Type::Select {
+                multi: false,
+                source: Source::Static(SPF_RESULT),
+            })
+            .default("none")
+            .build()
+            .new_field("arc.result")
+            .typ(Type::Select {
+                multi: false,
+                source: Source::Static(DKIM_RESULT),
+            })
+            .default("none")
+            .build()
+            .new_field("dkim.result")
+            .typ(Type::Select {
+                multi: false,
+                source: Source::Static(DKIM_RESULT),
+            })
+            .default("none")
+            .build()
+            .new_field("dmarc.result")
+            .typ(Type::Select {
+                multi: false,
+                source: Source::Static(DMARC_RESULT),
+            })
+            .default("none")
+            .build()
+            .new_field("dmarc.policy")
+            .typ(Type::Select {
+                multi: false,
+                source: Source::Static(DMARC_POLICY),
+            })
+            .default("none")
+            .build()
+            .new_field("param.body")
+            .typ(Type::Select {
+                multi: false,
+                source: Source::Static(MAIL_BODY),
+            })
+            .default("")
+            .build()
+            .build()
+            // SPAM train
+            .new_schema("spam-train")
+            .new_field("message")
+            .typ(Type::Text)
+            .input_check([], [Validator::Required])
+            .build()
+            .new_field("train")
+            .default("spam")
+            .typ(Type::Select {
+                multi: false,
+                source: Source::Static(&[("spam", "SPAM"), ("ham", "HAM")]),
+            })
+            .build()
+            .build()
+    }
+}
+
+pub static SPF_RESULT: &[(&str, &str)] = &[
+    ("pass", "Pass"),
+    ("fail", "Fail"),
+    ("softfail", "Soft Fail"),
+    ("neutral", "Neutral"),
+    ("temperror", "Temporary Error"),
+    ("permerror", "Permanent Error"),
+    ("none", "None"),
+];
+
+pub static IPREV_RESULT: &[(&str, &str)] = &[
+    ("pass", "Pass"),
+    ("fail", "Fail"),
+    ("temperror", "Temporary Error"),
+    ("permerror", "Permanent Error"),
+    ("none", "None"),
+];
+
+pub static DKIM_RESULT: &[(&str, &str)] = &[
+    ("pass", "Pass"),
+    ("fail", "Fail"),
+    ("neutral", "Neutral"),
+    ("none", "None"),
+    ("permerror", "Permanent Error"),
+    ("temperror", "Temporary Error"),
+];
+
+pub static DMARC_RESULT: &[(&str, &str)] = &[
+    ("pass", "Pass"),
+    ("fail", "Fail"),
+    ("temperror", "Temporary Error"),
+    ("permerror", "Permanent Error"),
+    ("none", "None"),
+];
+
+pub static DMARC_POLICY: &[(&str, &str)] = &[
+    ("reject", "Reject"),
+    ("quarantine", "Quarantine"),
+    ("none", "None"),
+];
+
+pub static MAIL_BODY: &[(&str, &str)] = &[
+    ("", "Not specified"),
+    ("7bit", "7bit"),
+    ("8bitmime", "8bit MIME"),
+    ("binarymime", "Binary MIME"),
+];
diff --git a/src/pages/queue/messages/list.rs b/src/pages/queue/messages/list.rs
index b89c287..5cd818f 100644
--- a/src/pages/queue/messages/list.rs
+++ b/src/pages/queue/messages/list.rs
@@ -382,9 +382,7 @@ fn QueueItem(message: Message) -> impl IntoView {
     let next_dsn = message.next_dsn().map(|dt| HumanTime::from(dt).to_string());
     let return_path = message.return_path().to_string();
     let recipients = if total_recipients > 0 {
-        format!(
-            "{first_recipient} and {total_recipients} more",
-        )
+        format!("{first_recipient} and {total_recipients} more",)
     } else {
         first_recipient.to_string()
     };
diff --git a/style/output.css b/style/output.css
index ec8b374..9f01f8d 100644
--- a/style/output.css
+++ b/style/output.css
@@ -1786,6 +1786,10 @@ select {
   text-transform: uppercase;
 }
 
+.lowercase {
+  text-transform: lowercase;
+}
+
 .leading-none {
   line-height: 1;
 }