.

2026-10-17 02:13:01 +03:00 · 2024-10-31 17:01:10 +01:00
50 changed files with 401 additions and 505 deletions
@@ -1,32 +1,5 @@
 # Changelog

-## [1.148.6] - 2024-10-31
-
-### API-Changes
-
- Add Message::new_text() ([#6123](https://github.com/deltachat/deltachat-core-rust/pull/6123)).
- Add `MessageSearchResult.chat_id` ([#6120](https://github.com/deltachat/deltachat-core-rust/pull/6120)).
-
-### Features / Changes
-
- Enable Webxdc realtime by default ([#6125](https://github.com/deltachat/deltachat-core-rust/pull/6125)).
-
-### Fixes
-
- Save full text to mime_headers for long outgoing messages ([#6091](https://github.com/deltachat/deltachat-core-rust/pull/6091)).
- Show root SMTP connection failure in connectivity view ([#6121](https://github.com/deltachat/deltachat-core-rust/pull/6121)).
- Skip IDLE if we got unsolicited FETCH ([#6130](https://github.com/deltachat/deltachat-core-rust/pull/6130)).
-
-### Miscellaneous Tasks
-
- Silence another rust-analyzer false-positive ([#6124](https://github.com/deltachat/deltachat-core-rust/pull/6124)).
- cargo: Upgrade iroh to 0.26.0.
-
-### Refactor
-
- Directly use connectives ([#6128](https://github.com/deltachat/deltachat-core-rust/pull/6128)).
- Use Message::new_text() more ([#6127](https://github.com/deltachat/deltachat-core-rust/pull/6127)).
-
 ## [1.148.5] - 2024-10-27

 ### Fixes
@@ -5192,4 +5165,3 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
 [1.148.3]: https://github.com/deltachat/deltachat-core-rust/compare/v1.148.2..v1.148.3
 [1.148.4]: https://github.com/deltachat/deltachat-core-rust/compare/v1.148.3..v1.148.4
 [1.148.5]: https://github.com/deltachat/deltachat-core-rust/compare/v1.148.4..v1.148.5
-[1.148.6]: https://github.com/deltachat/deltachat-core-rust/compare/v1.148.5..v1.148.6
@@ -160,9 +160,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.92"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
 dependencies = [
 "backtrace",
 ]
@@ -221,7 +221,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 "synstructure",
 ]

@@ -233,7 +233,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -338,14 +338,14 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
 name = "async-smtp"
-version = "0.9.2"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00d1f1a16e5abad3ada9f1f23dbc2f354b138121b90533381be62dada6cbf40a"
+checksum = "928ea96f04e1260036cb01f82c1e5dc7c3b478e7b9463c87712297784ce3cdc6"
 dependencies = [
 "anyhow",
 "base64 0.13.1",
@@ -366,7 +366,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -377,7 +377,7 @@ checksum = "00b9f7252833d5ed4b00aa9604b563529dd5e11de9c23615de2dcdf91eb87b52"
 dependencies = [
 "async-compression",
 "crc32fast",
- "futures-lite 2.4.0",
+ "futures-lite 2.3.0",
 "pin-project",
 "thiserror",
 "tokio",
@@ -415,7 +415,7 @@ dependencies = [
 "http 1.1.0",
 "http-body 1.0.0",
 "http-body-util",
- "hyper 1.5.0",
+ "hyper 1.4.1",
 "hyper-util",
 "itoa",
 "matchit",
@@ -685,9 +685,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"

 [[package]]
 name = "bytes"
-version = "1.8.0"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
+checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
 dependencies = [
 "serde",
 ]
@@ -991,16 +991,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8"

-[[package]]
-name = "cordyceps"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec10f0a762d93c4498d2e97a333805cb6250d60bead623f71d8034f9a4152ba3"
-dependencies = [
- "loom",
- "tracing",
-]
-
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -1235,7 +1225,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -1259,7 +1249,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "strsim",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -1270,7 +1260,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
 "darling_core",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -1303,7 +1293,7 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.148.6"
+version = "1.148.5"
 dependencies = [
 "anyhow",
 "async-broadcast",
@@ -1327,12 +1317,12 @@ dependencies = [
 "fd-lock",
 "format-flowed",
 "futures",
- "futures-lite 2.4.0",
+ "futures-lite 2.3.0",
 "hex",
 "hickory-resolver",
 "http-body-util",
 "humansize",
- "hyper 1.5.0",
+ "hyper 1.4.1",
 "hyper-util",
 "image",
 "iroh-gossip",
@@ -1403,7 +1393,7 @@ dependencies = [

 [[package]]
 name = "deltachat-jsonrpc"
-version = "1.148.6"
+version = "1.148.5"
 dependencies = [
 "anyhow",
 "async-channel 2.3.1",
@@ -1428,7 +1418,7 @@ dependencies = [

 [[package]]
 name = "deltachat-repl"
-version = "1.148.6"
+version = "1.148.5"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1444,12 +1434,12 @@ dependencies = [

 [[package]]
 name = "deltachat-rpc-server"
-version = "1.148.6"
+version = "1.148.5"
 dependencies = [
 "anyhow",
 "deltachat",
 "deltachat-jsonrpc",
- "futures-lite 2.4.0",
+ "futures-lite 2.3.0",
 "log",
 "serde",
 "serde_json",
@@ -1468,12 +1458,12 @@ name = "deltachat_derive"
 version = "2.0.0"
 dependencies = [
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
 name = "deltachat_ffi"
-version = "1.148.6"
+version = "1.148.5"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1523,7 +1513,7 @@ checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -1554,7 +1544,7 @@ dependencies = [
 "darling",
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -1564,27 +1554,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"
 dependencies = [
 "derive_builder_core",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
 name = "derive_more"
-version = "1.0.0"
+version = "1.0.0-beta.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
+checksum = "3249c0372e72f5f93b5c0ca54c0ab76bbf6216b6f718925476fd9bc4ffabb4fe"
 dependencies = [
 "derive_more-impl",
 ]

 [[package]]
 name = "derive_more-impl"
-version = "1.0.0"
+version = "1.0.0-beta.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
+checksum = "27d919ced7590fc17b5d5a3c63b662e8a7d2324212c4e4dbbed975cafd22d16d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 "unicode-xid",
 ]

@@ -1597,12 +1587,6 @@ dependencies = [
 "cipher",
 ]

-[[package]]
-name = "diatomic-waker"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab03c107fafeb3ee9f5925686dbb7a73bc76e3932abb0d2b365cb64b169cf04c"
-
 [[package]]
 name = "diff"
 version = "0.1.13"
@@ -1650,7 +1634,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -1921,7 +1905,7 @@ dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -1941,7 +1925,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -2213,9 +2197,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"

 [[package]]
 name = "futures"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -2228,13 +2212,12 @@ dependencies = [

 [[package]]
 name = "futures-buffered"
-version = "0.2.9"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34acda8ae8b63fbe0b2195c998b180cff89a8212fb2622a78b572a9f1c6f7684"
+checksum = "02dcae03ee5afa5ea17b1aebc793806b8ddfc6dc500e0b8e8e1eb30b9dad22c0"
 dependencies = [
- "cordyceps",
- "diatomic-waker",
 "futures-core",
+ "futures-util",
 "pin-project-lite",
 ]

@@ -2271,9 +2254,9 @@ checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"

 [[package]]
 name = "futures-executor"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
 "futures-core",
 "futures-task",
@@ -2303,9 +2286,9 @@ dependencies = [

 [[package]]
 name = "futures-lite"
-version = "2.4.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f1fa2f9765705486b33fd2acf1577f8ec449c2ba1f318ae5447697b7c08d210"
+checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
 dependencies = [
 "fastrand 2.1.1",
 "futures-core",
@@ -2322,7 +2305,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -2361,19 +2344,6 @@ dependencies = [
 "slab",
 ]

-[[package]]
-name = "generator"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
-dependencies = [
- "cc",
- "libc",
- "log",
- "rustversion",
- "windows 0.48.0",
-]
-
 [[package]]
 name = "generic-array"
 version = "0.14.7"
@@ -2714,9 +2684,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"

 [[package]]
 name = "human-panic"
-version = "2.0.2"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80b84a66a325082740043a6c28bbea400c129eac0d3a27673a1de971e44bf1f7"
+checksum = "1c5a08ed290eac04006e21e63d32e90086b6182c7cd0452d10f4264def1fec9a"
 dependencies = [
 "backtrace",
 "os_info",
@@ -2767,9 +2737,9 @@ dependencies = [

 [[package]]
 name = "hyper"
-version = "1.5.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
+checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
 dependencies = [
 "bytes",
 "futures-channel",
@@ -2793,7 +2763,7 @@ checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
 dependencies = [
 "futures-util",
 "http 1.1.0",
- "hyper 1.5.0",
+ "hyper 1.4.1",
 "hyper-util",
 "rustls",
 "rustls-pki-types",
@@ -2805,16 +2775,16 @@ dependencies = [

 [[package]]
 name = "hyper-util"
-version = "0.1.10"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
+checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
 dependencies = [
 "bytes",
 "futures-channel",
 "futures-util",
 "http 1.1.0",
 "http-body 1.0.0",
- "hyper 1.5.0",
+ "hyper 1.4.1",
 "pin-project-lite",
 "socket2",
 "tokio",
@@ -2891,9 +2861,9 @@ dependencies = [

 [[package]]
 name = "image"
-version = "0.25.4"
+version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae"
+checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
 dependencies = [
 "bytemuck",
 "byteorder-lite",
@@ -2908,12 +2878,12 @@ dependencies = [

 [[package]]
 name = "image-webp"
-version = "0.2.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e031e8e3d94711a9ccb5d6ea357439ef3dcbed361798bd4071dc4d9793fbe22f"
+checksum = "7a84a25dcae3ac487bc24ef280f9e20c79c9b1a3e5e32cbed3041d1c514aa87c"
 dependencies = [
- "byteorder-lite",
- "quick-error 2.0.1",
+ "byteorder",
+ "thiserror",
 ]

 [[package]]
@@ -2973,9 +2943,9 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"

 [[package]]
 name = "iroh-base"
-version = "0.26.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "973c0b3c7851fa2e8e6cf4cb81c9f4cab1373848828fafa43dfe25b123a89ff2"
+checksum = "545424889bce87e44fd08dac9e6889635630fdbdaaa858a3c5a5f0adbb8d3779"
 dependencies = [
 "aead",
 "anyhow",
@@ -3014,9 +2984,9 @@ dependencies = [

 [[package]]
 name = "iroh-gossip"
-version = "0.26.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b44749f361aca7cddcb357b62ef84cad1023771aee03d427c8922991fc4a9561"
+checksum = "6a5489a563e407fb2be654e950536da4230e46642111f12b16d7013228164aae"
 dependencies = [
 "anyhow",
 "async-channel 2.3.1",
@@ -3024,7 +2994,7 @@ dependencies = [
 "derive_more",
 "ed25519-dalek",
 "futures-concurrency",
- "futures-lite 2.4.0",
+ "futures-lite 2.3.0",
 "futures-util",
 "indexmap",
 "iroh-base",
@@ -3042,14 +3012,14 @@ dependencies = [

 [[package]]
 name = "iroh-metrics"
-version = "0.26.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02edfa7ca1aa89b0b9793d94671e32b79c97d61e9022f082c5eb2b95b64e90c0"
+checksum = "9fb6ab80f7cccde80be07a643308e1ff925d5be91721ec65ba96b261a0bcb5e5"
 dependencies = [
 "anyhow",
 "erased_set",
 "http-body-util",
- "hyper 1.5.0",
+ "hyper 1.4.1",
 "hyper-util",
 "once_cell",
 "prometheus-client",
@@ -3063,9 +3033,9 @@ dependencies = [

 [[package]]
 name = "iroh-net"
-version = "0.26.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "329553be056a92eec7802e1c087eed951eec6e60f0f0740491ef16a295be4ca2"
+checksum = "4a099a60478cb9319153756a9cf2ff41aa03d18403690a91e60f049ad467b057"
 dependencies = [
 "anyhow",
 "backoff",
@@ -3076,7 +3046,7 @@ dependencies = [
 "duct",
 "futures-buffered",
 "futures-concurrency",
- "futures-lite 2.4.0",
+ "futures-lite 2.3.0",
 "futures-sink",
 "futures-util",
 "governor",
@@ -3086,7 +3056,7 @@ dependencies = [
 "hostname",
 "http 1.1.0",
 "http-body-util",
- "hyper 1.5.0",
+ "hyper 1.4.1",
 "hyper-util",
 "igd-next",
 "iroh-base",
@@ -3122,7 +3092,6 @@ dependencies = [
 "time 0.3.36",
 "tokio",
 "tokio-rustls",
- "tokio-stream",
 "tokio-tungstenite",
 "tokio-tungstenite-wasm",
 "tokio-util",
@@ -3263,9 +3232,9 @@ dependencies = [

 [[package]]
 name = "kamadak-exif"
-version = "0.6.0"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99e7b00ff45df279c3e40f7fee99fad4f7eddbf9ed2d24e99133e8683330f0c7"
+checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077"
 dependencies = [
 "mutate_once",
 ]
@@ -3381,19 +3350,6 @@ version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"

-[[package]]
-name = "loom"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
-dependencies = [
- "cfg-if",
- "generator",
- "scoped-tls",
- "tracing",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "lru"
 version = "0.12.3"
@@ -3744,7 +3700,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -3805,7 +3761,7 @@ dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -3840,9 +3796,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"

 [[package]]
 name = "oorandom"
@@ -3879,7 +3835,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -4083,7 +4039,7 @@ dependencies = [
 "pest_meta",
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -4163,22 +4119,22 @@ dependencies = [

 [[package]]
 name = "pin-project"
-version = "1.1.7"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
 dependencies = [
 "pin-project-internal",
 ]

 [[package]]
 name = "pin-project-internal"
-version = "1.1.7"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -4290,7 +4246,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "regex",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -4473,7 +4429,7 @@ dependencies = [
 "proc-macro-error-attr2",
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -4505,7 +4461,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -4567,17 +4523,11 @@ version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"

-[[package]]
-name = "quick-error"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
-
 [[package]]
 name = "quick-xml"
-version = "0.37.0"
+version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffbfb3ddf5364c9cfcd65549a1e7b801d0e8d1b14c1a1590a6408aa93cfbfa84"
+checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
 dependencies = [
 "memchr",
 ]
@@ -4887,7 +4837,7 @@ dependencies = [
 "http 1.1.0",
 "http-body 1.0.0",
 "http-body-util",
- "hyper 1.5.0",
+ "hyper 1.4.1",
 "hyper-rustls",
 "hyper-util",
 "ipnet",
@@ -4923,7 +4873,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
 dependencies = [
 "hostname",
- "quick-error 1.2.3",
+ "quick-error",
 ]

 [[package]]
@@ -5089,9 +5039,9 @@ dependencies = [

 [[package]]
 name = "rustls"
-version = "0.23.14"
+version = "0.23.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8"
+checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
 dependencies = [
 "log",
 "once_cell",
@@ -5127,9 +5077,9 @@ dependencies = [

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

 [[package]]
 name = "rustls-platform-verifier"
@@ -5261,15 +5211,9 @@ dependencies = [
 "proc-macro2",
 "quote",
 "serde_derive_internals",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -5365,7 +5309,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -5376,14 +5320,14 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.132"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
 "itoa",
 "memchr",
@@ -5737,7 +5681,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "struct_iterable_internal",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -5765,7 +5709,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "rustversion",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -5827,9 +5771,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.86"
+version = "2.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -5856,7 +5800,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -5946,22 +5890,22 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.66"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.66"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -6078,7 +6022,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -6263,7 +6207,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -6356,9 +6300,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"

 [[package]]
 name = "typescript-type-def"
-version = "0.5.13"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233ee5e596f41dbaf8c3e48a60b128eadf89395ee9e45fcedc3281c077c5a014"
+checksum = "3c9a1ec7a0e59e03c7ab74e924abef19d2669aa9255b9821e55854b08453eb71"
 dependencies = [
 "serde_json",
 "typescript-type-def-derive",
@@ -6366,16 +6310,16 @@ dependencies = [

 [[package]]
 name = "typescript-type-def-derive"
-version = "0.5.13"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "912e6d6fed61bac90cd957093b11b5330d756ad4e7b8f309f71ae04b546a8513"
+checksum = "34c1213de2386875250474a109f0985ce83333038c885d2fec4de79d9dfcee8c"
 dependencies = [
 "darling",
 "ident_case",
 "proc-macro-error2",
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -6501,9 +6445,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"

 [[package]]
 name = "uuid"
-version = "1.11.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
 "getrandom 0.2.12",
 "serde",
@@ -6597,7 +6541,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 "wasm-bindgen-shared",
 ]

@@ -6631,7 +6575,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@@ -6727,15 +6671,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

-[[package]]
-name = "windows"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "windows"
 version = "0.51.1"
@@ -6784,7 +6719,7 @@ checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -6795,7 +6730,7 @@ checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -7101,7 +7036,7 @@ dependencies = [
 "darling",
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -7127,7 +7062,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -7147,7 +7082,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.86",
+ "syn 2.0.79",
 ]

 [[package]]
@@ -7158,9 +7093,9 @@ checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"

 [[package]]
 name = "zune-jpeg"
-version = "0.4.13"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768"
+checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448"
 dependencies = [
 "zune-core",
 ]
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.148.6"
+version = "1.148.5"
 edition = "2021"
 license = "MPL-2.0"
 rust-version = "1.77"
@@ -61,11 +61,11 @@ hickory-resolver = "=0.25.0-alpha.2"
 http-body-util = "0.1.2"
 humansize = "2"
 hyper = "1"
-hyper-util = "0.1.10"
-image = { version = "0.25.4", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
-iroh-gossip = { version = "0.26.0", default-features = false, features = ["net"] }
-iroh-net = { version = "0.26.0", default-features = false }
-kamadak-exif = "0.6.0"
+hyper-util = "0.1.9"
+image = { version = "0.25.1", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+iroh-gossip = { version = "0.25.0", default-features = false, features = ["net"] }
+iroh-net = { version = "0.25.0", default-features = false }
+kamadak-exif = "0.5.3"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 libc = { workspace = true }
 mailparse = "0.15"
@@ -79,14 +79,14 @@ percent-encoding = "2.3"
 pgp = { version = "0.13.2", default-features = false }
 pin-project = "1"
 qrcodegen = "1.7.0"
-quick-xml = "0.37"
+quick-xml = "0.36"
 quoted_printable = "0.5"
 rand = { workspace = true }
 regex = { workspace = true }
 rusqlite = { workspace = true, features = ["sqlcipher"] }
 rust-hsluv = "0.1"
-rustls-pki-types = "1.10.0"
-rustls = { version = "0.23.14", default-features = false }
+rustls-pki-types = "1.9.0"
+rustls = { version = "0.23.13", default-features = false }
 sanitize-filename = { workspace = true }
 serde_json = { workspace = true }
 serde_urlencoded = "0.7.1"
@@ -171,13 +171,13 @@ 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 }
-futures = "0.3.31"
-futures-lite = "2.4.0"
+futures = "0.3.30"
+futures-lite = "2.3.0"
 libc = "0.2"
 log = "0.4"
 nu-ansi-term = "0.46"
 num-traits = "0.2"
-once_cell = "1.20.2"
+once_cell = "1.18.0"
 rand = "0.8"
 regex = "1.10"
 rusqlite = "0.32"
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.148.6"
+version = "1.148.5"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
@@ -530,8 +530,8 @@ char*           dc_get_blobdir               (const dc_context_t* context);
 *                    These keys go to backups and allow easy per-account settings when using @ref dc_accounts_t,
 *                    however, are not handled by the core otherwise.
 * - `webxdc_realtime_enabled` = Whether the realtime APIs should be enabled.
- *                               0 = WebXDC realtime API is disabled and behaves as noop.
- *                               1 = WebXDC realtime API is enabled (default).
+ *                               0 = WebXDC realtime API is disabled and behaves as noop (default).
+ *                               1 = WebXDC realtime API is enabled.
 *
 * If you want to retrieve a value, use dc_get_config().
 *
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.148.6"
+version = "1.148.5"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
@@ -25,7 +25,7 @@ async-channel = { workspace = true }
 futures = { workspace = true }
 serde_json = { workspace = true }
 yerpc = { workspace = true, features = ["anyhow_expose", "openrpc"] }
-typescript-type-def = { version = "0.5.13", features = ["json_value"] }
+typescript-type-def = { version = "0.5.12", features = ["json_value"] }
 tokio = { workspace = true }
 sanitize-filename = { workspace = true }
 walkdir = "2.5.0"
@@ -409,9 +409,6 @@ impl From<CoreEventType> for EventType {
            },
            CoreEventType::ChatlistChanged => ChatlistChanged,
            CoreEventType::EventChannelOverflow { n } => EventChannelOverflow { n },
-            #[allow(unreachable_patterns)]
-            #[cfg(test)]
-            _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
        }
    }
 }
@@ -490,7 +490,6 @@ pub struct MessageSearchResult {
    author_name: String,
    author_color: String,
    author_id: u32,
-    chat_id: u32,
    chat_profile_image: Option<String>,
    chat_color: String,
    chat_name: String,
@@ -530,7 +529,6 @@ impl MessageSearchResult {
            author_name,
            author_color: color_int_to_hex_string(sender.get_color()),
            author_id: sender.id.to_u32(),
-            chat_id: chat.id.to_u32(),
            chat_name: chat.get_name().to_owned(),
            chat_color,
            chat_type: chat.get_type().to_u32().context("unknown chat type id")?,
@@ -58,5 +58,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "1.148.6"
+  "version": "1.148.5"
 }
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.148.6"
+version = "1.148.5"
 license = "MPL-2.0"
 edition = "2021"
 repository = "https://github.com/deltachat/deltachat-core-rust"
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat-rpc-client"
-version = "1.148.6"
+version = "1.148.5"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
    "Development Status :: 5 - Production/Stable",
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.148.6"
+version = "1.148.5"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
@@ -15,5 +15,5 @@
  },
  "type": "module",
  "types": "index.d.ts",
-  "version": "1.148.6"
+  "version": "1.148.5"
 }
@@ -55,5 +55,5 @@
    "test:mocha": "mocha node/test/test.mjs --growl --reporter=spec --bail --exit"
  },
  "types": "node/dist/index.d.ts",
-  "version": "1.148.6"
+  "version": "1.148.5"
 }
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat"
-version = "1.148.6"
+version = "1.148.5"
 description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
 readme = "README.rst"
 requires-python = ">=3.7"
@@ -1 +1 @@
-2024-10-31
+2024-10-27
@@ -5950,7 +5950,8 @@ mod tests {
        let t = TestContext::new().await;

        // create 3 chats, wait 1 second in between to get a reliable order (we order by time)
-        let mut msg = Message::new_text("foo".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("foo".to_string());
        let msg_id = add_device_msg(&t, None, Some(&mut msg)).await.unwrap();
        let chat_id1 = message::Message::load_from_db(&t, msg_id)
            .await
@@ -6027,7 +6028,8 @@ mod tests {
            ChatVisibility::Pinned,
        );

-        let mut msg = Message::new_text("hi!".into());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("hi!".into());
        let sent_msg = bob.send_msg(bob_chat_id, &mut msg).await;
        let msg = alice.recv_msg(&sent_msg).await;
        assert_eq!(msg.chat_id, alice_chat_id);
@@ -6666,7 +6668,8 @@ mod tests {
        let alice_chat = alice.create_chat(&bob).await;
        let bob_chat = bob.create_chat(&alice).await;

-        let mut msg = Message::new_text("Hi Bob".to_owned());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("Hi Bob".to_owned());
        let sent_msg = alice.send_msg(alice_chat.get_id(), &mut msg).await;
        let msg = bob.recv_msg(&sent_msg).await;

@@ -6717,7 +6720,8 @@ mod tests {
        let received_msg = bob.recv_msg(&sent_msg).await;

        // Bob quotes received message and sends a reply to Alice.
-        let mut reply = Message::new_text("Reply".to_owned());
+        let mut reply = Message::new(Viewtype::Text);
+        reply.set_text("Reply".to_owned());
        reply.set_quote(&bob, Some(&received_msg)).await?;
        let sent_reply = bob.send_msg(bob_chat.id, &mut reply).await;
        let received_reply = alice.recv_msg(&sent_reply).await;
@@ -6800,7 +6804,8 @@ mod tests {
        let group_id =
            create_group_chat(&alice, ProtectionStatus::Unprotected, "secretgrpname").await?;
        add_contact_to_chat(&alice, group_id, bob_id).await?;
-        let mut msg = Message::new_text("bla foo".to_owned());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("bla foo".to_owned());
        let sent_msg = alice.send_msg(group_id, &mut msg).await;
        assert!(sent_msg.payload().contains("secretgrpname"));
        assert!(sent_msg.payload().contains("secretname"));
@@ -476,6 +476,7 @@ mod tests {
        add_contact_to_chat, create_group_chat, get_chat_contacts, remove_contact_from_chat,
        send_text_msg, ProtectionStatus,
    };
+    use crate::message::Viewtype;
    use crate::receive_imf::receive_imf;
    use crate::stock_str::StockMessage;
    use crate::test_utils::TestContext;
@@ -509,7 +510,8 @@ mod tests {
        // Instead of setting drafts for chat_id1 and chat_id3, we could also sleep
        // 2s here.
        for chat_id in &[chat_id1, chat_id3, chat_id2] {
-            let mut msg = Message::new_text("hello".to_string());
+            let mut msg = Message::new(Viewtype::Text);
+            msg.set_text("hello".to_string());
            chat_id.set_draft(&t, Some(&mut msg)).await.unwrap();
        }

@@ -753,7 +755,8 @@ mod tests {
            .await
            .unwrap();

-        let mut msg = Message::new_text("foo:\nbar \r\n test".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("foo:\nbar \r\n test".to_string());
        chat_id1.set_draft(&t, Some(&mut msg)).await.unwrap();

        let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap();
@@ -433,7 +433,6 @@ pub enum Config {
    WebxdcIntegration,

    /// Enable webxdc realtime features.
-    #[strum(props(default = "1"))]
    WebxdcRealtimeEnabled,
 }

@@ -19,12 +19,11 @@ use auto_outlook::outlk_autodiscover;
 use deltachat_contact_tools::EmailAddress;
 use futures::FutureExt;
 use futures_lite::FutureExt as _;
-use percent_encoding::utf8_percent_encode;
+use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
 use server_params::{expand_param_vector, ServerParams};
 use tokio::task;

 use crate::config::{self, Config};
-use crate::constants::NON_ALPHANUMERIC_WITHOUT_DOT;
 use crate::context::Context;
 use crate::imap::Imap;
 use crate::log::LogExt;
@@ -32,7 +31,7 @@ use crate::login_param::{
    ConfiguredCertificateChecks, ConfiguredLoginParam, ConfiguredServerLoginParam,
    ConnectionCandidate, EnteredCertificateChecks, EnteredLoginParam,
 };
-use crate::message::Message;
+use crate::message::{Message, Viewtype};
 use crate::oauth2::get_oauth2_addr;
 use crate::provider::{Protocol, Socket, UsernamePattern};
 use crate::smtp::Smtp;
@@ -143,7 +142,8 @@ async fn on_configure_completed(
        }

        if !provider.after_login_hint.is_empty() {
-            let mut msg = Message::new_text(provider.after_login_hint.to_string());
+            let mut msg = Message::new(Viewtype::Text);
+            msg.text = provider.after_login_hint.to_string();
            if chat::add_device_msg(context, Some("core-provider-info"), Some(&mut msg))
                .await
                .is_err()
@@ -156,9 +156,9 @@ async fn on_configure_completed(
    if let Some(new_addr) = context.get_config(Config::ConfiguredAddr).await? {
        if let Some(old_addr) = old_addr {
            if !addr_cmp(&new_addr, &old_addr) {
-                let mut msg = Message::new_text(
-                    stock_str::aeap_explanation_and_link(context, &old_addr, &new_addr).await,
-                );
+                let mut msg = Message::new(Viewtype::Text);
+                msg.text =
+                    stock_str::aeap_explanation_and_link(context, &old_addr, &new_addr).await;
                chat::add_device_msg(context, None, Some(&mut msg))
                    .await
                    .context("Cannot add AEAP explanation")
@@ -499,15 +499,7 @@ async fn get_autoconfig(
    param: &EnteredLoginParam,
    param_domain: &str,
 ) -> Option<Vec<ServerParams>> {
-    // Make sure to not encode `.` as `%2E` here.
-    // Some servers like murena.io on 2024-11-01 produce incorrect autoconfig XML
-    // when address is encoded.
-    // E.g.
-    // <https://autoconfig.murena.io/mail/config-v1.1.xml?emailaddress=foobar%40example%2Eorg>
-    // produced XML file with `<username>foobar@example%2Eorg</username>`
-    // resulting in failure to log in.
-    let param_addr_urlencoded =
-        utf8_percent_encode(&param.addr, NON_ALPHANUMERIC_WITHOUT_DOT).to_string();
+    let param_addr_urlencoded = utf8_percent_encode(&param.addr, NON_ALPHANUMERIC).to_string();

    if let Ok(res) = moz_autoconfigure(
        ctx,
@@ -425,12 +425,9 @@ pub enum Origin {
    /// To: of incoming messages of unknown sender
    IncomingUnknownTo = 0x40,

-    /// Address scanned but not verified.
+    /// address scanned but not verified
    UnhandledQrScan = 0x80,

-    /// Address scanned from a SecureJoin QR code, but not verified yet.
-    UnhandledSecurejoinQrScan = 0x81,
-
    /// Reply-To: of incoming message of known sender
    /// Contacts with at least this origin value are shown in the contact list.
    IncomingReplyTo = 0x100,
@@ -28,7 +28,7 @@ use crate::events::{Event, EventEmitter, EventType, Events};
 use crate::imap::{FolderMeaning, Imap, ServerMetadata};
 use crate::key::{load_self_public_key, load_self_secret_key, DcKey as _};
 use crate::login_param::{ConfiguredLoginParam, EnteredLoginParam};
-use crate::message::{self, Message, MessageState, MsgId};
+use crate::message::{self, Message, MessageState, MsgId, Viewtype};
 use crate::param::{Param, Params};
 use crate::peer_channels::Iroh;
 use crate::peerstate::Peerstate;
@@ -1178,7 +1178,8 @@ impl Context {
            .set_protection(self, ProtectionStatus::Protected, time(), Some(contact_id))
            .await?;

-        let mut msg = Message::new_text(self.get_self_report().await?);
+        let mut msg = Message::new(Viewtype::Text);
+        msg.text = self.get_self_report().await?;

        chat_id.set_draft(self, Some(&mut msg)).await?;

@@ -1777,10 +1778,12 @@ mod tests {
        assert!(res.is_empty());

        // Add messages to chat with Bob.
-        let mut msg1 = Message::new_text("foobar".to_string());
+        let mut msg1 = Message::new(Viewtype::Text);
+        msg1.set_text("foobar".to_string());
        send_msg(&alice, chat.id, &mut msg1).await?;

-        let mut msg2 = Message::new_text("barbaz".to_string());
+        let mut msg2 = Message::new(Viewtype::Text);
+        msg2.set_text("barbaz".to_string());
        send_msg(&alice, chat.id, &mut msg2).await?;

        alice.send_text(chat.id, "Δ-Chat").await;
@@ -1883,7 +1886,8 @@ mod tests {
            .await;

        // Add 999 messages
-        let mut msg = Message::new_text("foobar".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("foobar".to_string());
        for _ in 0..999 {
            send_msg(&alice, chat.id, &mut msg).await?;
        }
@@ -318,7 +318,8 @@ mod tests {
        let t = TestContext::new_alice().await;
        let chat = t.create_chat_with_contact("Bob", "bob@example.org").await;

-        let mut msg = Message::new_text("Hi Bob".to_owned());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("Hi Bob".to_owned());
        let msg_id = send_msg(&t, chat.id, &mut msg).await?;
        let msg = Message::load_from_db(&t, msg_id).await?;
        assert_eq!(msg.download_state(), DownloadState::Done);
@@ -223,9 +223,8 @@ impl ChatId {
        self.inner_set_ephemeral_timer(context, timer).await?;

        if self.is_promoted(context).await? {
-            let mut msg = Message::new_text(
-                stock_ephemeral_timer_changed(context, timer, ContactId::SELF).await,
-            );
+            let mut msg = Message::new(Viewtype::Text);
+            msg.text = stock_ephemeral_timer_changed(context, timer, ContactId::SELF).await;
            msg.param.set_cmd(SystemMessage::EphemeralTimerChanged);
            if let Err(err) = send_msg(context, self, &mut msg).await {
                error!(
@@ -1363,7 +1362,8 @@ mod tests {
        chat.id
            .set_ephemeral_timer(&alice, Timer::Enabled { duration })
            .await?;
-        let mut msg = Message::new_text("hi".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("hi".to_string());
        assert!(chat::send_msg_sync(&alice, chat.id, &mut msg)
            .await
            .is_err());
@@ -1393,7 +1393,8 @@ mod tests {
        let sent = alice.pop_sent_msg().await;
        bob.recv_msg(&sent).await;

-        let mut poi_msg = Message::new_text("Here".to_string());
+        let mut poi_msg = Message::new(Viewtype::Text);
+        poi_msg.text = "Here".to_string();
        poi_msg.set_location(10.0, 20.0);

        let alice_sent_message = alice.send_msg(chat.id, &mut poi_msg).await;
@@ -525,7 +525,8 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x

        // alice sends a message with html-part to bob
        let chat_id = alice.create_chat(&bob).await.id;
-        let mut msg = Message::new_text("plain text".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("plain text".to_string());
        msg.set_html(Some("<b>html</b> text".to_string()));
        assert!(msg.mime_modified);
        chat::send_msg(&alice, chat_id, &mut msg).await.unwrap();
@@ -36,7 +36,7 @@ use crate::log::LogExt;
 use crate::login_param::{
    prioritize_server_login_params, ConfiguredLoginParam, ConfiguredServerLoginParam,
 };
-use crate::message::{self, Message, MessageState, MessengerMessage, MsgId};
+use crate::message::{self, Message, MessageState, MessengerMessage, MsgId, Viewtype};
 use crate::mimeparser;
 use crate::net::proxy::ProxyConfig;
 use crate::net::session::SessionStream;
@@ -426,7 +426,8 @@ impl Imap {
                        && err_str.to_lowercase().contains("authentication")
                        && context.get_config_bool(Config::NotifyAboutWrongPw).await?
                    {
-                        let mut msg = Message::new_text(message);
+                        let mut msg = Message::new(Viewtype::Text);
+                        msg.text.clone_from(&message);
                        if let Err(e) = chat::add_device_msg_with_importance(
                            context,
                            None,
@@ -1199,8 +1200,6 @@ impl Session {
            .await
            .context("failed to fetch flags")?;

-        let mut got_unsolicited_fetch = false;
-
        while let Some(fetch) = list
            .try_next()
            .await
@@ -1210,7 +1209,6 @@ impl Session {
                uid
            } else {
                info!(context, "FETCH result contains no UID, skipping");
-                got_unsolicited_fetch = true;
                continue;
            };
            let is_seen = fetch.flags().any(|flag| flag == Flag::Seen);
@@ -1233,15 +1231,6 @@ impl Session {
                warn!(context, "FETCH result contains no MODSEQ");
            }
        }
-        drop(list);
-
-        if got_unsolicited_fetch {
-            // We got unsolicited FETCH, which means some flags
-            // have been modified while our request was in progress.
-            // We may or may not have these new flags as a part of the response,
-            // so better skip next IDLE and do another round of flag synchronization.
-            self.new_mail = true;
-        }

        set_modseq(context, folder, highest_modseq)
            .await
@@ -1727,21 +1716,17 @@ impl Imap {
 }

 impl Session {
-    /// Return whether the server sent an unsolicited EXISTS or FETCH response.
-    ///
+    /// Return whether the server sent an unsolicited EXISTS response.
    /// Drains all responses from `session.unsolicited_responses` in the process.
-    ///
-    /// If this returns `true`, this means that new emails arrived
-    /// or flags have been changed.
-    /// In this case we may want to skip next IDLE and do a round
-    /// of fetching new messages and synchronizing seen flags.
-    fn drain_unsolicited_responses(&self, context: &Context) -> Result<bool> {
+    /// If this returns `true`, this means that new emails arrived and you should
+    /// fetch again, even if you just fetched.
+    fn server_sent_unsolicited_exists(&self, context: &Context) -> Result<bool> {
        use async_imap::imap_proto::Response;
        use async_imap::imap_proto::ResponseCode;
        use UnsolicitedResponse::*;

        let folder = self.selected_folder.as_deref().unwrap_or_default();
-        let mut should_refetch = false;
+        let mut unsolicited_exists = false;
        while let Ok(response) = self.unsolicited_responses.try_recv() {
            match response {
                Exists(_) => {
@@ -1749,38 +1734,28 @@ impl Session {
                        context,
                        "Need to refetch {folder:?}, got unsolicited EXISTS {response:?}"
                    );
-                    should_refetch = true;
+                    unsolicited_exists = true;
                }

+                // We are not interested in the following responses and they are are
+                // sent quite frequently, so, we ignore them without logging them
                Expunge(_) | Recent(_) => {}
-                Other(ref response_data) => {
-                    match response_data.parsed() {
-                        Response::Fetch { .. } => {
-                            info!(
-                                context,
-                                "Need to refetch {folder:?}, got unsolicited FETCH {response:?}"
-                            );
-                            should_refetch = true;
-                        }
+                Other(response_data)
+                    if matches!(
+                        response_data.parsed(),
+                        Response::Fetch { .. }
+                            | Response::Done {
+                                code: Some(ResponseCode::CopyUid(_, _, _)),
+                                ..
+                            }
+                    ) => {}

-                        // We are not interested in the following responses and they are are
-                        // sent quite frequently, so, we ignore them without logging them.
-                        Response::Done {
-                            code: Some(ResponseCode::CopyUid(_, _, _)),
-                            ..
-                        } => {}
-
-                        _ => {
-                            info!(context, "{folder:?}: got unsolicited response {response:?}")
-                        }
-                    }
-                }
                _ => {
                    info!(context, "{folder:?}: got unsolicited response {response:?}")
                }
            }
        }
-        Ok(should_refetch)
+        Ok(unsolicited_exists)
    }
 }

@@ -9,6 +9,7 @@ use tokio::time::timeout;
 use super::session::Session;
 use super::Imap;
 use crate::context::Context;
+use crate::imap::FolderMeaning;
 use crate::net::TIMEOUT;
 use crate::tools::{self, time_elapsed};

@@ -31,7 +32,7 @@ impl Session {

        self.select_with_uidvalidity(context, folder).await?;

-        if self.drain_unsolicited_responses(context)? {
+        if self.server_sent_unsolicited_exists(context)? {
            self.new_mail = true;
        }

@@ -108,16 +109,37 @@ impl Imap {
    pub(crate) async fn fake_idle(
        &mut self,
        context: &Context,
+        session: &mut Session,
        watch_folder: String,
+        folder_meaning: FolderMeaning,
    ) -> Result<()> {
        let fake_idle_start_time = tools::Time::now();

        info!(context, "IMAP-fake-IDLEing folder={:?}", watch_folder);

-        // Wait for 60 seconds or until we are interrupted.
-        match timeout(Duration::from_secs(60), self.idle_interrupt_receiver.recv()).await {
-            Err(_) => info!(context, "Fake IDLE finished."),
-            Ok(_) => info!(context, "Fake IDLE interrupted."),
+        // Loop until we are interrupted or until we fetch something.
+        loop {
+            match timeout(Duration::from_secs(60), self.idle_interrupt_receiver.recv()).await {
+                Err(_) => {
+                    // Let's see if fetching messages results
+                    // in anything.  If so, we behave as if IDLE had data but
+                    // will have already fetched the messages so perform_*_fetch
+                    // will not find any new.
+                    let res = self
+                        .fetch_new_messages(context, session, &watch_folder, folder_meaning, false)
+                        .await?;
+
+                    info!(context, "fetch_new_messages returned {:?}", res);
+
+                    if res {
+                        break;
+                    }
+                }
+                Ok(_) => {
+                    info!(context, "Fake IDLE interrupted.");
+                    break;
+                }
+            }
        }

        info!(
@@ -66,11 +66,21 @@ impl Imap {
                && folder_meaning != FolderMeaning::Drafts
                && folder_meaning != FolderMeaning::Trash
            {
-                self.fetch_move_delete(context, session, folder.name(), folder_meaning)
-                    .await
-                    .context("Can't fetch new msgs in scanned folder")
-                    .log_err(context)
-                    .ok();
+                // Drain leftover unsolicited EXISTS messages
+                session.server_sent_unsolicited_exists(context)?;
+
+                loop {
+                    self.fetch_move_delete(context, session, folder.name(), folder_meaning)
+                        .await
+                        .context("Can't fetch new msgs in scanned folder")
+                        .log_err(context)
+                        .ok();
+
+                    // If the server sent an unsocicited EXISTS during the fetch, we need to fetch again
+                    if !session.server_sent_unsolicited_exists(context)? {
+                        break;
+                    }
+                }
            }
        }

@@ -42,7 +42,7 @@ use tokio_util::sync::CancellationToken;
 use crate::chat::add_device_msg;
 use crate::context::Context;
 use crate::imex::BlobDirContents;
-use crate::message::Message;
+use crate::message::{Message, Viewtype};
 use crate::qr::Qr;
 use crate::stock_str::backup_transfer_msg_body;
 use crate::tools::{create_id, time, TempPathGuard};
@@ -200,7 +200,8 @@ impl BackupProvider {
        info!(context, "Received backup reception acknowledgement.");
        context.emit_event(EventType::ImexProgress(1000));

-        let mut msg = Message::new_text(backup_transfer_msg_body(&context).await);
+        let mut msg = Message::new(Viewtype::Text);
+        msg.text = backup_transfer_msg_body(&context).await;
        add_device_msg(&context, None, Some(&mut msg)).await?;

        Ok(())
@@ -368,7 +369,6 @@ mod tests {
    use std::time::Duration;

    use crate::chat::{get_chat_msgs, send_msg, ChatItem};
-    use crate::message::Viewtype;
    use crate::test_utils::TestContextManager;

    use super::*;
@@ -382,7 +382,8 @@ mod tests {

        // Write a message in the self chat
        let self_chat = ctx0.get_self_chat().await;
-        let mut msg = Message::new_text("hi there".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("hi there".to_string());
        send_msg(&ctx0, self_chat.id, &mut msg).await.unwrap();

        // Send an attachment in the self chat
@@ -290,7 +290,8 @@ pub async fn send_locations_to_chat(
        )
        .await?;
    if 0 != seconds && !is_sending_locations_before {
-        let mut msg = Message::new_text(stock_str::msg_location_enabled(context).await);
+        let mut msg = Message::new(Viewtype::Text);
+        msg.text = stock_str::msg_location_enabled(context).await;
        msg.param.set_cmd(SystemMessage::LocationStreamingEnabled);
        chat::send_msg(context, chat_id, &mut msg)
            .await
@@ -150,17 +150,16 @@ impl MsgId {

    pub(crate) async fn set_delivered(self, context: &Context) -> Result<()> {
        update_msg_state(context, self, MessageState::OutDelivered).await?;
-        let chat_id: Option<ChatId> = context
+        let chat_id: ChatId = context
            .sql
            .query_get_value("SELECT chat_id FROM msgs WHERE id=?", (self,))
-            .await?;
+            .await?
+            .unwrap_or_default();
        context.emit_event(EventType::MsgDelivered {
-            chat_id: chat_id.unwrap_or_default(),
+            chat_id,
            msg_id: self,
        });
-        if let Some(chat_id) = chat_id {
-            chatlist_events::emit_chatlist_item_changed(context, chat_id);
-        }
+        chatlist_events::emit_chatlist_item_changed(context, chat_id);
        Ok(())
    }

@@ -1851,21 +1850,20 @@ pub(crate) async fn set_msg_failed(
    }
    msg.error = Some(error.to_string());

-    let exists = context
+    context
        .sql
        .execute(
            "UPDATE msgs SET state=?, error=? WHERE id=?;",
            (msg.state, error, msg.id),
        )
-        .await?
-        > 0;
+        .await?;
+
    context.emit_event(EventType::MsgFailed {
        chat_id: msg.chat_id,
        msg_id: msg.id,
    });
-    if exists {
-        chatlist_events::emit_chatlist_item_changed(context, msg.chat_id);
-    }
+    chatlist_events::emit_chatlist_item_changed(context, msg.chat_id);
+
    Ok(())
 }

@@ -2344,7 +2342,8 @@ mod tests {

        let chat = d.create_chat_with_contact("", "dest@example.com").await;

-        let mut msg = Message::new_text("Quoted message".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("Quoted message".to_string());

        // Prepare message for sending, so it gets a Message-Id.
        assert!(msg.rfc724_mid.is_empty());
@@ -2410,8 +2409,9 @@ mod tests {
        add_contact_to_chat(alice, alice_group, alice_flubby_contact_id).await?;

        // Alice quotes encrypted message in unencrypted chat.
-        let mut msg = Message::new_text("unencrypted".to_string());
+        let mut msg = Message::new(Viewtype::Text);
        msg.set_quote(alice, Some(&alice_received_message)).await?;
+        msg.set_text("unencrypted".to_string());
        chat::send_msg(alice, alice_group, &mut msg).await?;

        let bob_received_message = bob.recv_msg(&alice.pop_sent_msg().await).await;
@@ -2469,7 +2469,8 @@ mod tests {
            .unwrap();
        let contact = Contact::get_by_id(&alice, contact_id).await.unwrap();

-        let mut msg = Message::new_text("bla blubb".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("bla blubb".to_string());
        msg.set_override_sender_name(Some("over ride".to_string()));
        assert_eq!(
            msg.get_override_sender_name(),
@@ -2516,7 +2517,8 @@ mod tests {
        let alice = TestContext::new_alice().await;
        let bob = TestContext::new_bob().await;
        let alice_chat = alice.create_chat(&bob).await;
-        let mut msg = Message::new_text("this is the text!".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("this is the text!".to_string());

        // alice sends to bob,
        assert_eq!(Chatlist::try_load(&bob, 0, None, None).await?.len(), 0);
@@ -2601,7 +2603,8 @@ mod tests {
        }

        // check outgoing messages states on sender side
-        let mut alice_msg = Message::new_text("hi!".to_string());
+        let mut alice_msg = Message::new(Viewtype::Text);
+        alice_msg.set_text("hi!".to_string());
        assert_eq!(alice_msg.get_state(), MessageState::Undefined); // message not yet in db, assert_state() won't work

        alice_chat
@@ -2784,7 +2787,8 @@ def hello():
        let chat = alice
            .create_chat_with_contact("Bob", "bob@example.org")
            .await;
-        let mut msg = Message::new_text("hi".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("hi".to_string());
        assert!(chat::send_msg_sync(&alice, chat.id, &mut msg)
            .await
            .is_err());
@@ -743,6 +743,8 @@ impl MimeFactory {
                hidden_headers.push(header);
            } else if header_name == "chat-user-avatar" {
                hidden_headers.push(header);
+            } else if header_name == "autocrypt" {
+                unprotected_headers.push(header.clone());
            } else if header_name == "from" {
                // Unencrypted securejoin messages should _not_ include the display name:
                if is_encrypted || !is_securejoin_message {
@@ -1980,7 +1982,8 @@ mod tests {
            group_id: ChatId,
            quote: Option<&Message>,
        ) -> Result<String> {
-            let mut new_msg = Message::new_text("Hi".to_string());
+            let mut new_msg = Message::new(Viewtype::Text);
+            new_msg.set_text("Hi".to_string());
            if let Some(q) = quote {
                new_msg.set_quote(t, Some(q)).await?;
            }
@@ -2066,7 +2069,8 @@ mod tests {

        let chat_id = ChatId::create_for_contact(&t, contact_id).await.unwrap();

-        let mut new_msg = Message::new_text("Hi".to_string());
+        let mut new_msg = Message::new(Viewtype::Text);
+        new_msg.set_text("Hi".to_string());
        new_msg.chat_id = chat_id;
        chat::prepare_msg(&t, chat_id, &mut new_msg).await.unwrap();

@@ -2173,7 +2177,8 @@ mod tests {
        let chat_id = chats.get_chat_id(0).unwrap();
        chat_id.accept(context).await.unwrap();

-        let mut new_msg = Message::new_text("Hi".to_string());
+        let mut new_msg = Message::new(Viewtype::Text);
+        new_msg.set_text("Hi".to_string());
        new_msg.chat_id = chat_id;
        chat::prepare_msg(context, chat_id, &mut new_msg)
            .await
@@ -2290,7 +2295,8 @@ mod tests {

        // send message to bob: that should get multipart/mixed because of the avatar moved to inner header;
        // make sure, `Subject:` stays in the outer header (imf header)
-        let mut msg = Message::new_text("this is the text!".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("this is the text!".to_string());

        let sent_msg = t.send_msg(chat.id, &mut msg).await;
        let mut payload = sent_msg.payload().splitn(3, "\r\n\r\n");
@@ -2356,7 +2362,8 @@ mod tests {
        // send message to bob: that should get multipart/signed.
        // `Subject:` is protected by copying it.
        // make sure, `Subject:` stays in the outer header (imf header)
-        let mut msg = Message::new_text("this is the text!".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("this is the text!".to_string());

        let sent_msg = t.send_msg(chat.id, &mut msg).await;
        let mut payload = sent_msg.payload().splitn(4, "\r\n\r\n");
@@ -2489,7 +2496,8 @@ mod tests {

        // send message to bob: that should get multipart/mixed because of the avatar moved to inner header;
        // make sure, `Subject:` stays in the outer header (imf header)
-        let mut msg = Message::new_text("this is the text!".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("this is the text!".to_string());

        let sent_msg = t.send_msg(chat.id, &mut msg).await;
        let payload = sent_msg.payload();
@@ -2240,22 +2240,12 @@ async fn handle_ndn(
    } else {
        "Delivery to at least one recipient failed.".to_string()
    };
-    let err_msg = &error;

    let mut first = true;
    for msg in msgs {
        let (msg_id, chat_id, chat_type) = msg?;
        let mut message = Message::load_from_db(context, msg_id).await?;
-        let aggregated_error = message
-            .error
-            .as_ref()
-            .map(|err| format!("{}\n\n{}", err, err_msg));
-        set_msg_failed(
-            context,
-            &mut message,
-            aggregated_error.as_ref().unwrap_or(err_msg),
-        )
-        .await?;
+        set_msg_failed(context, &mut message, &error).await?;
        if first {
            // Add only one info msg for all failed messages
            ndn_maybe_add_info_msg(context, failed, chat_id, chat_type).await?;
@@ -3610,7 +3600,8 @@ On 2020-10-25, Bob wrote:

        for draft in [false, true] {
            let chat = t.get_self_chat().await;
-            let mut msg = Message::new_text(long_txt.clone());
+            let mut msg = Message::new(Viewtype::Text);
+            msg.set_text(long_txt.clone());
            if draft {
                chat.id.set_draft(&t, Some(&mut msg)).await?;
            }
@@ -590,6 +590,17 @@ mod tests {
        let alice = &mut tcm.alice().await;
        let bob = &mut tcm.bob().await;

+        bob.ctx
+            .set_config_bool(Config::WebxdcRealtimeEnabled, true)
+            .await
+            .unwrap();
+
+        alice
+            .ctx
+            .set_config_bool(Config::WebxdcRealtimeEnabled, true)
+            .await
+            .unwrap();
+
        // Alice sends webxdc to bob
        let alice_chat = alice.create_chat(bob).await;
        let mut instance = Message::new(Viewtype::File);
@@ -728,6 +739,17 @@ mod tests {
        let alice = &mut tcm.alice().await;
        let bob = &mut tcm.bob().await;

+        bob.ctx
+            .set_config_bool(Config::WebxdcRealtimeEnabled, true)
+            .await
+            .unwrap();
+
+        alice
+            .ctx
+            .set_config_bool(Config::WebxdcRealtimeEnabled, true)
+            .await
+            .unwrap();
+
        assert!(alice
            .get_config_bool(Config::WebxdcRealtimeEnabled)
            .await
@@ -885,6 +907,17 @@ mod tests {
        let alice = &mut tcm.alice().await;
        let bob = &mut tcm.bob().await;

+        bob.ctx
+            .set_config_bool(Config::WebxdcRealtimeEnabled, true)
+            .await
+            .unwrap();
+
+        alice
+            .ctx
+            .set_config_bool(Config::WebxdcRealtimeEnabled, true)
+            .await
+            .unwrap();
+
        // Alice sends webxdc to bob
        let alice_chat = alice.create_chat(bob).await;
        let mut instance = Message::new(Viewtype::File);
@@ -953,11 +986,6 @@ mod tests {
        let mut tcm = TestContextManager::new();
        let alice = &mut tcm.alice().await;

-        alice
-            .set_config_bool(Config::WebxdcRealtimeEnabled, false)
-            .await
-            .unwrap();
-
        // creates iroh endpoint as side effect
        send_webxdc_realtime_advertisement(alice, MsgId::new(1))
            .await
@@ -446,7 +446,7 @@ async fn decode_openpgp(context: &Context, qr: &str) -> Result<Qr> {
    if let (Some(addr), Some(invitenumber), Some(authcode)) = (&addr, invitenumber, authcode) {
        let addr = ContactAddress::new(addr)?;
        let (contact_id, _) =
-            Contact::add_or_lookup(context, &name, &addr, Origin::UnhandledSecurejoinQrScan)
+            Contact::add_or_lookup(context, &name, &addr, Origin::UnhandledQrScan)
                .await
                .with_context(|| format!("failed to add or lookup contact for address {addr:?}"))?;

@@ -1270,8 +1270,7 @@ mod tests {
        if let Qr::AskVerifyContact { contact_id, .. } = qr {
            let contact = Contact::get_by_id(&ctx.ctx, contact_id).await?;
            assert_eq!(contact.get_addr(), "cli@deltachat.de");
-            assert_eq!(contact.get_authname(), "Jörn P. P.");
-            assert_eq!(contact.get_name(), "");
+            assert_eq!(contact.get_name(), "Jörn P. P.");
        } else {
            bail!("Wrong QR code type");
        }
@@ -1286,7 +1285,6 @@ mod tests {
        if let Qr::AskVerifyContact { contact_id, .. } = qr {
            let contact = Contact::get_by_id(&ctx.ctx, contact_id).await?;
            assert_eq!(contact.get_addr(), "cli@deltachat.de");
-            assert_eq!(contact.get_authname(), "");
            assert_eq!(contact.get_name(), "");
        } else {
            bail!("Wrong QR code type");
@@ -11,7 +11,7 @@ use crate::config::Config;
 use crate::context::Context;
 use crate::imap::scan_folders::get_watched_folders;
 use crate::imap::session::Session as ImapSession;
-use crate::message::Message;
+use crate::message::{Message, Viewtype};
 use crate::tools::{self, time_elapsed};
 use crate::{stock_str, EventType};

@@ -142,8 +142,8 @@ impl Context {
                            Some(&highest.to_string()),
                        )
                        .await?;
-                        let mut msg =
-                            Message::new_text(stock_str::quota_exceeding(self, highest).await);
+                        let mut msg = Message::new(Viewtype::Text);
+                        msg.text = stock_str::quota_exceeding(self, highest).await;
                        add_device_msg_with_importance(self, None, Some(&mut msg), true).await?;
                    } else if highest <= QUOTA_ALLCLEAR_PERCENTAGE {
                        self.set_config_internal(Config::QuotaExceeding, None)
@@ -26,7 +26,7 @@ use crate::chatlist_events;
 use crate::contact::ContactId;
 use crate::context::Context;
 use crate::events::EventType;
-use crate::message::{rfc724_mid_exists, Message, MsgId};
+use crate::message::{rfc724_mid_exists, Message, MsgId, Viewtype};
 use crate::param::Param;

 /// A single reaction consisting of multiple emoji sequences.
@@ -229,7 +229,8 @@ pub async fn send_reaction(context: &Context, msg_id: MsgId, reaction: &str) ->
    let chat_id = msg.chat_id;

    let reaction: Reaction = reaction.into();
-    let mut reaction_msg = Message::new_text(reaction.as_str().to_string());
+    let mut reaction_msg = Message::new(Viewtype::Text);
+    reaction_msg.text = reaction.as_str().to_string();
    reaction_msg.set_reaction();
    reaction_msg.in_reply_to = Some(msg.rfc724_mid);
    reaction_msg.hidden = true;
@@ -1093,8 +1093,8 @@ async fn add_parts(
                .await?;
            let now = tools::time();
            let update_config = if last_time.saturating_add(24 * 60 * 60) <= now {
-                let mut msg =
-                    Message::new_text(stock_str::cant_decrypt_outgoing_msgs(context).await);
+                let mut msg = Message::new(Viewtype::Text);
+                msg.text = stock_str::cant_decrypt_outgoing_msgs(context).await;
                chat::add_device_msg(context, None, Some(&mut msg))
                    .await
                    .log_err(context)
@@ -883,54 +883,6 @@ async fn test_parse_ndn_group_msg() -> Result<()> {
    Ok(())
 }

-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_concat_multiple_ndns() -> Result<()> {
-    let t = TestContext::new().await;
-    t.configure_addr("alice@posteo.org").await;
-    let mid = "1234@mail.gmail.com";
-    receive_imf(
-        &t,
-        b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\
-                 From: alice@posteo.org\n\
-                 To: hanerthaertidiuea@gmx.de\n\
-                 Subject: foo\n\
-                 Message-ID: <1234@mail.gmail.com>\n\
-                 Chat-Version: 1.0\n\
-                 Chat-Disposition-Notification-To: alice@example.org\n\
-                 Date: Sun, 22 Mar 2020 22:37:57 +0000\n\
-                 \n\
-                 hello\n",
-        false,
-    )
-    .await?;
-
-    let chats = Chatlist::try_load(&t, 0, None, None).await?;
-    let msg_id = chats.get_msg_id(0)?.unwrap();
-
-    let raw = include_str!("../../test-data/message/posteo_ndn.eml");
-    let raw = raw.replace(
-        "Message-ID: <04422840-f884-3e37-5778-8192fe22d8e1@posteo.de>",
-        &format!("Message-ID: <{}>", mid),
-    );
-    receive_imf(&t, raw.as_bytes(), false).await?;
-
-    let msg = Message::load_from_db(&t, msg_id).await?;
-
-    let err = "Undelivered Mail Returned to Sender – This is the mail system at host mout01.posteo.de.\n\nI'm sorry to have to inform you that your message could not\nbe delivered to one or more recipients. It's attached below.\n\nFor further assistance, please send mail to postmaster.\n\nIf you do so, please include this problem report. You can\ndelete your own text from the attached returned message.\n\n                   The mail system\n\n<hanerthaertidiuea@gmx.de>: host mx01.emig.gmx.net[212.227.17.5] said: 550\n    Requested action not taken: mailbox unavailable (in reply to RCPT TO\n    command)".to_string();
-    assert_eq!(msg.error(), Some(err.clone()));
-    assert_eq!(msg.state, MessageState::OutFailed);
-
-    let raw = raw.replace(
-        "Message-Id: <20200609184422.DCB6B1200DD@mout01.posteo.de>",
-        "Message-Id: <next@mout01.posteo.de>",
-    );
-    receive_imf(&t, raw.as_bytes(), false).await?;
-    let msg = Message::load_from_db(&t, msg_id).await?;
-
-    assert_eq!(msg.error(), Some([err.clone(), err].join("\n\n")));
-    Ok(())
-}
-
 async fn load_imf_email(context: &Context, imf_raw: &[u8]) -> Message {
    context
        .set_config(Config::ShowEmails, Some("2"))
@@ -2226,7 +2178,8 @@ async fn test_no_smtp_job_for_self_chat() -> Result<()> {
    let bob = &tcm.bob().await;
    bob.set_config_bool(Config::BccSelf, false).await?;
    let chat_id = bob.get_self_chat().await.id;
-    let mut msg = Message::new_text("Happy birthday to me".to_string());
+    let mut msg = Message::new(Viewtype::Text);
+    msg.text = "Happy birthday to me".to_string();
    chat::send_msg(bob, chat_id, &mut msg).await?;
    assert!(bob.pop_sent_msg_opt(Duration::ZERO).await.is_none());
    Ok(())
@@ -3345,7 +3298,8 @@ async fn test_outgoing_private_reply_multidevice() -> Result<()> {
    assert_eq!(received_group.name, "Group");
    assert_eq!(received_group.can_send(&alice1).await?, false); // Can't send because it's Blocked::Request

-    let mut msg_out = Message::new_text("Private reply".to_string());
+    let mut msg_out = Message::new(Viewtype::Text);
+    msg_out.set_text("Private reply".to_string());

    assert_eq!(received_group.blocked, Blocked::Request);
    msg_out.set_quote(&alice1, Some(&received)).await?;
@@ -3552,7 +3506,8 @@ async fn test_no_private_reply_to_blocked_account() -> Result<()> {
    let received_group = Chat::load_from_db(&alice, received.chat_id).await?;
    assert_eq!(received_group.typ, Chattype::Group);

-    let mut msg_out = Message::new_text("Private reply".to_string());
+    let mut msg_out = Message::new(Viewtype::Text);
+    msg_out.set_text("Private reply".to_string());
    msg_out.set_quote(&alice, Some(&received)).await?;

    let alice_bob_chat = alice.create_chat(&bob).await;
@@ -655,7 +655,9 @@ async fn fetch_idle(
            ctx,
            "IMAP session does not support IDLE, going to fake idle."
        );
-        connection.fake_idle(ctx, watch_folder).await?;
+        connection
+            .fake_idle(ctx, &mut session, watch_folder, folder_meaning)
+            .await?;
        return Ok(session);
    }

@@ -667,7 +669,9 @@ async fn fetch_idle(
        .unwrap_or_default()
    {
        info!(ctx, "IMAP IDLE is disabled, going to fake idle.");
-        connection.fake_idle(ctx, watch_folder).await?;
+        connection
+            .fake_idle(ctx, &mut session, watch_folder, folder_meaning)
+            .await?;
        return Ok(session);
    }

@@ -765,7 +765,6 @@ mod tests {
        WrongAliceGossip,
        SecurejoinWaitTimeout,
        AliceIsBot,
-        AliceHasName,
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -793,21 +792,10 @@ mod tests {
        test_setup_contact_ex(SetupContactCase::AliceIsBot).await
    }

-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_setup_contact_alice_has_name() {
-        test_setup_contact_ex(SetupContactCase::AliceHasName).await
-    }
-
    async fn test_setup_contact_ex(case: SetupContactCase) {
        let mut tcm = TestContextManager::new();
        let alice = tcm.alice().await;
        let alice_addr = &alice.get_config(Config::Addr).await.unwrap().unwrap();
-        if case == SetupContactCase::AliceHasName {
-            alice
-                .set_config(Config::Displayname, Some("Alice"))
-                .await
-                .unwrap();
-        }
        let bob = tcm.bob().await;
        bob.set_config(Config::Displayname, Some("Bob Examplenet"))
            .await
@@ -852,10 +840,7 @@ mod tests {
            Chatlist::try_load(&bob, 0, None, None).await.unwrap().len(),
            1
        );
-        let contact_alice_id = Contact::lookup_id_by_addr(&bob.ctx, alice_addr, Origin::Unknown)
-            .await
-            .expect("Error looking up contact")
-            .expect("Contact not found");
+
        let sent = bob.pop_sent_msg().await;
        assert!(!sent.payload.contains("Bob Examplenet"));
        assert_eq!(sent.recipient(), EmailAddress::new(alice_addr).unwrap());
@@ -989,7 +974,6 @@ mod tests {
            .await
            .unwrap();
        assert_eq!(contact_bob.get_authname(), "Bob Examplenet");
-        assert!(contact_bob.get_name().is_empty());
        assert_eq!(contact_bob.is_bot(), false);

        // exactly one one-to-one chat should be visible for both now
@@ -1019,13 +1003,14 @@ mod tests {
        }

        // Make sure Alice hasn't yet sent their name to Bob.
+        let contact_alice_id = Contact::lookup_id_by_addr(&bob.ctx, alice_addr, Origin::Unknown)
+            .await
+            .expect("Error looking up contact")
+            .expect("Contact not found");
        let contact_alice = Contact::get_by_id(&bob.ctx, contact_alice_id)
            .await
            .unwrap();
-        match case {
-            SetupContactCase::AliceHasName => assert_eq!(contact_alice.get_authname(), "Alice"),
-            _ => assert_eq!(contact_alice.get_authname(), ""),
-        };
+        assert_eq!(contact_alice.get_authname(), "");

        // Check Alice sent the right message to Bob.
        let sent = alice.pop_sent_msg().await;
@@ -1048,7 +1033,6 @@ mod tests {
            .await
            .unwrap();
        assert_eq!(contact_alice.get_authname(), "Alice Exampleorg");
-        assert!(contact_alice.get_name().is_empty());
        assert_eq!(contact_alice.is_bot(), case == SetupContactCase::AliceIsBot);

        if case != SetupContactCase::SecurejoinWaitTimeout {
@@ -372,10 +372,8 @@ pub(crate) async fn send_msg_to_smtp(
        )
        .await?;
    if retries > 6 {
-        if let Some(mut msg) = Message::load_from_db_optional(context, msg_id).await? {
-            message::set_msg_failed(context, &mut msg, "Number of retries exceeded the limit.")
-                .await?;
-        }
+        let mut msg = Message::load_from_db(context, msg_id).await?;
+        message::set_msg_failed(context, &mut msg, "Number of retries exceeded the limit.").await?;
        context
            .sql
            .execute("DELETE FROM smtp WHERE id=?", (rowid,))
@@ -17,7 +17,7 @@ use crate::ephemeral::start_ephemeral_timers;
 use crate::imex::BLOBS_BACKUP_NAME;
 use crate::location::delete_orphaned_poi_locations;
 use crate::log::LogExt;
-use crate::message::{Message, MsgId};
+use crate::message::{Message, MsgId, Viewtype};
 use crate::net::dns::prune_dns_cache;
 use crate::net::prune_connection_history;
 use crate::param::{Param, Params};
@@ -154,28 +154,29 @@ impl Sql {
            // don't have main database passphrase at this point.
            // See <https://sqlite.org/c3ref/c_dbconfig_enable_fkey.html> for documentation.
            // Without resetting import may fail due to existing tables.
-            res.and_then(|_| {
+            let res = res.and_then(|_| {
                conn.set_db_config(DbConfig::SQLITE_DBCONFIG_RESET_DATABASE, true)
                    .context("failed to set SQLITE_DBCONFIG_RESET_DATABASE")
-            })
-            .and_then(|_| {
+            });
+            let res = res.and_then(|_| {
                conn.execute("VACUUM", [])
                    .context("failed to vacuum the database")
-            })
-            .and(
+            });
+            let res = res.and(
                conn.set_db_config(DbConfig::SQLITE_DBCONFIG_RESET_DATABASE, false)
                    .context("failed to unset SQLITE_DBCONFIG_RESET_DATABASE"),
-            )
-            .and_then(|_| {
+            );
+            let res = res.and_then(|_| {
                conn.query_row("SELECT sqlcipher_export('main', 'backup')", [], |_row| {
                    Ok(())
                })
                .context("failed to import from attached backup database")
-            })
-            .and(
+            });
+            let res = res.and(
                conn.execute("DETACH DATABASE backup", [])
                    .context("failed to detach backup database"),
-            )?;
+            );
+            res?;
            Ok(())
        })
        .await
@@ -246,7 +247,8 @@ impl Sql {
            // We now always watch all folders and delete messages there if delete_server is enabled.
            // So, for people who have delete_server enabled, disable it and add a hint to the devicechat:
            if context.get_config_delete_server_after().await?.is_some() {
-                let mut msg = Message::new_text(stock_str::delete_server_turned_off(context).await);
+                let mut msg = Message::new(Viewtype::Text);
+                msg.set_text(stock_str::delete_server_turned_off(context).await);
                add_device_msg(context, None, Some(&mut msg)).await?;
                context
                    .set_config_internal(Config::DeleteServerAfter, Some("0"))
@@ -1127,7 +1129,8 @@ mod tests {
        let t = TestContext::new_alice().await;

        let chat = t.create_chat_with_contact("bob", "bob@example.com").await;
-        let mut new_draft = Message::new_text("This is my draft".to_string());
+        let mut new_draft = Message::new(Viewtype::Text);
+        new_draft.set_text("This is my draft".to_string());
        chat.id.set_draft(&t, Some(&mut new_draft)).await.unwrap();

        housekeeping(&t).await.unwrap();
@@ -1419,7 +1419,8 @@ impl Context {
        msg.param.set(Param::File, blob.as_name());
        chat::add_device_msg(self, Some("core-welcome-image"), Some(&mut msg)).await?;

-        let mut msg = Message::new_text(welcome_message(self).await);
+        let mut msg = Message::new(Viewtype::Text);
+        msg.text = welcome_message(self).await;
        chat::add_device_msg(self, Some("core-welcome"), Some(&mut msg)).await?;
        Ok(())
    }
@@ -305,7 +305,8 @@ mod tests {
            .unwrap();
        let some_text = " bla \t\n\tbla\n\t".to_string();

-        let msg = Message::new_text(some_text.to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text(some_text.to_string());
        assert_summary_texts(&msg, ctx, "bla bla").await; // for simple text, the type is not added to the summary

        let mut msg = Message::new(Viewtype::Image);
@@ -414,7 +415,8 @@ mod tests {
        }

        // Forwarded
-        let mut msg = Message::new_text(some_text.clone());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text(some_text.clone());
        msg.param.set_int(Param::Forwarded, 1);
        assert_eq!(msg.get_summary_text(ctx).await, "Forwarded: bla bla"); // for simple text, the type is not added to the summary
        assert_eq!(msg.get_summary_text_without_prefix(ctx).await, "bla bla"); // skipping prefix used for reactions summaries
@@ -730,7 +730,8 @@ impl TestContext {
    /// [`TestContext::recv_msg`] with the returned [`SentMessage`] if it wants to receive
    /// the message.
    pub async fn send_text(&self, chat_id: ChatId, txt: &str) -> SentMessage<'_> {
-        let mut msg = Message::new_text(txt.to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.text = txt.to_string();
        self.send_msg(chat_id, &mut msg).await
    }

@@ -6,7 +6,7 @@ use crate::chatlist::Chatlist;
 use crate::config::Config;
 use crate::constants::{Chattype, DC_GCL_FOR_FORWARDING};
 use crate::contact::{Contact, ContactId, Origin};
-use crate::message::Message;
+use crate::message::{Message, Viewtype};
 use crate::mimefactory::MimeFactory;
 use crate::mimeparser::SystemMessage;
 use crate::receive_imf::receive_imf;
@@ -716,7 +716,8 @@ async fn test_break_protection_then_verify_again() -> Result<()> {
        assert!(!alice_bob_chat.can_send(&alice).await?);

        // Alice's UI should still be able to save a draft, which Alice started to type right when she got Bob's message:
-        let mut msg = Message::new_text("Draftttt".to_string());
+        let mut msg = Message::new(Viewtype::Text);
+        msg.set_text("Draftttt".to_string());
        alice_bob_chat.id.set_draft(&alice, Some(&mut msg)).await?;
        assert_eq!(
            alice_bob_chat.id.get_draft(&alice).await?.unwrap().text,
@@ -250,7 +250,8 @@ async fn maybe_warn_on_bad_time(context: &Context, now: i64, known_past_timestam

 async fn maybe_warn_on_outdated(context: &Context, now: i64, approx_compile_time: i64) {
    if now > approx_compile_time + DC_OUTDATED_WARNING_DAYS * 24 * 60 * 60 {
-        let mut msg = Message::new_text(stock_str::update_reminder_msg_body(context).await);
+        let mut msg = Message::new(Viewtype::Text);
+        msg.text = stock_str::update_reminder_msg_body(context).await;
        if let Some(timestamp) = chrono::DateTime::<chrono::Utc>::from_timestamp(now, 0) {
            add_device_msg(
                context,
@@ -36,7 +36,7 @@ use crate::{chat, location};
 use std::collections::{hash_map, HashMap};

 use crate::context::Context;
-use crate::message::{Message, MsgId};
+use crate::message::{Message, MsgId, Viewtype};

 use crate::chat::ChatId;
 use crate::color::color_int_to_hex_string;
@@ -85,7 +85,8 @@ pub(crate) async fn intercept_send_update(
            ChatId::create_for_contact(context, ContactId::SELF).await?
        };

-        let mut poi_msg = Message::new_text(label);
+        let mut poi_msg = Message::new(Viewtype::Text);
+        poi_msg.text = label;
        poi_msg.set_location(lat, lng);
        chat::send_msg(context, chat_id, &mut poi_msg).await?;
    } else {
@@ -0,0 +1 @@
+.
@@ -1 +1 @@
 -10-31
 -10-27