ci: increase timeout in test_logged_ac_process_ffi_failure

This test keeps failing on macOS CI, likely because it does not get enough resources to finish in 10 seconds.
2026-07-04 06:24:57 +03:00 · 2025-01-03 01:05:11 +00:00
36 changed files with 208 additions and 424 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,48 +1,5 @@
 # Changelog

-## [1.153.0] - 2025-01-05
-
-### Features / Changes
-
- Remove "jobs" from imap_markseen if folder doesn't exist ([#5870](https://github.com/deltachat/deltachat-core-rust/pull/5870)).
- Delete `vg-request-with-auth` from IMAP after processing ([#6208](https://github.com/deltachat/deltachat-core-rust/pull/6208)).
-
-### API-Changes
-
- Add `IncomingWebxdcNotify.chat_id` ([#6356](https://github.com/deltachat/deltachat-core-rust/pull/6356)).
- rpc-client: Add INCOMING_REACTION to const.EventType ([#6349](https://github.com/deltachat/deltachat-core-rust/pull/6349)).
-
-### Documentation
-
- Viewtype::Sticker may be changed to Image and how to disable that ([#6352](https://github.com/deltachat/deltachat-core-rust/pull/6352)).
-
-### Fixes
-
- Never change Viewtype::Sticker to Image if file has non-image extension ([#6352](https://github.com/deltachat/deltachat-core-rust/pull/6352)).
- Change BccSelf default to 0 for chatmail ([#6340](https://github.com/deltachat/deltachat-core-rust/pull/6340)).
- Mark holiday notice messages as bot-generated.
- Don't treat location-only and sync messages as bot ones ([#6357](https://github.com/deltachat/deltachat-core-rust/pull/6357)).
- Update shadowsocks crate to 1.22.0 to avoid panic when parsing some QR codes.
- Prefer to encrypt if E2eeEnabled even if peers have EncryptPreference::NoPreference.
- Prioritize mailing list over self-sent messages.
- Allow empty `To` field for self-sent messages.
- Default `to_id` to self instead of 0.
-
-### Refactor
-
- Remove unused parameter and return value from `build_body_file(…)` ([#6369](https://github.com/deltachat/deltachat-core-rust/pull/6369)).
- Deprecate Param::ErroneousE2ee.
- Add `emit_msgs_changed_without_msg_id`.
- Add_parts: Remove excessive `is_mdn` checks.
- Simplify `self_sent` condition.
- Don't ignore get_for_contact errors.
-
-### Tests
-
- Messages without recipients are assigned to self chat.
- Message with empty To: field should have a valid to_id.
- Fix `test_logged_ac_process_ffi_failure` flakiness.
-
 ## [1.152.2] - 2024-12-24

 ### Features / Changes
@@ -5584,4 +5541,3 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
 [1.152.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.151.6..v1.152.0
 [1.152.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.152.0..v1.152.1
 [1.152.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.152.1..v1.152.2
-[1.153.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.152.2..v1.153.0
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -219,7 +219,7 @@ dependencies = [
 "nom",
 "num-traits",
 "rusticata-macros",
- "thiserror 1.0.69",
+ "thiserror",
 "time 0.3.36",
 ]

@@ -315,7 +315,7 @@ dependencies = [
 "pin-utils",
 "self_cell",
 "stop-token",
- "thiserror 1.0.69",
+ "thiserror",
 "tokio",
 ]

@@ -335,7 +335,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9343dc5acf07e79ff82d0c37899f079db3534d99f189a1837c8e549c99405bec"
 dependencies = [
 "native-tls",
- "thiserror 1.0.69",
+ "thiserror",
 "tokio",
 "url",
 ]
@@ -363,7 +363,7 @@ dependencies = [
 "log",
 "nom",
 "pin-project",
- "thiserror 1.0.69",
+ "thiserror",
 "tokio",
 ]

@@ -388,7 +388,7 @@ dependencies = [
 "crc32fast",
 "futures-lite 2.5.0",
 "pin-project",
- "thiserror 1.0.69",
+ "thiserror",
 "tokio",
 "tokio-util",
 ]
@@ -1306,7 +1306,7 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.153.0"
+version = "1.152.2"
 dependencies = [
 "anyhow",
 "async-broadcast",
@@ -1381,7 +1381,7 @@ dependencies = [
 "tempfile",
 "testdir",
 "textwrap",
- "thiserror 1.0.69",
+ "thiserror",
 "tokio",
 "tokio-io-timeout",
 "tokio-rustls",
@@ -1407,7 +1407,7 @@ dependencies = [

 [[package]]
 name = "deltachat-jsonrpc"
-version = "1.153.0"
+version = "1.152.2"
 dependencies = [
 "anyhow",
 "async-channel 2.3.1",
@@ -1432,7 +1432,7 @@ dependencies = [

 [[package]]
 name = "deltachat-repl"
-version = "1.153.0"
+version = "1.152.2"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1448,7 +1448,7 @@ dependencies = [

 [[package]]
 name = "deltachat-rpc-server"
-version = "1.153.0"
+version = "1.152.2"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1477,7 +1477,7 @@ dependencies = [

 [[package]]
 name = "deltachat_ffi"
-version = "1.153.0"
+version = "1.152.2"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1488,7 +1488,7 @@ dependencies = [
 "once_cell",
 "rand 0.8.5",
 "serde_json",
- "thiserror 1.0.69",
+ "thiserror",
 "tokio",
 "yerpc",
 ]
@@ -1717,27 +1717,6 @@ version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"

-[[package]]
-name = "dynosaur"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92fac44672fabad44990176319b9e94393f3a38b960b5ca2af6cd90f5ecd1497"
-dependencies = [
- "dynosaur_derive",
- "trait-variant",
-]
-
-[[package]]
-name = "dynosaur_derive"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16c187d1e575ef546d24f0fcd7701cc04abfe6b5e7e2758aabc450b99e835ac3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.94",
-]
-
 [[package]]
 name = "eax"
 version = "0.5.0"
@@ -1860,7 +1839,7 @@ dependencies = [
 "hex",
 "lazy_static",
 "regex",
- "thiserror 1.0.69",
+ "thiserror",
 ]

 [[package]]
@@ -2108,7 +2087,7 @@ dependencies = [
 "anyhow",
 "async-trait",
 "log",
- "thiserror 1.0.69",
+ "thiserror",
 "tokio",
 "tokio-stream",
 ]
@@ -2628,7 +2607,7 @@ dependencies = [
 "ipnet",
 "once_cell",
 "rand 0.8.5",
- "thiserror 1.0.69",
+ "thiserror",
 "time 0.3.36",
 "tinyvec",
 "tokio",
@@ -2652,7 +2631,7 @@ dependencies = [
 "rand 0.8.5",
 "resolv-conf",
 "smallvec",
- "thiserror 1.0.69",
+ "thiserror",
 "tokio",
 "tracing",
 ]
@@ -3172,7 +3151,7 @@ dependencies = [
 "rand_core 0.6.4",
 "serde",
 "ssh-key",
- "thiserror 1.0.69",
+ "thiserror",
 "ttl_cache",
 "url",
 "zeroize",
@@ -3302,7 +3281,7 @@ dependencies = [
 "strum",
 "stun-rs",
 "surge-ping",
- "thiserror 1.0.69",
+ "thiserror",
 "time 0.3.36",
 "tokio",
 "tokio-rustls",
@@ -3334,7 +3313,7 @@ dependencies = [
 "rustc-hash 2.0.0",
 "rustls",
 "socket2",
- "thiserror 1.0.69",
+ "thiserror",
 "tokio",
 "tracing",
 ]
@@ -3352,7 +3331,7 @@ dependencies = [
 "rustls",
 "rustls-platform-verifier",
 "slab",
- "thiserror 1.0.69",
+ "thiserror",
 "tinyvec",
 "tracing",
 ]
@@ -3428,7 +3407,7 @@ dependencies = [
 "combine",
 "jni-sys",
 "log",
- "thiserror 1.0.69",
+ "thiserror",
 "walkdir",
 ]

@@ -3648,7 +3627,7 @@ dependencies = [
 "serde_bencode",
 "serde_bytes",
 "sha1_smol",
- "thiserror 1.0.69",
+ "thiserror",
 "tracing",
 ]

@@ -3819,7 +3798,7 @@ dependencies = [
 "anyhow",
 "byteorder",
 "paste",
- "thiserror 1.0.69",
+ "thiserror",
 ]

 [[package]]
@@ -3833,7 +3812,7 @@ dependencies = [
 "log",
 "netlink-packet-core",
 "netlink-sys",
- "thiserror 1.0.69",
+ "thiserror",
 "tokio",
 ]

@@ -3871,7 +3850,7 @@ dependencies = [
 "rtnetlink",
 "serde",
 "socket2",
- "thiserror 1.0.69",
+ "thiserror",
 "time 0.3.36",
 "tokio",
 "tracing",
@@ -4315,7 +4294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8"
 dependencies = [
 "memchr",
- "thiserror 1.0.69",
+ "thiserror",
 "ucd-trie",
 ]

@@ -4363,7 +4342,7 @@ dependencies = [
 "aes-gcm",
 "aes-kw",
 "argon2",
- "base64 0.21.7",
+ "base64 0.22.1",
 "bitfield",
 "block-padding",
 "blowfish",
@@ -4413,7 +4392,7 @@ dependencies = [
 "sha3",
 "signature",
 "smallvec",
- "thiserror 1.0.69",
+ "thiserror",
 "twofish",
 "x25519-dalek",
 "x448",
@@ -4469,7 +4448,7 @@ dependencies = [
 "mainline",
 "self_cell",
 "simple-dns",
- "thiserror 1.0.69",
+ "thiserror",
 "tracing",
 "ureq",
 "wasm-bindgen",
@@ -4638,7 +4617,7 @@ dependencies = [
 "serde",
 "smallvec",
 "socket2",
- "thiserror 1.0.69",
+ "thiserror",
 "time 0.3.36",
 "tokio",
 "tokio-util",
@@ -4916,7 +4895,7 @@ dependencies = [
 "quinn-udp",
 "rustc-hash 1.1.0",
 "rustls",
- "thiserror 1.0.69",
+ "thiserror",
 "tokio",
 "tracing",
 ]
@@ -4933,7 +4912,7 @@ dependencies = [
 "rustc-hash 2.0.0",
 "rustls",
 "slab",
- "thiserror 1.0.69",
+ "thiserror",
 "tinyvec",
 "tracing",
 ]
@@ -5137,7 +5116,7 @@ checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
 dependencies = [
 "getrandom 0.2.12",
 "libredox",
- "thiserror 1.0.69",
+ "thiserror",
 ]

 [[package]]
@@ -5330,7 +5309,7 @@ dependencies = [
 "netlink-proto",
 "netlink-sys",
 "nix 0.26.4",
- "thiserror 1.0.69",
+ "thiserror",
 "tokio",
 ]

@@ -5405,9 +5384,9 @@ dependencies = [

 [[package]]
 name = "rustls"
-version = "0.23.20"
+version = "0.23.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b"
+checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1"
 dependencies = [
 "log",
 "once_cell",
@@ -5657,9 +5636,9 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.217"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
 dependencies = [
 "serde_derive",
 ]
@@ -5694,9 +5673,9 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.217"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -5716,9 +5695,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.134"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
 "itoa",
 "memchr",
@@ -5829,17 +5808,17 @@ dependencies = [

 [[package]]
 name = "shadowsocks"
-version = "1.22.0"
+version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1678a9acd37add020f89bfe05d45b9b8a6e8ad5d09f54ac2af3e0dcf0557b481"
+checksum = "5ecb3780dfbc654de9383758015b9bb95c6e32fecace36ebded09d67e854d130"
 dependencies = [
 "aes",
+ "async-trait",
 "base64 0.22.1",
 "blake3",
 "byte_string",
 "bytes",
 "cfg-if",
- "dynosaur",
 "futures",
 "libc",
 "log",
@@ -5855,19 +5834,18 @@ dependencies = [
 "shadowsocks-crypto",
 "socket2",
 "spin",
- "thiserror 2.0.9",
+ "thiserror",
 "tokio",
 "tokio-tfo",
- "trait-variant",
 "url",
 "windows-sys 0.59.0",
 ]

 [[package]]
 name = "shadowsocks-crypto"
-version = "0.5.8"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc77ecb3a97509d22751b76665894fcffad2d10df8758f4e3f20c92ccde6bf4f"
+checksum = "a9e49ecfad8b27f3df28848af11f08aa10df0c6b74b45748131753913be23373"
 dependencies = [
 "aes",
 "aes-gcm",
@@ -6158,7 +6136,7 @@ dependencies = [
 "pnet_packet",
 "rand 0.8.5",
 "socket2",
- "thiserror 1.0.69",
+ "thiserror",
 "tokio",
 "tracing",
 ]
@@ -6275,13 +6253,12 @@ dependencies = [

 [[package]]
 name = "testdir"
-version = "0.9.3"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9ffa013be124f7e8e648876190de818e3a87088ed97ccd414a398b403aec8c8"
+checksum = "ee79e927b64d193f5abb60d20a0eb56be0ee5a242fdeb8ce3bf054177006de52"
 dependencies = [
 "anyhow",
 "backtrace",
- "cargo-platform",
 "cargo_metadata",
 "once_cell",
 "sysinfo",
@@ -6305,16 +6282,7 @@ version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl 1.0.69",
-]
-
-[[package]]
-name = "thiserror"
-version = "2.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc"
-dependencies = [
- "thiserror-impl 2.0.9",
+ "thiserror-impl",
 ]

 [[package]]
@@ -6328,17 +6296,6 @@ dependencies = [
 "syn 2.0.94",
 ]

-[[package]]
-name = "thiserror-impl"
-version = "2.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.94",
-]
-
 [[package]]
 name = "thread_local"
 version = "1.1.8"
@@ -6428,9 +6385,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.42.0"
+version = "1.41.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
+checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
 dependencies = [
 "backtrace",
 "bytes",
@@ -6541,7 +6498,7 @@ dependencies = [
 "http 1.1.0",
 "httparse",
 "js-sys",
- "thiserror 1.0.69",
+ "thiserror",
 "tokio",
 "tokio-tungstenite",
 "wasm-bindgen",
@@ -6688,17 +6645,6 @@ dependencies = [
 "tracing-log",
 ]

-[[package]]
-name = "trait-variant"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70977707304198400eb4835a78f6a9f928bf41bba420deb8fdb175cd965d77a7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.94",
-]
-
 [[package]]
 name = "try-lock"
 version = "0.2.5"
@@ -6728,7 +6674,7 @@ dependencies = [
 "log",
 "rand 0.8.5",
 "sha1",
- "thiserror 1.0.69",
+ "thiserror",
 "url",
 "utf-8",
 ]
@@ -7057,7 +7003,7 @@ dependencies = [
 "event-listener 4.0.3",
 "futures-util",
 "parking_lot",
- "thiserror 1.0.69",
+ "thiserror",
 ]

 [[package]]
@@ -7391,7 +7337,7 @@ dependencies = [
 "futures",
 "log",
 "serde",
- "thiserror 1.0.69",
+ "thiserror",
 "windows 0.52.0",
 ]

@@ -7443,7 +7389,7 @@ dependencies = [
 "nom",
 "oid-registry",
 "rusticata-macros",
- "thiserror 1.0.69",
+ "thiserror",
 "time 0.3.36",
 ]

--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.153.0"
+version = "1.152.2"
 edition = "2021"
 license = "MPL-2.0"
 rust-version = "1.77"
@@ -86,14 +86,14 @@ regex = { workspace = true }
 rusqlite = { workspace = true, features = ["sqlcipher"] }
 rust-hsluv = "0.1"
 rustls-pki-types = "1.10.1"
-rustls = { version = "0.23.20", default-features = false }
+rustls = { version = "0.23.19", default-features = false }
 sanitize-filename = { workspace = true }
 serde_json = { workspace = true }
 serde_urlencoded = "0.7.1"
 serde = { workspace = true, features = ["derive"] }
 sha-1 = "0.10"
 sha2 = "0.10"
-shadowsocks = { version = "1.22.0", default-features = false, features = ["aead-cipher", "aead-cipher-2022"] }
+shadowsocks = { version = "1.21.0", default-features = false, features = ["aead-cipher-2022"] }
 smallvec = "1.13.2"
 strum = "0.26"
 strum_macros = "0.26"
@@ -120,7 +120,7 @@ nu-ansi-term = { workspace = true }
 pretty_assertions = "1.4.1"
 proptest = { version = "1", default-features = false, features = ["std"] }
 tempfile = { workspace = true }
-testdir = "0.9.3"
+testdir = "0.9.0"
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }

 [workspace]
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.153.0"
+version = "1.152.2"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
--- a/deltachat-jsonrpc/Cargo.toml
+++ b/deltachat-jsonrpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.153.0"
+version = "1.152.2"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
--- a/deltachat-jsonrpc/typescript/package.json
+++ b/deltachat-jsonrpc/typescript/package.json
@@ -58,5 +58,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "1.153.0"
+  "version": "1.152.2"
 }
--- a/deltachat-repl/Cargo.toml
+++ b/deltachat-repl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.153.0"
+version = "1.152.2"
 license = "MPL-2.0"
 edition = "2021"
 repository = "https://github.com/deltachat/deltachat-core-rust"
--- 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.153.0"
+version = "1.152.2"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
    "Development Status :: 5 - Production/Stable",
--- a/deltachat-rpc-server/Cargo.toml
+++ b/deltachat-rpc-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.153.0"
+version = "1.152.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.153.0"
+  "version": "1.152.2"
 }
--- a/deny.toml
+++ b/deny.toml
@@ -51,8 +51,6 @@ skip = [
     { name = "regex-syntax", version = "0.6.29" },
     { name = "sync_wrapper", version = "0.1.2" },
     { name = "syn", version = "1.0.109" },
-     { name = "thiserror-impl", version = "1.0.69" },
-     { name = "thiserror", version = "1.0.69" },
     { name = "time", version = "<0.3" },
     { name = "wasi", version = "<0.11" },
     { name = "windows_aarch64_gnullvm", version = "<0.52" },
--- a/package.json
+++ b/package.json
@@ -55,5 +55,5 @@
    "test:mocha": "mocha node/test/test.mjs --growl --reporter=spec --bail --exit"
  },
  "types": "node/dist/index.d.ts",
-  "version": "1.153.0"
+  "version": "1.152.2"
 }
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat"
-version = "1.153.0"
+version = "1.152.2"
 description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
 readme = "README.rst"
 requires-python = ">=3.7"
--- a/python/tests/test_1_online.py
+++ b/python/tests/test_1_online.py
@@ -1253,10 +1253,7 @@ def test_no_old_msg_is_fresh(acfactory, lp):

 def test_prefer_encrypt(acfactory, lp):
    """Test quorum rule for encryption preference in 1:1 and group chat."""
-    ac1 = acfactory.new_online_configuring_account(fix_is_chatmail=True)
-    ac2 = acfactory.new_online_configuring_account(fix_is_chatmail=True)
-    ac3 = acfactory.new_online_configuring_account(fix_is_chatmail=True)
-    acfactory.bring_accounts_online()
+    ac1, ac2, ac3 = acfactory.get_online_accounts(3)
    ac1.set_config("e2ee_enabled", "0")
    ac2.set_config("e2ee_enabled", "1")
    ac3.set_config("e2ee_enabled", "0")
@@ -1279,8 +1276,7 @@ def test_prefer_encrypt(acfactory, lp):
    lp.sec("ac2: sending message to ac1")
    chat2 = ac2.create_chat(ac1)
    msg2 = chat2.send_text("message2")
-    # Own preference is `Mutual` and we have the peer's key.
-    assert msg2.is_encrypted()
+    assert not msg2.is_encrypted()
    ac1._evtracker.wait_next_incoming_message()

    lp.sec("ac1: sending message to group chat with ac2 and ac3")
@@ -1296,8 +1292,8 @@ def test_prefer_encrypt(acfactory, lp):
    ac3.set_config("e2ee_enabled", "1")
    chat3 = ac3.create_chat(ac1)
    msg4 = chat3.send_text("message4")
-    # Own preference is `Mutual` and we have the peer's key.
-    assert msg4.is_encrypted()
+    # ac1 still does not prefer encryption
+    assert not msg4.is_encrypted()
    ac1._evtracker.wait_next_incoming_message()

    lp.sec("ac1: sending another message to group chat with ac2 and ac3")
--- a/python/tests/test_4_lowlevel.py
+++ b/python/tests/test_4_lowlevel.py
@@ -212,16 +212,11 @@ def test_logged_ac_process_ffi_failure(acfactory):
            0 / 0

    cap = Queue()
-
-    # Make sure the next attempt to log an event fails.
-    ac1.add_account_plugin(FailPlugin())
-
-    # Start capturing events.
    ac1.log = cap.put
-
+    ac1.add_account_plugin(FailPlugin())
    # cause any event eg contact added/changed
    ac1.create_contact("something@example.org")
-    res = cap.get(timeout=10)
+    res = cap.get(timeout=600)
    assert "ac_process_ffi_event" in res
    assert "ZeroDivisionError" in res
    assert "Traceback" in res
--- a/release-date.in
+++ b/release-date.in
@@ -1 +1 @@
-2025-01-05
+2024-12-24
--- a/src/chatlist.rs
+++ b/src/chatlist.rs
@@ -661,7 +661,7 @@ mod tests {
        let contacts = get_chat_contacts(&t, chat_id).await?;
        let contact_id = *contacts.first().unwrap();
        let chat = Chat::load_from_db(&t, chat_id).await?;
-        assert_eq!(chat.get_name(), "~Bob Authname");
+        assert_eq!(chat.get_name(), "Bob Authname");

        // check, the one-to-one-chat can be found using chatlist search query
        let chats = Chatlist::try_load(&t, 0, Some("bob authname"), None).await?;
@@ -682,7 +682,7 @@ mod tests {
        let test_id = Contact::create(&t, "", "bob@example.org").await?;
        assert_eq!(contact_id, test_id);
        let chat = Chat::load_from_db(&t, chat_id).await?;
-        assert_eq!(chat.get_name(), "~Bob Authname");
+        assert_eq!(chat.get_name(), "Bob Authname");
        let chats = Chatlist::try_load(&t, 0, Some("bob authname"), None).await?;
        assert_eq!(chats.len(), 1);
        let chats = Chatlist::try_load(&t, 0, Some("bob nickname"), None).await?;
--- a/src/contact.rs
+++ b/src/contact.rs
@@ -921,7 +921,7 @@ impl Contact {
                            let chat_name = if !name.is_empty() {
                                name
                            } else if !authname.is_empty() {
-                                format!("~{}", authname)
+                                authname
                            } else {
                                addr
                            };
@@ -1365,14 +1365,14 @@ impl Contact {
    ///
    /// This name is typically used in lists.
    /// To get the name editable in a formular, use `Contact::get_name`.
-    pub fn get_display_name(&self) -> String {
+    pub fn get_display_name(&self) -> &str {
        if !self.name.is_empty() {
-            return self.name.clone();
+            return &self.name;
        }
        if !self.authname.is_empty() {
-            return format!("~{}", self.authname);
+            return &self.authname;
        }
-        self.addr.clone()
+        &self.addr
    }

    /// Get a summary of authorized name and address.
@@ -1404,7 +1404,7 @@ impl Contact {
        if !self.name.is_empty() {
            format!("{} ({})", self.name, self.addr)
        } else if !self.authname.is_empty() {
-            format!("~{} ({})", self.authname, self.addr)
+            format!("{} ({})", self.authname, self.addr)
        } else {
            (&self.addr).into()
        }
@@ -2053,7 +2053,7 @@ mod tests {
        let contact = Contact::get_by_id(&context.ctx, id).await.unwrap();
        assert_eq!(contact.get_name(), "");
        assert_eq!(contact.get_authname(), "bob");
-        assert_eq!(contact.get_display_name(), "~bob");
+        assert_eq!(contact.get_display_name(), "bob");

        // Search by name.
        let contacts = Contact::get_all(&context.ctx, 0, Some("bob")).await?;
@@ -2185,7 +2185,7 @@ mod tests {
        assert_eq!(contact_id, contact_id_test);
        assert_eq!(sth_modified, Modifier::Modified);
        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
-        assert_eq!(contact.get_name_n_addr(), "~m. serious (three@drei.sam)");
+        assert_eq!(contact.get_name_n_addr(), "m. serious (three@drei.sam)");
        assert!(!contact.is_blocked());

        // manually edit name of third contact (does not changed authorized name)
@@ -2276,14 +2276,14 @@ mod tests {
        )
        .await?;
        let chat_id = t.get_last_msg().await.get_chat_id();
-        assert_eq!(Chat::load_from_db(&t, chat_id).await?.name, "~Flobbyfoo");
+        assert_eq!(Chat::load_from_db(&t, chat_id).await?.name, "Flobbyfoo");
        let chatlist = Chatlist::try_load(&t, 0, Some("flobbyfoo"), None).await?;
        assert_eq!(chatlist.len(), 1);
        let contact = Contact::get_by_id(&t, *contact_id).await?;
        assert_eq!(contact.get_authname(), "Flobbyfoo");
        assert_eq!(contact.get_name(), "");
-        assert_eq!(contact.get_display_name(), "~Flobbyfoo");
-        assert_eq!(contact.get_name_n_addr(), "~Flobbyfoo (f@example.org)");
+        assert_eq!(contact.get_display_name(), "Flobbyfoo");
+        assert_eq!(contact.get_name_n_addr(), "Flobbyfoo (f@example.org)");
        let contacts = Contact::get_all(&t, 0, Some("f@example.org")).await?;
        assert_eq!(contacts.len(), 1);
        let contacts = Contact::get_all(&t, 0, Some("flobbyfoo")).await?;
@@ -2304,7 +2304,7 @@ mod tests {
        )
        .await?;
        let chat_id = t.get_last_msg().await.get_chat_id();
-        assert_eq!(Chat::load_from_db(&t, chat_id).await?.name, "~Foo Flobby");
+        assert_eq!(Chat::load_from_db(&t, chat_id).await?.name, "Foo Flobby");
        let chatlist = Chatlist::try_load(&t, 0, Some("Flobbyfoo"), None).await?;
        assert_eq!(chatlist.len(), 0);
        let chatlist = Chatlist::try_load(&t, 0, Some("Foo Flobby"), None).await?;
@@ -2312,8 +2312,8 @@ mod tests {
        let contact = Contact::get_by_id(&t, *contact_id).await?;
        assert_eq!(contact.get_authname(), "Foo Flobby");
        assert_eq!(contact.get_name(), "");
-        assert_eq!(contact.get_display_name(), "~Foo Flobby");
-        assert_eq!(contact.get_name_n_addr(), "~Foo Flobby (f@example.org)");
+        assert_eq!(contact.get_display_name(), "Foo Flobby");
+        assert_eq!(contact.get_name_n_addr(), "Foo Flobby (f@example.org)");
        let contacts = Contact::get_all(&t, 0, Some("f@example.org")).await?;
        assert_eq!(contacts.len(), 1);
        let contacts = Contact::get_all(&t, 0, Some("flobbyfoo")).await?;
@@ -2439,7 +2439,7 @@ mod tests {
        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_authname(), "bob1");
        assert_eq!(contact.get_name(), "");
-        assert_eq!(contact.get_display_name(), "~bob1");
+        assert_eq!(contact.get_display_name(), "bob1");

        // incoming mail `From: bob2 <bob@example.org>` - this should update authname
        let (contact_id, sth_modified) = Contact::add_or_lookup(
@@ -2455,7 +2455,7 @@ mod tests {
        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_authname(), "bob2");
        assert_eq!(contact.get_name(), "");
-        assert_eq!(contact.get_display_name(), "~bob2");
+        assert_eq!(contact.get_display_name(), "bob2");

        // manually edit name to "bob3" - authname should be still be "bob2" as given in `From:` above
        let contact_id = Contact::create(&t, "bob3", "bob@example.org")
@@ -2510,7 +2510,7 @@ mod tests {
        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_authname(), "claire1");
        assert_eq!(contact.get_name(), "");
-        assert_eq!(contact.get_display_name(), "~claire1");
+        assert_eq!(contact.get_display_name(), "claire1");

        // incoming mail `From: claire2 <claire@example.org>` - this should update authname
        let (contact_id_same, sth_modified) = Contact::add_or_lookup(
@@ -2526,7 +2526,7 @@ mod tests {
        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_authname(), "claire2");
        assert_eq!(contact.get_name(), "");
-        assert_eq!(contact.get_display_name(), "~claire2");
+        assert_eq!(contact.get_display_name(), "claire2");
    }

    /// Regression test.
@@ -2547,7 +2547,7 @@ mod tests {
        .await?;
        assert_eq!(sth_modified, Modifier::Created);
        let contact = Contact::get_by_id(&t, contact_id).await?;
-        assert_eq!(contact.get_display_name(), "~Bob");
+        assert_eq!(contact.get_display_name(), "Bob");

        // Incoming message from someone else with "Not Bob" <bob@example.org> in the "To:" field.
        let (contact_id_same, sth_modified) = Contact::add_or_lookup(
@@ -2560,7 +2560,7 @@ mod tests {
        assert_eq!(contact_id, contact_id_same);
        assert_eq!(sth_modified, Modifier::Modified);
        let contact = Contact::get_by_id(&t, contact_id).await?;
-        assert_eq!(contact.get_display_name(), "~Not Bob");
+        assert_eq!(contact.get_display_name(), "Not Bob");

        // Incoming message from Bob, changing the name back.
        let (contact_id_same, sth_modified) = Contact::add_or_lookup(
@@ -2573,7 +2573,7 @@ mod tests {
        assert_eq!(contact_id, contact_id_same);
        assert_eq!(sth_modified, Modifier::Modified); // This was None until the bugfix
        let contact = Contact::get_by_id(&t, contact_id).await?;
-        assert_eq!(contact.get_display_name(), "~Bob");
+        assert_eq!(contact.get_display_name(), "Bob");

        Ok(())
    }
@@ -2610,7 +2610,7 @@ mod tests {
        let contact = Contact::get_by_id(&t, contact_id).await.unwrap();
        assert_eq!(contact.get_authname(), "dave2");
        assert_eq!(contact.get_name(), "");
-        assert_eq!(contact.get_display_name(), "~dave2");
+        assert_eq!(contact.get_display_name(), "dave2");
    }

    #[test]
--- a/src/e2ee.rs
+++ b/src/e2ee.rs
@@ -40,17 +40,20 @@ impl EncryptHelper {

    /// Determines if we can and should encrypt.
    ///
+    /// For encryption to be enabled, `e2ee_guaranteed` should be true, or strictly more than a half
+    /// of peerstates should prefer encryption. Own preference is counted equally to peer
+    /// preferences, even if message copy is not sent to self.
+    ///
    /// `e2ee_guaranteed` should be set to true for replies to encrypted messages (as required by
    /// Autocrypt Level 1, version 1.1) and for messages sent in protected groups.
    ///
    /// Returns an error if `e2ee_guaranteed` is true, but one or more keys are missing.
-    pub(crate) async fn should_encrypt(
+    pub fn should_encrypt(
        &self,
        context: &Context,
        e2ee_guaranteed: bool,
        peerstates: &[(Option<Peerstate>, String)],
    ) -> Result<bool> {
-        let is_chatmail = context.is_chatmail().await?;
        let mut prefer_encrypt_count = if self.prefer_encrypt == EncryptPreference::Mutual {
            1
        } else {
@@ -61,15 +64,10 @@ impl EncryptHelper {
                Some(peerstate) => {
                    let prefer_encrypt = peerstate.prefer_encrypt;
                    info!(context, "Peerstate for {addr:?} is {prefer_encrypt}.");
-                    if match peerstate.prefer_encrypt {
-                        EncryptPreference::NoPreference | EncryptPreference::Reset => {
-                            (peerstate.prefer_encrypt != EncryptPreference::Reset || is_chatmail)
-                                && self.prefer_encrypt == EncryptPreference::Mutual
-                        }
-                        EncryptPreference::Mutual => true,
-                    } {
-                        prefer_encrypt_count += 1;
-                    }
+                    match peerstate.prefer_encrypt {
+                        EncryptPreference::NoPreference | EncryptPreference::Reset => {}
+                        EncryptPreference::Mutual => prefer_encrypt_count += 1,
+                    };
                }
                None => {
                    let msg = format!("Peerstate for {addr:?} missing, cannot encrypt");
@@ -172,11 +170,9 @@ pub async fn ensure_secret_key_exists(context: &Context) -> Result<()> {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::chat::send_text_msg;
    use crate::key::DcKey;
    use crate::message::{Message, Viewtype};
    use crate::param::Param;
-    use crate::receive_imf::receive_imf;
    use crate::test_utils::{bob_keypair, TestContext, TestContextManager};

    mod ensure_secret_key_exists {
@@ -324,109 +320,29 @@ Sent with my Delta Chat Messenger: https://delta.chat";
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_should_encrypt() -> Result<()> {
+    async fn test_should_encrypt() {
        let t = TestContext::new_alice().await;
-        assert!(t.get_config_bool(Config::E2eeEnabled).await?);
        let encrypt_helper = EncryptHelper::new(&t).await.unwrap();

+        // test with EncryptPreference::NoPreference:
+        // if e2ee_eguaranteed is unset, there is no encryption as not more than half of peers want encryption
        let ps = new_peerstates(EncryptPreference::NoPreference);
-        assert!(encrypt_helper.should_encrypt(&t, true, &ps).await?);
-        // Own preference is `Mutual` and we have the peer's key.
-        assert!(encrypt_helper.should_encrypt(&t, false, &ps).await?);
+        assert!(encrypt_helper.should_encrypt(&t, true, &ps).unwrap());
+        assert!(!encrypt_helper.should_encrypt(&t, false, &ps).unwrap());

+        // test with EncryptPreference::Reset
        let ps = new_peerstates(EncryptPreference::Reset);
-        assert!(encrypt_helper.should_encrypt(&t, true, &ps).await?);
-        assert!(!encrypt_helper.should_encrypt(&t, false, &ps).await?);
+        assert!(encrypt_helper.should_encrypt(&t, true, &ps).unwrap());
+        assert!(!encrypt_helper.should_encrypt(&t, false, &ps).unwrap());

+        // test with EncryptPreference::Mutual (self is also Mutual)
        let ps = new_peerstates(EncryptPreference::Mutual);
-        assert!(encrypt_helper.should_encrypt(&t, true, &ps).await?);
-        assert!(encrypt_helper.should_encrypt(&t, false, &ps).await?);
+        assert!(encrypt_helper.should_encrypt(&t, true, &ps).unwrap());
+        assert!(encrypt_helper.should_encrypt(&t, false, &ps).unwrap());

        // test with missing peerstate
        let ps = vec![(None, "bob@foo.bar".to_string())];
-        assert!(encrypt_helper.should_encrypt(&t, true, &ps).await.is_err());
-        assert!(!encrypt_helper.should_encrypt(&t, false, &ps).await?);
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_should_encrypt_e2ee_disabled() -> Result<()> {
-        let t = &TestContext::new_alice().await;
-        t.set_config_bool(Config::E2eeEnabled, false).await?;
-        let encrypt_helper = EncryptHelper::new(t).await.unwrap();
-
-        let ps = new_peerstates(EncryptPreference::NoPreference);
-        assert!(!encrypt_helper.should_encrypt(t, false, &ps).await?);
-
-        let ps = new_peerstates(EncryptPreference::Reset);
-        assert!(encrypt_helper.should_encrypt(t, true, &ps).await?);
-
-        let mut ps = new_peerstates(EncryptPreference::Mutual);
-        // Own preference is `NoPreference` and there's no majority with `Mutual`.
-        assert!(!encrypt_helper.should_encrypt(t, false, &ps).await?);
-        // Now the majority wants to encrypt. Let's encrypt, anyway there are other cases when we
-        // can't send unencrypted, e.g. protected groups.
-        ps.push(ps[0].clone());
-        assert!(encrypt_helper.should_encrypt(t, false, &ps).await?);
-
-        // Test with missing peerstate.
-        let ps = vec![(None, "bob@foo.bar".to_string())];
-        assert!(encrypt_helper.should_encrypt(t, true, &ps).await.is_err());
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_chatmail_prefers_to_encrypt() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-        let alice = &tcm.alice().await;
-        let bob = &tcm.bob().await;
-        bob.set_config_bool(Config::IsChatmail, true).await?;
-
-        let bob_chat_id = tcm
-            .send_recv_accept(alice, bob, "Hello from DC")
-            .await
-            .chat_id;
-        receive_imf(
-            bob,
-            b"From: alice@example.org\n\
-            To: bob@example.net\n\
-            Message-ID: <2222@example.org>\n\
-            Date: Sun, 22 Mar 3000 22:37:58 +0000\n\
-            \n\
-            Hello from another MUA\n",
-            false,
-        )
-        .await?;
-        send_text_msg(bob, bob_chat_id, "hi".to_string()).await?;
-        let sent_msg = bob.pop_sent_msg().await;
-        let msg = Message::load_from_db(bob, sent_msg.sender_msg_id).await?;
-        assert!(msg.get_showpadlock());
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_chatmail_can_send_unencrypted() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-        let bob = &tcm.bob().await;
-        bob.set_config_bool(Config::IsChatmail, true).await?;
-        let bob_chat_id = receive_imf(
-            bob,
-            b"From: alice@example.org\n\
-            To: bob@example.net\n\
-            Message-ID: <2222@example.org>\n\
-            Date: Sun, 22 Mar 3000 22:37:58 +0000\n\
-            \n\
-            Hello\n",
-            false,
-        )
-        .await?
-        .unwrap()
-        .chat_id;
-        bob_chat_id.accept(bob).await?;
-        send_text_msg(bob, bob_chat_id, "hi".to_string()).await?;
-        let sent_msg = bob.pop_sent_msg().await;
-        let msg = Message::load_from_db(bob, sent_msg.sender_msg_id).await?;
-        assert!(!msg.get_showpadlock());
-        Ok(())
+        assert!(encrypt_helper.should_encrypt(&t, true, &ps).is_err());
+        assert!(!encrypt_helper.should_encrypt(&t, false, &ps).unwrap());
    }
 }
--- a/src/events/chatlist_events.rs
+++ b/src/events/chatlist_events.rs
@@ -241,7 +241,7 @@ mod test_chatlist_events {
            .await;
        bob.recv_msg(&sent_msg).await;
        let alice_on_bob = bob.add_or_lookup_contact(&alice).await;
-        assert_eq!(alice_on_bob.get_display_name(), "~Alice");
+        assert!(alice_on_bob.get_display_name() == "Alice");

        wait_for_chatlist_all_items(&bob).await;

--- a/src/message.rs
+++ b/src/message.rs
@@ -230,7 +230,7 @@ impl MsgId {
        let name = from_contact.get_name_n_addr();
        if let Some(override_sender_name) = msg.get_override_sender_name() {
            let addr = from_contact.get_addr();
-            ret += &format!(" by {override_sender_name} ({addr})");
+            ret += &format!(" by ~{override_sender_name} ({addr})");
        } else {
            ret += &format!(" by {name}");
        }
@@ -895,7 +895,7 @@ impl Message {
    pub fn get_override_sender_name(&self) -> Option<String> {
        self.param
            .get(Param::OverrideSenderDisplayname)
-            .map(|name| format!("~{name}"))
+            .map(|name| name.to_string())
    }

    // Exposing this function over the ffi instead of get_override_sender_name() would mean that at least Android Java code has
@@ -2437,10 +2437,10 @@ mod tests {
        msg.set_override_sender_name(Some("over ride".to_string()));
        assert_eq!(
            msg.get_override_sender_name(),
-            Some("~over ride".to_string())
+            Some("over ride".to_string())
        );
-        assert_eq!(msg.get_sender_name(&contact), "~over ride".to_string());
-        assert_ne!(contact.get_display_name(), "~over ride".to_string());
+        assert_eq!(msg.get_sender_name(&contact), "over ride".to_string());
+        assert_ne!(contact.get_display_name(), "over ride".to_string());
        chat::send_msg(&alice, chat.id, &mut msg).await.unwrap();
        let sent_msg = alice.pop_sent_msg().await;

@@ -2457,10 +2457,10 @@ mod tests {
        assert_eq!(msg.text, "bla blubb");
        assert_eq!(
            msg.get_override_sender_name(),
-            Some("~over ride".to_string())
+            Some("over ride".to_string())
        );
-        assert_eq!(msg.get_sender_name(&contact), "~over ride".to_string());
-        assert_ne!(contact.get_display_name(), "~over ride".to_string());
+        assert_eq!(msg.get_sender_name(&contact), "over ride".to_string());
+        assert_ne!(contact.get_display_name(), "over ride".to_string());

        // explicitly check that the message does not create a mailing list
        // (mailing lists may also use `Sender:`-header)
@@ -2471,7 +2471,7 @@ mod tests {
        let msg = alice2.recv_msg(&sent_msg).await;
        assert_eq!(
            msg.get_override_sender_name(),
-            Some("~over ride".to_string())
+            Some("over ride".to_string())
        );
    }

--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -652,9 +652,7 @@ impl MimeFactory {

        let peerstates = self.peerstates_for_recipients(context).await?;
        let is_encrypted = !self.should_force_plaintext()
-            && encrypt_helper
-                .should_encrypt(context, e2ee_guaranteed, &peerstates)
-                .await?;
+            && encrypt_helper.should_encrypt(context, e2ee_guaranteed, &peerstates)?;
        let is_securejoin_message = if let Loaded::Message { msg, .. } = &self.loaded {
            msg.param.get_cmd() == SystemMessage::SecurejoinMessage
        } else {
--- a/src/net/proxy.rs
+++ b/src/net/proxy.rs
@@ -640,9 +640,6 @@ mod tests {
    fn test_invalid_proxy_url() {
        assert!(ProxyConfig::from_url("foobar://127.0.0.1:9050").is_err());
        assert!(ProxyConfig::from_url("abc").is_err());
-
-        // This caused panic before shadowsocks 1.22.0.
-        assert!(ProxyConfig::from_url("ss://foo:bar@127.0.0.1:9999").is_err());
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
--- a/src/peerstate.rs
+++ b/src/peerstate.rs
@@ -664,7 +664,7 @@ impl Peerstate {
                let old_contact = Contact::get_by_id(context, contact_id).await?;
                stock_str::aeap_addr_changed(
                    context,
-                    &old_contact.get_display_name(),
+                    old_contact.get_display_name(),
                    &self.addr,
                    new_addr,
                )
--- a/src/reaction.rs
+++ b/src/reaction.rs
@@ -731,7 +731,7 @@ Here's my footer -- bob@example.net"
        assert_eq!(summary.state, MessageState::InFresh); // state refers to message, not to reaction
        assert!(summary.prefix.is_none());
        assert!(summary.thumbnail_path.is_none());
-        assert_summary(&alice, "~BOB reacted 👍 to \"Party?\"").await;
+        assert_summary(&alice, "BOB reacted 👍 to \"Party?\"").await;

        // Alice reacts to own message as well
        SystemTime::shift(Duration::from_secs(10));
@@ -742,7 +742,7 @@ Here's my footer -- bob@example.net"
        expect_no_unwanted_events(&bob).await;

        assert_summary(&alice, "You reacted 🍿 to \"Party?\"").await;
-        assert_summary(&bob, "~ALICE reacted 🍿 to \"Party?\"").await;
+        assert_summary(&bob, "ALICE reacted 🍿 to \"Party?\"").await;

        // Alice sends a newer message, this overwrites reaction summaries
        SystemTime::shift(Duration::from_secs(10));
@@ -759,7 +759,7 @@ Here's my footer -- bob@example.net"
        bob.recv_msg_opt(&alice_send_reaction).await;

        assert_summary(&alice, "You reacted 🤘 to \"Party?\"").await;
-        assert_summary(&bob, "~ALICE reacted 🤘 to \"Party?\"").await;
+        assert_summary(&bob, "ALICE reacted 🤘 to \"Party?\"").await;

        // Retracted reactions remove all summary reactions
        SystemTime::shift(Duration::from_secs(10));
--- a/src/receive_imf.rs
+++ b/src/receive_imf.rs
@@ -360,7 +360,7 @@ pub(crate) async fn receive_imf_inner(
            let contact = Contact::get_by_id(context, from_id).await?;
            mime_parser.peerstate = Peerstate::from_addr(context, contact.get_addr()).await?;
        } else {
-            let to_id = to_ids.first().copied().unwrap_or(ContactId::SELF);
+            let to_id = to_ids.first().copied().unwrap_or_default();
            // handshake may mark contacts as verified and must be processed before chats are created
            res = observe_securejoin_on_other_device(context, &mime_parser, to_id)
                .await
@@ -778,11 +778,6 @@ async fn add_parts(
        }
    }

-    if chat_id.is_none() && is_mdn {
-        chat_id = Some(DC_CHAT_ID_TRASH);
-        info!(context, "Message is an MDN (TRASH).",);
-    }
-
    if mime_parser.incoming {
        to_id = ContactId::SELF;

@@ -794,6 +789,11 @@ async fn add_parts(
            markseen_on_imap_table(context, rfc724_mid).await.ok();
        }

+        if chat_id.is_none() && is_mdn {
+            chat_id = Some(DC_CHAT_ID_TRASH);
+            info!(context, "Message is an MDN (TRASH).",);
+        }
+
        let create_blocked_default = if is_bot {
            Blocked::Not
        } else {
@@ -946,11 +946,14 @@ async fn add_parts(
                chat_id = Some(chat.id);
                chat_id_blocked = chat.blocked;
            } else if allow_creation {
-                let chat = ChatIdBlocked::get_for_contact(context, from_id, create_blocked)
+                if let Ok(chat) = ChatIdBlocked::get_for_contact(context, from_id, create_blocked)
                    .await
-                    .context("Failed to get (new) chat for contact")?;
-                chat_id = Some(chat.id);
-                chat_id_blocked = chat.blocked;
+                    .context("Failed to get (new) chat for contact")
+                    .log_err(context)
+                {
+                    chat_id = Some(chat.id);
+                    chat_id_blocked = chat.blocked;
+                }
            }

            if let Some(chat_id) = chat_id {
@@ -974,6 +977,7 @@ async fn add_parts(
                // the 1:1 chat accordingly.
                let chat = match is_partial_download.is_none()
                    && mime_parser.get_header(HeaderDef::SecureJoin).is_none()
+                    && !is_mdn
                {
                    true => Some(Chat::load_from_db(context, chat_id).await?)
                        .filter(|chat| chat.typ == Chattype::Single),
@@ -1034,13 +1038,9 @@ async fn add_parts(
        // the mail is on the IMAP server, probably it is also delivered.
        // We cannot recreate other states (read, error).
        state = MessageState::OutDelivered;
-        to_id = to_ids.first().copied().unwrap_or(ContactId::SELF);
+        to_id = to_ids.first().copied().unwrap_or_default();

-        // Older Delta Chat versions with core <=1.152.2 only accepted
-        // self-sent messages in Saved Messages with own address in the `To` field.
-        // New Delta Chat versions may use empty `To` field
-        // with only a single `hidden-recipients` group in this case.
-        let self_sent = to_ids.len() <= 1 && to_id == ContactId::SELF;
+        let self_sent = to_ids.len() == 1 && to_ids.contains(&ContactId::SELF);

        if mime_parser.sync_items.is_some() && self_sent {
            chat_id = Some(DC_CHAT_ID_TRASH);
@@ -1146,8 +1146,9 @@ async fn add_parts(
                        chat_id = Some(id);
                        chat_id_blocked = blocked;
                    }
-                } else {
-                    let chat = ChatIdBlocked::get_for_contact(context, to_id, Blocked::Not).await?;
+                } else if let Ok(chat) =
+                    ChatIdBlocked::get_for_contact(context, to_id, Blocked::Not).await
+                {
                    chat_id = Some(chat.id);
                    chat_id_blocked = chat.blocked;
                }
@@ -1163,7 +1164,7 @@ async fn add_parts(
            if chat_id_blocked != Blocked::Not {
                if let Some(chat_id) = chat_id {
                    chat_id.unblock_ex(context, Nosync).await?;
-                    // Not assigning `chat_id_blocked = Blocked::Not` to avoid unused_assignments warning.
+                    chat_id_blocked = Blocked::Not;
                }
            }
        }
@@ -1181,6 +1182,26 @@ async fn add_parts(
            .await?;
        }

+        if chat_id.is_none() && self_sent {
+            // from_id==to_id==ContactId::SELF - this is a self-sent messages,
+            // maybe an Autocrypt Setup Message
+            if let Ok(chat) = ChatIdBlocked::get_for_contact(context, ContactId::SELF, Blocked::Not)
+                .await
+                .context("Failed to get (new) chat for contact")
+                .log_err(context)
+            {
+                chat_id = Some(chat.id);
+                chat_id_blocked = chat.blocked;
+            }
+
+            if let Some(chat_id) = chat_id {
+                if Blocked::Not != chat_id_blocked {
+                    chat_id.unblock_ex(context, Nosync).await?;
+                    // Not assigning `chat_id_blocked = Blocked::Not` to avoid unused_assignments warning.
+                }
+            }
+        }
+
        if chat_id.is_none() {
            // Check if the message belongs to a broadcast list.
            if let Some(mailinglist_header) = mime_parser.get_mailinglist_header() {
@@ -1196,21 +1217,6 @@ async fn add_parts(
                );
            }
        }
-
-        if chat_id.is_none() && self_sent {
-            // from_id==to_id==ContactId::SELF - this is a self-sent messages,
-            // maybe an Autocrypt Setup Message
-            let chat = ChatIdBlocked::get_for_contact(context, ContactId::SELF, Blocked::Not)
-                .await
-                .context("Failed to get (new) chat for contact")?;
-
-            chat_id = Some(chat.id);
-            // Not assigning `chat_id_blocked = chat.blocked` to avoid unused_assignments warning.
-
-            if Blocked::Not != chat.blocked {
-                chat.id.unblock_ex(context, Nosync).await?;
-            }
-        }
    }

    if fetching_existing_messages && mime_parser.decrypting_failed {
@@ -1230,7 +1236,7 @@ async fn add_parts(
    }

    let orig_chat_id = chat_id;
-    let mut chat_id = if is_reaction {
+    let mut chat_id = if is_mdn || is_reaction {
        DC_CHAT_ID_TRASH
    } else {
        chat_id.unwrap_or_else(|| {
@@ -1688,7 +1694,7 @@ RETURNING id
        "Message has {icnt} parts and is assigned to chat #{chat_id}."
    );

-    if !chat_id.is_trash() {
+    if !is_mdn {
        let mut chat = Chat::load_from_db(context, chat_id).await?;

        // In contrast to most other update-timestamps,
--- a/src/receive_imf/tests.rs
+++ b/src/receive_imf/tests.rs
@@ -165,7 +165,7 @@ async fn test_adhoc_group_show_accepted_contact_accepted() {
    chat_id.accept(&t).await.unwrap();
    let chat = chat::Chat::load_from_db(&t, chat_id).await.unwrap();
    assert_eq!(chat.typ, Chattype::Single);
-    assert_eq!(chat.name, "~Bob");
+    assert_eq!(chat.name, "Bob");
    assert_eq!(chat::get_chat_contacts(&t, chat_id).await.unwrap().len(), 1);
    assert_eq!(chat::get_chat_msgs(&t, chat_id).await.unwrap().len(), 1);

@@ -584,7 +584,7 @@ async fn test_escaped_recipients() {
    .unwrap();
    let contact = Contact::get_by_id(&t, carl_contact_id).await.unwrap();
    assert_eq!(contact.get_name(), "");
-    assert_eq!(contact.get_display_name(), "~h2");
+    assert_eq!(contact.get_display_name(), "h2");

    let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap();
    let msg = Message::load_from_db(&t, chats.get_msg_id(0).unwrap().unwrap())
@@ -631,7 +631,7 @@ async fn test_cc_to_contact() {
    .unwrap();
    let contact = Contact::get_by_id(&t, carl_contact_id).await.unwrap();
    assert_eq!(contact.get_name(), "");
-    assert_eq!(contact.get_display_name(), "~Carl");
+    assert_eq!(contact.get_display_name(), "Carl");
 }

 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -1011,8 +1011,8 @@ async fn test_github_mailing_list() -> Result<()> {
    let contact2 = Contact::get_by_id(&t.ctx, msg2.from_id).await?;
    assert_eq!(contact2.get_addr(), "notifications@github.com");

-    assert_eq!(msg1.get_override_sender_name().unwrap(), "~Max Mustermann");
-    assert_eq!(msg2.get_override_sender_name().unwrap(), "~Github");
+    assert_eq!(msg1.get_override_sender_name().unwrap(), "Max Mustermann");
+    assert_eq!(msg2.get_override_sender_name().unwrap(), "Github");
    Ok(())
 }

@@ -2077,7 +2077,7 @@ async fn check_alias_reply(from_dc: bool, chat_request: bool, group_request: boo
    }
    assert_eq!(
        answer.get_override_sender_name().unwrap(),
-        "~bob@example.net"
+        "bob@example.net"
    ); // Bob is not part of the group, so override-sender-name should be set

    // Check that Claire also gets the message in the same chat.
@@ -2089,7 +2089,7 @@ async fn check_alias_reply(from_dc: bool, chat_request: bool, group_request: boo
    assert_eq!(answer.chat_id, request.chat_id);
    assert_eq!(
        answer.get_override_sender_name().unwrap(),
-        "~bob@example.net"
+        "bob@example.net"
    );
 }

@@ -2200,30 +2200,6 @@ Message content",
    assert_ne!(msg.chat_id, t.get_self_chat().await.id);
 }

-/// Tests that message with hidden recipients is assigned to Saved Messages chat.
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_hidden_recipients_self_chat() {
-    let t = TestContext::new_alice().await;
-
-    receive_imf(
-        &t,
-        b"Subject: s
-Chat-Version: 1.0
-Message-ID: <foobar@localhost>
-To: hidden-recipients:;
-From: <alice@example.org>
-
-Message content",
-        false,
-    )
-    .await
-    .unwrap();
-
-    let msg = t.get_last_msg().await;
-    assert_eq!(msg.chat_id, t.get_self_chat().await.id);
-    assert_eq!(msg.to_id, ContactId::SELF);
-}
-
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_no_unencrypted_name_in_self_chat() -> Result<()> {
    let mut tcm = TestContextManager::new();
@@ -2313,12 +2289,12 @@ Second signature";
    receive_imf(&alice, first_message, false).await?;
    let contact = Contact::get_by_id(&alice, bob_contact_id).await?;
    assert_eq!(contact.get_status(), "First signature");
-    assert_eq!(contact.get_display_name(), "~Bob1");
+    assert_eq!(contact.get_display_name(), "Bob1");

    receive_imf(&alice, second_message, false).await?;
    let contact = Contact::get_by_id(&alice, bob_contact_id).await?;
    assert_eq!(contact.get_status(), "Second signature");
-    assert_eq!(contact.get_display_name(), "~Bob2");
+    assert_eq!(contact.get_display_name(), "Bob2");

    // Duplicate message, should be ignored
    receive_imf(&alice, first_message, false).await?;
@@ -2326,7 +2302,7 @@ Second signature";
    // No change because last message is duplicate of the first.
    let contact = Contact::get_by_id(&alice, bob_contact_id).await?;
    assert_eq!(contact.get_status(), "Second signature");
-    assert_eq!(contact.get_display_name(), "~Bob2");
+    assert_eq!(contact.get_display_name(), "Bob2");

    Ok(())
 }
@@ -5230,7 +5206,7 @@ async fn test_list_from() -> Result<()> {
    let raw = include_bytes!("../../test-data/message/list-from.eml");
    let received = receive_imf(t, raw, false).await?.unwrap();
    let msg = Message::load_from_db(t, *received.msg_ids.last().unwrap()).await?;
-    assert_eq!(msg.get_override_sender_name().unwrap(), "~ÖAMTC");
+    assert_eq!(msg.get_override_sender_name().unwrap(), "ÖAMTC");
    let sender_contact = Contact::get_by_id(t, msg.from_id).await?;
    assert_eq!(
        sender_contact.get_display_name(),
--- a/src/stock_str.rs
+++ b/src/stock_str.rs
@@ -822,7 +822,7 @@ pub(crate) async fn secure_join_started(
        translated(context, StockMessage::SecureJoinStarted)
            .await
            .replace1(&contact.get_name_n_addr())
-            .replace2(&contact.get_display_name())
+            .replace2(contact.get_display_name())
    } else {
        format!("secure_join_started: unknown contact {inviter_contact_id}")
    }
--- a/src/test_utils.rs
+++ b/src/test_utils.rs
@@ -770,7 +770,7 @@ impl TestContext {
        } else {
            assert_eq!(
                actual, expected,
-                "To update the expected value, run `UPDATE_GOLDEN_TESTS=1 cargo nextest run`"
+                "To update the expected value, run `UPDATE_GOLDEN_TESTS=1 cargo test`"
            );
        }
    }
--- a/src/tests/aeap.rs
+++ b/src/tests/aeap.rs
@@ -288,8 +288,7 @@ async fn check_that_transition_worked(

        let info_msg = get_last_info_msg(bob, *group).await.unwrap();
        let expected_text =
-            stock_str::aeap_addr_changed(bob, &format!("{name}"), old_alice_addr, new_alice_addr)
-                .await;
+            stock_str::aeap_addr_changed(bob, name, old_alice_addr, new_alice_addr).await;
        assert_eq!(info_msg.text, expected_text);
        assert_eq!(info_msg.from_id, ContactId::INFO);

--- a/src/tests/verified_chats.rs
+++ b/src/tests/verified_chats.rs
@@ -947,7 +947,8 @@ async fn test_no_unencrypted_name_if_encrypted() -> Result<()> {

        let msg = alice.recv_msg(msg).await;
        let contact = Contact::get_by_id(&alice, msg.from_id).await?;
-        assert_eq!(Contact::get_display_name(&contact), "~Bob Smith");
+
+        assert_eq!(Contact::get_display_name(&contact), "Bob Smith");
    }
    Ok(())
 }
--- a/test-data/golden/test_old_message_1
+++ b/test-data/golden/test_old_message_1
@@ -1,6 +1,6 @@
-Single#Chat#10: ~Bob [bob@example.net] 
+Single#Chat#10: Bob [bob@example.net] 
 --------------------------------------------------------------------------------
 Msg#10: info (Contact#Contact#Info): Messages are guaranteed to be end-to-end encrypted from now on. [NOTICED][INFO 🛡️]
-Msg#11: info (Contact#Contact#Info): ~Bob sent a message from another device. [NOTICED][INFO 🛡️❌]
+Msg#11: info (Contact#Contact#Info): Bob sent a message from another device. [NOTICED][INFO 🛡️❌]
 Msg#12:  (Contact#Contact#10): Message from Thunderbird [SEEN]
 --------------------------------------------------------------------------------
--- a/test-data/golden/test_old_message_2
+++ b/test-data/golden/test_old_message_2
@@ -1,7 +1,7 @@
-Single#Chat#10: ~Bob [bob@example.net] 
+Single#Chat#10: Bob [bob@example.net] 
 --------------------------------------------------------------------------------
 Msg#10: info (Contact#Contact#Info): Messages are guaranteed to be end-to-end encrypted from now on. [NOTICED][INFO 🛡️]
-Msg#11: info (Contact#Contact#Info): ~Bob sent a message from another device. [NOTICED][INFO 🛡️❌]
+Msg#11: info (Contact#Contact#Info): Bob sent a message from another device. [NOTICED][INFO 🛡️❌]
 Msg#12:  (Contact#Contact#10): Somewhat old message [FRESH]
 Msg#13:  (Contact#Contact#10): Even older message, that must NOT be shown before the info message [SEEN]
 --------------------------------------------------------------------------------
--- a/test-data/golden/test_old_message_3
+++ b/test-data/golden/test_old_message_3
@@ -1,8 +1,8 @@
-Single#Chat#10: ~Bob [bob@example.net] 🛡️
+Single#Chat#10: Bob [bob@example.net] 🛡️
 --------------------------------------------------------------------------------
 Msg#10: info (Contact#Contact#Info): Messages are guaranteed to be end-to-end encrypted from now on. [NOTICED][INFO 🛡️]
 Msg#11🔒:  (Contact#Contact#10): Heyho from my verified device! [FRESH]
-Msg#12: info (Contact#Contact#Info): ~Bob sent a message from another device. [NOTICED][INFO 🛡️❌]
+Msg#12: info (Contact#Contact#Info): Bob sent a message from another device. [NOTICED][INFO 🛡️❌]
 Msg#13:  (Contact#Contact#10): Old, unverified message [SEEN]
 Msg#14: info (Contact#Contact#Info): Messages are guaranteed to be end-to-end encrypted from now on. [NOTICED][INFO 🛡️]
 --------------------------------------------------------------------------------
--- a/test-data/golden/test_old_message_5
+++ b/test-data/golden/test_old_message_5
@@ -1,4 +1,4 @@
-Single#Chat#10: ~Bob [bob@example.net] 
+Single#Chat#10: Bob [bob@example.net] 
 --------------------------------------------------------------------------------
 Msg#10: Me (Contact#Contact#Self): Happy birthday, Bob!  √
 Msg#11:  (Contact#Contact#10): Happy birthday to me, Alice! [FRESH]
--- a/test-data/golden/test_verified_oneonone_chat_enable_disable
+++ b/test-data/golden/test_verified_oneonone_chat_enable_disable
@@ -1,11 +1,11 @@
-Single#Chat#10: ~Bob [bob@example.net] 🛡️
+Single#Chat#10: Bob [bob@example.net] 🛡️
 --------------------------------------------------------------------------------
 Msg#10: info (Contact#Contact#Info): Messages are guaranteed to be end-to-end encrypted from now on. [NOTICED][INFO 🛡️]
-Msg#11: info (Contact#Contact#Info): ~Bob sent a message from another device. [NOTICED][INFO 🛡️❌]
+Msg#11: info (Contact#Contact#Info): Bob sent a message from another device. [NOTICED][INFO 🛡️❌]
 Msg#12:  (Contact#Contact#10): Message from Thunderbird [FRESH]
 Msg#13: info (Contact#Contact#Info): Messages are guaranteed to be end-to-end encrypted from now on. [NOTICED][INFO 🛡️]
 Msg#14🔒:  (Contact#Contact#10): Hello from DC [FRESH]
-Msg#15: info (Contact#Contact#Info): ~Bob sent a message from another device. [NOTICED][INFO 🛡️❌]
+Msg#15: info (Contact#Contact#Info): Bob sent a message from another device. [NOTICED][INFO 🛡️❌]
 Msg#16:  (Contact#Contact#10): Message from Thunderbird [FRESH]
 Msg#17: info (Contact#Contact#Info): Messages are guaranteed to be end-to-end encrypted from now on. [NOTICED][INFO 🛡️]
 Msg#18🔒:  (Contact#Contact#10): Hello from DC [FRESH]
@@ -1 +1 @@
 -01-05
 -12-24