Generate rfc724_mid when creating Message

chore: update strum dependency
test: fix test_no_old_msg_is_fresh flakiness
2026-04-07 08:02:11 +03:00 · 2025-03-17 18:04:58 +01:00 · 2025-03-17 15:19:36 +00:00 · 2025-03-17 14:56:23 +00:00 · 2025-03-17 14:46:48 +00:00 · 2025-03-17 14:29:04 +01:00
40 changed files with 358 additions and 826 deletions
--- a/.github/workflows/jsonrpc.yml
+++ b/.github/workflows/jsonrpc.yml
@@ -37,9 +37,6 @@ jobs:
        run: npm run test
        env:
          CHATMAIL_DOMAIN: ${{ vars.CHATMAIL_DOMAIN }}
-      - name: make sure websocket server version still builds
-        working-directory: deltachat-jsonrpc
-        run: cargo build --bin deltachat-jsonrpc-server --features webserver
      - name: Run linter
        working-directory: deltachat-jsonrpc/typescript
        run: npm run prettier:check
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog

+## [1.157.2] - 2025-03-15
+
+### Fixes
+
+- Prefer hidden Message-ID header if any.
+- Update async-compression to 0.4.21 to fix IMAP COMPRESS getting stuck.
+
+### Refactor
+
+- Extract handle_edit_delete() function for message edit/delete  ([#6664](https://github.com/chatmail/core/pull/6664)).
+
+### Tests
+
+- test_secure_join: Bob should not create a 1:1 chat before sending a message.
+- Return chat ID from TestContext.exec_securejoin_qr().
+
 ## [1.157.1] - 2025-03-13

 ### Miscellaneous Tasks
@@ -5998,3 +6014,4 @@ https://github.com/chatmail/core/pulls?q=is%3Apr+is%3Aclosed
 [1.156.3]: https://github.com/chatmail/core/compare/v1.156.2..v1.156.3
 [1.157.0]: https://github.com/chatmail/core/compare/v1.156.3..v1.157.0
 [1.157.1]: https://github.com/chatmail/core/compare/v1.157.0..v1.157.1
+[1.157.2]: https://github.com/chatmail/core/compare/v1.157.1..v1.157.2
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -125,54 +125,12 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"

-[[package]]
-name = "anstream"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "utf8parse",
-]
-
 [[package]]
 name = "anstyle"
 version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"

-[[package]]
-name = "anstyle-parse"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
-dependencies = [
- "anstyle",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.96"
@@ -283,9 +241,9 @@ dependencies = [

 [[package]]
 name = "async-compression"
-version = "0.4.18"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522"
+checksum = "c0cf008e5e1a9e9e22a7d3c9a4992e21a350290069e36d8fb72304ed17e8f2d2"
 dependencies = [
 "flate2",
 "futures-core",
@@ -416,64 +374,6 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"

-[[package]]
-name = "axum"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
-dependencies = [
- "async-trait",
- "axum-core",
- "base64 0.21.7",
- "bytes",
- "futures-util",
- "http 1.1.0",
- "http-body",
- "http-body-util",
- "hyper",
- "hyper-util",
- "itoa",
- "matchit",
- "memchr",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "rustversion",
- "serde",
- "serde_json",
- "serde_path_to_error",
- "serde_urlencoded",
- "sha1",
- "sync_wrapper 1.0.0",
- "tokio",
- "tokio-tungstenite 0.21.0",
- "tower",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "axum-core"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"
-dependencies = [
- "async-trait",
- "bytes",
- "futures-util",
- "http 1.1.0",
- "http-body",
- "http-body-util",
- "mime",
- "pin-project-lite",
- "rustversion",
- "sync_wrapper 0.1.2",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
 [[package]]
 name = "backoff"
 version = "0.4.0"
@@ -508,12 +408,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"

-[[package]]
-name = "base64"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
-
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -1015,12 +909,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"

-[[package]]
-name = "colorchoice"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
-
 [[package]]
 name = "combine"
 version = "4.6.7"
@@ -1378,7 +1266,7 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.157.1"
+version = "1.157.2"
 dependencies = [
 "anyhow",
 "async-broadcast",
@@ -1397,7 +1285,6 @@ dependencies = [
 "deltachat-contact-tools",
 "deltachat-time",
 "deltachat_derive",
- "encoded-words",
 "escaper",
 "fast-socks5",
 "fd-lock",
@@ -1448,8 +1335,8 @@ dependencies = [
 "sha2",
 "shadowsocks",
 "smallvec",
- "strum",
- "strum_macros",
+ "strum 0.27.1",
+ "strum_macros 0.27.1",
 "tagger",
 "tempfile",
 "testdir",
@@ -1490,15 +1377,13 @@ dependencies = [

 [[package]]
 name = "deltachat-jsonrpc"
-version = "1.157.1"
+version = "1.157.2"
 dependencies = [
 "anyhow",
 "async-channel 2.3.1",
- "axum",
 "base64 0.22.1",
 "deltachat",
 "deltachat-contact-tools",
- "env_logger",
 "futures",
 "log",
 "num-traits",
@@ -1515,7 +1400,7 @@ dependencies = [

 [[package]]
 name = "deltachat-repl"
-version = "1.157.1"
+version = "1.157.2"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1531,7 +1416,7 @@ dependencies = [

 [[package]]
 name = "deltachat-rpc-server"
-version = "1.157.1"
+version = "1.157.2"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1560,7 +1445,7 @@ dependencies = [

 [[package]]
 name = "deltachat_ffi"
-version = "1.157.1"
+version = "1.157.2"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1894,21 +1779,6 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"

-[[package]]
-name = "encoded-words"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c1693107e6084e2b9444d34a985697f56c8832d314924d5cfb1fb7793154bef"
-dependencies = [
- "base64 0.12.3",
- "charset",
- "encoding_rs",
- "hex",
- "lazy_static",
- "regex",
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "encoding_rs"
 version = "0.8.35"
@@ -1936,7 +1806,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
 dependencies = [
- "heck",
+ "heck 0.4.1",
 "proc-macro2",
 "quote",
 "syn 2.0.98",
@@ -1962,29 +1832,6 @@ dependencies = [
 "syn 2.0.98",
 ]

-[[package]]
-name = "env_filter"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
-dependencies = [
- "log",
- "regex",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.11.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697"
-dependencies = [
- "anstream",
- "anstyle",
- "env_filter",
- "jiff",
- "log",
-]
-
 [[package]]
 name = "equivalent"
 version = "1.0.2"
@@ -2488,6 +2335,12 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"

+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "hermit-abi"
 version = "0.3.9"
@@ -3071,7 +2924,7 @@ dependencies = [
 "rustls-webpki",
 "serde",
 "smallvec",
- "strum",
+ "strum 0.26.2",
 "stun-rs",
 "thiserror 2.0.11",
 "time",
@@ -3275,7 +3128,7 @@ dependencies = [
 "rustls",
 "rustls-webpki",
 "serde",
- "strum",
+ "strum 0.26.2",
 "stun-rs",
 "thiserror 2.0.11",
 "tokio",
@@ -3320,30 +3173,6 @@ version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"

-[[package]]
-name = "jiff"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d699bc6dfc879fb1bf9bdff0d4c56f0884fc6f0d0eb0fba397a6d00cd9a6b85e"
-dependencies = [
- "jiff-static",
- "log",
- "portable-atomic",
- "portable-atomic-util",
- "serde",
-]
-
-[[package]]
-name = "jiff-static"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d16e75759ee0aa64c57a56acbf43916987b20c77373cb7e808979e02b93c9f9"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.98",
-]
-
 [[package]]
 name = "jni"
 version = "0.21.1"
@@ -3558,12 +3387,6 @@ dependencies = [
 "regex-automata 0.1.10",
 ]

-[[package]]
-name = "matchit"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
-
 [[package]]
 name = "md-5"
 version = "0.10.6"
@@ -4543,15 +4366,6 @@ version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"

-[[package]]
-name = "portable-atomic-util"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
-dependencies = [
- "portable-atomic",
-]
-
 [[package]]
 name = "portmapper"
 version = "0.3.1"
@@ -5080,7 +4894,7 @@ dependencies = [
 "serde",
 "serde_json",
 "serde_urlencoded",
- "sync_wrapper 1.0.0",
+ "sync_wrapper",
 "tokio",
 "tokio-rustls",
 "tokio-util",
@@ -5598,16 +5412,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "serde_path_to_error"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c"
-dependencies = [
- "itoa",
- "serde",
-]
-
 [[package]]
 name = "serde_spanned"
 version = "0.6.7"
@@ -5906,16 +5710,35 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
 dependencies = [
- "strum_macros",
+ "strum_macros 0.26.2",
 ]

+[[package]]
+name = "strum"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32"
+
 [[package]]
 name = "strum_macros"
 version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
 dependencies = [
- "heck",
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8"
+dependencies = [
+ "heck 0.5.0",
 "proc-macro2",
 "quote",
 "rustversion",
@@ -5990,12 +5813,6 @@ dependencies = [
 "unicode-ident",
 ]

-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
 [[package]]
 name = "sync_wrapper"
 version = "1.0.0"
@@ -6312,18 +6129,6 @@ dependencies = [
 "windows-sys 0.52.0",
 ]

-[[package]]
-name = "tokio-tungstenite"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38"
-dependencies = [
- "futures-util",
- "log",
- "tokio",
- "tungstenite 0.21.0",
-]
-
 [[package]]
 name = "tokio-tungstenite"
 version = "0.24.0"
@@ -6333,7 +6138,7 @@ dependencies = [
 "futures-util",
 "log",
 "tokio",
- "tungstenite 0.24.0",
+ "tungstenite",
 ]

 [[package]]
@@ -6349,7 +6154,7 @@ dependencies = [
 "js-sys",
 "thiserror 1.0.69",
 "tokio",
- "tokio-tungstenite 0.24.0",
+ "tokio-tungstenite",
 "wasm-bindgen",
 "web-sys",
 ]
@@ -6404,33 +6209,11 @@ dependencies = [
 "winnow",
 ]

-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
-
 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"

 [[package]]
 name = "tracing"
@@ -6511,25 +6294,6 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"

-[[package]]
-name = "tungstenite"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
-dependencies = [
- "byteorder",
- "bytes",
- "data-encoding",
- "http 1.1.0",
- "httparse",
- "log",
- "rand 0.8.5",
- "sha1",
- "thiserror 1.0.69",
- "url",
- "utf-8",
-]
-
 [[package]]
 name = "tungstenite"
 version = "0.24.0"
@@ -6722,11 +6486,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"

 [[package]]
 name = "uuid"
-version = "1.12.1"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3758f5e68192bb96cc8f9b7e2c2cfdabb435499a28499a42f8f984092adad4b"
+checksum = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587"
 dependencies = [
- "getrandom 0.2.12",
+ "getrandom 0.3.1",
 "serde",
 ]

@@ -7538,15 +7302,12 @@ dependencies = [
 "async-channel 1.9.0",
 "async-mutex",
 "async-trait",
- "axum",
 "futures",
 "futures-util",
 "log",
 "schemars",
 "serde",
 "serde_json",
- "tokio",
- "tracing",
 "typescript-type-def",
 "yerpc_derive",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.157.1"
+version = "1.157.2"
 edition = "2021"
 license = "MPL-2.0"
 rust-version = "1.81"
@@ -50,7 +50,6 @@ brotli = { version = "7", default-features=false, features = ["std"] }
 bytes = "1"
 chrono = { workspace = true, features = ["alloc", "clock", "std"] }
 data-encoding = "2.7.0"
-encoded-words = "0.2"
 escaper = "0.1"
 fast-socks5 = "0.10"
 fd-lock = "4"
@@ -95,8 +94,8 @@ sha-1 = "0.10"
 sha2 = "0.10"
 shadowsocks = { version = "1.22.0", default-features = false, features = ["aead-cipher", "aead-cipher-2022"] }
 smallvec = "1.14.0"
-strum = "0.26"
-strum_macros = "0.26"
+strum = "0.27"
+strum_macros = "0.27"
 tagger = "4.3.4"
 textwrap = "0.16.1"
 thiserror = { workspace = true }
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.157.1"
+version = "1.157.2"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
--- a/deltachat-jsonrpc/Cargo.toml
+++ b/deltachat-jsonrpc/Cargo.toml
@@ -1,17 +1,11 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.157.1"
+version = "1.157.2"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
-default-run = "deltachat-jsonrpc-server"
 license = "MPL-2.0"
 repository = "https://github.com/chatmail/core"

-[[bin]]
-name = "deltachat-jsonrpc-server"
-path = "src/webserver.rs"
-required-features = ["webserver"]
-
 [dependencies]
 anyhow = { workspace = true }
 deltachat = { workspace = true }
@@ -31,15 +25,10 @@ sanitize-filename = { workspace = true }
 walkdir = "2.5.0"
 base64 = { workspace = true }

-# optional dependencies
-axum = { version = "0.7", optional = true, features = ["ws"] }
-env_logger = { version = "0.11.6", optional = true }
-
 [dev-dependencies]
 tokio = { workspace = true, features = ["full", "rt-multi-thread"] }


 [features]
 default = ["vendored"]
-webserver = ["dep:env_logger", "dep:axum", "tokio/full", "yerpc/support-axum"]
 vendored = ["deltachat/vendored"]
--- a/deltachat-jsonrpc/README.md
+++ b/deltachat-jsonrpc/README.md
@@ -4,46 +4,16 @@ This crate provides a [JSON-RPC 2.0](https://www.jsonrpc.org/specification) inte

 The JSON-RPC API is exposed in two fashions:

-* A executable that exposes the JSON-RPC API through a [WebSocket](https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API) server running on localhost.
-* The JSON-RPC API can also be called through the [C FFI](../deltachat-ffi). The C FFI needs to be built with the `jsonrpc` feature. It will then expose the functions `dc_jsonrpc_init`, `dc_jsonrpc_request`, `dc_jsonrpc_next_response` and `dc_jsonrpc_unref`. See the docs in the [header file](../deltachat-ffi/deltachat.h) for details.
+* A executable `deltachat-rpc-server` that exposes the JSON-RPC API through stdio.
+* The JSON-RPC API can also be called through the [C FFI](../deltachat-ffi). It exposes the functions `dc_jsonrpc_init`, `dc_jsonrpc_request`, `dc_jsonrpc_next_response` and `dc_jsonrpc_unref`. See the docs in the [header file](../deltachat-ffi/deltachat.h) for details.

-We also include a JavaScript and TypeScript client for the JSON-RPC API. The source for this is in the [`typescript`](typescript) folder. The client can easily be used with the WebSocket server to build DeltaChat apps for web browsers or Node.js. See the [examples](typescript/example) for details.
+We also include a JavaScript and TypeScript client for the JSON-RPC API. The source for this is in the [`typescript`](typescript) folder.

 ## Usage

-#### Running the WebSocket server
-
-From within this folder, you can start the WebSocket server with the following command:
-
-```sh
-cargo run --features webserver
-```
-
-If you want to use the server in a production setup, first build it in release mode:
-
-```sh
-cargo build --features webserver --release
-```
-You will then find the `deltachat-jsonrpc-server` executable in your `target/release` folder.
-
-The executable currently does not support any command-line arguments. By default, once started it will accept WebSocket connections on `ws://localhost:20808/ws`. It will store the persistent configuration and databases in a `./accounts` folder relative to the directory from where it is started.
-
-The server can be configured with environment variables:
-
-|variable|default|description|
-|-|-|-|
-|`DC_PORT`|`20808`|port to listen on|
-|`DC_ACCOUNTS_PATH`|`./accounts`|path to storage directory|
-
-If you are targeting other architectures (like KaiOS or Android), the webserver binary can be cross-compiled easily with [rust-cross](https://github.com/cross-rs/cross):
-
-```sh
-cross build --features=webserver --target armv7-linux-androideabi --release
-```
-
 #### Using the TypeScript/JavaScript client

-The package includes a JavaScript/TypeScript client which is partially auto-generated through the JSON-RPC library used by this crate ([yerpc](https://github.com/Frando/yerpc/)). Find the source in the [`typescript`](typescript) folder. 
+The package includes a JavaScript/TypeScript client which is partially auto-generated through the JSON-RPC library used by this crate ([yerpc](https://github.com/chatmail/yerpc)). Find the source in the [`typescript`](typescript) folder. 

 To use it locally, first install the dependencies and compile the TypeScript code to JavaScript:
 ```sh
@@ -52,15 +22,7 @@ npm install
 npm run build
 ```

-The JavaScript client is not yet published on NPM (but will likely be soon). Currently, it is recommended to vendor the bundled build. After running `npm run build` as documented above, there will be a file `dist/deltachat.bundle.js`. This is an ESM module containing all dependencies. Copy this file to your project and import the DeltaChat class.
-
-
-```typescript
-import { DeltaChat } from './deltachat.bundle.js'
-const dc = new DeltaChat('ws://localhost:20808/ws')
-const accounts = await dc.rpc.getAllAccounts()
-console.log('accounts', accounts)
-```
+The JavaScript client is [published on NPM](https://www.npmjs.com/package/@deltachat/jsonrpc-client).

 A script is included to build autogenerated documentation, which includes all RPC methods:
 ```sh
@@ -73,18 +35,6 @@ Then open the [`typescript/docs`](typescript/docs) folder in a web browser.

 #### Running the example app

-We include a small demo web application that talks to the WebSocket server. It can be used for testing. Feel invited to expand this.
-
-```sh
-cd typescript
-npm run build
-npm run example:build
-npm run example:start
-```
-Then, open [`http://localhost:8080/example.html`](http://localhost:8080/example.html) in a web browser.
-
-Run `npm run example:dev` to live-rebuild the example app when files changes.
-
 ### Testing

 The crate includes both a basic Rust smoke test and more featureful integration tests that use the TypeScript client.
@@ -104,14 +54,12 @@ cd typescript
 npm run test
 ```

-This will build the `deltachat-jsonrpc-server` binary and then run a test suite against the WebSocket server.
+This will build the `deltachat-jsonrpc-server` binary and then run a test suite.

-The test suite includes some tests that need online connectivity and a way to create test email accounts. To run these tests, talk to DeltaChat developers to get a token for the `testrun.org` service, or use a local instance of [`mailadm`](https://github.com/deltachat/docker-mailadm).
-
-Then, set the `CHATMAIL_DOMAIN` environment variable to your testing email server domain.
+The test suite includes some tests that need online connectivity and a way to create test email accounts. To run these tests, set the `CHATMAIL_DOMAIN` environment variable to your testing email server domain.

 ```
-CHATMAIL_DOMAIN=chat.example.org npm run test
+CHATMAIL_DOMAIN=ci-chatmail.testrun.org npm run test
 ```

 #### Test Coverage
--- a/deltachat-jsonrpc/TODO.md
+++ b/deltachat-jsonrpc/TODO.md
@@ -1,28 +0,0 @@
-# TODO
-
- [ ] different test type to simulate two devices: to test autocrypt_initiate_key_transfer & autocrypt_continue_key_transfer
-
-## MVP - Websocket server&client
-
-For kaiOS and other experiments, like a deltachat "web" over network from an android phone.
-
- [ ] coverage for a majority of the API
- [ ] Blobs served
- [ ] Blob upload (for attachments, setting profile-picture, importing backup and so on)
- [ ] other way blobs can be addressed when using websocket vs. jsonrpc over dc-node
- [ ] Web push API? At least some kind of notification hook closure this lib can accept.
-
-### Other Ideas for the Websocket server
-
- [ ] make sure there can only be one connection at a time to the ws
-  - why? , it could give problems if its commanded from multiple connections
- [ ] encrypted connection?
- [ ] authenticated connection?
- [ ] Look into unit-testing for the proc macros?
- [ ] proc macro taking over doc comments to generated typescript file
-
-## Desktop Apis
-
-Incomplete todo for desktop api porting, just some remainders for points that might need more work:
-
- [ ] manual start/stop io functions in the api for context and accounts, so "not syncing all accounts" can still be done in desktop -> webserver should then not do start io on all accounts by default
--- a/deltachat-jsonrpc/src/api.rs
+++ b/deltachat-jsonrpc/src/api.rs
@@ -1,5 +1,5 @@
 use std::collections::BTreeMap;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use std::str;
 use std::sync::Arc;
 use std::time::Duration;
@@ -7,6 +7,7 @@ use std::{collections::HashMap, str::FromStr};

 use anyhow::{anyhow, bail, ensure, Context, Result};
 pub use deltachat::accounts::Accounts;
+use deltachat::blob::BlobObject;
 use deltachat::chat::{
    self, add_contact_to_chat, forward_msgs, get_chat_media, get_chat_msgs, get_chat_msgs_ex,
    marknoticed_chat, remove_contact_from_chat, Chat, ChatId, ChatItem, MessageListOptions,
@@ -21,7 +22,7 @@ use deltachat::ephemeral::Timer;
 use deltachat::location;
 use deltachat::message::get_msg_read_receipts;
 use deltachat::message::{
-    self, delete_msgs, markseen_msgs, Message, MessageState, MsgId, Viewtype,
+    self, delete_msgs_ex, markseen_msgs, Message, MessageState, MsgId, Viewtype,
 };
 use deltachat::peer_channels::{
    leave_webxdc_realtime, send_webxdc_realtime_advertisement, send_webxdc_realtime_data,
@@ -341,11 +342,19 @@ impl CommandApi {
        ctx.get_info().await
    }

+    /// Get the blob dir.
    async fn get_blob_dir(&self, account_id: u32) -> Result<Option<String>> {
        let ctx = self.get_context(account_id).await?;
        Ok(ctx.get_blobdir().to_str().map(|s| s.to_owned()))
    }

+    /// Copy file to blobdir.
+    async fn copy_to_blobdir(&self, account_id: u32, path: String) -> Result<PathBuf> {
+        let ctx = self.get_context(account_id).await?;
+        let file = Path::new(&path);
+        Ok(BlobObject::create_and_deduplicate(&ctx, file, file)?.to_abs_path())
+    }
+
    async fn draft_self_report(&self, account_id: u32) -> Result<u32> {
        let ctx = self.get_context(account_id).await?;
        Ok(ctx.draft_self_report().await?.to_u32())
@@ -1205,7 +1214,15 @@ impl CommandApi {
    async fn delete_messages(&self, account_id: u32, message_ids: Vec<u32>) -> Result<()> {
        let ctx = self.get_context(account_id).await?;
        let msgs: Vec<MsgId> = message_ids.into_iter().map(MsgId::new).collect();
-        delete_msgs(&ctx, &msgs).await
+        delete_msgs_ex(&ctx, &msgs, false).await
+    }
+
+    /// Delete messages. The messages are deleted on the current device,
+    /// on the IMAP server and also for all chat members
+    async fn delete_messages_for_all(&self, account_id: u32, message_ids: Vec<u32>) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        let msgs: Vec<MsgId> = message_ids.into_iter().map(MsgId::new).collect();
+        delete_msgs_ex(&ctx, &msgs, true).await
    }

    /// Get an informational text for a single message. The text is multiline and may
--- a/deltachat-jsonrpc/src/webserver.rs
+++ b/deltachat-jsonrpc/src/webserver.rs
@@ -1,47 +0,0 @@
-#![recursion_limit = "256"]
-use std::net::SocketAddr;
-use std::path::PathBuf;
-
-use axum::{extract::ws::WebSocketUpgrade, response::Response, routing::get, Extension, Router};
-use yerpc::axum::handle_ws_rpc;
-use yerpc::{RpcClient, RpcSession};
-
-mod api;
-use api::{Accounts, CommandApi};
-
-const DEFAULT_PORT: u16 = 20808;
-
-#[tokio::main(flavor = "multi_thread")]
-async fn main() -> Result<(), std::io::Error> {
-    env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
-
-    let path = std::env::var("DC_ACCOUNTS_PATH").unwrap_or_else(|_| "./accounts".to_string());
-    let port = std::env::var("DC_PORT")
-        .map(|port| port.parse::<u16>().expect("DC_PORT must be a number"))
-        .unwrap_or(DEFAULT_PORT);
-    log::info!("Starting with accounts directory `{path}`.");
-    let writable = true;
-    let accounts = Accounts::new(PathBuf::from(&path), writable).await.unwrap();
-    let state = CommandApi::new(accounts);
-
-    let app = Router::new()
-        .route("/ws", get(handler))
-        .layer(Extension(state.clone()));
-
-    tokio::spawn(async move {
-        state.accounts.write().await.start_io().await;
-    });
-
-    let addr = SocketAddr::from(([127, 0, 0, 1], port));
-    log::info!("JSON-RPC WebSocket server listening on {}", addr);
-    let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
-    axum::serve(listener, app).await.unwrap();
-
-    Ok(())
-}
-
-async fn handler(ws: WebSocketUpgrade, Extension(api): Extension<CommandApi>) -> Response {
-    let (client, out_receiver) = RpcClient::new();
-    let session = RpcSession::new(client.clone(), api.clone());
-    handle_ws_rpc(ws, out_receiver, session).await
-}
--- a/deltachat-jsonrpc/typescript/example.html
+++ b/deltachat-jsonrpc/typescript/example.html
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>DeltaChat JSON-RPC example</title>
-    <style>
-      body {
-        font-family: monospace;
-        background: black;
-        color: grey;
-      }
-      .grid {
-        display: grid;
-        grid-template-columns: 3fr 1fr;
-        grid-template-areas: "a a" "b c";
-      }
-      .message {
-        color: red;
-      }
-      #header {
-        grid-area: a;
-        color: white;
-        font-size: 1.2rem;
-      }
-      #header a {
-        color: white;
-        font-weight: bold;
-      }
-      #main {
-        grid-area: b;
-        color: green;
-      }
-      #main h2,
-      #main h3 {
-        color: blue;
-      }
-      #side {
-        grid-area: c;
-        color: #777;
-        overflow-y: auto;
-      }
-    </style>
-    <script type="module" src="dist/example.bundle.js"></script>
-  </head>
-  <body>
-    <h1>DeltaChat JSON-RPC example</h1>
-    <div class="grid">
-      <div id="header"></div>
-      <div id="main"></div>
-      <div id="side"><h2>log</h2></div>
-    </div>
-    <p>
-      Tip: open the dev console and use the client with
-      <code>window.client</code>
-    </p>
-  </body>
-</html>
--- a/deltachat-jsonrpc/typescript/example/example.ts
+++ b/deltachat-jsonrpc/typescript/example/example.ts
@@ -1,109 +0,0 @@
-import { DcEvent, DeltaChat } from "../deltachat.js";
-
-var SELECTED_ACCOUNT = 0;
-
-window.addEventListener("DOMContentLoaded", (_event) => {
-  (window as any).selectDeltaAccount = (id: string) => {
-    SELECTED_ACCOUNT = Number(id);
-    window.dispatchEvent(new Event("account-changed"));
-  };
-  console.log("launch run script...");
-  run().catch((err) => console.error("run failed", err));
-});
-
-async function run() {
-  const $main = document.getElementById("main")!;
-  const $side = document.getElementById("side")!;
-  const $head = document.getElementById("header")!;
-
-  const client = new DeltaChat("ws://localhost:20808/ws");
-
-  (window as any).client = client.rpc;
-
-  client.on("ALL", (accountId, event) => {
-    onIncomingEvent(accountId, event);
-  });
-
-  window.addEventListener("account-changed", async (_event: Event) => {
-    listChatsForSelectedAccount();
-  });
-
-  await Promise.all([loadAccountsInHeader(), listChatsForSelectedAccount()]);
-
-  async function loadAccountsInHeader() {
-    console.log("load accounts");
-    const accounts = await client.rpc.getAllAccounts();
-    console.log("accounts loaded", accounts);
-    for (const account of accounts) {
-      if (account.kind === "Configured") {
-        write(
-          $head,
-          `<a href="#" onclick="selectDeltaAccount(${account.id})">
-          ${account.id}: ${account.addr!}
-          </a>&nbsp;`
-        );
-      } else {
-        write(
-          $head,
-          `<a href="#">
-          ${account.id}: (unconfigured)
-          </a>&nbsp;`
-        );
-      }
-    }
-  }
-
-  async function listChatsForSelectedAccount() {
-    clear($main);
-    const selectedAccount = SELECTED_ACCOUNT;
-    const info = await client.rpc.getAccountInfo(selectedAccount);
-    if (info.kind !== "Configured") {
-      return write($main, "Account is not configured");
-    }
-    write($main, `<h2>${info.addr!}</h2>`);
-    const chats = await client.rpc.getChatlistEntries(
-      selectedAccount,
-      0,
-      null,
-      null
-    );
-    for (const chatId of chats) {
-      const chat = await client.rpc.getFullChatById(selectedAccount, chatId);
-      write($main, `<h3>${chat.name}</h3>`);
-      const messageIds = await client.rpc.getMessageIds(
-        selectedAccount,
-        chatId,
-        false,
-        false
-      );
-      const messages = await client.rpc.getMessages(
-        selectedAccount,
-        messageIds
-      );
-      for (const [_messageId, message] of Object.entries(messages)) {
-        if (message.kind === "message") write($main, `<p>${message.text}</p>`);
-        else write($main, `<p>loading error: ${message.error}</p>`);
-      }
-    }
-  }
-
-  function onIncomingEvent(accountId: number, event: DcEvent) {
-    write(
-      $side,
-      `
-        <p class="message">
-          [<strong>${event.kind}</strong> on account ${accountId}]<br>
-          <em>f1:</em> ${JSON.stringify(
-            Object.assign({}, event, { kind: undefined })
-          )}
-        </p>`
-    );
-  }
-}
-
-function write(el: HTMLElement, html: string) {
-  el.innerHTML += html;
-}
-function clear(el: HTMLElement) {
-  el.innerHTML = "";
-}
--- a/deltachat-jsonrpc/typescript/example/node-add-account.js
+++ b/deltachat-jsonrpc/typescript/example/node-add-account.js
@@ -1,29 +0,0 @@
-import { DeltaChat } from "../dist/deltachat.js";
-
-run().catch(console.error);
-
-async function run() {
-  const delta = new DeltaChat("ws://localhost:20808/ws");
-  delta.on("event", (event) => {
-    console.log("event", event.data);
-  });
-
-  const email = process.argv[2];
-  const password = process.argv[3];
-  if (!email || !password)
-    throw new Error(
-      "USAGE: node node-add-account.js <EMAILADDRESS> <PASSWORD>"
-    );
-  console.log(`creating account for ${email}`);
-  const id = await delta.rpc.addAccount();
-  console.log(`created account id ${id}`);
-  await delta.rpc.setConfig(id, "addr", email);
-  await delta.rpc.setConfig(id, "mail_pw", password);
-  console.log("configuration updated");
-  await delta.rpc.configure(id);
-  console.log("account configured!");
-
-  const accounts = await delta.rpc.getAllAccounts();
-  console.log("accounts", accounts);
-  console.log("waiting for events...");
-}
--- a/deltachat-jsonrpc/typescript/example/node-demo.js
+++ b/deltachat-jsonrpc/typescript/example/node-demo.js
@@ -1,14 +0,0 @@
-import { DeltaChat } from "../dist/deltachat.js";
-
-run().catch(console.error);
-
-async function run() {
-  const delta = new DeltaChat();
-  delta.on("event", (event) => {
-    console.log("event", event.data);
-  });
-
-  const accounts = await delta.rpc.getAllAccounts();
-  console.log("accounts", accounts);
-  console.log("waiting for events...");
-}
--- a/deltachat-jsonrpc/typescript/package.json
+++ b/deltachat-jsonrpc/typescript/package.json
@@ -42,10 +42,6 @@
    "build:cjs": "esbuild --format=cjs --bundle --packages=external dist/deltachat.js --outfile=dist/deltachat.cjs",
    "build:tsc": "tsc",
    "docs": "typedoc --out docs deltachat.ts",
-    "example": "run-s build example:build example:start",
-    "example:build": "esbuild --bundle dist/example/example.js --outfile=dist/example.bundle.js",
-    "example:dev": "esbuild example/example.ts --bundle --outfile=dist/example.bundle.js --servedir=.",
-    "example:start": "http-server .",
    "extract-constants": "node ./scripts/generate-constants.js",
    "generate-bindings": "cargo test",
    "prettier:check": "prettier --check .",
@@ -58,5 +54,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "1.157.1"
+  "version": "1.157.2"
 }
--- a/deltachat-jsonrpc/typescript/src/client.ts
+++ b/deltachat-jsonrpc/typescript/src/client.ts
@@ -2,7 +2,7 @@ import * as T from "../generated/types.js";
 import { EventType } from "../generated/types.js";
 import * as RPC from "../generated/jsonrpc.js";
 import { RawClient } from "../generated/client.js";
-import { WebsocketTransport, BaseTransport, Request } from "yerpc";
+import { BaseTransport, Request } from "yerpc";
 import { TinyEmitter } from "@deltachat/tiny-emitter";

 type Events = { ALL: (accountId: number, event: EventType) => void } & {
@@ -74,34 +74,6 @@ export class BaseDeltaChat<
  }
 }

-export type Opts = {
-  url: string;
-  startEventLoop: boolean;
-};
-
-export const DEFAULT_OPTS: Opts = {
-  url: "ws://localhost:20808/ws",
-  startEventLoop: true,
-};
-export class DeltaChat extends BaseDeltaChat<WebsocketTransport> {
-  opts: Opts;
-  close() {
-    this.transport.close();
-  }
-  constructor(opts?: Opts | string) {
-    if (typeof opts === "string") {
-      opts = { ...DEFAULT_OPTS, url: opts };
-    } else if (opts) {
-      opts = { ...DEFAULT_OPTS, ...opts };
-    } else {
-      opts = { ...DEFAULT_OPTS };
-    }
-    const transport = new WebsocketTransport(opts.url);
-    super(transport, opts.startEventLoop);
-    this.opts = opts;
-  }
-}
-
 export class StdioDeltaChat extends BaseDeltaChat<StdioTransport> {
  close() {}
  constructor(input: any, output: any, startEventLoop: boolean) {
--- a/deltachat-jsonrpc/typescript/tsconfig.json
+++ b/deltachat-jsonrpc/typescript/tsconfig.json
@@ -15,6 +15,6 @@
    "noImplicitAny": true,
    "isolatedModules": true
  },
-  "include": ["*.ts", "example/*.ts", "test/*.ts"],
+  "include": ["*.ts", "test/*.ts"],
  "compileOnSave": false
 }
--- a/deltachat-repl/Cargo.toml
+++ b/deltachat-repl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.157.1"
+version = "1.157.2"
 license = "MPL-2.0"
 edition = "2021"
 repository = "https://github.com/chatmail/core"
--- a/deltachat-rpc-client/pyproject.toml
+++ b/deltachat-rpc-client/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat-rpc-client"
-version = "1.157.1"
+version = "1.157.2"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
    "Development Status :: 5 - Production/Stable",
--- a/deltachat-rpc-client/tests/test_something.py
+++ b/deltachat-rpc-client/tests/test_something.py
@@ -728,6 +728,11 @@ def test_no_old_msg_is_fresh(acfactory):
    assert ac1.create_chat(ac2).get_fresh_message_count() == 1
    assert len(list(ac1.get_fresh_messages())) == 1

+    while True:
+        event = ac1.wait_for_event()
+        if event.kind == EventType.IMAP_INBOX_IDLE:
+            break
+
    logging.info("Send a message from ac1_clone to ac2 and check that ac1 marks the first message as 'noticed'")
    ac1_clone_chat.send_text("Hi back")
    ev = ac1.wait_for_msgs_noticed_event()
--- a/deltachat-rpc-server/Cargo.toml
+++ b/deltachat-rpc-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.157.1"
+version = "1.157.2"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
--- a/deltachat-rpc-server/npm-package/package.json
+++ b/deltachat-rpc-server/npm-package/package.json
@@ -15,5 +15,5 @@
  },
  "type": "module",
  "types": "index.d.ts",
-  "version": "1.157.1"
+  "version": "1.157.2"
 }
--- a/deny.toml
+++ b/deny.toml
@@ -31,6 +31,7 @@ skip = [
     { name = "event-listener", version = "2.5.3" },
     { name = "generator", version = "0.7.5" },
     { name = "getrandom", version = "0.2.12" },
+     { name = "heck", version = "0.4.1" },
     { name = "http", version = "0.2.12" },
     { name = "loom", version = "0.5.6" },
     { name = "netlink-packet-route", version = "0.17.1" },
@@ -45,12 +46,11 @@ skip = [
     { name = "regex-syntax", version = "0.6.29" },
     { name = "rtnetlink", version = "0.13.1" },
     { name = "security-framework", version = "2.11.1" },
-     { name = "sync_wrapper", version = "0.1.2" },
+     { name = "strum_macros", version = "0.26.2" },
+     { name = "strum", version = "0.26.2" },
     { name = "syn", version = "1.0.109" },
     { name = "thiserror-impl", version = "1.0.69" },
     { name = "thiserror", version = "1.0.69" },
-     { name = "tokio-tungstenite", version = "0.21.0" },
-     { name = "tungstenite", version = "0.21.0" },
     { name = "unicode-width", version = "0.1.11" },
     { name = "wasi", version = "0.11.0+wasi-snapshot-preview1" },
     { name = "windows" },
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat"
-version = "1.157.1"
+version = "1.157.2"
 description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
 readme = "README.rst"
 requires-python = ">=3.8"
--- a/release-date.in
+++ b/release-date.in
@@ -1 +1 @@
-2025-03-13
+2025-03-15
--- a/src/blob.rs
+++ b/src/blob.rs
@@ -193,6 +193,7 @@ impl<'a> BlobObject<'a> {
    /// Note that this is NOT the user-visible filename,
    /// which is only stored in Param::Filename on the message.
    ///
+    #[allow(rustdoc::private_intra_doc_links)]
    /// [Params]: crate::param::Params
    pub fn as_name(&self) -> &str {
        &self.name
@@ -251,6 +252,7 @@ impl<'a> BlobObject<'a> {
        Ok(blob.as_name().to_string())
    }

+    /// Recode image to avatar size.
    pub async fn recode_to_avatar_size(&mut self, context: &Context) -> Result<()> {
        let (img_wh, max_bytes) =
            match MediaQuality::from_i32(context.get_config_int(Config::MediaQuality).await?)
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -2027,8 +2027,6 @@ impl Chat {
        let mut to_id = 0;
        let mut location_id = 0;

-        let new_rfc724_mid = create_outgoing_rfc724_mid();
-
        if self.typ == Chattype::Single {
            if let Some(id) = context
                .sql
@@ -2123,7 +2121,7 @@ impl Chat {
            if references_vec.is_empty() {
                // As a fallback, use our Message-ID,
                // same as in the case of top-level message.
-                new_references = new_rfc724_mid.clone();
+                new_references = msg.rfc724_mid.clone();
            } else {
                new_references = references_vec.join(" ");
            }
@@ -2133,8 +2131,9 @@ impl Chat {
            // This allows us to identify replies to our message even if
            // email server such as Outlook changes `Message-ID:` header.
            // MUAs usually keep the first Message-ID in `References:` header unchanged.
-            new_references = new_rfc724_mid.clone();
+            new_references = msg.rfc724_mid.clone();
        }
+        info!(context, "new references: {new_references:?}");

        // add independent location to database
        if msg.param.exists(Param::SetLatitude) {
@@ -2201,7 +2200,6 @@ impl Chat {

        msg.chat_id = self.id;
        msg.from_id = ContactId::SELF;
-        msg.rfc724_mid = new_rfc724_mid;
        msg.timestamp_sort = timestamp;

        // add message to the database
@@ -4369,6 +4367,8 @@ pub async fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: ChatId)
        let new_msg_id = chat
            .prepare_msg_raw(context, &mut msg, None, curr_timestamp)
            .await?;
+
+        msg.rfc724_mid = create_outgoing_rfc724_mid();
        curr_timestamp += 1;
        if !create_send_msg_jobs(context, &mut msg).await?.is_empty() {
            context.scheduler.interrupt_smtp().await;
--- a/src/chat/chat_tests.rs
+++ b/src/chat/chat_tests.rs
@@ -2964,15 +2964,24 @@ async fn test_sync_accept_before_first_msg() -> Result<()> {

    let ba_chat = bob.create_chat(alice0).await;
    let sent_msg = bob.send_text(ba_chat.id, "hi").await;
-    let a0b_chat_id = alice0.recv_msg(&sent_msg).await.chat_id;
-    assert_eq!(alice0.get_chat(&bob).await.blocked, Blocked::Request);
+    let rcvd_msg = alice0.recv_msg(&sent_msg).await;
+    let a0b_chat_id = rcvd_msg.chat_id;
+    let a0b_contact_id = rcvd_msg.from_id;
+    assert_eq!(
+        Chat::load_from_db(alice0, a0b_chat_id).await?.blocked,
+        Blocked::Request
+    );
    a0b_chat_id.accept(alice0).await?;
-    let a0b_contact = alice0.add_or_lookup_contact(&bob).await;
+    let a0b_contact = Contact::get_by_id(alice0, a0b_contact_id).await?;
    assert_eq!(a0b_contact.origin, Origin::CreateChat);
    assert_eq!(alice0.get_chat(&bob).await.blocked, Blocked::Not);

    sync(alice0, alice1).await;
-    let a1b_contact = alice1.add_or_lookup_contact(&bob).await;
+    let alice1_contacts = Contact::get_all(alice1, 0, None).await?;
+    assert_eq!(alice1_contacts.len(), 1);
+    let a1b_contact_id = alice1_contacts[0];
+    let a1b_contact = Contact::get_by_id(alice1, a1b_contact_id).await?;
+    assert_eq!(a1b_contact.get_addr(), "bob@example.net");
    assert_eq!(a1b_contact.origin, Origin::CreateChat);
    let a1b_chat = alice1.get_chat(&bob).await;
    assert_eq!(a1b_chat.blocked, Blocked::Not);
@@ -2995,22 +3004,22 @@ async fn test_sync_block_before_first_msg() -> Result<()> {

    let ba_chat = bob.create_chat(alice0).await;
    let sent_msg = bob.send_text(ba_chat.id, "hi").await;
-    let a0b_chat_id = alice0.recv_msg(&sent_msg).await.chat_id;
+    let rcvd_msg = alice0.recv_msg(&sent_msg).await;
+    let a0b_chat_id = rcvd_msg.chat_id;
+    let a0b_contact_id = rcvd_msg.from_id;
    assert_eq!(alice0.get_chat(&bob).await.blocked, Blocked::Request);
    a0b_chat_id.block(alice0).await?;
-    let a0b_contact = alice0.add_or_lookup_contact(&bob).await;
+    let a0b_contact = Contact::get_by_id(alice0, a0b_contact_id).await?;
    assert_eq!(a0b_contact.origin, Origin::IncomingUnknownFrom);
    assert_eq!(alice0.get_chat(&bob).await.blocked, Blocked::Yes);

    sync(alice0, alice1).await;
-    let a1b_contact = alice1.add_or_lookup_contact(&bob).await;
-    assert_eq!(a1b_contact.origin, Origin::Hidden);
-    assert!(ChatIdBlocked::lookup_by_contact(alice1, a1b_contact.id)
-        .await?
-        .is_none());
+    let alice1_contacts = Contact::get_all(alice1, 0, None).await?;
+    assert_eq!(alice1_contacts.len(), 0);

    let rcvd_msg = alice1.recv_msg(&sent_msg).await;
-    let a1b_contact = alice1.add_or_lookup_contact(&bob).await;
+    let a1b_contact_id = rcvd_msg.from_id;
+    let a1b_contact = Contact::get_by_id(alice1, a1b_contact_id).await?;
    assert_eq!(a1b_contact.origin, Origin::IncomingUnknownFrom);
    let a1b_chat = alice1.get_chat(&bob).await;
    assert_eq!(a1b_chat.blocked, Blocked::Yes);
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -52,7 +52,7 @@ pub(crate) mod events;
 pub use events::*;

 mod aheader;
-mod blob;
+pub mod blob;
 pub mod chat;
 pub mod chatlist;
 pub mod config;
--- a/src/message.rs
+++ b/src/message.rs
@@ -33,6 +33,7 @@ use crate::reaction::get_msg_reactions;
 use crate::sql;
 use crate::summary::Summary;
 use crate::sync::SyncData;
+use crate::tools::create_outgoing_rfc724_mid;
 use crate::tools::{
    buf_compress, buf_decompress, get_filebytes, get_filemeta, gm2local_offset, read_file,
    sanitize_filename, time, timestamp_to_str, truncate,
@@ -485,6 +486,7 @@ impl Message {
    pub fn new(viewtype: Viewtype) -> Self {
        Message {
            viewtype,
+            rfc724_mid: create_outgoing_rfc724_mid(),
            ..Default::default()
        }
    }
@@ -494,6 +496,7 @@ impl Message {
        Message {
            viewtype: Viewtype::Text,
            text,
+            rfc724_mid: create_outgoing_rfc724_mid(),
            ..Default::default()
        }
    }
@@ -2158,9 +2161,11 @@ pub(crate) async fn get_by_rfc724_mids(
    let mut latest = None;
    for id in mids.iter().rev() {
        let Some((msg_id, _)) = rfc724_mid_exists(context, id).await? else {
+            info!(context, "continue msgid");
            continue;
        };
        let Some(msg) = Message::load_from_db_optional(context, msg_id).await? else {
+            info!(context, "continue msg");
            continue;
        };
        if msg.download_state == DownloadState::Done {
--- a/src/message/message_tests.rs
+++ b/src/message/message_tests.rs
@@ -147,8 +147,6 @@ async fn test_quote() {

    let mut msg = Message::new_text("Quoted message".to_string());

-    // Send message, so it gets a Message-Id.
-    assert!(msg.rfc724_mid.is_empty());
    let msg_id = chat::send_msg(ctx, chat.id, &mut msg).await.unwrap();
    let msg = Message::load_from_db(ctx, msg_id).await.unwrap();
    assert!(!msg.rfc724_mid.is_empty());
@@ -358,6 +356,7 @@ async fn test_markseen_msgs() -> Result<()> {
    let sent1 = alice.send_msg(alice_chat.id, &mut msg).await;
    let msg1 = bob.recv_msg(&sent1).await;
    let bob_chat_id = msg1.chat_id;
+    let mut msg = Message::new_text("this is the text!".to_string());
    let sent2 = alice.send_msg(alice_chat.id, &mut msg).await;
    let msg2 = bob.recv_msg(&sent2).await;
    assert_eq!(msg1.chat_id, msg2.chat_id);
@@ -380,9 +379,11 @@ async fn test_markseen_msgs() -> Result<()> {

    // bob sends to alice,
    // alice knows bob and messages appear in normal chat
+    let mut msg = Message::new_text("this is the text!".to_string());
    let msg1 = alice
        .recv_msg(&bob.send_msg(bob_chat_id, &mut msg).await)
        .await;
+    let mut msg = Message::new_text("this is the text!".to_string());
    let msg2 = alice
        .recv_msg(&bob.send_msg(bob_chat_id, &mut msg).await)
        .await;
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -607,10 +607,7 @@ impl MimeFactory {
                || to.len() + past_members.len() == self.member_timestamps.len()
        );
        if to.is_empty() {
-            to.push(Address::new_group(
-                Some("hidden-recipients".to_string()),
-                Vec::new(),
-            ));
+            to.push(hidden_recipients());
        }

        // Start with Internet Message Format headers in the order of the standard example
@@ -713,12 +710,11 @@ impl MimeFactory {

        if let Loaded::Message { chat, .. } = &self.loaded {
            if chat.typ == Chattype::Broadcast {
-                let encoded_chat_name = encode_words(&chat.name);
                headers.push((
                    "List-ID",
-                    mail_builder::headers::raw::Raw::new(format!(
-                        "{encoded_chat_name} <{}>",
-                        chat.grpid
+                    mail_builder::headers::text::Text::new(format!(
+                        "{} <{}>",
+                        chat.name, chat.grpid
                    ))
                    .into(),
                ));
@@ -888,21 +884,23 @@ impl MimeFactory {
            } else if header_name == "to" {
                protected_headers.push(header.clone());
                if is_encrypted {
+                    let mut to_without_names = to
+                        .clone()
+                        .into_iter()
+                        .filter_map(|header| match header {
+                            Address::Address(mb) => Some(Address::Address(EmailAddress {
+                                name: None,
+                                email: mb.email,
+                            })),
+                            _ => None,
+                        })
+                        .collect::<Vec<_>>();
+                    if to_without_names.is_empty() {
+                        to_without_names.push(hidden_recipients());
+                    }
                    unprotected_headers.push((
                        original_header_name,
-                        Address::new_list(
-                            to.clone()
-                                .into_iter()
-                                .filter_map(|header| match header {
-                                    Address::Address(mb) => Some(Address::Address(EmailAddress {
-                                        name: None,
-                                        email: mb.email,
-                                    })),
-                                    _ => None,
-                                })
-                                .collect::<Vec<_>>(),
-                        )
-                        .into(),
+                        Address::new_list(to_without_names).into(),
                    ));
                } else {
                    unprotected_headers.push(header.clone());
@@ -1633,6 +1631,10 @@ impl MimeFactory {
    }
 }

+fn hidden_recipients() -> Address<'static> {
+    Address::new_group(Some("hidden-recipients".to_string()), Vec::new())
+}
+
 async fn build_body_file(context: &Context, msg: &Message) -> Result<MimePart<'static>> {
    let file_name = msg.get_filename().context("msg has no file")?;
    let suffix = Path::new(&file_name)
@@ -1748,13 +1750,5 @@ fn render_rfc724_mid(rfc724_mid: &str) -> String {
    }
 }

-/* ******************************************************************************
- * Encode/decode header words, RFC 2047
- ******************************************************************************/
-
-fn encode_words(word: &str) -> String {
-    encoded_words::encode(word, None, encoded_words::EncodingFlag::Shortest, None)
-}
-
 #[cfg(test)]
 mod mimefactory_tests;
--- a/src/mimefactory/mimefactory_tests.rs
+++ b/src/mimefactory/mimefactory_tests.rs
@@ -727,6 +727,7 @@ async fn test_selfavatar_unencrypted_signed() {
        .is_some());

    // if another message is sent, that one must not contain the avatar
+    let mut msg = Message::new_text("this is the text!".to_string());
    let sent_msg = t.send_msg(chat.id, &mut msg).await;
    let mut payload = sent_msg.payload().splitn(4, "\r\n\r\n");

@@ -898,3 +899,23 @@ async fn test_dont_remove_self() -> Result<()> {

    Ok(())
 }
+
+/// Regression test: mimefactory should never create an empty to header,
+/// also not if the Selftalk parameter is missing
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_no_empty_to_header() -> Result<()> {
+    let alice = &TestContext::new_alice().await;
+    let mut self_chat = alice.get_self_chat().await;
+    self_chat.param.remove(Param::Selftalk);
+    self_chat.update_param(alice).await?;
+
+    let payload = alice.send_text(self_chat.id, "Hi").await.payload;
+    assert!(
+        // It would be equally fine if the payload contained `To: alice@example.org` or similar,
+        // as long as it's a valid header
+        payload.contains("To: \"hidden-recipients\": ;"),
+        "Payload doesn't contain correct To: header: {payload}"
+    );
+
+    Ok(())
+}
--- a/src/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -264,7 +264,7 @@ impl MimeMessage {
                    // messages are shown as unencrypted anyway.

                    timestamp_sent =
-                        Self::get_timestamp_sent(&mail.headers, timestamp_sent, timestamp_rcvd);
+                        Self::get_timestamp_sent(&part.headers, timestamp_sent, timestamp_rcvd);
                    MimeMessage::merge_headers(
                        context,
                        &mut headers,
@@ -288,9 +288,7 @@ impl MimeMessage {
            if let Some(part) = part.subparts.first() {
                for field in &part.headers {
                    let key = field.get_key().to_lowercase();
-
-                    // For now only avatar headers can be hidden.
-                    if !headers.contains_key(&key) && is_hidden(&key) {
+                    if !headers.contains_key(&key) && is_hidden(&key) || key == "message-id" {
                        headers.insert(key.to_string(), field.get_value());
                    }
                }
--- a/src/mimeparser/mimeparser_tests.rs
+++ b/src/mimeparser/mimeparser_tests.rs
@@ -1918,6 +1918,29 @@ This is the epilogue.  It is also to be ignored.";
    );
 }

+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_hidden_message_id() {
+    let t = &TestContext::new().await;
+    let raw = br#"Message-ID: bar@example.org
+Date: Sun, 08 Dec 2019 23:12:55 +0000
+To: <alice@example.org>
+From: <tunis4@example.org>
+Content-Type: multipart/mixed; boundary="luTiGu6GBoVLCvTkzVtmZmwsmhkNMw"
+
+
+--luTiGu6GBoVLCvTkzVtmZmwsmhkNMw
+Message-ID: foo@example.org
+Content-Type: text/plain; charset=utf-8
+
+Message with a correct Message-ID hidden header
+
+--luTiGu6GBoVLCvTkzVtmZmwsmhkNMw--
+"#;
+
+    let message = MimeMessage::from_bytes(t, &raw[..], None).await.unwrap();
+    assert_eq!(message.get_rfc724_mid().unwrap(), "foo@example.org");
+}
+
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_chat_edit_imf_header() -> Result<()> {
    let mut tcm = TestContextManager::new();
@@ -1959,3 +1982,32 @@ async fn test_chat_edit_imf_header() -> Result<()> {

    Ok(())
 }
+
+/// Tests that timestamp of signed but not encrypted message is protected.
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_protected_date() -> Result<()> {
+    let mut tcm = TestContextManager::new();
+    let alice = &tcm.alice().await;
+    let bob = &tcm.bob().await;
+
+    alice.set_config(Config::SignUnencrypted, Some("1")).await?;
+
+    let alice_chat = alice.create_email_chat(bob).await;
+    let alice_msg_id = chat::send_text_msg(alice, alice_chat.id, "Hello!".to_string()).await?;
+    let alice_msg = Message::load_from_db(alice, alice_msg_id).await?;
+    assert_eq!(alice_msg.get_showpadlock(), false);
+
+    let mut sent_msg = alice.pop_sent_msg().await;
+    sent_msg.payload = sent_msg.payload.replacen(
+        "Date:",
+        "Date: Wed, 17 Mar 2021 14:30:53 +0100 (CET)\r\nX-Not-Date:",
+        1,
+    );
+    let bob_msg = bob.recv_msg(&sent_msg).await;
+    assert_eq!(alice_msg.get_text(), bob_msg.get_text());
+
+    // Timestamp that the sender has put into the message
+    // should always be displayed as is on the receiver.
+    assert_eq!(alice_msg.get_timestamp(), bob_msg.get_timestamp());
+    Ok(())
+}
--- a/src/receive_imf.rs
+++ b/src/receive_imf.rs
@@ -1495,73 +1495,9 @@ async fn add_parts(
        }
    }

-    if let Some(rfc724_mid) = mime_parser.get_header(HeaderDef::ChatEdit) {
+    if handle_edit_delete(context, mime_parser, from_id).await? {
        chat_id = DC_CHAT_ID_TRASH;
-        if let Some((original_msg_id, _)) = rfc724_mid_exists(context, rfc724_mid).await? {
-            if let Some(mut original_msg) =
-                Message::load_from_db_optional(context, original_msg_id).await?
-            {
-                if original_msg.from_id == from_id {
-                    if let Some(part) = mime_parser.parts.first() {
-                        let edit_msg_showpadlock = part
-                            .param
-                            .get_bool(Param::GuaranteeE2ee)
-                            .unwrap_or_default();
-                        if edit_msg_showpadlock || !original_msg.get_showpadlock() {
-                            let new_text =
-                                part.msg.strip_prefix(EDITED_PREFIX).unwrap_or(&part.msg);
-                            chat::save_text_edit_to_db(context, &mut original_msg, new_text)
-                                .await?;
-                        } else {
-                            warn!(context, "Edit message: Not encrypted.");
-                        }
-                    }
-                } else {
-                    warn!(context, "Edit message: Bad sender.");
-                }
-            } else {
-                warn!(context, "Edit message: Database entry does not exist.");
-            }
-        } else {
-            warn!(
-                context,
-                "Edit message: rfc724_mid {rfc724_mid:?} not found."
-            );
-        }
-    } else if let Some(rfc724_mid_list) = mime_parser.get_header(HeaderDef::ChatDelete) {
-        chat_id = DC_CHAT_ID_TRASH;
-        if let Some(part) = mime_parser.parts.first() {
-            // See `message::delete_msgs_ex()`, unlike edit requests, DC doesn't send unencrypted
-            // deletion requests, so there's no need to support them.
-            if part.param.get_bool(Param::GuaranteeE2ee).unwrap_or(false) {
-                let mut modified_chat_ids = HashSet::new();
-                let mut msg_ids = Vec::new();
-
-                let rfc724_mid_vec: Vec<&str> = rfc724_mid_list.split_whitespace().collect();
-                for rfc724_mid in rfc724_mid_vec {
-                    if let Some((msg_id, _)) =
-                        message::rfc724_mid_exists(context, rfc724_mid).await?
-                    {
-                        if let Some(msg) = Message::load_from_db_optional(context, msg_id).await? {
-                            if msg.from_id == from_id {
-                                message::delete_msg_locally(context, &msg).await?;
-                                msg_ids.push(msg.id);
-                                modified_chat_ids.insert(msg.chat_id);
-                            } else {
-                                warn!(context, "Delete message: Bad sender.");
-                            }
-                        } else {
-                            warn!(context, "Delete message: Database entry does not exist.");
-                        }
-                    } else {
-                        warn!(context, "Delete message: {rfc724_mid:?} not found.");
-                    }
-                }
-                message::delete_msgs_locally_done(context, &msg_ids, modified_chat_ids).await?;
-            } else {
-                warn!(context, "Delete message: Not encrypted.");
-            }
-        }
+        info!(context, "Message edits/deletes existing message (TRASH).");
    }

    let mut parts = mime_parser.parts.iter().peekable();
@@ -1830,6 +1766,89 @@ RETURNING id
    })
 }

+/// Checks for "Chat-Edit" and "Chat-Delete" headers,
+/// and edits/deletes existing messages accordingly.
+///
+/// Returns `true` if this message is an edit/deletion request.
+async fn handle_edit_delete(
+    context: &Context,
+    mime_parser: &MimeMessage,
+    from_id: ContactId,
+) -> Result<bool> {
+    if let Some(rfc724_mid) = mime_parser.get_header(HeaderDef::ChatEdit) {
+        if let Some((original_msg_id, _)) = rfc724_mid_exists(context, rfc724_mid).await? {
+            if let Some(mut original_msg) =
+                Message::load_from_db_optional(context, original_msg_id).await?
+            {
+                if original_msg.from_id == from_id {
+                    if let Some(part) = mime_parser.parts.first() {
+                        let edit_msg_showpadlock = part
+                            .param
+                            .get_bool(Param::GuaranteeE2ee)
+                            .unwrap_or_default();
+                        if edit_msg_showpadlock || !original_msg.get_showpadlock() {
+                            let new_text =
+                                part.msg.strip_prefix(EDITED_PREFIX).unwrap_or(&part.msg);
+                            chat::save_text_edit_to_db(context, &mut original_msg, new_text)
+                                .await?;
+                        } else {
+                            warn!(context, "Edit message: Not encrypted.");
+                        }
+                    }
+                } else {
+                    warn!(context, "Edit message: Bad sender.");
+                }
+            } else {
+                warn!(context, "Edit message: Database entry does not exist.");
+            }
+        } else {
+            warn!(
+                context,
+                "Edit message: rfc724_mid {rfc724_mid:?} not found."
+            );
+        }
+
+        Ok(true)
+    } else if let Some(rfc724_mid_list) = mime_parser.get_header(HeaderDef::ChatDelete) {
+        if let Some(part) = mime_parser.parts.first() {
+            // See `message::delete_msgs_ex()`, unlike edit requests, DC doesn't send unencrypted
+            // deletion requests, so there's no need to support them.
+            if part.param.get_bool(Param::GuaranteeE2ee).unwrap_or(false) {
+                let mut modified_chat_ids = HashSet::new();
+                let mut msg_ids = Vec::new();
+
+                let rfc724_mid_vec: Vec<&str> = rfc724_mid_list.split_whitespace().collect();
+                for rfc724_mid in rfc724_mid_vec {
+                    if let Some((msg_id, _)) =
+                        message::rfc724_mid_exists(context, rfc724_mid).await?
+                    {
+                        if let Some(msg) = Message::load_from_db_optional(context, msg_id).await? {
+                            if msg.from_id == from_id {
+                                message::delete_msg_locally(context, &msg).await?;
+                                msg_ids.push(msg.id);
+                                modified_chat_ids.insert(msg.chat_id);
+                            } else {
+                                warn!(context, "Delete message: Bad sender.");
+                            }
+                        } else {
+                            warn!(context, "Delete message: Database entry does not exist.");
+                        }
+                    } else {
+                        warn!(context, "Delete message: {rfc724_mid:?} not found.");
+                    }
+                }
+                message::delete_msgs_locally_done(context, &msg_ids, modified_chat_ids).await?;
+            } else {
+                warn!(context, "Delete message: Not encrypted.");
+            }
+        }
+
+        Ok(true)
+    } else {
+        Ok(false)
+    }
+}
+
 async fn tweak_sort_timestamp(
    context: &Context,
    mime_parser: &mut MimeMessage,
@@ -3197,6 +3216,7 @@ async fn get_parent_message(
    if let Some(field) = references {
        mids.append(&mut parse_message_ids(field));
    }
+    info!(context, "mids: {mids:?}");
    message::get_by_rfc724_mids(context, &mids).await
 }

--- a/src/receive_imf/receive_imf_tests.rs
+++ b/src/receive_imf/receive_imf_tests.rs
@@ -5139,7 +5139,7 @@ async fn test_references() -> Result<()> {
    alice.set_config_bool(Config::BccSelf, true).await?;

    let alice_chat_id = create_group_chat(alice, ProtectionStatus::Unprotected, "Group").await?;
-    let _sent = alice
+    alice
        .send_text(alice_chat_id, "Hi! I created a group.")
        .await;

--- a/src/securejoin/securejoin_tests.rs
+++ b/src/securejoin/securejoin_tests.rs
@@ -669,11 +669,11 @@ async fn test_secure_join() -> Result<()> {
    assert_eq!(Chatlist::try_load(&bob, 0, None, None).await?.len(), 1);

    // If Bob then sends a direct message to alice, however, the one-to-one with Alice should appear.
-    let bobs_chat_with_alice = bob.get_chat(&alice).await;
+    let bobs_chat_with_alice = bob.create_chat(&alice).await;
    let sent = bob.send_text(bobs_chat_with_alice.id, "Hello").await;
    alice.recv_msg(&sent).await;
    assert_eq!(Chatlist::try_load(&alice, 0, None, None).await?.len(), 2);
-    assert_eq!(Chatlist::try_load(&bob, 0, None, None).await?.len(), 1);
+    assert_eq!(Chatlist::try_load(&bob, 0, None, None).await?.len(), 2);

    Ok(())
 }
--- a/src/test_utils.rs
+++ b/src/test_utils.rs
@@ -167,7 +167,10 @@ impl TestContextManager {
        );
    }

-    pub async fn execute_securejoin(&self, scanner: &TestContext, scanned: &TestContext) {
+    /// Executes SecureJoin protocol between `scanner` and `scanned`.
+    ///
+    /// Returns chat ID of the 1:1 chat for `scanner`.
+    pub async fn execute_securejoin(&self, scanner: &TestContext, scanned: &TestContext) -> ChatId {
        self.section(&format!(
            "{} scans {}'s QR code",
            scanner.name(),
@@ -175,12 +178,20 @@ impl TestContextManager {
        ));

        let qr = get_securejoin_qr(&scanned.ctx, None).await.unwrap();
-        self.exec_securejoin_qr(scanner, scanned, &qr).await;
+        self.exec_securejoin_qr(scanner, scanned, &qr).await
    }

    /// Executes SecureJoin initiated by `scanner` scanning `qr` generated by `scanned`.
-    pub async fn exec_securejoin_qr(&self, scanner: &TestContext, scanned: &TestContext, qr: &str) {
-        join_securejoin(&scanner.ctx, qr).await.unwrap();
+    ///
+    /// The [`ChatId`] of the created chat is returned, for a SetupContact QR this is the 1:1
+    /// chat with `scanned`, for a SecureJoin QR this is the group chat.
+    pub async fn exec_securejoin_qr(
+        &self,
+        scanner: &TestContext,
+        scanned: &TestContext,
+        qr: &str,
+    ) -> ChatId {
+        let chat_id = join_securejoin(&scanner.ctx, qr).await.unwrap();

        loop {
            if let Some(sent) = scanner.pop_sent_msg_opt(Duration::ZERO).await {
@@ -191,6 +202,7 @@ impl TestContextManager {
                break;
            }
        }
+        chat_id
    }
 }

--- a/src/tests/verified_chats.rs
+++ b/src/tests/verified_chats.rs
@@ -186,14 +186,14 @@ async fn test_missing_peerstate_reexecute_securejoin() -> Result<()> {
    let alice_addr = alice.get_config(Config::Addr).await?.unwrap();
    let bob = &tcm.bob().await;
    enable_verified_oneonone_chats(&[alice, bob]).await;
-    tcm.execute_securejoin(bob, alice).await;
-    let chat = bob.get_chat(alice).await;
+    let chat_id = tcm.execute_securejoin(bob, alice).await;
+    let chat = Chat::load_from_db(bob, chat_id).await?;
    assert!(chat.is_protected());
    bob.sql
        .execute("DELETE FROM acpeerstates WHERE addr=?", (&alice_addr,))
        .await?;
-    tcm.execute_securejoin(bob, alice).await;
-    let chat = bob.get_chat(alice).await;
+    let chat_id = tcm.execute_securejoin(bob, alice).await;
+    let chat = Chat::load_from_db(bob, chat_id).await?;
    assert!(chat.is_protected());
    assert!(!chat.is_protection_broken());
    Ok(())
Author	SHA1	Message	Date
Septias	5cadc5d850	Generate rfc724_mid when creating Message	2025-03-17 18:04:58 +01:00
link2xt	94187f7ee1	chore: update `strum` dependency	2025-03-17 15:19:36 +00:00
link2xt	fa7bf179fb	test: fix `test_no_old_msg_is_fresh` flakiness	2025-03-17 14:56:23 +00:00
dependabot[bot]	9bca0b3b90	chore(cargo): bump uuid from 1.12.1 to 1.15.1 Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.12.1 to 1.15.1. - [Release notes](https://github.com/uuid-rs/uuid/releases) - [Commits](https://github.com/uuid-rs/uuid/compare/1.12.1...v1.15.1) --- updated-dependencies: - dependency-name: uuid dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-03-17 14:46:48 +00:00
Nico de Haen	4c93feeddb	feat: add "delete_for_all" function in json-rpc (#6672 )	2025-03-17 14:29:04 +01:00
Sebastian Klähn	3d061d1dbd	feat(jsonrpc): add `copy_to_blobdir` api (#6660 ) Add a new API to jsonrpc to copy a file over to blobdir. This enables desktop tauri to not give global file permission.	2025-03-17 14:08:44 +01:00
link2xt	156f9642fe	build: remove encoded-words dependency mail-builder is doing its own encoding.	2025-03-16 19:49:55 +00:00
link2xt	ef008d4ca0	fix: use protected Date header for signed messages	2025-03-16 16:08:46 +00:00
Hocuri	0931d9326e	fix: Never send empty To: header (#6663 ) fix #6662 by adding "hidden-recipients:" if To: header would be empty	2025-03-16 09:47:57 +00:00
link2xt	65ea456bd8	build: remove websocket support from deltachat-jsonrpc WebSocket support is not used and is not maintained. It still uses outdated axum 0.7 version and does not have any authentication. Delta Chat Desktop has a new browser target that implements WebSocket support on top of stdio server, supports blobs and is tested in CI.	2025-03-16 09:04:26 +00:00
link2xt	7f55613607	test: avoid creating contacts in test_sync_{accept,block}_before_first_msg() When it is possible to test that no unhidden contact is creating by looking through the contact list or get the contact ID as the from_id of received message, do it to avoid acidentally creating a contact or changing its origin before testing.	2025-03-16 03:47:55 +00:00
link2xt	03b0185b8e	chore(release): prepare for 1.157.2	2025-03-15 11:43:33 +00:00
link2xt	1fa9707317	fix: update async-compression to 0.4.21 to fix IMAP COMPRESS getting stuck async-compression 0.4.21 fixes a bug in the encoder where it did not flush all the internal state sometimes, resulting in IMAP APPEND command timing out waiting for response when uploading large sync messages. See <https://github.com/Nullus157/async-compression/pull/333> for details.	2025-03-15 10:39:27 +00:00
Hocuri	e10f95b3ea	refactor: Extract handle_edit_delete() function for message edit/delete (#6664 ) Follow-up to https://github.com/chatmail/core/pull/6576	2025-03-15 09:26:17 +01:00
iequidoo	82f61035d4	fix: Prefer hidden Message-ID header if any Delta Chat already adds hidden Message-ID header because some servers mess up with it, so it should be preferred.	2025-03-13 19:52:33 -03:00
link2xt	4ec20ab9dc	test: return chat ID from TestContext.exec_securejoin_qr()	2025-03-13 21:08:14 +00:00
link2xt	296d2aa7f4	test(test_secure_join): Bob should not create a 1:1 chat before sending a message	2025-03-13 21:08:14 +00:00
@@ -1 +1 @@
 -03-13
 -03-15