fix: remove optional dependency aiodns

it fails to install in android(termux) because binary code dependency
2026-04-05 15:02:11 +03:00 · 2023-08-29 21:56:04 +02:00
22 changed files with 260 additions and 1831 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17,9 +17,9 @@ dependencies = [

 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
 dependencies = [
 "gimli",
 ]
@@ -120,9 +120,9 @@ checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"

 [[package]]
 name = "anyhow"
-version = "1.0.75"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
 dependencies = [
 "backtrace",
 ]
@@ -215,7 +215,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b538b767cbf9c162a6c5795d4b932bd2c20ba10b5a91a94d2b2b6886c1dce6a8"
 dependencies = [
 "async-channel",
- "base64 0.21.3",
+ "base64 0.21.2",
 "bytes",
 "chrono",
 "futures",
@@ -276,7 +276,7 @@ checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.28",
 ]

 [[package]]
@@ -307,7 +307,7 @@ checksum = "a6a1de45611fdb535bfde7b7de4fd54f4fd2b17b1737c0a59b69bf9b92074b8c"
 dependencies = [
 "async-trait",
 "axum-core",
- "base64 0.21.3",
+ "base64 0.21.2",
 "bitflags 1.3.2",
 "bytes",
 "futures-util",
@@ -353,9 +353,9 @@ dependencies = [

 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
 dependencies = [
 "addr2line",
 "cc",
@@ -398,9 +398,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"

 [[package]]
 name = "base64"
-version = "0.21.3"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"

 [[package]]
 name = "base64ct"
@@ -643,9 +643,9 @@ dependencies = [

 [[package]]
 name = "chrono"
-version = "0.4.28"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
 dependencies = [
 "android-tzdata",
 "iana-time-zone",
@@ -653,7 +653,7 @@ dependencies = [
 "num-traits",
 "time 0.1.45",
 "wasm-bindgen",
- "windows-targets 0.48.1",
+ "winapi",
 ]

 [[package]]
@@ -987,7 +987,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.28",
 ]

 [[package]]
@@ -1095,7 +1095,7 @@ dependencies = [
 "async-smtp",
 "async_zip",
 "backtrace",
- "base64 0.21.3",
+ "base64 0.21.2",
 "brotli",
 "chrono",
 "criterion",
@@ -1167,7 +1167,7 @@ dependencies = [
 "anyhow",
 "async-channel",
 "axum",
- "base64 0.21.3",
+ "base64 0.21.2",
 "deltachat",
 "env_logger",
 "futures",
@@ -1221,7 +1221,7 @@ name = "deltachat_derive"
 version = "2.0.0"
 dependencies = [
 "quote",
- "syn 2.0.29",
+ "syn 2.0.28",
 ]

 [[package]]
@@ -1427,7 +1427,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.28",
 ]

 [[package]]
@@ -1727,7 +1727,7 @@ dependencies = [
 "num-traits",
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.28",
 ]

 [[package]]
@@ -2030,7 +2030,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.28",
 ]

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

 [[package]]
 name = "gimli"
-version = "0.28.0"
+version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"

 [[package]]
 name = "group"
@@ -2403,9 +2403,9 @@ dependencies = [

 [[package]]
 name = "image"
-version = "0.24.7"
+version = "0.24.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
+checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
 dependencies = [
 "bytemuck",
 "byteorder",
@@ -2473,7 +2473,7 @@ dependencies = [
 "socket2 0.5.3",
 "widestring",
 "windows-sys 0.48.0",
- "winreg",
+ "winreg 0.50.0",
 ]

 [[package]]
@@ -2490,7 +2490,7 @@ checksum = "e4fb9858c8cd3dd924a5da5bc511363845a9bcfdfac066bb2ef8454eb6111546"
 dependencies = [
 "abao",
 "anyhow",
- "base64 0.21.3",
+ "base64 0.21.2",
 "blake3",
 "bytes",
 "default-net",
@@ -2666,9 +2666,9 @@ dependencies = [

 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"

 [[package]]
 name = "lru-cache"
@@ -2949,7 +2949,7 @@ checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.28",
 ]

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

 [[package]]
 name = "object"
-version = "0.32.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
+checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
 dependencies = [
 "memchr",
 ]
@@ -3063,7 +3063,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.28",
 ]

 [[package]]
@@ -3238,7 +3238,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "27e1f8e085bfa9b85763fe3ddaacbe90a09cd847b3833129153a6cb063bbe132"
 dependencies = [
 "aes",
- "base64 0.21.3",
+ "base64 0.21.2",
 "bitfield",
 "block-padding",
 "blowfish",
@@ -3300,14 +3300,14 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.28",
 ]

 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"

 [[package]]
 name = "pin-utils"
@@ -3614,9 +3614,9 @@ dependencies = [

 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
 dependencies = [
 "proc-macro2",
 ]
@@ -3830,11 +3830,11 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"

 [[package]]
 name = "reqwest"
-version = "0.11.20"
+version = "0.11.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
+checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
 dependencies = [
- "base64 0.21.3",
+ "base64 0.21.2",
 "bytes",
 "encoding_rs",
 "futures-core",
@@ -3862,7 +3862,7 @@ dependencies = [
 "wasm-bindgen",
 "wasm-bindgen-futures",
 "web-sys",
- "winreg",
+ "winreg 0.10.1",
 ]

 [[package]]
@@ -4055,7 +4055,7 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
 dependencies = [
- "base64 0.21.3",
+ "base64 0.21.2",
 ]

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

 [[package]]
 name = "schemars"
-version = "0.8.13"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763f8cd0d4c71ed8389c90cb8100cba87e763bd01a8e614d4f0af97bcd50a161"
+checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f"
 dependencies = [
 "dyn-clone",
 "schemars_derive",
@@ -4141,9 +4141,9 @@ dependencies = [

 [[package]]
 name = "schemars_derive"
-version = "0.8.13"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0f696e21e10fa546b7ffb1c9672c6de8fbc7a81acf59524386d8639bf12737"
+checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -4235,9 +4235,9 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.180"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed"
 dependencies = [
 "serde_derive",
 ]
@@ -4262,13 +4262,13 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.180"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.28",
 ]

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

 [[package]]
 name = "serde_json"
-version = "1.0.105"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
+checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
 dependencies = [
 "itoa",
 "ryu",
@@ -4575,7 +4575,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "rustversion",
- "syn 2.0.29",
+ "syn 2.0.28",
 ]

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

 [[package]]
 name = "syn"
-version = "2.0.29"
+version = "2.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
+checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -4667,9 +4667,9 @@ checksum = "094c9f64d6de9a8506b1e49b63a29333b37ed9e821ee04be694d431b3264c3c5"

 [[package]]
 name = "tempfile"
-version = "3.8.0"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
+checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998"
 dependencies = [
 "cfg-if",
 "fastrand 2.0.0",
@@ -4714,22 +4714,22 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.47"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
+checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.47"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
+checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.28",
 ]

 [[package]]
@@ -4808,10 +4808,11 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.32.0"
+version = "1.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
+checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
 dependencies = [
+ "autocfg",
 "backtrace",
 "bytes",
 "libc",
@@ -4820,7 +4821,7 @@ dependencies = [
 "parking_lot",
 "pin-project-lite",
 "signal-hook-registry",
- "socket2 0.5.3",
+ "socket2 0.4.9",
 "tokio-macros",
 "windows-sys 0.48.0",
 ]
@@ -4843,7 +4844,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.28",
 ]

 [[package]]
@@ -5006,7 +5007,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.28",
 ]

 [[package]]
@@ -5145,9 +5146,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"

 [[package]]
 name = "typescript-type-def"
-version = "0.5.8"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "356e00027bd9ef773605a353070dc87684b25561a59087ea3ee3dd5fe8854e83"
+checksum = "3c4be05eb0171e18da471e545cfff85d80b8118e5aa2d50c2d152265d7435997"
 dependencies = [
 "serde_json",
 "typescript-type-def-derive",
@@ -5155,9 +5156,9 @@ dependencies = [

 [[package]]
 name = "typescript-type-def-derive"
-version = "0.5.8"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4e696c28431595138cc53892104528152cbcf26653ae0aa655e4eaede5b9f69"
+checksum = "71aeb2295da6c2bfe665493332b4e4281d113fab3a0786e9651dcc85708095a4"
 dependencies = [
 "darling 0.13.4",
 "ident_case",
@@ -5226,9 +5227,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"

 [[package]]
 name = "url"
-version = "2.4.1"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
+checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
 dependencies = [
 "form_urlencoded",
 "idna 0.4.0",
@@ -5339,7 +5340,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.28",
 "wasm-bindgen-shared",
 ]

@@ -5373,7 +5374,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.28",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@@ -5650,6 +5651,15 @@ dependencies = [
 "memchr",
 ]

+[[package]]
+name = "winreg"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "winreg"
 version = "0.50.0"
@@ -5767,5 +5777,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.28",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -53,7 +53,7 @@ futures = "0.3"
 futures-lite = "1.13.0"
 hex = "0.4.0"
 humansize = "2"
-image = { version = "0.24.7", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+image = { version = "0.24.6", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
 iroh = { version = "0.4.1", default-features = false }
 kamadak-exif = "0.5"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
@@ -72,7 +72,7 @@ qrcodegen = "1.7.0"
 quick-xml = "0.30"
 rand = "0.8"
 regex = "1.8"
-reqwest = { version = "0.11.20", features = ["json"] }
+reqwest = { version = "0.11.18", features = ["json"] }
 rusqlite = { version = "0.29", features = ["sqlcipher"] }
 rust-hsluv = "0.1"
 sanitize-filename = "0.5"
--- a/deltachat-jsonrpc/Cargo.toml
+++ b/deltachat-jsonrpc/Cargo.toml
@@ -15,16 +15,16 @@ required-features = ["webserver"]
 anyhow = "1"
 deltachat = { path = ".." }
 num-traits = "0.2"
-schemars = "0.8.13"
+schemars = "0.8.11"
 serde = { version = "1.0", features = ["derive"] }
-tempfile = "3.8.0"
+tempfile = "3.6.0"
 log = "0.4"
 async-channel = { version = "1.8.0" }
 futures = { version = "0.3.28" }
-serde_json = "1.0.105"
+serde_json = "1.0.99"
 yerpc = { version = "0.5.2", features = ["anyhow_expose", "openrpc"] }
-typescript-type-def = { version = "0.5.8", features = ["json_value"] }
-tokio = { version = "1.32.0" }
+typescript-type-def = { version = "0.5.5", features = ["json_value"] }
+tokio = { version = "1.29.1" }
 sanitize-filename = "0.5"
 walkdir = "2.3.3"
 base64 = "0.21"
@@ -34,7 +34,7 @@ axum = { version = "0.6.18", optional = true, features = ["ws"] }
 env_logger = { version = "0.10.0", optional = true }

 [dev-dependencies]
-tokio = { version = "1.32.0", features = ["full", "rt-multi-thread"] }
+tokio = { version = "1.29.1", features = ["full", "rt-multi-thread"] }


 [features]
--- a/deltachat-repl/Cargo.toml
+++ b/deltachat-repl/Cargo.toml
@@ -9,7 +9,7 @@ ansi_term = "0.12.1"
 anyhow = "1"
 deltachat = { path = "..", features = ["internals"]}
 dirs = "5"
-log = "0.4.20"
+log = "0.4.19"
 pretty_env_logger = "0.5"
 rusqlite = "0.29"
 rustyline = "12"
--- a/deltachat-rpc-client/src/deltachat_rpc_client/rpc.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/rpc.py
@@ -89,14 +89,16 @@ class Rpc:
        return await queue.get()

    def __getattr__(self, attr: str):
-        async def method(*args) -> Any:
+        async def method(*args, **kwargs) -> Any:
            self.id += 1
            request_id = self.id

+            assert not (args and kwargs), "Mixing positional and keyword arguments"
+
            request = {
                "jsonrpc": "2.0",
                "method": attr,
-                "params": args,
+                "params": kwargs or args,
                "id": self.id,
            }
            data = (json.dumps(request) + "\n").encode()
--- a/deltachat-rpc-server/Cargo.toml
+++ b/deltachat-rpc-server/Cargo.toml
@@ -17,9 +17,9 @@ anyhow = "1"
 env_logger = { version = "0.10.0" }
 futures-lite = "1.13.0"
 log = "0.4"
-serde_json = "1.0.105"
+serde_json = "1.0.99"
 serde = { version = "1.0", features = ["derive"] }
-tokio = { version = "1.32.0", features = ["io-std"] }
+tokio = { version = "1.29.1", features = ["io-std"] }
 tokio-util = "0.7.8"
 yerpc = { version = "0.5.2", features = ["anyhow_expose", "openrpc"] }

--- a/deny.toml
+++ b/deny.toml
@@ -62,6 +62,7 @@ skip = [
     { name = "windows_x86_64_gnullvm", version = "<0.48" },
     { name = "windows_x86_64_gnu", version = "<0.48" },
     { name = "windows_x86_64_msvc", version = "<0.48" },
+     { name = "winreg", version = "0.10.1" },
 ]


--- a/scripts/create-provider-data-rs.py
+++ b/scripts/create-provider-data-rs.py
@@ -62,7 +62,7 @@ def process_opt(data):
 def process_config_defaults(data):
    if not "config_defaults" in data:
        return "None"
-    defaults = "Some(&[\n"
+    defaults = "Some(vec![\n"
    config_defaults = data.get("config_defaults", "")
    for key in config_defaults:
        value = str(config_defaults[key])
@@ -162,7 +162,7 @@ def process_data(data, file):
        provider += '    before_login_hint: "' + before_login_hint + '",\n'
        provider += '    after_login_hint: "' + after_login_hint + '",\n'
        provider += '    overview_page: "' + file2url(file) + '",\n'
-        provider += "    server: &[\n" + server + "    ],\n"
+        provider += "    server: vec![\n" + server + "    ],\n"
        provider += "    opt: " + opt + ",\n"
        provider += "    config_defaults: " + config_defaults + ",\n"
        provider += "    oauth2_authorizer: " + oauth2 + ",\n"
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -1255,7 +1255,6 @@ impl Chat {
    pub(crate) async fn why_cant_send(&self, context: &Context) -> Result<Option<CantSendReason>> {
        use CantSendReason::*;

-        // NB: Don't forget to update Chatlist::try_load() when changing this function!
        let reason = if self.id.is_special() {
            Some(SpecialChat)
        } else if self.is_device_talk() {
@@ -1264,7 +1263,7 @@ impl Chat {
            Some(ContactRequest)
        } else if self.is_protection_broken() {
            Some(ProtectionBroken)
-        } else if self.is_mailing_list() && self.get_mailinglist_addr().is_none_or_empty() {
+        } else if self.is_mailing_list() && self.param.get(Param::ListPost).is_none_or_empty() {
            Some(ReadOnlyMailingList)
        } else if !self.is_self_in_chat(context).await? {
            Some(NotAMember)
@@ -1326,11 +1325,11 @@ impl Chat {
    pub async fn get_profile_image(&self, context: &Context) -> Result<Option<PathBuf>> {
        if let Some(image_rel) = self.param.get(Param::ProfileImage) {
            if !image_rel.is_empty() {
-                return Ok(Some(get_abs_path(context, Path::new(&image_rel))));
+                return Ok(Some(get_abs_path(context, image_rel)));
            }
        } else if self.id.is_archived_link() {
            if let Ok(image_rel) = get_archive_icon(context).await {
-                return Ok(Some(get_abs_path(context, Path::new(&image_rel))));
+                return Ok(Some(get_abs_path(context, image_rel)));
            }
        } else if self.typ == Chattype::Single {
            let contacts = get_chat_contacts(context, self.id).await?;
@@ -1341,7 +1340,7 @@ impl Chat {
            }
        } else if self.typ == Chattype::Broadcast {
            if let Ok(image_rel) = get_broadcast_icon(context).await {
-                return Ok(Some(get_abs_path(context, Path::new(&image_rel))));
+                return Ok(Some(get_abs_path(context, image_rel)));
            }
        }
        Ok(None)
--- a/src/chatlist.rs
+++ b/src/chatlist.rs
@@ -10,10 +10,8 @@ use crate::constants::{
 use crate::contact::{Contact, ContactId};
 use crate::context::Context;
 use crate::message::{Message, MessageState, MsgId};
-use crate::param::{Param, Params};
 use crate::stock_str;
 use crate::summary::Summary;
-use crate::tools::IsNoneOrEmpty;

 /// An object representing a single chatlist in memory.
 ///
@@ -206,84 +204,34 @@ impl Chatlist {
                )
                .await?
        } else {
-            let mut ids = if flag_for_forwarding {
-                let sort_id_up = ChatId::lookup_by_contact(context, ContactId::SELF)
+            //  show normal chatlist
+            let sort_id_up = if flag_for_forwarding {
+                ChatId::lookup_by_contact(context, ContactId::SELF)
                    .await?
-                    .unwrap_or_default();
-                let process_row = |row: &rusqlite::Row| {
-                    let chat_id: ChatId = row.get(0)?;
-                    let typ: Chattype = row.get(1)?;
-                    let param: Params = row.get::<_, String>(2)?.parse().unwrap_or_default();
-                    let msg_id: Option<MsgId> = row.get(3)?;
-                    Ok((chat_id, typ, param, msg_id))
-                };
-                let process_rows = |rows: rusqlite::MappedRows<_>| {
-                    rows.filter_map(|row: std::result::Result<(_, _, Params, _), _>| match row {
-                        Ok((chat_id, typ, param, msg_id)) => {
-                            if typ == Chattype::Mailinglist
-                                && param.get(Param::ListPost).is_none_or_empty()
-                            {
-                                None
-                            } else {
-                                Some(Ok((chat_id, msg_id)))
-                            }
-                        }
-                        Err(e) => Some(Err(e)),
-                    })
-                    .collect::<std::result::Result<Vec<_>, _>>()
-                    .map_err(Into::into)
-                };
-                // Return ProtectionBroken chats also, as that may happen to a verified chat at any
-                // time. It may be confusing if a chat that is normally in the list disappears
-                // suddenly. The UI need to deal with that case anyway.
-                context.sql.query_map(
-                    "SELECT c.id, c.type, c.param, m.id
-                     FROM chats c
-                     LEFT JOIN msgs m
-                            ON c.id=m.chat_id
-                           AND m.id=(
-                                   SELECT id
-                                     FROM msgs
-                                    WHERE chat_id=c.id
-                                      AND (hidden=0 OR state=?)
-                                      ORDER BY timestamp DESC, id DESC LIMIT 1)
-                     WHERE c.id>9 AND c.id!=?
-                       AND c.blocked=0
-                       AND NOT c.archived=?
-                       AND (c.type!=? OR c.id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?))
-                     GROUP BY c.id
-                     ORDER BY c.id=? DESC, c.archived=? DESC, IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
-                    (
-                        MessageState::OutDraft, skip_id, ChatVisibility::Archived,
-                        Chattype::Group, ContactId::SELF,
-                        sort_id_up, ChatVisibility::Pinned,
-                    ),
-                    process_row,
-                    process_rows,
-                ).await?
+                    .unwrap_or_default()
            } else {
-                //  show normal chatlist
-                context.sql.query_map(
-                    "SELECT c.id, m.id
-                     FROM chats c
-                     LEFT JOIN msgs m
-                            ON c.id=m.chat_id
-                           AND m.id=(
-                                   SELECT id
-                                     FROM msgs
-                                    WHERE chat_id=c.id
-                                      AND (hidden=0 OR state=?)
-                                      ORDER BY timestamp DESC, id DESC LIMIT 1)
-                     WHERE c.id>9 AND c.id!=?
-                       AND (c.blocked=0 OR c.blocked=2)
-                       AND NOT c.archived=?
-                     GROUP BY c.id
-                     ORDER BY c.id=0 DESC, c.archived=? DESC, IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
-                    (MessageState::OutDraft, skip_id, ChatVisibility::Archived, ChatVisibility::Pinned),
-                    process_row,
-                    process_rows,
-                ).await?
+                ChatId::new(0)
            };
+            let mut ids = context.sql.query_map(
+                "SELECT c.id, m.id
+                 FROM chats c
+                 LEFT JOIN msgs m
+                        ON c.id=m.chat_id
+                       AND m.id=(
+                               SELECT id
+                                 FROM msgs
+                                WHERE chat_id=c.id
+                                  AND (hidden=0 OR state=?1)
+                                  ORDER BY timestamp DESC, id DESC LIMIT 1)
+                 WHERE c.id>9 AND c.id!=?2
+                   AND (c.blocked=0 OR (c.blocked=2 AND NOT ?3))
+                   AND NOT c.archived=?4
+                 GROUP BY c.id
+                 ORDER BY c.id=?5 DESC, c.archived=?6 DESC, IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
+                (MessageState::OutDraft, skip_id, flag_for_forwarding, ChatVisibility::Archived, sort_id_up, ChatVisibility::Pinned),
+                process_row,
+                process_rows,
+            ).await?;
            if !flag_no_specials && get_archived_cnt(context).await? > 0 {
                if ids.is_empty() && flag_add_alldone_hint {
                    ids.push((DC_CHAT_ID_ALLDONE_HINT, None));
@@ -440,9 +388,7 @@ pub async fn get_last_message_for_chat(
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::chat::{
-        create_group_chat, get_chat_contacts, remove_contact_from_chat, ProtectionStatus,
-    };
+    use crate::chat::{create_group_chat, get_chat_contacts, ProtectionStatus};
    use crate::message::Viewtype;
    use crate::receive_imf::receive_imf;
    use crate::stock_str::StockMessage;
@@ -527,14 +473,6 @@ mod tests {
            .await
            .unwrap()
            .is_self_talk());
-
-        remove_contact_from_chat(&t, chats.get_chat_id(1).unwrap(), ContactId::SELF)
-            .await
-            .unwrap();
-        let chats = Chatlist::try_load(&t, DC_GCL_FOR_FORWARDING, None, None)
-            .await
-            .unwrap();
-        assert!(chats.len() == 1);
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,7 +1,6 @@
 //! # Key-value configuration management.

 use std::env;
-use std::path::Path;
 use std::str::FromStr;

 use anyhow::{ensure, Context as _, Result};
@@ -340,11 +339,7 @@ impl Context {
        let value = match key {
            Config::Selfavatar => {
                let rel_path = self.sql.get_raw_config(key.as_ref()).await?;
-                rel_path.map(|p| {
-                    get_abs_path(self, Path::new(&p))
-                        .to_string_lossy()
-                        .into_owned()
-                })
+                rel_path.map(|p| get_abs_path(self, p).to_string_lossy().into_owned())
            }
            Config::SysVersion => Some((*DC_VERSION_STR).clone()),
            Config::SysMsgsizeMaxRecommended => Some(format!("{RECOMMENDED_FILE_SIZE}")),
--- a/src/configure.rs
+++ b/src/configure.rs
@@ -130,7 +130,7 @@ async fn on_configure_completed(
    old_addr: Option<String>,
 ) -> Result<()> {
    if let Some(provider) = param.provider {
-        if let Some(config_defaults) = provider.config_defaults {
+        if let Some(config_defaults) = &provider.config_defaults {
            for def in config_defaults {
                if !context.config_exists(def.key).await? {
                    info!(context, "apply config_defaults {}={}", def.key, def.value);
--- a/src/contact.rs
+++ b/src/contact.rs
@@ -5,7 +5,7 @@ use std::collections::BinaryHeap;
 use std::convert::{TryFrom, TryInto};
 use std::fmt;
 use std::ops::Deref;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::time::{SystemTime, UNIX_EPOCH};

 use anyhow::{bail, ensure, Context as _, Result};
@@ -1186,7 +1186,7 @@ impl Contact {
            }
        } else if let Some(image_rel) = self.param.get(Param::ProfileImage) {
            if !image_rel.is_empty() {
-                return Ok(Some(get_abs_path(context, Path::new(image_rel))));
+                return Ok(Some(get_abs_path(context, image_rel)));
            }
        }
        Ok(None)
--- a/src/decrypt.rs
+++ b/src/decrypt.rs
@@ -28,30 +28,14 @@ pub fn try_decrypt(
    private_keyring: &[SignedSecretKey],
    public_keyring_for_validate: &[SignedPublicKey],
 ) -> Result<Option<(Vec<u8>, HashSet<Fingerprint>)>> {
-    let encrypted_data_part = match {
-        let mime = get_autocrypt_mime(mail);
-        if mime.is_some() {
-            info!(context, "Detected Autocrypt-mime message.");
-        }
-        mime
-    }
-    .or_else(|| {
-        let mime = get_mixed_up_mime(mail);
-        if mime.is_some() {
-            info!(context, "Detected mixed-up mime message.");
-        }
-        mime
-    })
-    .or_else(|| {
-        let mime = get_attachment_mime(mail);
-        if mime.is_some() {
-            info!(context, "Detected attached Autocrypt-mime message.");
-        }
-        mime
-    }) {
+    let encrypted_data_part = match get_autocrypt_mime(mail)
+        .or_else(|| get_mixed_up_mime(mail))
+        .or_else(|| get_attachment_mime(mail))
+    {
        None => return Ok(None),
        Some(res) => res,
    };
+    info!(context, "Detected Autocrypt-mime message");

    decrypt_part(
        encrypted_data_part,
@@ -418,18 +402,4 @@ mod tests {

        Ok(())
    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_mixed_up_mime_long() -> Result<()> {
-        // Long "mixed-up" mail as received when sending an encrypted message using Delta Chat
-        // Desktop via MS Exchange (actually made with TB though).
-        let mixed_up_mime = include_bytes!("../test-data/message/mixed-up-long.eml");
-        let bob = TestContext::new_bob().await;
-        receive_imf(&bob, mixed_up_mime, false).await?;
-        let msg = bob.get_last_msg().await;
-        assert!(!msg.get_text().is_empty());
-        assert!(msg.has_html());
-        assert!(msg.id.get_html(&bob).await?.unwrap().len() > 40000);
-        Ok(())
-    }
 }
--- a/src/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -12,6 +12,7 @@ use deltachat_derive::{FromSql, ToSql};
 use format_flowed::unformat_flowed;
 use lettre_email::mime::{self, Mime};
 use mailparse::{addrparse_header, DispositionType, MailHeader, MailHeaderMap, SingleInfo};
+use once_cell::sync::Lazy;

 use crate::aheader::{Aheader, EncryptPreference};
 use crate::blob::BlobObject;
@@ -1616,21 +1617,25 @@ impl MimeMessage {
            false
        };
        if maybe_ndn && self.delivery_report.is_none() {
-            for original_message_id in self
+            static RE: Lazy<regex::Regex> =
+                Lazy::new(|| regex::Regex::new(r"Message-ID:(.*)").unwrap());
+            for captures in self
                .parts
                .iter()
                .filter_map(|part| part.msg_raw.as_ref())
                .flat_map(|part| part.lines())
-                .filter_map(|line| line.split_once("Message-ID:"))
-                .filter_map(|(_, message_id)| parse_message_id(message_id).ok())
+                .filter_map(|line| RE.captures(line))
            {
-                if let Ok(Some(_)) = message::rfc724_mid_exists(context, &original_message_id).await
-                {
-                    self.delivery_report = Some(DeliveryReport {
-                        rfc724_mid: original_message_id,
-                        failed_recipient: None,
-                        failure: true,
-                    })
+                if let Ok(original_message_id) = parse_message_id(&captures[1]) {
+                    if let Ok(Some(_)) =
+                        message::rfc724_mid_exists(context, &original_message_id).await
+                    {
+                        self.delivery_report = Some(DeliveryReport {
+                            rfc724_mid: original_message_id,
+                            failed_recipient: None,
+                            failure: true,
+                        })
+                    }
                }
            }
        }
--- a/src/provider.rs
+++ b/src/provider.rs
@@ -123,10 +123,10 @@ pub struct Provider {
    pub overview_page: &'static str,

    /// List of provider servers.
-    pub server: &'static [Server],
+    pub server: Vec<Server>,

    /// Default configuration values to set when provider is configured.
-    pub config_defaults: Option<&'static [ConfigDefault]>,
+    pub config_defaults: Option<Vec<ConfigDefault>>,

    /// Type of OAuth 2 authorization if provider supports it.
    pub oauth2_authorizer: Option<Oauth2Authorizer>,
--- a/src/provider/data.rs
+++ b/src/provider/data.rs
@@ -17,7 +17,7 @@ static P_163: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/163",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -45,7 +45,7 @@ static P_AKTIVIX_ORG: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/aktivix-org",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Starttls,
@@ -74,7 +74,7 @@ static P_AOL: Lazy<Provider> = Lazy::new(|| {
    before_login_hint: "To log in to AOL with Delta Chat, you need to set up an app password in the AOL web interface.",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/aol",
-    server: &[
+    server: vec![
        Server { protocol: Imap, socket: Ssl, hostname: "imap.aol.com", port: 993, username_pattern: Email },
        Server { protocol: Smtp, socket: Ssl, hostname: "smtp.aol.com", port: 465, username_pattern: Email },
    ],
@@ -91,7 +91,7 @@ static P_ARCOR_DE: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/arcor-de",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -119,7 +119,7 @@ static P_AUTISTICI_ORG: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/autistici-org",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -147,7 +147,7 @@ static P_BLINDZELN_ORG: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/blindzeln-org",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -175,7 +175,7 @@ static P_BLUEWIN_CH: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/bluewin-ch",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -203,7 +203,7 @@ static P_BUZON_UY: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/buzon-uy",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Starttls,
@@ -231,7 +231,7 @@ static P_CHELLO_AT: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/chello-at",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -259,7 +259,7 @@ static P_COMCAST: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/comcast",
-    server: &[],
+    server: vec![],
    opt: Default::default(),
    config_defaults: None,
    oauth2_authorizer: None,
@@ -272,7 +272,7 @@ static P_DISMAIL_DE: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/dismail-de",
-    server: &[],
+    server: vec![],
    opt: Default::default(),
    config_defaults: None,
    oauth2_authorizer: None,
@@ -285,7 +285,7 @@ static P_DISROOT: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/disroot",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -313,7 +313,7 @@ static P_E_EMAIL: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/e-email",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -341,7 +341,7 @@ static P_ESPIV_NET: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/espiv-net",
-    server: &[],
+    server: vec![],
    opt: Default::default(),
    config_defaults: None,
    oauth2_authorizer: None,
@@ -355,7 +355,7 @@ static P_EXAMPLE_COM: Lazy<Provider> = Lazy::new(|| {
    before_login_hint: "Hush this provider doesn't exist!",
    after_login_hint: "This provider doesn't really exist, so you can't use it :/ If you need an email provider for Delta Chat, take a look at providers.delta.chat!",
    overview_page: "https://providers.delta.chat/example-com",
-    server: &[
+    server: vec![
        Server { protocol: Imap, socket: Ssl, hostname: "imap.example.com", port: 1337, username_pattern: Email },
        Server { protocol: Smtp, socket: Starttls, hostname: "smtp.example.com", port: 1337, username_pattern: Email },
    ],
@@ -373,7 +373,7 @@ static P_FASTMAIL: Lazy<Provider> = Lazy::new(|| Provider {
        "You must create an app-specific password for Delta Chat before you can log in.",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/fastmail",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -402,7 +402,7 @@ static P_FIREMAIL_DE: Lazy<Provider> = Lazy::new(|| {
    before_login_hint: "Firemail erlaubt nur bei bezahlten Accounts den vollen Zugriff auf das E-Mail-Protokoll. Wenn Sie nicht für Firemail bezahlen, verwenden Sie bitte einen anderen E-Mail-Anbieter.",
    after_login_hint: "Leider schränkt Firemail die maximale Gruppengröße ein. Je nach Bezahlmodell sind nur 5 bis 30 Gruppenmitglieder erlaubt.",
    overview_page: "https://providers.delta.chat/firemail-de",
-    server: &[
+    server: vec![
    ],
    opt: Default::default(),
    config_defaults: None,
@@ -417,9 +417,9 @@ static P_FIVE_CHAT: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/five-chat",
-    server: &[],
+    server: vec![],
    opt: Default::default(),
-    config_defaults: Some(&[
+    config_defaults: Some(vec![
        ConfigDefault {
            key: Config::BccSelf,
            value: "1",
@@ -444,7 +444,7 @@ static P_FREENET_DE: Lazy<Provider> = Lazy::new(|| {
    before_login_hint: "Um deine freenet.de E-Mail-Adresse mit Delta Chat zu benutzen, musst du erst auf der freenet.de-Webseite \"POP3/IMAP/SMTP\" aktivieren.",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/freenet-de",
-    server: &[
+    server: vec![
        Server { protocol: Imap, socket: Ssl, hostname: "mx.freenet.de", port: 993, username_pattern: Email },
        Server { protocol: Smtp, socket: Starttls, hostname: "mx.freenet.de", port: 587, username_pattern: Email },
    ],
@@ -462,7 +462,7 @@ static P_GMAIL: Lazy<Provider> = Lazy::new(|| {
    before_login_hint: "For Gmail accounts, you need to create an app-password if you have \"2-Step Verification\" enabled. If this setting is not available, you need to enable \"less secure apps\".",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/gmail",
-    server: &[
+    server: vec![
        Server { protocol: Imap, socket: Ssl, hostname: "imap.gmail.com", port: 993, username_pattern: Email },
        Server { protocol: Smtp, socket: Ssl, hostname: "smtp.gmail.com", port: 465, username_pattern: Email },
    ],
@@ -482,7 +482,7 @@ static P_GMX_NET: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "You must allow IMAP access to your account before you can login.",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/gmx-net",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -517,12 +517,12 @@ static P_HERMES_RADIO: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/hermes-radio",
-    server: &[],
+    server: vec![],
    opt: ProviderOptions {
        strict_tls: false,
        ..Default::default()
    },
-    config_defaults: Some(&[
+    config_defaults: Some(vec![
        ConfigDefault {
            key: Config::MdnsEnabled,
            value: "0",
@@ -547,7 +547,7 @@ static P_HEY_COM: Lazy<Provider> = Lazy::new(|| {
    before_login_hint: "hey.com does not offer the standard IMAP e-mail protocol, so you cannot log in with Delta Chat to hey.com.",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/hey-com",
-    server: &[
+    server: vec![
    ],
    opt: Default::default(),
    config_defaults: None,
@@ -562,7 +562,7 @@ static P_I_UA: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "Протокол IMAP не предоставляется и не планируется.",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/i-ua",
-    server: &[],
+    server: vec![],
    opt: Default::default(),
    config_defaults: None,
    oauth2_authorizer: None,
@@ -575,7 +575,7 @@ static P_I3_NET: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/i3-net",
-    server: &[],
+    server: vec![],
    opt: Default::default(),
    config_defaults: None,
    oauth2_authorizer: None,
@@ -588,7 +588,7 @@ static P_ICLOUD: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "You must create an app-specific password for Delta Chat before login.",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/icloud",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -616,7 +616,7 @@ static P_INFOMANIAK_COM: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/infomaniak-com",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -647,7 +647,7 @@ static P_KOLST_COM: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/kolst-com",
-    server: &[],
+    server: vec![],
    opt: Default::default(),
    config_defaults: None,
    oauth2_authorizer: None,
@@ -660,7 +660,7 @@ static P_KONTENT_COM: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/kontent-com",
-    server: &[],
+    server: vec![],
    opt: Default::default(),
    config_defaults: None,
    oauth2_authorizer: None,
@@ -673,7 +673,7 @@ static P_MAIL_DE: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/mail-de",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -702,7 +702,7 @@ static P_MAIL_RU: Lazy<Provider> = Lazy::new(|| {
    before_login_hint: "Вам необходимо сгенерировать \"пароль для внешнего приложения\" в веб-интерфейсе mail.ru, чтобы mail.ru работал с Delta Chat.",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/mail-ru",
-    server: &[
+    server: vec![
        Server { protocol: Imap, socket: Ssl, hostname: "imap.mail.ru", port: 993, username_pattern: Email },
        Server { protocol: Smtp, socket: Ssl, hostname: "smtp.mail.ru", port: 465, username_pattern: Email },
    ],
@@ -719,7 +719,7 @@ static P_MAIL2TOR: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "Tor is needed to connect to the email servers.",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/mail2tor",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Plain,
@@ -747,7 +747,7 @@ static P_MAILBOX_ORG: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/mailbox-org",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -775,7 +775,7 @@ static P_MAILO_COM: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/mailo-com",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -803,7 +803,7 @@ static P_NAUTA_CU: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/nauta-cu",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Starttls,
@@ -824,7 +824,7 @@ static P_NAUTA_CU: Lazy<Provider> = Lazy::new(|| Provider {
        strict_tls: false,
        ..Default::default()
    },
-    config_defaults: Some(&[
+    config_defaults: Some(vec![
        ConfigDefault {
            key: Config::DeleteServerAfter,
            value: "1",
@@ -860,7 +860,7 @@ static P_NAVER: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "Manually enabling IMAP/SMTP is required.",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/naver",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -888,7 +888,7 @@ static P_NUBO_COOP: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/nubo-coop",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -916,7 +916,7 @@ static P_OUTLOOK_COM: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/outlook-com",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -944,7 +944,7 @@ static P_OUVATON_COOP: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/ouvaton-coop",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -972,7 +972,7 @@ static P_POSTEO: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/posteo",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -1015,7 +1015,7 @@ static P_PROTONMAIL: Lazy<Provider> = Lazy::new(|| {
    before_login_hint: "Protonmail does not offer the standard IMAP e-mail protocol, so you cannot log in with Delta Chat to Protonmail.",
    after_login_hint: "To use Delta Chat with Protonmail, the IMAP bridge must be running in the background. If you have connectivity issues, double check whether it works as expected.",
    overview_page: "https://providers.delta.chat/protonmail",
-    server: &[
+    server: vec![
    ],
    opt: Default::default(),
    config_defaults: None,
@@ -1031,7 +1031,7 @@ static P_QQ: Lazy<Provider> = Lazy::new(|| {
    before_login_hint: "Manually enabling IMAP/SMTP and creating an app-specific password for Delta Chat are required.",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/qq",
-    server: &[
+    server: vec![
        Server { protocol: Imap, socket: Ssl, hostname: "imap.qq.com", port: 993, username_pattern: Emaillocalpart },
        Server { protocol: Smtp, socket: Ssl, hostname: "smtp.qq.com", port: 465, username_pattern: Email },
    ],
@@ -1048,7 +1048,7 @@ static P_RISEUP_NET: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/riseup-net",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -1076,7 +1076,7 @@ static P_ROGERS_COM: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/rogers-com",
-    server: &[],
+    server: vec![],
    opt: Default::default(),
    config_defaults: None,
    oauth2_authorizer: None,
@@ -1089,7 +1089,7 @@ static P_SONIC: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/sonic",
-    server: &[],
+    server: vec![],
    opt: Default::default(),
    config_defaults: None,
    oauth2_authorizer: None,
@@ -1102,7 +1102,7 @@ static P_SYSTEMAUSFALL_ORG: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/systemausfall-org",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -1130,7 +1130,7 @@ static P_SYSTEMLI_ORG: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/systemli-org",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -1159,7 +1159,7 @@ static P_T_ONLINE: Lazy<Provider> = Lazy::new(|| {
    before_login_hint: "To use Delta Chat with a T-Online email address, you need to create an app password in the web interface.",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/t-online",
-    server: &[
+    server: vec![
        Server { protocol: Imap, socket: Ssl, hostname: "secureimap.t-online.de", port: 993, username_pattern: Email },
        Server { protocol: Smtp, socket: Ssl, hostname: "securesmtp.t-online.de", port: 465, username_pattern: Email },
    ],
@@ -1176,7 +1176,7 @@ static P_TESTRUN: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/testrun",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -1200,7 +1200,7 @@ static P_TESTRUN: Lazy<Provider> = Lazy::new(|| Provider {
        },
    ],
    opt: Default::default(),
-    config_defaults: Some(&[
+    config_defaults: Some(vec![
        ConfigDefault {
            key: Config::BccSelf,
            value: "1",
@@ -1224,7 +1224,7 @@ static P_TISCALI_IT: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/tiscali-it",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -1253,7 +1253,7 @@ static P_TUTANOTA: Lazy<Provider> = Lazy::new(|| {
    before_login_hint: "Tutanota does not offer the standard IMAP e-mail protocol, so you cannot log in with Delta Chat to Tutanota.",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/tutanota",
-    server: &[
+    server: vec![
    ],
    opt: Default::default(),
    config_defaults: None,
@@ -1268,7 +1268,7 @@ static P_UKR_NET: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/ukr-net",
-    server: &[],
+    server: vec![],
    opt: Default::default(),
    config_defaults: None,
    oauth2_authorizer: None,
@@ -1281,7 +1281,7 @@ static P_UNDERNET_UY: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/undernet-uy",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Starttls,
@@ -1309,7 +1309,7 @@ static P_VFEMAIL: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/vfemail",
-    server: &[],
+    server: vec![],
    opt: Default::default(),
    config_defaults: None,
    oauth2_authorizer: None,
@@ -1322,7 +1322,7 @@ static P_VIVALDI: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/vivaldi",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Starttls,
@@ -1350,7 +1350,7 @@ static P_VODAFONE_DE: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/vodafone-de",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -1379,7 +1379,7 @@ static P_WEB_DE: Lazy<Provider> = Lazy::new(|| {
    before_login_hint: "You must allow IMAP access to your account before you can login.",
    after_login_hint: "Note: if you have your web.de spam settings too strict, you won't receive contact requests from new people. If you want to receive contact requests, you should disable the \"3-Wege-Spamschutz\" in the web.de settings.  Read how: https://hilfe.web.de/email/spam-und-viren/spamschutz-einstellungen.html",
    overview_page: "https://providers.delta.chat/web-de",
-    server: &[
+    server: vec![
        Server { protocol: Imap, socket: Ssl, hostname: "imap.web.de", port: 993, username_pattern: Emaillocalpart },
        Server { protocol: Imap, socket: Starttls, hostname: "imap.web.de", port: 143, username_pattern: Emaillocalpart },
        Server { protocol: Smtp, socket: Starttls, hostname: "smtp.web.de", port: 587, username_pattern: Emaillocalpart },
@@ -1398,7 +1398,7 @@ static P_YAHOO: Lazy<Provider> = Lazy::new(|| {
    before_login_hint: "To use Delta Chat with your Yahoo email address you have to create an \"App-Password\" in the account security screen.",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/yahoo",
-    server: &[
+    server: vec![
        Server { protocol: Imap, socket: Ssl, hostname: "imap.mail.yahoo.com", port: 993, username_pattern: Email },
        Server { protocol: Smtp, socket: Ssl, hostname: "smtp.mail.yahoo.com", port: 465, username_pattern: Email },
    ],
@@ -1415,7 +1415,7 @@ static P_YANDEX_RU: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "For Yandex accounts, you have to set IMAP protocol option turned on.",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/yandex-ru",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -1444,12 +1444,12 @@ static P_YGGMAIL: Lazy<Provider> = Lazy::new(|| {
    before_login_hint: "An Yggmail companion app needs to be installed on your device to access the Yggmail network.",
    after_login_hint: "Make sure, the Yggmail companion app runs whenever you want to use this account. Note, that you usually cannot write from @yggmail addresses to normal e-mail-addresses (as @gmx.net). However, you can create another account in the normal e-mail-network for this purpose.",
    overview_page: "https://providers.delta.chat/yggmail",
-    server: &[
+    server: vec![
        Server { protocol: Imap, socket: Plain, hostname: "localhost", port: 1143, username_pattern: Email },
        Server { protocol: Smtp, socket: Plain, hostname: "localhost", port: 1025, username_pattern: Email },
    ],
    opt: Default::default(),
-    config_defaults: Some(&[
+    config_defaults: Some(vec![
        ConfigDefault { key: Config::MvboxMove, value: "0" },
    ]),
    oauth2_authorizer: None,
@@ -1463,7 +1463,7 @@ static P_ZIGGO_NL: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/ziggo-nl",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
@@ -1491,7 +1491,7 @@ static P_ZOHO: Lazy<Provider> = Lazy::new(|| Provider {
    before_login_hint: "To use Zoho Mail, you have to turn on IMAP in the Zoho Mail backend.",
    after_login_hint: "",
    overview_page: "https://providers.delta.chat/zoho",
-    server: &[
+    server: vec![
        Server {
            protocol: Imap,
            socket: Ssl,
--- a/src/receive_imf.rs
+++ b/src/receive_imf.rs
@@ -1095,7 +1095,7 @@ async fn add_parts(
    let mut save_mime_modified = mime_parser.is_mime_modified;

    let mime_headers = if save_mime_headers || save_mime_modified {
-        let headers = if !mime_parser.decoded_data.is_empty() {
+        let headers = if mime_parser.was_encrypted() && !mime_parser.decoded_data.is_empty() {
            mime_parser.decoded_data.clone()
        } else {
            imf_raw.to_vec()
@@ -1702,22 +1702,19 @@ async fn apply_group_changes(
        };

    // Whether to allow any changes to the member list at all.
-    let allow_member_list_changes = if chat::is_contact_in_chat(context, chat_id, ContactId::SELF)
-        .await?
-        || self_added
-        || !mime_parser.has_chat_version()
-    {
-        // Reject old group changes.
-        chat_id
-            .update_timestamp(context, Param::MemberListTimestamp, sent_timestamp)
-            .await?
-    } else {
-        // Member list changes are not allowed if we're not in the group
-        // and are not explicitly added.
-        // This message comes from a Delta Chat that restored an old backup
-        // or the message is a MUA reply to an old message.
-        false
-    };
+    let allow_member_list_changes =
+        if chat::is_contact_in_chat(context, chat_id, ContactId::SELF).await? || self_added {
+            // Reject old group changes.
+            chat_id
+                .update_timestamp(context, Param::MemberListTimestamp, sent_timestamp)
+                .await?
+        } else {
+            // Member list changes are not allowed if we're not in the group
+            // and are not explicitly added.
+            // This message comes from a Delta Chat that restored an old backup
+            // or the message is a MUA reply to an old message.
+            false
+        };

    // Whether to rebuild the member list from scratch.
    let recreate_member_list = if allow_member_list_changes {
--- a/src/receive_imf/tests.rs
+++ b/src/receive_imf/tests.rs
@@ -8,7 +8,7 @@ use crate::chat::{
 };
 use crate::chat::{get_chat_msgs, ChatItem, ChatVisibility};
 use crate::chatlist::Chatlist;
-use crate::constants::{DC_GCL_FOR_FORWARDING, DC_GCL_NO_SPECIALS};
+use crate::constants::DC_GCL_NO_SPECIALS;
 use crate::imap::prefetch_should_download;
 use crate::message::Message;
 use crate::test_utils::{get_chat_msg, TestContext, TestContextManager};
@@ -793,8 +793,6 @@ async fn test_github_mailing_list() -> Result<()> {

    let chats = Chatlist::try_load(&t.ctx, 0, None, None).await?;
    assert_eq!(chats.len(), 1);
-    let chats = Chatlist::try_load(&t.ctx, DC_GCL_FOR_FORWARDING, None, None).await?;
-    assert_eq!(chats.len(), 0);
    let contacts = Contact::get_all(&t.ctx, 0, None).await?;
    assert_eq!(contacts.len(), 0); // mailing list recipients and senders do not count as "known contacts"

@@ -3562,52 +3560,3 @@ async fn test_mua_can_add() -> Result<()> {
    );
    Ok(())
 }
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_mua_can_readd() -> Result<()> {
-    let alice = TestContext::new_alice().await;
-
-    // Alice creates chat with 3 contacts.
-    let msg = receive_imf(
-        &alice,
-        b"Subject: =?utf-8?q?Message_from_alice=40example=2Eorg?=\r\n\
-            From: alice@example.org\r\n\
-            To: <bob@example.net>, <claire@example.org>, <fiona@example.org> \r\n\
-            Date: Mon, 12 Dec 2022 14:30:39 +0000\r\n\
-            Message-ID: <Mr.alices_original_mail@example.org>\r\n\
-            Chat-Version: 1.0\r\n\
-            \r\n\
-            Hi!\r\n",
-        false,
-    )
-    .await?
-    .unwrap();
-    let alice_chat = Chat::load_from_db(&alice, msg.chat_id).await?;
-    assert_eq!(alice_chat.typ, Chattype::Group);
-    assert!(is_contact_in_chat(&alice, alice_chat.id, ContactId::SELF).await?);
-
-    // And leaves it.
-    remove_contact_from_chat(&alice, alice_chat.id, ContactId::SELF).await?;
-    let alice_chat = Chat::load_from_db(&alice, alice_chat.id).await?;
-    assert!(!is_contact_in_chat(&alice, alice_chat.id, ContactId::SELF).await?);
-
-    // Bob uses a classical MUA to answer, adding Alice back.
-    receive_imf(
-        &alice,
-        b"Subject: Re: Message from alice\r\n\
-            From: <bob@example.net>\r\n\
-            To: <alice@example.org>, <claire@example.org>, <fiona@example.org>\r\n\
-            Date: Mon, 12 Dec 2022 14:32:39 +0000\r\n\
-            Message-ID: <bobs_answer_to_two_recipients@example.net>\r\n\
-            In-Reply-To: <Mr.alices_original_mail@example.org>\r\n\
-            \r\n\
-            Hi back!\r\n",
-        false,
-    )
-    .await?
-    .unwrap();
-
-    let alice_chat = Chat::load_from_db(&alice, alice_chat.id).await?;
-    assert!(is_contact_in_chat(&alice, alice_chat.id, ContactId::SELF).await?);
-    Ok(())
-}
--- a/src/tests/verified_chats.rs
+++ b/src/tests/verified_chats.rs
@@ -2,9 +2,7 @@ use anyhow::Result;
 use pretty_assertions::assert_eq;

 use crate::chat::{Chat, ProtectionStatus};
-use crate::chatlist::Chatlist;
 use crate::config::Config;
-use crate::constants::DC_GCL_FOR_FORWARDING;
 use crate::contact::VerifiedStatus;
 use crate::contact::{Contact, Origin};
 use crate::message::{Message, Viewtype};
@@ -659,8 +657,6 @@ async fn test_break_protection_then_verify_again() -> Result<()> {

    alice.create_chat(&bob).await;
    assert_verified(&alice, &bob, ProtectionStatus::Protected).await;
-    let chats = Chatlist::try_load(&alice, DC_GCL_FOR_FORWARDING, None, None).await?;
-    assert!(chats.len() == 1);

    tcm.section("Bob reinstalls DC");
    drop(bob);
@@ -682,8 +678,6 @@ async fn test_break_protection_then_verify_again() -> Result<()> {
    let chat = alice.get_chat(&bob_new).await;
    assert_eq!(chat.is_protected(), false);
    assert_eq!(chat.is_protection_broken(), true);
-    let chats = Chatlist::try_load(&alice, DC_GCL_FOR_FORWARDING, None, None).await?;
-    assert!(chats.len() == 1);

    {
        let alice_bob_chat = alice.get_chat(&bob_new).await;
--- a/src/tools.rs
+++ b/src/tools.rs
@@ -323,16 +323,17 @@ pub fn get_filemeta(buf: &[u8]) -> Result<(u32, u32)> {
 ///
 /// If `path` starts with "$BLOBDIR", replaces it with the blobdir path.
 /// Otherwise, returns path as is.
-pub(crate) fn get_abs_path(context: &Context, path: &Path) -> PathBuf {
-    if let Ok(p) = path.strip_prefix("$BLOBDIR") {
+pub(crate) fn get_abs_path(context: &Context, path: impl AsRef<Path>) -> PathBuf {
+    let p: &Path = path.as_ref();
+    if let Ok(p) = p.strip_prefix("$BLOBDIR") {
        context.get_blobdir().join(p)
    } else {
-        path.into()
+        p.into()
    }
 }

 pub(crate) async fn get_filebytes(context: &Context, path: impl AsRef<Path>) -> Result<u64> {
-    let path_abs = get_abs_path(context, path.as_ref());
+    let path_abs = get_abs_path(context, &path);
    let meta = fs::metadata(&path_abs).await?;
    Ok(meta.len())
 }
@@ -376,7 +377,7 @@ pub(crate) async fn create_folder(
    context: &Context,
    path: impl AsRef<Path>,
 ) -> Result<(), io::Error> {
-    let path_abs = get_abs_path(context, path.as_ref());
+    let path_abs = get_abs_path(context, &path);
    if !path_abs.exists() {
        match fs::create_dir_all(path_abs).await {
            Ok(_) => Ok(()),
@@ -401,7 +402,7 @@ pub(crate) async fn write_file(
    path: impl AsRef<Path>,
    buf: &[u8],
 ) -> Result<(), io::Error> {
-    let path_abs = get_abs_path(context, path.as_ref());
+    let path_abs = get_abs_path(context, &path);
    fs::write(&path_abs, buf).await.map_err(|err| {
        warn!(
            context,
@@ -416,7 +417,7 @@ pub(crate) async fn write_file(

 /// Reads the file and returns its context as a byte vector.
 pub async fn read_file(context: &Context, path: impl AsRef<Path>) -> Result<Vec<u8>> {
-    let path_abs = get_abs_path(context, path.as_ref());
+    let path_abs = get_abs_path(context, &path);

    match fs::read(&path_abs).await {
        Ok(bytes) => Ok(bytes),
@@ -433,7 +434,7 @@ pub async fn read_file(context: &Context, path: impl AsRef<Path>) -> Result<Vec<
 }

 pub async fn open_file(context: &Context, path: impl AsRef<Path>) -> Result<fs::File> {
-    let path_abs = get_abs_path(context, path.as_ref());
+    let path_abs = get_abs_path(context, &path);

    match fs::File::open(&path_abs).await {
        Ok(bytes) => Ok(bytes),
@@ -449,8 +450,12 @@ pub async fn open_file(context: &Context, path: impl AsRef<Path>) -> Result<fs::
    }
 }

-pub fn open_file_std(context: &Context, path: impl AsRef<Path>) -> Result<std::fs::File> {
-    let path_abs = get_abs_path(context, path.as_ref());
+pub fn open_file_std<P: AsRef<std::path::Path>>(
+    context: &Context,
+    path: P,
+) -> Result<std::fs::File> {
+    let p: PathBuf = path.as_ref().into();
+    let path_abs = get_abs_path(context, p);

    match std::fs::File::open(path_abs) {
        Ok(bytes) => Ok(bytes),
--- a/test-data/message/mixed-up-long.eml
+++ b/test-data/message/mixed-up-long.eml