add another test case

simplification and renaming
remove explciit send() call
2026-04-10 09:32:11 +03:00 · 2024-12-17 17:40:02 +01:00 · 2024-12-17 17:30:02 +01:00 · 2024-12-17 17:01:32 +01:00 · 2024-12-17 16:58:37 +01:00 · 2024-12-17 15:19:00 +01:00
56 changed files with 645 additions and 844 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -103,9 +103,9 @@ jobs:
          - os: macos-latest
            rust: 1.83.0

-          # Minimum Supported Rust Version = 1.77.0
+          # Minimum Supported Rust Version = 1.81.0
          - os: ubuntu-latest
-            rust: 1.77.0
+            rust: 1.81.0
    runs-on: ${{ matrix.os }}
    steps:
      - uses: actions/checkout@v4
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,35 +1,5 @@
 # Changelog

-## [1.152.2] - 2024-12-24
-
-### Features / Changes
-
- Emit ImexProgress(1) after receiving backup size.
- `delete_msgs`: Use `transaction()` instead of `call_write()`.
- Start ephemeral timers when the chat is noticed.
- Start ephemeral timers when the chat is archived.
- Revalidate HTTP cache entries once per minute maximum.
-
-### Fixes
-
- Reduce number of `repeat_vars()` calls.
- `sanitise_name`: Don't consider punctuation and control chars as part of file extension ([#6362](https://github.com/deltachat/deltachat-core-rust/pull/6362)).
-
-### Refactor
-
- Remove marknoticed_chat_if_older_than().
-
-### Miscellaneous Tasks
-
- Remove contrib/ directory.
-
-## [1.152.1] - 2024-12-17
-
-### Build system
-
- Downgrade Rust version used to build binaries.
- Reduce MSRV to 1.77.0.
-
 ## [1.152.0] - 2024-12-12

 ### API-Changes
@@ -5539,5 +5509,3 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
 [1.151.5]: https://github.com/deltachat/deltachat-core-rust/compare/v1.151.4..v1.151.5
 [1.151.6]: https://github.com/deltachat/deltachat-core-rust/compare/v1.151.5..v1.151.6
 [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
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -169,9 +169,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.95"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
 dependencies = [
 "backtrace",
 ]
@@ -231,7 +231,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 "synstructure",
 ]

@@ -243,14 +243,14 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
 name = "async-broadcast"
-version = "0.7.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532"
+checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e"
 dependencies = [
 "event-listener 5.2.0",
 "event-listener-strategy",
@@ -348,7 +348,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -375,7 +375,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -783,9 +783,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "cfg_aliases"
-version = "0.1.1"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"

 [[package]]
 name = "chacha20"
@@ -823,9 +823,9 @@ dependencies = [

 [[package]]
 name = "chrono"
-version = "0.4.39"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
 dependencies = [
 "android-tzdata",
 "iana-time-zone",
@@ -1238,7 +1238,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -1262,7 +1262,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "strsim",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -1273,7 +1273,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
 "darling_core",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -1306,7 +1306,7 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.152.2"
+version = "1.152.0"
 dependencies = [
 "anyhow",
 "async-broadcast",
@@ -1407,7 +1407,7 @@ dependencies = [

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

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

 [[package]]
 name = "deltachat-rpc-server"
-version = "1.152.2"
+version = "1.152.0"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1472,12 +1472,12 @@ name = "deltachat_derive"
 version = "2.0.0"
 dependencies = [
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
 name = "deltachat_ffi"
-version = "1.152.2"
+version = "1.152.0"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1527,7 +1527,7 @@ checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -1558,7 +1558,7 @@ dependencies = [
 "darling",
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -1568,7 +1568,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"
 dependencies = [
 "derive_builder_core",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -1588,7 +1588,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 "unicode-xid",
 ]

@@ -1654,7 +1654,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -1936,7 +1936,7 @@ dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -1956,7 +1956,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -1971,9 +1971,9 @@ dependencies = [

 [[package]]
 name = "env_logger"
-version = "0.11.6"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
+checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
 dependencies = [
 "anstream",
 "anstyle",
@@ -2080,9 +2080,9 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"

 [[package]]
 name = "fast-socks5"
-version = "0.10.0"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d09fe4a491909a716088083eeb5bcc25427330fdbcd4ecd3dfa5469b3da795df"
+checksum = "f89f36d4ee12370d30d57b16c7e190950a1a916e7dbbb5fd5a412f5ef913fe84"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -2343,7 +2343,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -2784,9 +2784,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"

 [[package]]
 name = "hyper"
-version = "1.5.2"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0"
+checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f"
 dependencies = [
 "bytes",
 "futures-channel",
@@ -2851,7 +2851,7 @@ dependencies = [
 "iana-time-zone-haiku",
 "js-sys",
 "wasm-bindgen",
- "windows-core 0.52.0",
+ "windows-core 0.51.1",
 ]

 [[package]]
@@ -2978,7 +2978,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -3493,9 +3493,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.169"
+version = "0.2.167"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"

 [[package]]
 name = "libm"
@@ -3880,9 +3880,9 @@ dependencies = [

 [[package]]
 name = "nix"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
 "bitflags 2.6.0",
 "cfg-if",
@@ -3979,7 +3979,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -4040,7 +4040,7 @@ dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -4114,7 +4114,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -4318,7 +4318,7 @@ dependencies = [
 "pest_meta",
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -4416,7 +4416,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -4530,7 +4530,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "regex",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -4768,7 +4768,7 @@ dependencies = [
 "proc-macro-error-attr2",
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -4806,14 +4806,14 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
 name = "proptest"
-version = "1.6.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
+checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d"
 dependencies = [
 "bitflags 2.6.0",
 "lazy_static",
@@ -4876,9 +4876,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"

 [[package]]
 name = "quick-xml"
-version = "0.37.2"
+version = "0.37.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "165859e9e55f79d67b96c5d96f4e88b6f2695a1972849c15a6a3f5c59fc2c003"
+checksum = "f22f29bdff3987b4d8632ef95fd6424ec7e4e0a57e2f4fc63e489e75357f6a03"
 dependencies = [
 "memchr",
 ]
@@ -4932,9 +4932,9 @@ dependencies = [

 [[package]]
 name = "quote"
-version = "1.0.38"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
 "proc-macro2",
 ]
@@ -5422,9 +5422,9 @@ dependencies = [

 [[package]]
 name = "rustls-pki-types"
-version = "1.10.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"

 [[package]]
 name = "rustls-platform-verifier"
@@ -5472,9 +5472,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"

 [[package]]
 name = "rustyline"
-version = "14.0.0"
+version = "15.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7803e8936da37efd9b6d4478277f4b2b9bb5cdb37a113e8d63222e58da647e63"
+checksum = "2ee1e066dc922e513bda599c6ccb5f3bb2b0ea5870a579448f2622993f0a9a2f"
 dependencies = [
 "bitflags 2.6.0",
 "cfg-if",
@@ -5484,12 +5484,12 @@ dependencies = [
 "libc",
 "log",
 "memchr",
- "nix 0.28.0",
+ "nix 0.29.0",
 "radix_trie",
 "unicode-segmentation",
- "unicode-width",
+ "unicode-width 0.2.0",
 "utf8parse",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -5556,7 +5556,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "serde_derive_internals",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -5679,7 +5679,7 @@ checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -5690,7 +5690,7 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -6064,7 +6064,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "struct_iterable_internal",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -6092,7 +6092,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "rustversion",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -6154,9 +6154,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.94"
+version = "2.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -6194,7 +6194,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -6273,7 +6273,7 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
 dependencies = [
 "smawk",
 "unicode-linebreak",
- "unicode-width",
+ "unicode-width 0.1.11",
 ]

 [[package]]
@@ -6293,7 +6293,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -6419,24 +6419,25 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
 name = "tokio-rustls"
-version = "0.26.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
 "rustls",
+ "rustls-pki-types",
 "tokio",
 ]

 [[package]]
 name = "tokio-stream"
-version = "0.1.17"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
 dependencies = [
 "futures-core",
 "pin-project-lite",
@@ -6507,9 +6508,9 @@ dependencies = [

 [[package]]
 name = "tokio-util"
-version = "0.7.13"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
 "bytes",
 "futures-core",
@@ -6603,7 +6604,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -6715,7 +6716,7 @@ dependencies = [
 "proc-macro-error2",
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -6778,6 +6779,12 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"

+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
 [[package]]
 name = "unicode-xid"
 version = "0.2.4"
@@ -6949,7 +6956,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 "wasm-bindgen-shared",
 ]

@@ -6983,7 +6990,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@@ -7136,7 +7143,7 @@ checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -7147,7 +7154,7 @@ checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -7467,7 +7474,7 @@ dependencies = [
 "darling",
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -7490,7 +7497,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 "synstructure",
 ]

@@ -7517,7 +7524,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -7537,7 +7544,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 "synstructure",
 ]

@@ -7558,7 +7565,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -7580,7 +7587,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.94",
+ "syn 2.0.90",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "deltachat"
-version = "1.152.2"
+version = "1.152.0"
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.77"
+rust-version = "1.81"
 repository = "https://github.com/deltachat/deltachat-core-rust"

 [profile.dev]
@@ -39,7 +39,7 @@ format-flowed = { path = "./format-flowed" }
 ratelimit = { path = "./deltachat-ratelimit" }

 anyhow = { workspace = true }
-async-broadcast = "0.7.2"
+async-broadcast = "0.7.1"
 async-channel = { workspace = true }
 async-imap = { version = "0.10.2", default-features = false, features = ["runtime-tokio", "compress"] }
 async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
@@ -52,7 +52,7 @@ chrono = { workspace = true, features = ["alloc", "clock", "std"] }
 email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
 encoded-words = { git = "https://github.com/async-email/encoded-words", branch = "master" }
 escaper = "0.1"
-fast-socks5 = "0.10"
+fast-socks5 = "0.9"
 fd-lock = "4"
 futures-lite = { workspace = true }
 futures = { workspace = true }
@@ -85,7 +85,7 @@ rand = { workspace = true }
 regex = { workspace = true }
 rusqlite = { workspace = true, features = ["sqlcipher"] }
 rust-hsluv = "0.1"
-rustls-pki-types = "1.10.1"
+rustls-pki-types = "1.10.0"
 rustls = { version = "0.23.19", default-features = false }
 sanitize-filename = { workspace = true }
 serde_json = { workspace = true }
@@ -101,8 +101,8 @@ tagger = "4.3.4"
 textwrap = "0.16.1"
 thiserror = { workspace = true }
 tokio-io-timeout = "1.2.0"
-tokio-rustls = { version = "0.26.1", default-features = false }
-tokio-stream = { version = "0.1.17", features = ["fs"] }
+tokio-rustls = { version = "0.26.0", default-features = false }
+tokio-stream = { version = "0.1.16", features = ["fs"] }
 tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
 tokio-util = { workspace = true }
 tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
@@ -169,7 +169,7 @@ harness = false
 anyhow = "1"
 async-channel = "2.3.1"
 base64 = "0.22"
-chrono = { version = "0.4.39", default-features = false }
+chrono = { version = "0.4.38", default-features = false }
 deltachat-contact-tools = { path = "deltachat-contact-tools" }
 deltachat-jsonrpc = { path = "deltachat-jsonrpc", default-features = false }
 deltachat = { path = ".", default-features = false }
@@ -189,7 +189,7 @@ serde_json = "1"
 tempfile = "3.14.0"
 thiserror = "1"
 tokio = "1"
-tokio-util = "0.7.13"
+tokio-util = "0.7.11"
 tracing-subscriber = "0.3"
 yerpc = "0.6.2"

--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.152.2"
+version = "1.152.0"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -5393,8 +5393,6 @@ int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);

 /**
 * Message containing a sticker, similar to image.
- * NB: When sending, the message viewtype may be changed to `Image` by some heuristics like checking
- * for transparent pixels.
 * If possible, the UI should display the image without borders in a transparent way.
 * A click on a sticker will offer to install the sticker set in some future.
 */
--- a/deltachat-jsonrpc/Cargo.toml
+++ b/deltachat-jsonrpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.152.2"
+version = "1.152.0"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
@@ -33,7 +33,7 @@ base64 = { workspace = true }

 # optional dependencies
 axum = { version = "0.7", optional = true, features = ["ws"] }
-env_logger = { version = "0.11.6", optional = true }
+env_logger = { version = "0.11.5", optional = true }

 [dev-dependencies]
 tokio = { workspace = true, features = ["full", "rt-multi-thread"] }
--- a/deltachat-jsonrpc/src/api/types/events.rs
+++ b/deltachat-jsonrpc/src/api/types/events.rs
@@ -109,7 +109,6 @@ pub enum EventType {
    /// Incoming webxdc info or summary update, should be notified.
    #[serde(rename_all = "camelCase")]
    IncomingWebxdcNotify {
-        chat_id: u32,
        contact_id: u32,
        msg_id: u32,
        text: String,
@@ -344,13 +343,11 @@ impl From<CoreEventType> for EventType {
                reaction: reaction.as_str().to_string(),
            },
            CoreEventType::IncomingWebxdcNotify {
-                chat_id,
                contact_id,
                msg_id,
                text,
                href,
            } => IncomingWebxdcNotify {
-                chat_id: chat_id.to_u32(),
                contact_id: contact_id.to_u32(),
                msg_id: msg_id.to_u32(),
                text,
--- a/deltachat-jsonrpc/src/api/types/message.rs
+++ b/deltachat-jsonrpc/src/api/types/message.rs
@@ -273,9 +273,6 @@ pub enum MessageViewtype {
    Gif,

    /// Message containing a sticker, similar to image.
-    /// NB: When sending, the message viewtype may be changed to `Image` by some heuristics like
-    /// checking for transparent pixels. Use `Message::force_sticker()` to disable them.
-    ///
    /// If possible, the ui should display the image without borders in a transparent way.
    /// A click on a sticker will offer to install the sticker set in some future.
    Sticker,
--- 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.152.2"
+  "version": "1.152.0"
 }
--- a/deltachat-repl/Cargo.toml
+++ b/deltachat-repl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.152.2"
+version = "1.152.0"
 license = "MPL-2.0"
 edition = "2021"
 repository = "https://github.com/deltachat/deltachat-core-rust"
@@ -13,7 +13,7 @@ log = { workspace = true }
 nu-ansi-term = { workspace = true }
 qr2term = "0.3.3"
 rusqlite = { workspace = true }
-rustyline = "14"
+rustyline = "15"
 tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }

--- a/deltachat-repl/src/main.rs
+++ b/deltachat-repl/src/main.rs
@@ -22,7 +22,7 @@ use log::{error, info, warn};
 use nu_ansi_term::Color;
 use rustyline::completion::{Completer, FilenameCompleter, Pair};
 use rustyline::error::ReadlineError;
-use rustyline::highlight::{Highlighter, MatchingBracketHighlighter};
+use rustyline::highlight::{CmdKind as HighlightCmdKind, Highlighter, MatchingBracketHighlighter};
 use rustyline::hint::{Hinter, HistoryHinter};
 use rustyline::validate::Validator;
 use rustyline::{
@@ -298,8 +298,8 @@ impl Highlighter for DcHelper {
        self.highlighter.highlight(line, pos)
    }

-    fn highlight_char(&self, line: &str, pos: usize, forced: bool) -> bool {
-        self.highlighter.highlight_char(line, pos, forced)
+    fn highlight_char(&self, line: &str, pos: usize, kind: HighlightCmdKind) -> bool {
+        self.highlighter.highlight_char(line, pos, kind)
    }
 }

--- 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.152.2"
+version = "1.152.0"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
    "Development Status :: 5 - Production/Stable",
--- a/deltachat-rpc-client/src/deltachat_rpc_client/const.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/const.py
@@ -41,7 +41,6 @@ class EventType(str, Enum):
    REACTIONS_CHANGED = "ReactionsChanged"
    INCOMING_MSG = "IncomingMsg"
    INCOMING_MSG_BUNCH = "IncomingMsgBunch"
-    INCOMING_REACTION = "IncomingReaction"
    MSGS_NOTICED = "MsgsNoticed"
    MSG_DELIVERED = "MsgDelivered"
    MSG_FAILED = "MsgFailed"
--- a/deltachat-rpc-client/tests/test_securejoin.py
+++ b/deltachat-rpc-client/tests/test_securejoin.py
@@ -73,25 +73,22 @@ def test_qr_securejoin(acfactory, protect, tmp_path):
    qr_code = alice_chat.get_qr_code()
    bob.secure_join(qr_code)

-    # Alice deletes "vg-request".
-    while True:
-        event = alice.wait_for_event()
-        if event["kind"] == "ImapMessageDeleted":
-            break
-    alice.wait_for_securejoin_inviter_success()
-    # Bob deletes "vg-auth-required", Alice deletes "vg-request-with-auth".
+    # Check that at least some of the handshake messages are deleted.
    for ac in [alice, bob]:
        while True:
            event = ac.wait_for_event()
            if event["kind"] == "ImapMessageDeleted":
                break
-    bob.wait_for_securejoin_joiner_success()
+
+    alice.wait_for_securejoin_inviter_success()

    # Test that Alice verified Bob's profile.
    alice_contact_bob = alice.get_contact_by_addr(bob.get_config("addr"))
    alice_contact_bob_snapshot = alice_contact_bob.get_snapshot()
    assert alice_contact_bob_snapshot.is_verified

+    bob.wait_for_securejoin_joiner_success()
+
    snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert snapshot.text == "Member Me ({}) added by {}.".format(bob.get_config("addr"), alice.get_config("addr"))
    assert snapshot.chat.get_basic_snapshot().is_protected == protect
--- a/deltachat-rpc-server/Cargo.toml
+++ b/deltachat-rpc-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.152.2"
+version = "1.152.0"
 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.152.2"
+  "version": "1.152.0"
 }
--- a/deny.toml
+++ b/deny.toml
@@ -52,6 +52,7 @@ skip = [
     { name = "sync_wrapper", version = "0.1.2" },
     { name = "syn", version = "1.0.109" },
     { name = "time", version = "<0.3" },
+     { name = "unicode-width", version = "0.1.11" },
     { name = "wasi", version = "<0.11" },
     { name = "windows_aarch64_gnullvm", version = "<0.52" },
     { name = "windows_aarch64_msvc", version = "<0.52" },
--- a/flake.lock
+++ b/flake.lock
@@ -47,17 +47,16 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1711088506,
-        "narHash": "sha256-USdlY7Tx2oJWqFBpp10+03+h7eVhpkQ4s9t1ERjeIJE=",
+        "lastModified": 1731393059,
+        "narHash": "sha256-rmzi0GHEwpzg1LGfGPO4SRD7D6QGV3UYGQxkJvn+J5U=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "85f4139f3c092cf4afd9f9906d7ed218ef262c97",
+        "rev": "fda8d5b59bb0dc0021ad3ba1d722f9ef6d36e4d9",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "85f4139f3c092cf4afd9f9906d7ed218ef262c97",
        "type": "github"
      }
    },
@@ -115,25 +114,6 @@
        "type": "github"
      }
    },
-    "new-fenix": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_4",
-        "rust-analyzer-src": "rust-analyzer-src_2"
-      },
-      "locked": {
-        "lastModified": 1734417396,
-        "narHash": "sha256-32x1Z+Pz3Jv0cK9EG56cFTKXy/mZ/c+Ikxw+aVfKHp4=",
-        "owner": "nix-community",
-        "repo": "fenix",
-        "rev": "a18d41b26e998e95a598858fdb86ba22fb5da47d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "fenix",
-        "type": "github"
-      }
-    },
    "nix-filter": {
      "locked": {
        "lastModified": 1730207686,
@@ -194,22 +174,6 @@
      }
    },
    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1734119587,
-        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
      "locked": {
        "lastModified": 1731139594,
        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
@@ -231,9 +195,8 @@
        "fenix": "fenix",
        "flake-utils": "flake-utils_2",
        "naersk": "naersk",
-        "new-fenix": "new-fenix",
        "nix-filter": "nix-filter",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_4"
      }
    },
    "rust-analyzer-src": {
@@ -253,23 +216,6 @@
        "type": "github"
      }
    },
-    "rust-analyzer-src_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734386068,
-        "narHash": "sha256-Py025JiD9lcPmldB7X1AEjq3WBTS60jZUJRtTDonmaE=",
-        "owner": "rust-lang",
-        "repo": "rust-analyzer",
-        "rev": "0a706f7d2ac093985eae317781200689cfd48b78",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rust-lang",
-        "ref": "nightly",
-        "repo": "rust-analyzer",
-        "type": "github"
-      }
-    },
    "systems": {
      "locked": {
        "lastModified": 1681028828,
--- a/flake.nix
+++ b/flake.nix
@@ -1,19 +1,14 @@
 {
  description = "Delta Chat core";
  inputs = {
-    # Old Rust to build releases.
-    fenix.url = "github:nix-community/fenix?rev=85f4139f3c092cf4afd9f9906d7ed218ef262c97";
-
-    # New Rust for development shell.
-    new-fenix.url = "github:nix-community/fenix";
-
+    fenix.url = "github:nix-community/fenix";
    flake-utils.url = "github:numtide/flake-utils";
    naersk.url = "github:nix-community/naersk";
    nix-filter.url = "github:numtide/nix-filter";
    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
    android.url = "github:tadfisher/android-nixpkgs";
  };
-  outputs = { self, nixpkgs, flake-utils, nix-filter, naersk, fenix, new-fenix, android }:
+  outputs = { self, nixpkgs, flake-utils, nix-filter, naersk, fenix, android }:
    flake-utils.lib.eachDefaultSystem (system:
      let
        pkgs = nixpkgs.legacyPackages.${system};
@@ -544,13 +539,13 @@
          let
            pkgs = import nixpkgs {
              system = system;
-              overlays = [ new-fenix.overlays.default ];
+              overlays = [ fenix.overlays.default ];
            };
          in
          pkgs.mkShell {

            buildInputs = with pkgs; [
-              (new-fenix.packages.${system}.complete.withComponents [
+              (fenix.packages.${system}.complete.withComponents [
                "cargo"
                "clippy"
                "rust-src"
--- 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.152.2"
+  "version": "1.152.0"
 }
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat"
-version = "1.152.2"
+version = "1.152.0"
 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_4_lowlevel.py
+++ b/python/tests/test_4_lowlevel.py
@@ -216,7 +216,7 @@ def test_logged_ac_process_ffi_failure(acfactory):
    ac1.add_account_plugin(FailPlugin())
    # cause any event eg contact added/changed
    ac1.create_contact("something@example.org")
-    res = cap.get(timeout=600)
+    res = cap.get(timeout=10)
    assert "ac_process_ffi_event" in res
    assert "ZeroDivisionError" in res
    assert "Traceback" in res
--- a/python/tests/test_5_simulation.py
+++ b/python/tests/test_5_simulation.py
@@ -0,0 +1,229 @@
+import pytest
+
+
+@pytest.fixture
+def relay():
+    return Relay()
+
+
+class Relay:
+    def __init__(self):
+        self.peers = {}
+
+    def make_peers(self, num):
+        for i in range(num):
+            newpeer = Peer(relay=self, num=i)
+            self.peers[newpeer.id] = newpeer
+        return self.peers.values()
+
+    def dump(self, title):
+        print()
+        print(f"# {title}")
+        for peer_id, peer in self.peers.items():
+            pending = sum(len(x) for x in peer.from2mailbox.values())
+            members = ",".join(peer.members)
+            print(f"{peer_id} clock={peer.current_clock} members={members} pending={pending}")
+        print()
+
+    def receive_all(self, peers=None):
+        peers = peers if peers is not None else list(self.peers.values())
+        for peer in peers:
+            # drain peer mailbox by reading messages from each sender separately
+            for from_peer in self.peers.values():
+                pending = peer.from2mailbox.pop(from_peer, [])
+                if from_peer.id != peer.id:
+                    for msg in pending:
+                        msg.receive(peer)
+
+    def assert_group_consistency(self):
+        peers = list(self.peers.values())
+        for peer1, peer2 in zip(peers, peers[1:]):
+            assert peer1.members == peer2.members
+            assert peer1.current_clock == peer2.current_clock
+            nums = ",".join(sorted(peer1.members))
+            print(f"{peer1.id} and {peer2.id} have same members {nums}")
+
+
+class Message:
+    def __init__(self, sender, **payload):
+        self.sender = sender
+        self.payload = payload
+        self.recipients = set(sender.members)
+        # we increment clock on AddMemberMessage and DelMemberMessage
+        sender.current_clock += self.clock_inc
+        self.clock = sender.current_clock
+        self.send()
+
+    def __repr__(self):
+        nums = ",".join(self.recipients)
+        return f"<{self.__class__.__name__} clock={self.clock} {self.sender.id}->{nums} {self.payload}>"
+
+    def send(self):
+        print(f"sending {self}")
+        for peer_id in self.sender.members:
+            peer = self.sender.relay.peers[peer_id]
+            peer.from2mailbox.setdefault(self.sender, []).append(self)
+
+
+class AddMemberMessage(Message):
+    clock_inc = 1
+
+    def __init__(self, sender, member):
+        sender.members.add(member)
+        super().__init__(sender, member=member)
+
+    def receive(self, peer):
+        if not peer.members:  # create group
+            peer.members = self.recipients.copy()
+            peer.current_clock = self.clock
+            return
+
+        peer.members.add(self.payload["member"])
+        if peer.current_clock < self.clock:
+            peer.members.update(self.recipients)
+            peer.current_clock = self.clock
+        elif peer.current_clock == self.clock:
+            if peer.members != self.recipients:
+                peer.current_clock += 1
+
+
+class DelMemberMessage(Message):
+    clock_inc = 1
+
+    def send(self):
+        super().send()
+        self.sender.members.remove(self.payload["member"])
+
+    def receive(self, peer):
+        member = self.payload["member"]
+        if member in peer.members:
+            if peer.current_clock <= self.clock:
+                peer.members.remove(member)
+            peer.current_clock = self.clock
+
+
+class ChatMessage(Message):
+    clock_inc = 0
+
+    def receive(self, peer):
+        print(f"receive {peer.id} clock={peer.current_clock} msgclock={self.clock}")
+        if peer.current_clock < self.clock:
+            print(f"{peer.id} is outdated, using incoming memberslist")
+            peer.members = set(self.recipients)
+            peer.current_clock = self.clock
+            print(f"-> NEWCLOCK: {peer.current_clock}")
+        elif peer.current_clock == self.clock:
+            if peer.members != set(self.recipients):
+                print(f"{peer.id} has different members than incoming same-clock message")
+                print(f"{peer.id} resetting to incoming recipients, and increase own clock")
+                peer.members = set(self.recipients)
+                peer.current_clock = self.clock + 1
+        else:
+            print(f"{peer.id} has newer clock than incoming message")
+
+
+class Peer:
+    """A peer in a group"""
+
+    def __init__(self, relay, num):
+        self.relay = relay
+        self.id = f"p{num}"
+        self.members = set()
+        self.from2mailbox = {}
+        self.current_clock = 0
+
+    def __eq__(self, other):
+        return self.id == other.id
+
+    def __hash__(self):
+        return int(self.id[1:])
+
+    def __repr__(self):
+        clock = self.current_clock
+        return f"<Peer {self.id} members={','.join(self.members)} clock={clock}>"
+
+    def immediate_create_group(self, peers):
+        assert not self.members
+        self.members.add(self.id)
+        for peer in peers:
+            AddMemberMessage(self, member=peer.id)
+        self.relay.receive_all()
+
+
+### Tests
+
+
+def test_add_and_remove(relay):
+    p0, p1, p2, p3 = relay.make_peers(4)
+
+    # create group
+    p0.immediate_create_group([p1])
+    assert p0.members == p1.members == set([p0.id, p1.id])
+
+    # add members
+    AddMemberMessage(p0, member=p2.id)
+    AddMemberMessage(p0, member=p3.id)
+    relay.receive_all()
+    relay.assert_group_consistency()
+
+    DelMemberMessage(p3, member=p0.id)
+    relay.receive_all()
+    relay.assert_group_consistency()
+
+
+def test_concurrent_add(relay):
+    p0, p1, p2, p3 = relay.make_peers(4)
+
+    p0.immediate_create_group([p1])
+    # concurrent adding and then let base set send a chat message
+    AddMemberMessage(p1, member=p2.id)
+    AddMemberMessage(p0, member=p3.id)
+    relay.receive_all()
+
+    relay.dump("after concurrent add")
+    # only now do p0 and p1 know of each others additions
+    # so p0 or p1 needs to send another message to get consistent membership
+    ChatMessage(p0)
+    relay.receive_all()
+    relay.dump("after chatmessage")
+    relay.assert_group_consistency()
+
+
+def test_add_remove_and_stale_member_sends_chatmessage(relay):
+    p0, p1, p2, p3 = relay.make_peers(4)
+
+    p0.immediate_create_group([p1, p2, p3])
+
+    # p3 is offline and p0 deletes p2
+    DelMemberMessage(p0, member=p2.id)
+    relay.receive_all([p0, p1, p2])
+
+    # p3 sends a message with old memberlist and goes online
+    ChatMessage(p3)
+    relay.receive_all()
+    relay.assert_group_consistency()
+    ChatMessage(p0)
+    relay.receive_all()
+    assert p0.members == set(["p0", "p1", "p3"])
+
+
+def test_add_remove_and_stale_member_sends_addition(relay):
+    p0, p1, p2, p3, p4 = relay.make_peers(5)
+
+    p0.immediate_create_group([p1, p2, p3])
+
+    # p3 is offline and p0 deletes p2
+    DelMemberMessage(p0, member=p2.id)
+    relay.receive_all([p0, p1, p2])
+
+    # p3 sends a message with member addition and goes online
+    AddMemberMessage(p3, member=p4.id)
+    relay.receive_all()
+    relay.dump("after p3 is online")
+
+    # we need a chat message from a higher clock state to heal consistency
+    ChatMessage(p0)
+    relay.receive_all()
+    relay.dump("after p0 sent chatmessage")
+    relay.assert_group_consistency()
+    assert p0.members == set(["p0", "p1", "p3", "p4"])
--- a/release-date.in
+++ b/release-date.in
@@ -1 +1 @@
-2024-12-24
+2024-12-12
--- a/src/blob.rs
+++ b/src/blob.rs
@@ -279,9 +279,7 @@ impl<'a> BlobObject<'a> {
        let ext: String = name
            .chars()
            .rev()
-            .take_while(|c| {
-                (!c.is_ascii_punctuation() || *c == '.') && !c.is_whitespace() && !c.is_control()
-            })
+            .take_while(|c| !c.is_whitespace())
            .take(33)
            .collect::<Vec<_>>()
            .iter()
@@ -984,10 +982,6 @@ mod tests {
        let (stem, ext) = BlobObject::sanitise_name("a. tar.tar.gz");
        assert_eq!(stem, "a. tar");
        assert_eq!(ext, ".tar.gz");
-
-        let (stem, ext) = BlobObject::sanitise_name("Guia_uso_GNB (v0.8).pdf");
-        assert_eq!(stem, "Guia_uso_GNB (v0.8)");
-        assert_eq!(ext, ".pdf");
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -1461,23 +1455,4 @@ mod tests {
        check_image_size(file_saved, width, height);
        Ok(())
    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_send_gif_as_sticker() -> Result<()> {
-        let bytes = include_bytes!("../test-data/image/image100x50.gif");
-        let alice = &TestContext::new_alice().await;
-        let file = alice.get_blobdir().join("file").with_extension("gif");
-        fs::write(&file, &bytes)
-            .await
-            .context("failed to write file")?;
-        let mut msg = Message::new(Viewtype::Sticker);
-        msg.set_file(file.to_str().unwrap(), None);
-        let chat = alice.get_self_chat().await;
-        let sent = alice.send_msg(chat.id, &mut msg).await;
-        let msg = Message::load_from_db(alice, sent.sender_msg_id).await?;
-        // Message::force_sticker() wasn't used, still Viewtype::Sticker is preserved because of the
-        // extension.
-        assert_eq!(msg.get_viewtype(), Viewtype::Sticker);
-        Ok(())
-    }
 }
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -28,7 +28,7 @@ use crate::contact::{self, Contact, ContactId, Origin};
 use crate::context::Context;
 use crate::debug_logging::maybe_set_logging_xdc;
 use crate::download::DownloadState;
-use crate::ephemeral::{start_chat_ephemeral_timers, Timer as EphemeralTimer};
+use crate::ephemeral::Timer as EphemeralTimer;
 use crate::events::EventType;
 use crate::html::new_html_mimepart;
 use crate::location;
@@ -312,7 +312,7 @@ impl ChatId {

    /// Create a group or mailinglist raw database record with the given parameters.
    /// The function does not add SELF nor checks if the record already exists.
-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
    pub(crate) async fn create_multiuser_record(
        context: &Context,
        chattype: Chattype,
@@ -688,10 +688,6 @@ impl ChatId {
            })
            .await?;

-        if visibility == ChatVisibility::Archived {
-            start_chat_ephemeral_timers(context, self).await?;
-        }
-
        context.emit_msgs_changed_without_ids();
        chatlist_events::emit_chatlist_changed(context);
        chatlist_events::emit_chatlist_item_changed(context, self);
@@ -747,7 +743,7 @@ impl ChatId {
                .await?;
            if unread_cnt == 1 {
                // Added the first unread message in the chat.
-                context.emit_msgs_changed_without_msg_id(DC_CHAT_ID_ARCHIVED_LINK);
+                context.emit_msgs_changed(DC_CHAT_ID_ARCHIVED_LINK, MsgId::new(0));
            }
            return Ok(());
        }
@@ -762,8 +758,6 @@ impl ChatId {
    /// shown.
    pub(crate) fn emit_msg_event(self, context: &Context, msg_id: MsgId, important: bool) {
        if important {
-            debug_assert!(!msg_id.is_unset());
-
            context.emit_incoming_msg(self, msg_id);
        } else {
            context.emit_msgs_changed(self, msg_id);
@@ -825,14 +819,17 @@ impl ChatId {
        };

        if changed {
-            if msg.is_some() {
-                match self.get_draft_msg_id(context).await? {
-                    Some(msg_id) => context.emit_msgs_changed(self, msg_id),
-                    None => context.emit_msgs_changed_without_msg_id(self),
-                }
-            } else {
-                context.emit_msgs_changed_without_msg_id(self)
-            }
+            context.emit_msgs_changed(
+                self,
+                if msg.is_some() {
+                    match self.get_draft_msg_id(context).await? {
+                        Some(msg_id) => msg_id,
+                        None => MsgId::new(0),
+                    }
+                } else {
+                    MsgId::new(0)
+                },
+            );
        }

        Ok(())
@@ -1990,6 +1987,9 @@ impl Chat {
                .ok();
        }

+        // reset encrypt error state eg. for forwarding
+        msg.param.remove(Param::ErroneousE2ee);
+
        let is_bot = context.get_config_bool(Config::Bot).await?;
        msg.param
            .set_optional(Param::Bot, Some("1").filter(|_| is_bot));
@@ -2688,10 +2688,7 @@ async fn prepare_msg_blob(context: &Context, msg: &mut Message) -> Result<()> {
            .with_context(|| format!("attachment missing for message of type #{}", msg.viewtype))?;
        let send_as_is = msg.viewtype == Viewtype::File;

-        if msg.viewtype == Viewtype::File
-            || msg.viewtype == Viewtype::Image
-            || msg.viewtype == Viewtype::Sticker && !msg.param.exists(Param::ForceSticker)
-        {
+        if msg.viewtype == Viewtype::File || msg.viewtype == Viewtype::Image {
            // Correct the type, take care not to correct already very special
            // formats as GIF or VOICE.
            //
@@ -2700,12 +2697,7 @@ async fn prepare_msg_blob(context: &Context, msg: &mut Message) -> Result<()> {
            // - from FILE/IMAGE to GIF */
            if let Some((better_type, _)) = message::guess_msgtype_from_suffix(&blob.to_abs_path())
            {
-                if msg.viewtype == Viewtype::Sticker {
-                    if better_type != Viewtype::Image {
-                        // UIs don't want conversions of `Sticker` to anything other than `Image`.
-                        msg.param.set_int(Param::ForceSticker, 1);
-                    }
-                } else if better_type != Viewtype::Webxdc
+                if better_type != Viewtype::Webxdc
                    || context
                        .ensure_sendable_webxdc_file(&blob.to_abs_path())
                        .await
@@ -2939,8 +2931,7 @@ pub(crate) async fn create_send_msg_jobs(context: &Context, msg: &mut Message) -
    // because BCC-self messages are also used to detect
    // that message was sent if SMTP server is slow to respond
    // and connection is frequently lost
-    // before receiving status line. NB: This is not a problem for chatmail servers, so `BccSelf`
-    // disabled by default is fine.
+    // before receiving status line.
    //
    // `from` must be the last addr, see `receive_imf_inner()` why.
    if context.get_config_bool(Config::BccSelf).await?
@@ -3240,6 +3231,19 @@ pub async fn get_chat_msgs_ex(
    Ok(items)
 }

+pub(crate) async fn marknoticed_chat_if_older_than(
+    context: &Context,
+    chat_id: ChatId,
+    timestamp: i64,
+) -> Result<()> {
+    if let Some(chat_timestamp) = chat_id.get_timestamp(context).await? {
+        if timestamp > chat_timestamp {
+            marknoticed_chat(context, chat_id).await?;
+        }
+    }
+    Ok(())
+}
+
 /// Marks all messages in the chat as noticed.
 /// If the given chat-id is the archive-link, marks all messages in all archived chats as noticed.
 pub async fn marknoticed_chat(context: &Context, chat_id: ChatId) -> Result<()> {
@@ -3251,10 +3255,10 @@ pub async fn marknoticed_chat(context: &Context, chat_id: ChatId) -> Result<()>
            .query_map(
                "SELECT DISTINCT(m.chat_id) FROM msgs m
                    LEFT JOIN chats c ON m.chat_id=c.id
-                    WHERE m.state=10 AND m.hidden=0 AND m.chat_id>9 AND c.archived=1",
-                (),
+                    WHERE m.state=10 AND m.hidden=0 AND m.chat_id>9 AND c.blocked=0 AND c.archived=1",
+                    (),
                |row| row.get::<_, ChatId>(0),
-                |ids| ids.collect::<Result<Vec<_>, _>>().map_err(Into::into),
+                |ids| ids.collect::<Result<Vec<_>, _>>().map_err(Into::into)
            )
            .await?;
        if chat_ids_in_archive.is_empty() {
@@ -3263,40 +3267,32 @@ pub async fn marknoticed_chat(context: &Context, chat_id: ChatId) -> Result<()>

        context
            .sql
-            .transaction(|transaction| {
-                let mut stmt = transaction.prepare(
-                    "UPDATE msgs SET state=13 WHERE state=10 AND hidden=0 AND chat_id = ?",
-                )?;
-                for chat_id_in_archive in &chat_ids_in_archive {
-                    stmt.execute((chat_id_in_archive,))?;
-                }
-                Ok(())
-            })
+            .execute(
+                &format!(
+                    "UPDATE msgs SET state=13 WHERE state=10 AND hidden=0 AND chat_id IN ({});",
+                    sql::repeat_vars(chat_ids_in_archive.len())
+                ),
+                rusqlite::params_from_iter(&chat_ids_in_archive),
+            )
            .await?;
-
        for chat_id_in_archive in chat_ids_in_archive {
-            start_chat_ephemeral_timers(context, chat_id_in_archive).await?;
            context.emit_event(EventType::MsgsNoticed(chat_id_in_archive));
            chatlist_events::emit_chatlist_item_changed(context, chat_id_in_archive);
        }
-    } else {
-        start_chat_ephemeral_timers(context, chat_id).await?;
-
-        if context
-            .sql
-            .execute(
-                "UPDATE msgs
+    } else if context
+        .sql
+        .execute(
+            "UPDATE msgs
            SET state=?
          WHERE state=?
            AND hidden=0
            AND chat_id=?;",
-                (MessageState::InNoticed, MessageState::InFresh, chat_id),
-            )
-            .await?
-            == 0
-        {
-            return Ok(());
-        }
+            (MessageState::InNoticed, MessageState::InFresh, chat_id),
+        )
+        .await?
+        == 0
+    {
+        return Ok(());
    }

    context.emit_event(EventType::MsgsNoticed(chat_id));
@@ -3368,7 +3364,6 @@ pub(crate) async fn mark_old_messages_as_noticed(
    }

    for c in changed_chats {
-        start_chat_ephemeral_timers(context, c).await?;
        context.emit_event(EventType::MsgsNoticed(c));
        chatlist_events::emit_chatlist_item_changed(context, c);
    }
@@ -4449,7 +4444,7 @@ pub(crate) async fn delete_and_reset_all_device_msgs(context: &Context) -> Resul
 ///
 /// For example, it can be a message showing that a member was added to a group.
 /// Doesn't fail if the chat doesn't exist.
-#[allow(clippy::too_many_arguments)]
+#[expect(clippy::too_many_arguments)]
 pub(crate) async fn add_info_msg_with_cmd(
    context: &Context,
    chat_id: ChatId,
@@ -4648,7 +4643,7 @@ impl Context {
    /// a noticed chat is archived. Emitting events should be cheap, a false-positive `MsgsChanged`
    /// is ok.
    pub(crate) fn on_archived_chats_maybe_noticed(&self) {
-        self.emit_msgs_changed_without_msg_id(DC_CHAT_ID_ARCHIVED_LINK);
+        self.emit_msgs_changed(DC_CHAT_ID_ARCHIVED_LINK, MsgId::new(0));
    }
 }

--- a/src/config.rs
+++ b/src/config.rs
@@ -143,7 +143,7 @@ pub enum Config {
    /// Send BCC copy to self.
    ///
    /// Should be enabled for multidevice setups.
-    /// Default is 0 for chatmail accounts before a backup export, 1 otherwise.
+    #[strum(props(default = "1"))]
    BccSelf,

    /// True if encryption is preferred according to Autocrypt standard.
@@ -202,7 +202,7 @@ pub enum Config {
    /// Value 1 is treated as "delete at once": messages are deleted
    /// immediately, without moving to DeltaChat folder.
    ///
-    /// Default is 1 for chatmail accounts without `BccSelf`, 0 otherwise.
+    /// Default is 1 for chatmail accounts before a backup export, 0 otherwise.
    DeleteServerAfter,

    /// Timer in seconds after which the message is deleted from the
@@ -519,19 +519,11 @@ impl Context {

        // Default values
        let val = match key {
-            Config::BccSelf => match Box::pin(self.is_chatmail()).await? {
-                false => Some("1"),
-                true => Some("0"),
-            },
            Config::ConfiguredInboxFolder => Some("INBOX"),
-            Config::DeleteServerAfter => {
-                match !Box::pin(self.get_config_bool(Config::BccSelf)).await?
-                    && Box::pin(self.is_chatmail()).await?
-                {
-                    true => Some("1"),
-                    false => Some("0"),
-                }
-            }
+            Config::DeleteServerAfter => match Box::pin(self.is_chatmail()).await? {
+                false => Some("0"),
+                true => Some("1"),
+            },
            _ => key.get_str("default"),
        };
        Ok(val.map(|s| s.to_string()))
@@ -1113,28 +1105,6 @@ mod tests {
        Ok(())
    }

-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_delete_server_after_default() -> Result<()> {
-        let t = &TestContext::new_alice().await;
-
-        // Check that the settings are displayed correctly.
-        assert_eq!(t.get_config(Config::BccSelf).await?, Some("1".to_string()));
-        assert_eq!(
-            t.get_config(Config::DeleteServerAfter).await?,
-            Some("0".to_string())
-        );
-
-        // Leaving emails on the server even w/o `BccSelf` is a good default at least because other
-        // MUAs do so even if the server doesn't save sent messages to some sentbox (like Gmail
-        // does).
-        t.set_config_bool(Config::BccSelf, false).await?;
-        assert_eq!(
-            t.get_config(Config::DeleteServerAfter).await?,
-            Some("0".to_string())
-        );
-        Ok(())
-    }
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_sync() -> Result<()> {
        let alice0 = TestContext::new_alice().await;
--- a/src/configure.rs
+++ b/src/configure.rs
@@ -452,9 +452,8 @@ async fn configure(ctx: &Context, param: &EnteredLoginParam) -> Result<Configure
    imap.configure_folders(ctx, &mut imap_session, create_mvbox)
        .await?;

-    let create = true;
    imap_session
-        .select_with_uidvalidity(ctx, "INBOX", create)
+        .select_with_uidvalidity(ctx, "INBOX")
        .await
        .context("could not read INBOX status")?;

--- a/src/contact.rs
+++ b/src/contact.rs
@@ -129,14 +129,17 @@ impl ContactId {
    ) -> Result<()> {
        context
            .sql
-            .transaction(|transaction| {
-                let mut stmt = transaction
-                    .prepare("UPDATE contacts SET origin=?1 WHERE id = ?2 AND origin < ?1")?;
-                for id in ids {
-                    stmt.execute((origin, id))?;
-                }
-                Ok(())
-            })
+            .execute(
+                &format!(
+                    "UPDATE contacts SET origin=? WHERE id IN ({}) AND origin<?",
+                    sql::repeat_vars(ids.len())
+                ),
+                rusqlite::params_from_iter(
+                    params_iter(&[origin])
+                        .chain(params_iter(ids))
+                        .chain(params_iter(&[origin])),
+                ),
+            )
            .await?;
        Ok(())
    }
@@ -802,7 +805,6 @@ impl Contact {
        }

        let mut name = sanitize_name(name);
-        #[allow(clippy::collapsible_if)]
        if origin <= Origin::OutgoingTo {
            // The user may accidentally have written to a "noreply" address with another MUA:
            if addr.contains("noreply")
--- a/src/context.rs
+++ b/src/context.rs
@@ -643,36 +643,14 @@ impl Context {
    }

    /// Emits a MsgsChanged event with specified chat and message ids
-    ///
-    /// If IDs are unset, [`Self::emit_msgs_changed_without_ids`]
-    /// or [`Self::emit_msgs_changed_without_msg_id`] should be used
-    /// instead of this function.
    pub fn emit_msgs_changed(&self, chat_id: ChatId, msg_id: MsgId) {
-        debug_assert!(!chat_id.is_unset());
-        debug_assert!(!msg_id.is_unset());
-
        self.emit_event(EventType::MsgsChanged { chat_id, msg_id });
        chatlist_events::emit_chatlist_changed(self);
        chatlist_events::emit_chatlist_item_changed(self, chat_id);
    }

-    /// Emits a MsgsChanged event with specified chat and without message id.
-    pub fn emit_msgs_changed_without_msg_id(&self, chat_id: ChatId) {
-        debug_assert!(!chat_id.is_unset());
-
-        self.emit_event(EventType::MsgsChanged {
-            chat_id,
-            msg_id: MsgId::new(0),
-        });
-        chatlist_events::emit_chatlist_changed(self);
-        chatlist_events::emit_chatlist_item_changed(self, chat_id);
-    }
-
    /// Emits an IncomingMsg event with specified chat and message ids
    pub fn emit_incoming_msg(&self, chat_id: ChatId, msg_id: MsgId) {
-        debug_assert!(!chat_id.is_unset());
-        debug_assert!(!msg_id.is_unset());
-
        self.emit_event(EventType::IncomingMsg { chat_id, msg_id });
        chatlist_events::emit_chatlist_changed(self);
        chatlist_events::emit_chatlist_item_changed(self, chat_id);
--- a/src/download.rs
+++ b/src/download.rs
@@ -3,7 +3,7 @@
 use std::cmp::max;
 use std::collections::BTreeMap;

-use anyhow::{anyhow, bail, ensure, Result};
+use anyhow::{anyhow, bail, Result};
 use deltachat_derive::{FromSql, ToSql};
 use serde::{Deserialize, Serialize};

@@ -201,11 +201,7 @@ impl Session {
            bail!("Attempt to fetch UID 0");
        }

-        let create = false;
-        let folder_exists = self
-            .select_with_uidvalidity(context, folder, create)
-            .await?;
-        ensure!(folder_exists, "No folder {folder}");
+        self.select_with_uidvalidity(context, folder).await?;

        // we are connected, and the folder is selected
        info!(context, "Downloading message {}/{} fully...", folder, uid);
--- a/src/ephemeral.rs
+++ b/src/ephemeral.rs
@@ -84,6 +84,7 @@ use crate::location;
 use crate::log::LogExt;
 use crate::message::{Message, MessageState, MsgId, Viewtype};
 use crate::mimeparser::SystemMessage;
+use crate::sql::{self, params_iter};
 use crate::stock_str;
 use crate::tools::{duration_to_str, time, SystemTime};

@@ -328,44 +329,23 @@ pub(crate) async fn start_ephemeral_timers_msgids(
    msg_ids: &[MsgId],
 ) -> Result<()> {
    let now = time();
-    let should_interrupt =
-    context
-        .sql
-        .transaction(move |transaction| {
-            let mut should_interrupt = false;
-            let mut stmt =
-                transaction.prepare(
-                    "UPDATE msgs SET ephemeral_timestamp = ?1 + ephemeral_timer
-                     WHERE (ephemeral_timestamp == 0 OR ephemeral_timestamp > ?1 + ephemeral_timer) AND ephemeral_timer > 0
-                     AND id=?2")?;
-            for msg_id in msg_ids {
-                should_interrupt |= stmt.execute((now, msg_id))? > 0;
-            }
-            Ok(should_interrupt)
-        }).await?;
-    if should_interrupt {
-        context.scheduler.interrupt_ephemeral_task().await;
-    }
-    Ok(())
-}
-
-/// Starts ephemeral timer for all messages in the chat.
-///
-/// This should be called when chat is marked as noticed.
-pub(crate) async fn start_chat_ephemeral_timers(context: &Context, chat_id: ChatId) -> Result<()> {
-    let now = time();
-    let should_interrupt = context
+    let count = context
        .sql
        .execute(
-            "UPDATE msgs SET ephemeral_timestamp = ?1 + ephemeral_timer
-             WHERE chat_id = ?2
-             AND ephemeral_timer > 0
-             AND (ephemeral_timestamp == 0 OR ephemeral_timestamp > ?1 + ephemeral_timer)",
-            (now, chat_id),
+            &format!(
+                "UPDATE msgs SET ephemeral_timestamp = ? + ephemeral_timer
+         WHERE (ephemeral_timestamp == 0 OR ephemeral_timestamp > ? + ephemeral_timer) AND ephemeral_timer > 0
+         AND id IN ({})",
+                sql::repeat_vars(msg_ids.len())
+            ),
+            rusqlite::params_from_iter(
+                std::iter::once(&now as &dyn crate::sql::ToSql)
+                    .chain(std::iter::once(&now as &dyn crate::sql::ToSql))
+                    .chain(params_iter(msg_ids)),
+            ),
        )
-        .await?
-        > 0;
-    if should_interrupt {
+        .await?;
+    if count > 0 {
        context.scheduler.interrupt_ephemeral_task().await;
    }
    Ok(())
@@ -502,7 +482,7 @@ pub(crate) async fn delete_expired_messages(context: &Context, now: i64) -> Resu
        }

        for modified_chat_id in modified_chat_ids {
-            context.emit_msgs_changed_without_msg_id(modified_chat_id);
+            context.emit_msgs_changed(modified_chat_id, MsgId::new(0));
        }

        for msg_id in webxdc_deleted {
@@ -715,9 +695,7 @@ pub(crate) async fn start_ephemeral_timers(context: &Context) -> Result<()> {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::chat::{marknoticed_chat, set_muted, ChatVisibility, MuteDuration};
    use crate::config::Config;
-    use crate::constants::DC_CHAT_ID_ARCHIVED_LINK;
    use crate::download::DownloadState;
    use crate::location;
    use crate::message::markseen_msgs;
@@ -1444,77 +1422,4 @@ mod tests {

        Ok(())
    }
-
-    /// Tests that ephemeral timer is started when the chat is noticed.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_noticed_ephemeral_timer() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-        let alice = &tcm.alice().await;
-        let bob = &tcm.bob().await;
-
-        let chat = alice.create_chat(bob).await;
-        let duration = 60;
-        chat.id
-            .set_ephemeral_timer(alice, Timer::Enabled { duration })
-            .await?;
-        let bob_received_message = tcm.send_recv(alice, bob, "Hello!").await;
-
-        marknoticed_chat(bob, bob_received_message.chat_id).await?;
-        SystemTime::shift(Duration::from_secs(100));
-
-        delete_expired_messages(bob, time()).await?;
-
-        assert!(Message::load_from_db_optional(bob, bob_received_message.id)
-            .await?
-            .is_none());
-        Ok(())
-    }
-
-    /// Tests that archiving the chat starts ephemeral timer.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_archived_ephemeral_timer() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-        let alice = &tcm.alice().await;
-        let bob = &tcm.bob().await;
-
-        let chat = alice.create_chat(bob).await;
-        let duration = 60;
-        chat.id
-            .set_ephemeral_timer(alice, Timer::Enabled { duration })
-            .await?;
-        let bob_received_message = tcm.send_recv(alice, bob, "Hello!").await;
-
-        bob_received_message
-            .chat_id
-            .set_visibility(bob, ChatVisibility::Archived)
-            .await?;
-        SystemTime::shift(Duration::from_secs(100));
-
-        delete_expired_messages(bob, time()).await?;
-
-        assert!(Message::load_from_db_optional(bob, bob_received_message.id)
-            .await?
-            .is_none());
-
-        // Bob mutes the chat so it is not unarchived.
-        set_muted(bob, bob_received_message.chat_id, MuteDuration::Forever).await?;
-
-        // Now test that for already archived chat
-        // timer is started if all archived chats are marked as noticed.
-        let bob_received_message_2 = tcm.send_recv(alice, bob, "Hello again!").await;
-        assert_eq!(bob_received_message_2.state, MessageState::InFresh);
-
-        marknoticed_chat(bob, DC_CHAT_ID_ARCHIVED_LINK).await?;
-        SystemTime::shift(Duration::from_secs(100));
-
-        delete_expired_messages(bob, time()).await?;
-
-        assert!(
-            Message::load_from_db_optional(bob, bob_received_message_2.id)
-                .await?
-                .is_none()
-        );
-
-        Ok(())
-    }
 }
--- a/src/events/payload.rs
+++ b/src/events/payload.rs
@@ -109,9 +109,6 @@ pub enum EventType {

    /// A webxdc wants an info message or a changed summary to be notified.
    IncomingWebxdcNotify {
-        /// ID of the chat.
-        chat_id: ChatId,
-
        /// ID of the contact sending.
        contact_id: ContactId,

--- a/src/headerdef.rs
+++ b/src/headerdef.rs
@@ -73,7 +73,6 @@ pub enum HeaderDef {

    /// [Autocrypt](https://autocrypt.org/) header.
    Autocrypt,
-    AutocryptGossip,
    AutocryptSetupMessage,
    SecureJoin,

--- a/src/imap.rs
+++ b/src/imap.rs
@@ -13,7 +13,7 @@ use std::{
    time::{Duration, UNIX_EPOCH},
 };

-use anyhow::{bail, ensure, format_err, Context as _, Result};
+use anyhow::{bail, format_err, Context as _, Result};
 use async_channel::Receiver;
 use async_imap::types::{Fetch, Flag, Name, NameAttribute, UnsolicitedResponse};
 use deltachat_contact_tools::ContactAddress;
@@ -46,6 +46,7 @@ use crate::receive_imf::{
    from_field_to_contact_id, get_prefetch_parent_message, receive_imf_inner, ReceivedMsg,
 };
 use crate::scheduler::connectivity::ConnectivityStore;
+use crate::sql;
 use crate::stock_str;
 use crate::tools::{self, create_id, duration_to_str};

@@ -540,14 +541,10 @@ impl Imap {
            return Ok(false);
        }

-        let create = false;
-        let folder_exists = session
-            .select_with_uidvalidity(context, folder, create)
+        session
+            .select_with_uidvalidity(context, folder)
            .await
            .with_context(|| format!("Failed to select folder {folder:?}"))?;
-        if !folder_exists {
-            return Ok(false);
-        }

        if !session.new_mail && !fetch_existing_msgs {
            info!(context, "No new emails in folder {folder:?}.");
@@ -839,52 +836,45 @@ impl Session {
        folder: &str,
        folder_meaning: FolderMeaning,
    ) -> Result<()> {
-        let uid_validity;
        // Collect pairs of UID and Message-ID.
        let mut msgs = BTreeMap::new();

-        let create = false;
-        let folder_exists = self
-            .select_with_uidvalidity(context, folder, create)
-            .await?;
-        if folder_exists {
-            let mut list = self
-                .uid_fetch("1:*", RFC724MID_UID)
-                .await
-                .with_context(|| format!("Can't resync folder {folder}"))?;
-            while let Some(fetch) = list.try_next().await? {
-                let headers = match get_fetch_headers(&fetch) {
-                    Ok(headers) => headers,
-                    Err(err) => {
-                        warn!(context, "Failed to parse FETCH headers: {}", err);
-                        continue;
-                    }
-                };
-                let message_id = prefetch_get_message_id(&headers);
+        self.select_with_uidvalidity(context, folder).await?;

-                if let (Some(uid), Some(rfc724_mid)) = (fetch.uid, message_id) {
-                    msgs.insert(
-                        uid,
-                        (
-                            rfc724_mid,
-                            target_folder(context, folder, folder_meaning, &headers).await?,
-                        ),
-                    );
+        let mut list = self
+            .uid_fetch("1:*", RFC724MID_UID)
+            .await
+            .with_context(|| format!("can't resync folder {folder}"))?;
+        while let Some(fetch) = list.try_next().await? {
+            let headers = match get_fetch_headers(&fetch) {
+                Ok(headers) => headers,
+                Err(err) => {
+                    warn!(context, "Failed to parse FETCH headers: {}", err);
+                    continue;
                }
+            };
+            let message_id = prefetch_get_message_id(&headers);
+
+            if let (Some(uid), Some(rfc724_mid)) = (fetch.uid, message_id) {
+                msgs.insert(
+                    uid,
+                    (
+                        rfc724_mid,
+                        target_folder(context, folder, folder_meaning, &headers).await?,
+                    ),
+                );
            }
-
-            info!(
-                context,
-                "resync_folder_uids: Collected {} message IDs in {folder}.",
-                msgs.len(),
-            );
-
-            uid_validity = get_uidvalidity(context, folder).await?;
-        } else {
-            warn!(context, "resync_folder_uids: No folder {folder}.");
-            uid_validity = 0;
        }

+        info!(
+            context,
+            "Resync: collected {} message IDs in folder {}",
+            msgs.len(),
+            folder,
+        );
+
+        let uid_validity = get_uidvalidity(context, folder).await?;
+
        // Write collected UIDs to SQLite database.
        context
            .sql
@@ -921,15 +911,15 @@ impl Session {
            .await?;
        context
            .sql
-            .transaction(|transaction| {
-                let mut stmt = transaction.prepare("DELETE FROM imap WHERE id = ?")?;
-                for row_id in row_ids {
-                    stmt.execute((row_id,))?;
-                }
-                Ok(())
-            })
+            .execute(
+                &format!(
+                    "DELETE FROM imap WHERE id IN ({})",
+                    sql::repeat_vars(row_ids.len())
+                ),
+                rusqlite::params_from_iter(row_ids),
+            )
            .await
-            .context("Cannot remove deleted messages from imap table")?;
+            .context("cannot remove deleted messages from imap table")?;

        context.emit_event(EventType::ImapMessageDeleted(format!(
            "IMAP messages {uid_set} marked as deleted"
@@ -952,15 +942,15 @@ impl Session {
                    // Messages are moved or don't exist, IMAP returns OK response in both cases.
                    context
                        .sql
-                        .transaction(|transaction| {
-                            let mut stmt = transaction.prepare("DELETE FROM imap WHERE id = ?")?;
-                            for row_id in row_ids {
-                                stmt.execute((row_id,))?;
-                            }
-                            Ok(())
-                        })
+                        .execute(
+                            &format!(
+                                "DELETE FROM imap WHERE id IN ({})",
+                                sql::repeat_vars(row_ids.len())
+                            ),
+                            rusqlite::params_from_iter(row_ids),
+                        )
                        .await
-                        .context("Cannot delete moved messages from imap table")?;
+                        .context("cannot delete moved messages from imap table")?;
                    context.emit_event(EventType::ImapMessageMoved(format!(
                        "IMAP messages {set} moved to {target}"
                    )));
@@ -1006,15 +996,15 @@ impl Session {
        }
        context
            .sql
-            .transaction(|transaction| {
-                let mut stmt = transaction.prepare("UPDATE imap SET target='' WHERE id = ?")?;
-                for row_id in row_ids {
-                    stmt.execute((row_id,))?;
-                }
-                Ok(())
-            })
+            .execute(
+                &format!(
+                    "UPDATE imap SET target='' WHERE id IN ({})",
+                    sql::repeat_vars(row_ids.len())
+                ),
+                rusqlite::params_from_iter(row_ids),
+            )
            .await
-            .context("Cannot plan deletion of messages")?;
+            .context("cannot plan deletion of messages")?;
        if copy {
            context.emit_event(EventType::ImapMessageMoved(format!(
                "IMAP messages {set} copied to {target}"
@@ -1050,11 +1040,7 @@ impl Session {
            // MOVE/DELETE operations. This does not result in multiple SELECT commands
            // being sent because `select_folder()` does nothing if the folder is already
            // selected.
-            let create = false;
-            let folder_exists = self
-                .select_with_uidvalidity(context, folder, create)
-                .await?;
-            ensure!(folder_exists, "No folder {folder}");
+            self.select_with_uidvalidity(context, folder).await?;

            // Empty target folder name means messages should be deleted.
            if target.is_empty() {
@@ -1148,40 +1134,29 @@ impl Session {
            .await?;

        for (folder, rowid_set, uid_set) in UidGrouper::from(rows) {
-            let create = false;
-            let folder_exists = match self.select_with_uidvalidity(context, &folder, create).await {
-                Err(err) => {
-                    warn!(
-                        context,
-                        "store_seen_flags_on_imap: Failed to select {folder}, will retry later: {err:#}.");
-                    continue;
-                }
-                Ok(folder_exists) => folder_exists,
-            };
-            if !folder_exists {
-                warn!(context, "store_seen_flags_on_imap: No folder {folder}.");
+            if let Err(err) = self.select_with_uidvalidity(context, &folder).await {
+                warn!(context, "store_seen_flags_on_imap: Failed to select {folder}, will retry later: {err:#}.");
            } else if let Err(err) = self.add_flag_finalized_with_set(&uid_set, "\\Seen").await {
                warn!(
                    context,
                    "Cannot mark messages {uid_set} in {folder} as seen, will retry later: {err:#}.");
-                continue;
            } else {
                info!(
                    context,
                    "Marked messages {} in folder {} as seen.", uid_set, folder
                );
+                context
+                    .sql
+                    .execute(
+                        &format!(
+                            "DELETE FROM imap_markseen WHERE id IN ({})",
+                            sql::repeat_vars(rowid_set.len())
+                        ),
+                        rusqlite::params_from_iter(rowid_set),
+                    )
+                    .await
+                    .context("cannot remove messages marked as seen from imap_markseen table")?;
            }
-            context
-                .sql
-                .transaction(|transaction| {
-                    let mut stmt = transaction.prepare("DELETE FROM imap_markseen WHERE id = ?")?;
-                    for rowid in rowid_set {
-                        stmt.execute((rowid,))?;
-                    }
-                    Ok(())
-                })
-                .await
-                .context("Cannot remove messages marked as seen from imap_markseen table")?;
        }

        Ok(())
@@ -1197,14 +1172,9 @@ impl Session {
            return Ok(());
        }

-        let create = false;
-        let folder_exists = self
-            .select_with_uidvalidity(context, folder, create)
+        self.select_with_uidvalidity(context, folder)
            .await
-            .context("Failed to select folder")?;
-        if !folder_exists {
-            return Ok(());
-        }
+            .context("failed to select folder")?;

        let mailbox = self
            .selected_mailbox
@@ -1331,7 +1301,7 @@ impl Session {
    /// Returns the last UID fetched successfully and the info about each downloaded message.
    /// If the message is incorrect or there is a failure to write a message to the database,
    /// it is skipped and the error is logged.
-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
    pub(crate) async fn fetch_many_msgs(
        &mut self,
        context: &Context,
@@ -1660,7 +1630,7 @@ fn format_setmetadata(folder: &str, device_token: &str) -> String {
 impl Session {
    /// Returns success if we successfully set the flag or we otherwise
    /// think add_flag should not be retried: Disconnection during setting
-    /// the flag, or other imap-errors, returns Ok as well.
+    /// the flag, or other imap-errors, returns true as well.
    ///
    /// Returning error means that the operation can be retried.
    async fn add_flag_finalized_with_set(&mut self, uid_set: &str, flag: &str) -> Result<()> {
@@ -1707,11 +1677,7 @@ impl Session {
                self.close().await?;
                // Before moving emails to the mvbox we need to remember its UIDVALIDITY, otherwise
                // emails moved before that wouldn't be fetched but considered "old" instead.
-                let create = false;
-                let folder_exists = self
-                    .select_with_uidvalidity(context, folder, create)
-                    .await?;
-                ensure!(folder_exists, "No MVBOX folder {:?}??", &folder);
+                self.select_with_uidvalidity(context, folder).await?;
                return Ok(Some(folder));
            }
        }
@@ -1722,10 +1688,7 @@ impl Session {
        // Some servers require namespace-style folder names like "INBOX.DeltaChat", so we try all
        // the variants here.
        for folder in folders {
-            match self
-                .select_with_uidvalidity(context, folder, create_mvbox)
-                .await
-            {
+            match self.select_with_uidvalidity(context, folder).await {
                Ok(_) => {
                    info!(context, "MVBOX-folder {} created.", folder);
                    return Ok(Some(folder));
@@ -2576,14 +2539,10 @@ async fn add_all_recipients_as_contacts(
        );
        return Ok(());
    };
-    let create = false;
-    let folder_exists = session
-        .select_with_uidvalidity(context, &mailbox, create)
+    session
+        .select_with_uidvalidity(context, &mailbox)
        .await
        .with_context(|| format!("could not select {mailbox}"))?;
-    if !folder_exists {
-        return Ok(());
-    }

    let recipients = session
        .get_all_recipients(context)
@@ -2730,7 +2689,6 @@ mod tests {
        }
    }

-    #[allow(clippy::too_many_arguments)]
    async fn check_target_folder_combination(
        folder: &str,
        mvbox_move: bool,
--- a/src/imap/idle.rs
+++ b/src/imap/idle.rs
@@ -29,9 +29,7 @@ impl Session {
    ) -> Result<Self> {
        use futures::future::FutureExt;

-        let create = true;
-        self.select_with_uidvalidity(context, folder, create)
-            .await?;
+        self.select_with_uidvalidity(context, folder).await?;

        if self.drain_unsolicited_responses(context)? {
            self.new_mail = true;
--- a/src/imap/scan_folders.rs
+++ b/src/imap/scan_folders.rs
@@ -34,7 +34,6 @@ impl Imap {
        let watched_folders = get_watched_folders(context).await?;

        let mut folder_configs = BTreeMap::new();
-        let mut folder_names = Vec::new();

        for folder in folders {
            let folder_meaning = get_folder_meaning_by_attrs(folder.attributes());
@@ -45,7 +44,6 @@ impl Imap {
                // already been moved and left it in the inbox.
                continue;
            }
-            folder_names.push(folder.name().to_string());
            let folder_name_meaning = get_folder_meaning_by_name(folder.name());

            if let Some(config) = folder_meaning.to_config() {
@@ -93,7 +91,6 @@ impl Imap {
            }
        }

-        info!(context, "Found folders: {folder_names:?}.");
        last_scan.replace(tools::Time::now());
        Ok(true)
    }
--- a/src/imap/select_folder.rs
+++ b/src/imap/select_folder.rs
@@ -111,8 +111,7 @@ impl ImapSession {
        }
    }

-    /// Selects a folder optionally creating it and takes care of UIDVALIDITY changes. Returns false
-    /// iff `folder` doesn't exist.
+    /// Selects a folder and takes care of UIDVALIDITY changes.
    ///
    /// When selecting a folder for the first time, sets the uid_next to the current
    /// mailbox.uid_next so that no old emails are fetched.
@@ -124,24 +123,11 @@ impl ImapSession {
        &mut self,
        context: &Context,
        folder: &str,
-        create: bool,
-    ) -> Result<bool> {
-        let newly_selected = if create {
-            self.select_or_create_folder(context, folder)
-                .await
-                .with_context(|| format!("failed to select or create folder {folder}"))?
-        } else {
-            match self.select_folder(context, folder).await {
-                Ok(newly_selected) => newly_selected,
-                Err(err) => match err {
-                    Error::NoFolder(..) => return Ok(false),
-                    _ => {
-                        return Err(err)
-                            .with_context(|| format!("failed to select folder {folder}"))?
-                    }
-                },
-            }
-        };
+    ) -> Result<()> {
+        let newly_selected = self
+            .select_or_create_folder(context, folder)
+            .await
+            .with_context(|| format!("failed to select or create folder {folder}"))?;
        let mailbox = self
            .selected_mailbox
            .as_mut()
@@ -213,7 +199,7 @@ impl ImapSession {
                }
            }

-            return Ok(true);
+            return Ok(());
        }

        // UIDVALIDITY is modified, reset highest seen MODSEQ.
@@ -247,7 +233,7 @@ impl ImapSession {
            old_uid_next,
            old_uid_validity,
        );
-        Ok(true)
+        Ok(())
    }
 }

--- a/src/imex.rs
+++ b/src/imex.rs
@@ -416,7 +416,7 @@ async fn import_backup_stream_inner<R: tokio::io::AsyncRead + Unpin>(
            .context("cannot import unpacked database");
    }
    if res.is_ok() {
-        res = adjust_bcc_self(context).await;
+        res = adjust_delete_server_after(context).await;
    }
    fs::remove_file(unpacked_database)
        .await
@@ -796,7 +796,7 @@ async fn export_database(
        .to_str()
        .with_context(|| format!("path {} is not valid unicode", dest.display()))?;

-    adjust_bcc_self(context).await?;
+    adjust_delete_server_after(context).await?;
    context
        .sql
        .set_raw_config_int("backup_time", timestamp)
@@ -826,14 +826,15 @@ async fn export_database(
        .await
 }

-/// Sets `Config::BccSelf` (and `DeleteServerAfter` to "never" in effect) if needed so that new
-/// messages are present on the server after a backup restoration or available for all devices in
-/// multi-device case. NB: Calling this after a backup import isn't reliable as we can crash in
-/// between, but this is a problem only for old backups, new backups already have `BccSelf` set if
-/// necessary.
-async fn adjust_bcc_self(context: &Context) -> Result<()> {
-    if context.is_chatmail().await? && !context.config_exists(Config::BccSelf).await? {
-        context.set_config(Config::BccSelf, Some("1")).await?;
+/// Sets `Config::DeleteServerAfter` to "never" if needed so that new messages are present on the
+/// server after a backup restoration or available for all devices in multi-device case.
+/// NB: Calling this after a backup import isn't reliable as we can crash in between, but this is a
+/// problem only for old backups, new backups already have `DeleteServerAfter` set if necessary.
+async fn adjust_delete_server_after(context: &Context) -> Result<()> {
+    if context.is_chatmail().await? && !context.config_exists(Config::DeleteServerAfter).await? {
+        context
+            .set_config(Config::DeleteServerAfter, Some("0"))
+            .await?;
    }
    Ok(())
 }
@@ -1029,20 +1030,12 @@ mod tests {

        let context1 = &TestContext::new_alice().await;

-        // Check that the settings are displayed correctly.
-        assert_eq!(
-            context1.get_config(Config::BccSelf).await?,
-            Some("1".to_string())
-        );
+        // Check that the setting is displayed correctly.
        assert_eq!(
            context1.get_config(Config::DeleteServerAfter).await?,
            Some("0".to_string())
        );
        context1.set_config_bool(Config::IsChatmail, true).await?;
-        assert_eq!(
-            context1.get_config(Config::BccSelf).await?,
-            Some("0".to_string())
-        );
        assert_eq!(
            context1.get_config(Config::DeleteServerAfter).await?,
            Some("1".to_string())
@@ -1065,10 +1058,6 @@ mod tests {
        assert!(context2.is_configured().await?);
        assert!(context2.is_chatmail().await?);
        for ctx in [context1, context2] {
-            assert_eq!(
-                ctx.get_config(Config::BccSelf).await?,
-                Some("1".to_string())
-            );
            assert_eq!(
                ctx.get_config(Config::DeleteServerAfter).await?,
                Some("0".to_string())
--- a/src/imex/transfer.rs
+++ b/src/imex/transfer.rs
@@ -178,7 +178,6 @@ impl BackupProvider {
        }

        info!(context, "Received valid backup authentication token.");
-        // Emit a nonzero progress so that UIs can display smth like "Transferring...".
        context.emit_event(EventType::ImexProgress(1));

        let blobdir = BlobDirContents::new(&context).await?;
@@ -310,10 +309,6 @@ pub async fn get_backup2(
    let mut file_size_buf = [0u8; 8];
    recv_stream.read_exact(&mut file_size_buf).await?;
    let file_size = u64::from_be_bytes(file_size_buf);
-    info!(context, "Received backup file size.");
-    // Emit a nonzero progress so that UIs can display smth like "Transferring...".
-    context.emit_event(EventType::ImexProgress(1));
-
    import_backup_stream(context, recv_stream, file_size, passphrase)
        .await
        .context("Failed to import backup from QUIC stream")?;
@@ -439,14 +434,12 @@ mod tests {
        assert!(msg.save_file(&ctx1, &path).await.is_err());

        // Check that both received the ImexProgress events.
-        for ctx in [&ctx0, &ctx1] {
-            ctx.evtracker
-                .get_matching(|ev| matches!(ev, EventType::ImexProgress(1)))
-                .await;
-            ctx.evtracker
-                .get_matching(|ev| matches!(ev, EventType::ImexProgress(1000)))
-                .await;
-        }
+        ctx0.evtracker
+            .get_matching(|ev| matches!(ev, EventType::ImexProgress(1000)))
+            .await;
+        ctx1.evtracker
+            .get_matching(|ev| matches!(ev, EventType::ImexProgress(1000)))
+            .await;
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
--- a/src/location.rs
+++ b/src/location.rs
@@ -707,6 +707,9 @@ pub(crate) async fn save(
                    ))?;

                    if timestamp > newest_timestamp {
+                        // okay to drop, as we use cached prepared statements
+                        drop(stmt_test);
+                        drop(stmt_insert);
                        newest_timestamp = timestamp;
                        newest_location_id = Some(u32::try_from(conn.last_insert_rowid())?);
                    }
@@ -1127,10 +1130,6 @@ Content-Disposition: attachment; filename="location.kml"
        assert_eq!(get_range(alice, None, None, 0, 0).await?.len(), 1);
        assert_eq!(get_range(bob, None, None, 0, 0).await?.len(), 1);

-        // Location-only messages are "auto-generated", but they mustn't make the contact a bot.
-        let contact = bob.add_or_lookup_contact(alice).await;
-        assert!(!contact.is_bot());
-
        // Day later Bob removes location.
        SystemTime::shift(Duration::from_secs(86400));
        delete_expired(alice, time()).await?;
--- a/src/message.rs
+++ b/src/message.rs
@@ -293,7 +293,13 @@ impl MsgId {
            ret += ", Location sent";
        }

-        if 0 != msg.param.get_int(Param::GuaranteeE2ee).unwrap_or_default() {
+        let e2ee_errors = msg.param.get_int(Param::ErroneousE2ee).unwrap_or_default();
+
+        if 0 != e2ee_errors {
+            if 0 != e2ee_errors & 0x2 {
+                ret += ", Encrypted, no valid signature";
+            }
+        } else if 0 != msg.param.get_int(Param::GuaranteeE2ee).unwrap_or_default() {
            ret += ", Encrypted";
        }

@@ -1607,15 +1613,15 @@ pub async fn delete_msgs(context: &Context, msg_ids: &[MsgId]) -> Result<()> {
        modified_chat_ids.insert(msg.chat_id);

        let target = context.get_delete_msgs_target().await?;
-        let update_db = |trans: &mut rusqlite::Transaction| {
-            trans.execute(
+        let update_db = |conn: &mut rusqlite::Connection| {
+            conn.execute(
                "UPDATE imap SET target=? WHERE rfc724_mid=?",
                (target, msg.rfc724_mid),
            )?;
-            trans.execute("DELETE FROM smtp WHERE msg_id=?", (msg_id,))?;
+            conn.execute("DELETE FROM smtp WHERE msg_id=?", (msg_id,))?;
            Ok(())
        };
-        if let Err(e) = context.sql.transaction(update_db).await {
+        if let Err(e) = context.sql.call_write(update_db).await {
            error!(context, "delete_msgs: failed to update db: {e:#}.");
            res = Err(e);
            continue;
@@ -1637,7 +1643,7 @@ pub async fn delete_msgs(context: &Context, msg_ids: &[MsgId]) -> Result<()> {
    res?;

    for modified_chat_id in modified_chat_ids {
-        context.emit_msgs_changed_without_msg_id(modified_chat_id);
+        context.emit_msgs_changed(modified_chat_id, MsgId::new(0));
        chatlist_events::emit_chatlist_item_changed(context, modified_chat_id);
    }

@@ -2088,9 +2094,6 @@ pub enum Viewtype {
    Gif = 21,

    /// Message containing a sticker, similar to image.
-    /// NB: When sending, the message viewtype may be changed to `Image` by some heuristics like
-    /// checking for transparent pixels. Use `Message::force_sticker()` to disable them.
-    ///
    /// If possible, the ui should display the image without borders in a transparent way.
    /// A click on a sticker will offer to install the sticker set in some future.
    Sticker = 23,
@@ -2707,29 +2710,6 @@ mod tests {
    async fn test_is_bot() -> Result<()> {
        let alice = TestContext::new_alice().await;

-        // Alice receives an auto-generated non-chat message.
-        //
-        // This could be a holiday notice,
-        // in which case the message should be marked as bot-generated,
-        // but the contact should not.
-        receive_imf(
-            &alice,
-            b"From: Claire <claire@example.com>\n\
-                    To: alice@example.org\n\
-                    Message-ID: <789@example.com>\n\
-                    Auto-Submitted: auto-generated\n\
-                    Date: Fri, 29 Jan 2021 21:37:55 +0000\n\
-                    \n\
-                    hello\n",
-            false,
-        )
-        .await?;
-        let msg = alice.get_last_msg().await;
-        assert_eq!(msg.get_text(), "hello".to_string());
-        assert!(msg.is_bot());
-        let contact = Contact::get_by_id(&alice, msg.from_id).await?;
-        assert!(!contact.is_bot());
-
        // Alice receives a message from Bob the bot.
        receive_imf(
            &alice,
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -1047,7 +1047,6 @@ impl MimeFactory {
        part.body(text)
    }

-    #[allow(clippy::cognitive_complexity)]
    async fn render_message(
        &mut self,
        context: &Context,
@@ -1369,7 +1368,7 @@ impl MimeFactory {

        // add attachment part
        if msg.viewtype.has_file() {
-            let file_part = build_body_file(context, &msg).await?;
+            let (file_part, _) = build_body_file(context, &msg, "").await?;
            parts.push(file_part);
        }

@@ -1509,7 +1508,11 @@ pub(crate) fn wrapped_base64_encode(buf: &[u8]) -> String {
        .join("\r\n")
 }

-async fn build_body_file(context: &Context, msg: &Message) -> Result<PartBuilder> {
+async fn build_body_file(
+    context: &Context,
+    msg: &Message,
+    base_name: &str,
+) -> Result<(PartBuilder, String)> {
    let blob = msg
        .param
        .get_blob(Param::File, context)
@@ -1535,13 +1538,17 @@ async fn build_body_file(context: &Context, msg: &Message) -> Result<PartBuilder
        ),
        Viewtype::Image | Viewtype::Gif => format!(
            "image_{}.{}",
-            chrono::Utc
-                .timestamp_opt(msg.timestamp_sort, 0)
-                .single()
-                .map_or_else(
-                    || "YY-mm-dd_hh:mm:ss".to_string(),
-                    |ts| ts.format("%Y-%m-%d_%H-%M-%S").to_string(),
-                ),
+            if base_name.is_empty() {
+                chrono::Utc
+                    .timestamp_opt(msg.timestamp_sort, 0)
+                    .single()
+                    .map_or_else(
+                        || "YY-mm-dd_hh:mm:ss".to_string(),
+                        |ts| ts.format("%Y-%m-%d_%H-%M-%S").to_string(),
+                    )
+            } else {
+                base_name.to_string()
+            },
            &suffix,
        ),
        Viewtype::Video => format!(
@@ -1593,7 +1600,7 @@ async fn build_body_file(context: &Context, msg: &Message) -> Result<PartBuilder
        .header(("Content-Transfer-Encoding", "base64"))
        .body(encoded_body);

-    Ok(mail)
+    Ok((mail, filename_to_send))
 }

 async fn build_avatar_file(context: &Context, path: &str) -> Result<String> {
--- a/src/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -116,15 +116,7 @@ pub(crate) struct MimeMessage {
    /// Hop info for debugging.
    pub(crate) hop_info: String,

-    /// Whether the message is auto-generated.
-    ///
-    /// If chat message (with `Chat-Version` header) is auto-generated,
-    /// the contact sending this should be marked as bot.
-    ///
-    /// If non-chat message is auto-generated,
-    /// it could be a holiday notice auto-reply,
-    /// in which case the message should be marked as bot-generated,
-    /// but the contact should not be.
+    /// Whether the contact sending this should be marked as bot or non-bot.
    pub(crate) is_bot: Option<bool>,

    /// When the message was received, in secs since epoch.
@@ -570,14 +562,11 @@ impl MimeMessage {
            },
        };

-        let is_location_only = parser.location_kml.is_some() && parser.parts.is_empty();
-        if parser.mdn_reports.is_empty()
-            && !is_location_only
-            && parser.sync_items.is_none()
-            && parser.webxdc_status_update.is_none()
-        {
-            let is_bot =
-                parser.headers.get("auto-submitted") == Some(&"auto-generated".to_string());
+        if parser.mdn_reports.is_empty() && parser.webxdc_status_update.is_none() {
+            // "Auto-Submitted" is also set by holiday-notices so we also check "chat-version".
+            let is_bot = parser.headers.get("auto-submitted")
+                == Some(&"auto-generated".to_string())
+                && parser.headers.contains_key("chat-version");
            parser.is_bot = Some(is_bot);
        }
        parser.maybe_remove_bad_parts();
@@ -1290,7 +1279,7 @@ impl MimeMessage {
        Ok(self.parts.len() > old_part_count)
    }

-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
    async fn do_add_single_file_part(
        &mut self,
        context: &Context,
--- a/src/net/http.rs
+++ b/src/net/http.rs
@@ -151,7 +151,7 @@ async fn http_cache_put(context: &Context, url: &str, response: &Response) -> Re
 /// Also returns if the response is stale and should be revalidated in the background.
 async fn http_cache_get(context: &Context, url: &str) -> Result<Option<(Response, bool)>> {
    let now = time();
-    let Some((blob_name, mimetype, encoding, stale_timestamp)) = context
+    let Some((blob_name, mimetype, encoding, is_stale)) = context
        .sql
        .query_row_optional(
            "SELECT blobname, mimetype, encoding, stale
@@ -162,14 +162,13 @@ async fn http_cache_get(context: &Context, url: &str) -> Result<Option<(Response
                let mimetype: Option<String> = Some(row.get(1)?).filter(|s: &String| !s.is_empty());
                let encoding: Option<String> = Some(row.get(2)?).filter(|s: &String| !s.is_empty());
                let stale_timestamp: i64 = row.get(3)?;
-                Ok((blob_name, mimetype, encoding, stale_timestamp))
+                Ok((blob_name, mimetype, encoding, now > stale_timestamp))
            },
        )
        .await?
    else {
        return Ok(None);
    };
-    let is_stale = now > stale_timestamp;

    let blob_object = BlobObject::from_name(context, blob_name)?;
    let blob_abs_path = blob_object.to_abs_path();
@@ -196,16 +195,15 @@ async fn http_cache_get(context: &Context, url: &str) -> Result<Option<(Response
    // Update expiration timestamp
    // to prevent deletion of the file still in use.
    //
-    // If the response is stale, the caller should revalidate it in the background, so update
-    // `stale` timestamp to avoid revalidating too frequently (and have many parallel revalidation
-    // tasks) if revalidation fails or the HTTP request takes some time. The stale period >= 1 hour,
-    // so 1 more minute won't be a problem.
-    let stale_timestamp = if is_stale { now + 60 } else { stale_timestamp };
+    // We do not update stale timestamp here
+    // as we have not revalidated the response.
+    // Stale timestamp is updated only
+    // when the URL is sucessfully fetched.
    context
        .sql
        .execute(
-            "UPDATE http_cache SET expires=?, stale=? WHERE url=?",
-            (expires, stale_timestamp, url),
+            "UPDATE http_cache SET expires=? WHERE url=?",
+            (expires, url),
        )
        .await?;

@@ -307,6 +305,8 @@ pub async fn read_url_blob(context: &Context, url: &str) -> Result<Response> {
                }
            });
        }
+
+        // Return stale result.
        return Ok(response);
    }

@@ -495,22 +495,6 @@ mod tests {
        );
        assert_eq!(http_cache_get(t, xdc_pixel_url).await?, None);

-        // If we get the blob the second time quickly, it shouldn't be stale because it's supposed
-        // that we've already run a revalidation task which will update the blob soon.
-        assert_eq!(
-            http_cache_get(t, xdc_editor_url).await?,
-            Some((xdc_response.clone(), false))
-        );
-        // But if the revalidation task hasn't succeeded after some time, the blob is stale again
-        // even if we continue to get it frequently.
-        for i in (0..100).rev() {
-            SystemTime::shift(Duration::from_secs(6));
-            if let Some((_, true)) = http_cache_get(t, xdc_editor_url).await? {
-                break;
-            }
-            assert!(i > 0);
-        }
-
        // Test that if the file is accidentally removed from the blobdir,
        // there is no error when trying to load the cache entry.
        for entry in std::fs::read_dir(t.get_blobdir())? {
--- a/src/param.rs
+++ b/src/param.rs
@@ -55,8 +55,6 @@ pub enum Param {

    /// For Messages: decrypted with validation errors or without mutual set, if neither
    /// 'c' nor 'e' are preset, the messages is only transport encrypted.
-    ///
-    /// Deprecated on 2024-12-25.
    ErroneousE2ee = b'e',

    /// For Messages: force unencrypted message, a value from `ForcePlaintext` enum.
@@ -373,7 +371,6 @@ impl Params {
    /// Note that in the [ParamsFile::FsPath] case the blob can be
    /// created without copying if the path already refers to a valid
    /// blob.  If so a [BlobObject] will be returned.
-    #[allow(clippy::needless_lifetimes)]
    pub async fn get_blob<'a>(
        &self,
        key: Param,
--- a/src/pgp.rs
+++ b/src/pgp.rs
@@ -21,11 +21,9 @@ use tokio::runtime::Handle;
 use crate::constants::KeyGenType;
 use crate::key::{DcKey, Fingerprint};

-#[allow(missing_docs)]
 #[cfg(test)]
 pub(crate) const HEADER_AUTOCRYPT: &str = "autocrypt-prefer-encrypt";

-#[allow(missing_docs)]
 pub const HEADER_SETUPCODE: &str = "passphrase-begin";

 /// Preferred symmetric encryption algorithm.
--- a/src/quota.rs
+++ b/src/quota.rs
@@ -187,7 +187,7 @@ mod tests {
        Ok(())
    }

-    #[allow(clippy::assertions_on_constants)]
+    #[expect(clippy::assertions_on_constants)]
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_quota_thresholds() -> anyhow::Result<()> {
        assert!(QUOTA_ALLCLEAR_PERCENTAGE > 50);
--- a/src/receive_imf.rs
+++ b/src/receive_imf.rs
@@ -158,7 +158,7 @@ async fn insert_tombstone(context: &Context, rfc724_mid: &str) -> Result<MsgId>
 /// If `is_partial_download` is set, it contains the full message size in bytes.
 /// Do not confuse that with `replace_msg_id` that will be set when the full message is loaded
 /// later.
-#[allow(clippy::too_many_arguments)]
+#[expect(clippy::too_many_arguments)]
 pub(crate) async fn receive_imf_inner(
    context: &Context,
    folder: &str,
@@ -607,7 +607,7 @@ pub(crate) async fn receive_imf_inner(
    }

    if let Some(replace_chat_id) = replace_chat_id {
-        context.emit_msgs_changed_without_msg_id(replace_chat_id);
+        context.emit_msgs_changed(replace_chat_id, MsgId::new(0));
    } else if !chat_id.is_trash() {
        let fresh = received_msg.state == MessageState::InFresh;
        for msg_id in &received_msg.msg_ids {
@@ -621,11 +621,7 @@ pub(crate) async fn receive_imf_inner(
        .await;

    if let Some(is_bot) = mime_parser.is_bot {
-        // If the message is auto-generated and was generated by Delta Chat,
-        // mark the contact as a bot.
-        if mime_parser.get_header(HeaderDef::ChatVersion).is_some() {
-            from_id.mark_bot(context, is_bot).await?;
-        }
+        from_id.mark_bot(context, is_bot).await?;
    }

    Ok(Some(received_msg))
@@ -683,7 +679,7 @@ pub async fn from_field_to_contact_id(
 /// Creates a `ReceivedMsg` from given parts which might consist of
 /// multiple messages (if there are multiple attachments).
 /// Every entry in `mime_parser.parts` produces a new row in the `msgs` table.
-#[allow(clippy::too_many_arguments, clippy::cognitive_complexity)]
+#[expect(clippy::too_many_arguments)]
 async fn add_parts(
    context: &Context,
    mime_parser: &mut MimeMessage,
@@ -1694,6 +1690,11 @@ RETURNING id
        "Message has {icnt} parts and is assigned to chat #{chat_id}."
    );

+    // new outgoing message from another device marks the chat as noticed.
+    if !mime_parser.incoming && !chat_id.is_special() {
+        chat::marknoticed_chat_if_older_than(context, chat_id, sort_timestamp).await?;
+    }
+
    if !is_mdn {
        let mut chat = Chat::load_from_db(context, chat_id).await?;

@@ -1833,7 +1834,7 @@ async fn lookup_chat_by_reply(
    Ok(Some((parent_chat.id, parent_chat.blocked)))
 }

-#[allow(clippy::too_many_arguments)]
+#[expect(clippy::too_many_arguments)]
 async fn lookup_chat_or_create_adhoc_group(
    context: &Context,
    mime_parser: &MimeMessage,
@@ -1968,7 +1969,7 @@ async fn is_probably_private_reply(
 /// than two members, a new ad hoc group is created.
 ///
 /// On success the function returns the created (chat_id, chat_blocked) tuple.
-#[allow(clippy::too_many_arguments)]
+#[expect(clippy::too_many_arguments)]
 async fn create_group(
    context: &Context,
    mime_parser: &mut MimeMessage,
@@ -2088,7 +2089,6 @@ async fn create_group(
 /// just omitted.
 ///
 /// * `is_partial_download` - whether the message is not fully downloaded.
-#[allow(clippy::too_many_arguments)]
 async fn apply_group_changes(
    context: &Context,
    mime_parser: &mut MimeMessage,
--- a/src/securejoin.rs
+++ b/src/securejoin.rs
@@ -454,9 +454,6 @@ pub(crate) async fn handle_securejoin_handshake(
                    .await?;
                inviter_progress(context, contact_id, 800);
                inviter_progress(context, contact_id, 1000);
-                // IMAP-delete the message to avoid handling it by another device and adding the
-                // member twice. Another device will know the member's key from Autocrypt-Gossip.
-                Ok(HandshakeMessage::Done)
            } else {
                // Setup verified contact.
                secure_connection_established(
@@ -471,8 +468,8 @@ pub(crate) async fn handle_securejoin_handshake(
                    .context("failed sending vc-contact-confirm message")?;

                inviter_progress(context, contact_id, 1000);
-                Ok(HandshakeMessage::Ignore) // "Done" would delete the message and break multi-device (the key from Autocrypt-header is needed)
            }
+            Ok(HandshakeMessage::Ignore) // "Done" would delete the message and break multi-device (the key from Autocrypt-header is needed)
        }
        /*=======================================================
        ====             Bob - the joiner's side             ====
@@ -1356,8 +1353,6 @@ mod tests {
        // explicit user action, the Auto-Submitted header shouldn't be present. Otherwise it would
        // be strange to have it in "member-added" messages of verified groups only.
        assert!(msg.get_header(HeaderDef::AutoSubmitted).is_none());
-        // This is a two-member group, but Alice must Autocrypt-gossip to her other devices.
-        assert!(msg.get_header(HeaderDef::AutocryptGossip).is_some());

        {
            // Now Alice's chat with Bob should still be hidden, the verified message should
--- a/src/smtp.rs
+++ b/src/smtp.rs
@@ -21,6 +21,7 @@ use crate::mimefactory::MimeFactory;
 use crate::net::proxy::ProxyConfig;
 use crate::net::session::SessionBufStream;
 use crate::scheduler::connectivity::ConnectivityStore;
+use crate::sql;
 use crate::stock_str::unencrypted_email;
 use crate::tools::{self, time_elapsed};

@@ -103,7 +104,7 @@ impl Smtp {
    }

    /// Connect using the provided login params.
-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
    pub async fn connect(
        &mut self,
        context: &Context,
@@ -584,16 +585,18 @@ async fn send_mdn_rfc724_mid(
            info!(context, "Successfully sent MDN for {rfc724_mid}.");
            context
                .sql
-                .transaction(|transaction| {
-                    let mut stmt =
-                        transaction.prepare("DELETE FROM smtp_mdns WHERE rfc724_mid = ?")?;
-                    stmt.execute((rfc724_mid,))?;
-                    for additional_rfc724_mid in additional_rfc724_mids {
-                        stmt.execute((additional_rfc724_mid,))?;
-                    }
-                    Ok(())
-                })
+                .execute("DELETE FROM smtp_mdns WHERE rfc724_mid = ?", (rfc724_mid,))
                .await?;
+            if !additional_rfc724_mids.is_empty() {
+                let q = format!(
+                    "DELETE FROM smtp_mdns WHERE rfc724_mid IN({})",
+                    sql::repeat_vars(additional_rfc724_mids.len())
+                );
+                context
+                    .sql
+                    .execute(&q, rusqlite::params_from_iter(additional_rfc724_mids))
+                    .await?;
+            }
            Ok(true)
        }
        SendResult::Retry => {
--- a/src/smtp/connect.rs
+++ b/src/smtp/connect.rs
@@ -45,7 +45,7 @@ async fn new_smtp_transport<S: AsyncBufRead + AsyncWrite + Unpin>(
    Ok(transport)
 }

-#[allow(clippy::too_many_arguments)]
+#[expect(clippy::too_many_arguments)]
 pub(crate) async fn connect_and_auth(
    context: &Context,
    proxy_config: &Option<ProxyConfig>,
--- a/src/sql/migrations.rs
+++ b/src/sql/migrations.rs
@@ -1121,23 +1121,6 @@ CREATE INDEX msgs_status_updates_index2 ON msgs_status_updates (uid);
        .await?;
    }

-    inc_and_check(&mut migration_version, 127)?;
-    if dbversion < migration_version {
-        // Existing chatmail configurations having `delete_server_after` disabled should get
-        // `bcc_self` enabled, they may be multidevice configurations because before,
-        // `delete_server_after` was set to 0 upon a backup export for them, but together with this
-        // migration `bcc_self` is enabled instead (whose default is changed to 0 for chatmail). We
-        // don't check `is_chatmail` for simplicity.
-        sql.execute_migration(
-            "INSERT OR IGNORE INTO config (keyname, value)
-             SELECT 'bcc_self', '1'
-             FROM config WHERE keyname='delete_server_after' AND value='0'
-            ",
-            migration_version,
-        )
-        .await?;
-    }
-
    let new_version = sql
        .get_raw_config_int(VERSION_CFG)
        .await?
--- a/src/sync.rs
+++ b/src/sync.rs
@@ -566,10 +566,6 @@ mod tests {
        assert!(token::exists(&alice2, token::Namespace::Auth, "testtoken").await?);
        assert_eq!(Chatlist::try_load(&alice2, 0, None, None).await?.len(), 0);

-        // Sync messages are "auto-generated", but they mustn't make the self-contact a bot.
-        let self_contact = alice2.add_or_lookup_contact(&alice2).await;
-        assert!(!self_contact.is_bot());
-
        // the same sync message sent to bob must not be executed
        let bob = TestContext::new_bob().await;
        bob.recv_msg(&sent_msg).await;
--- a/src/webxdc.rs
+++ b/src/webxdc.rs
@@ -421,7 +421,6 @@ impl Context {
                    notify_list.get(&self_addr).or_else(|| notify_list.get("*"))
                {
                    self.emit_event(EventType::IncomingWebxdcNotify {
-                        chat_id: instance.chat_id,
                        contact_id: from_id,
                        msg_id: notify_msg_id,
                        text: notify_text.clone(),
Author	SHA1	Message	Date
holger krekel	6b850007bb	add another test case	2024-12-17 17:40:02 +01:00
holger krekel	1ffee4089b	simplification and renaming	2024-12-17 17:30:02 +01:00
holger krekel	78da7ce38b	remove explciit send() call	2024-12-17 17:01:32 +01:00
holger krekel	b0a08cd1b2	fix all cases with clocks	2024-12-17 16:58:37 +01:00
holger krekel	a54f1390aa	rename	2024-12-17 15:19:00 +01:00
holger krekel	30e0cd7328	actually drain mailbox	2024-12-17 14:28:40 +01:00
holger krekel	5238c85dc5	streamline function signatures	2024-12-17 14:27:36 +01:00
holger krekel	156270be3b	a first solution with lamport clocks without tombstones	2024-12-16 23:11:42 +01:00
holger krekel	0e9076db00	make members attribute only contain ids, not objects	2024-12-16 21:58:56 +01:00
holger krekel	90f49a04e8	small refactor	2024-12-16 20:01:37 +01:00
holger krekel	4747d7abc2	refactor for clearer algorithm	2024-12-16 19:49:23 +01:00
holger krekel	3d0692e2bf	add failing test for removing a member while one peer is offline	2024-12-16 19:19:34 +01:00
holger krekel	43897a66f0	streamline	2024-12-16 18:31:29 +01:00
holger krekel	ca431f61b9	fixes	2024-12-16 18:03:55 +01:00
holger krekel	99dc991bb0	split mailboxes by sender	2024-12-16 17:49:44 +01:00
holger krekel	6b817d6c25	a first little group consistency simulation	2024-12-16 15:23:00 +01:00
@@ -1 +1 @@
 -12-24
 -12-12