deps(default-net): Switch to main branch

The main branch now has the right PRs merged. This is better than relying on a fork. Additionally the dependencies are updated and a bunch of duplicates removed as a result.
2026-04-05 23:22:11 +03:00 · 2023-03-23 14:41:45 +01:00
37 changed files with 569 additions and 1706 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -77,9 +77,6 @@ jobs:
          - os: windows-latest
            rust: 1.68.0
            python: false # Python bindings compilation on Windows is not supported.
-          - os: macos-latest
-            rust: 1.68.0
-            python: 3.9

          # Minimum Supported Rust Version = 1.64.0
          #
--- a/.github/workflows/deltachat-rpc-server.yml
+++ b/.github/workflows/deltachat-rpc-server.yml
@@ -84,15 +84,35 @@ jobs:
      contents: write
    runs-on: "ubuntu-latest"
    steps:
-      - name: Download built binaries
+      - name: Download deltachat-rpc-server-x86_64
        uses: "actions/download-artifact@v3"
+        with:
+          name: "deltachat-rpc-server-x86_64"
+          path: "dist/deltachat-rpc-server-x86_64"

-      - name: Compose dist/ directory
-        run: |
-          mkdir dist
-          for x in x86_64 aarch64 armv7 win32.exe win64.exe; do
-            mv "deltachat-rpc-server-$x"/* "dist/deltachat-rpc-server-$x"
-          done
+      - name: Download deltachat-rpc-server-aarch64
+        uses: "actions/download-artifact@v3"
+        with:
+          name: "deltachat-rpc-server-aarch64"
+          path: "dist/deltachat-rpc-server-aarch64"
+
+      - name: Download deltachat-rpc-server-armv7
+        uses: "actions/download-artifact@v3"
+        with:
+          name: "deltachat-rpc-server-armv7"
+          path: "dist/deltachat-rpc-server-armv7"
+
+      - name: Download deltachat-rpc-server-win32.exe
+        uses: "actions/download-artifact@v3"
+        with:
+          name: "deltachat-rpc-server-win32.exe"
+          path: "dist/deltachat-rpc-server-win32.exe"
+
+      - name: Download deltachat-rpc-server-win64.exe
+        uses: "actions/download-artifact@v3"
+        with:
+          name: "deltachat-rpc-server-win64.exe"
+          path: "dist/deltachat-rpc-server-win64.exe"

      - name: List downloaded artifacts
        run: ls -l dist/
@@ -103,4 +123,4 @@ jobs:
        run: |
          gh release upload ${{ github.ref_name }} \
            --repo ${{ github.repository }} \
-            dist/*
+            dist/deltachat-rpc-server-*
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,37 +1,18 @@
 # Changelog

-## 1.112.2 - unreleased
-
-### Changes
- Update iroh, remove `default-net` from `[patch.crates-io]` section.
- transfer backup: Connect to mutliple provider addresses concurrently.  This should speed up connection time significantly on the getter side.  #4240
- Make sure BackupProvider is cancelled on drop (or dc_backup_provider_unref).  The BackupProvider will now alaway finish with an IMEX event of 1000 or 0, previoulsy it would sometimes finishe with 1000 (success) when it really was 0 (failure). #4242
- Fix crash when dc_backup_provider_t is unrefed while dc_backup_provider_wait() is still using it.  #4244
-
-## [1.112.1] - 2023-03-27
-
-### Changes
- Add support for `--version` argument to `deltachat-rpc-server`. #4224
-  It can be used to check the installed version without starting the server.
-
-### Fixes
- deltachat-rpc-client: fix bug in `Chat.send_message()`: invalid `MessageData` field `quotedMsg` instead of `quotedMsgId`
- `receive_imf`: Mark special messages as seen. Exactly: delivery reports, webxdc status updates. #4230
-
-
-## [1.112.0] - 2023-03-23
+## [Unreleased]

 ### Changes
+- "full message view" not needed because of footers that go to contact status #4151
+- Pick up system's light/dark mode in generated message HTML #4150
+- Support non-persistent configuration with DELTACHAT_* env
+- Print deltachat-repl errors with causes. #4166
 - Increase MSRV to 1.64. #4167
 - Core takes care of stopping and re-starting IO itself where needed,
-  e.g. during backup creation.
-  It is no longer needed to call `dc_stop_io()`.
-  `dc_start_io()` can now be called at any time without harm. #4138
- Pick up system's light/dark mode in generated message HTML. #4150
- More accurate `maybe_add_bcc_self` device message text. #4175
- "Full message view" not needed because of footers that go to contact status. #4151
- Support non-persistent configuration with `DELTACHAT_*` env. #4154
- Print deltachat-repl errors with causes. #4166
+  e.g. during backup creation.  It is no longer needed to call
+  dc_stop_io().  dc_start_io() can now be called at any time without
+  harm. #4138
+- More accurate maybe_add_bcc_self device message text #4175

 ### Fixes
 - Fix segmentation fault if `dc_context_unref()` is called during
@@ -45,8 +26,7 @@
 - Add `DC_EVENT_IMAP_INBOX_IDLE` event to wait until the account
  is ready for testing.
  It is used to fix race condition between fetching
-  existing messages and starting the test. #4208
-
+  existing messages and starting the test.

 ## [1.111.0] - 2023-03-05

@@ -2338,6 +2318,5 @@ For a full list of changes, please see our closed Pull Requests:

 https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed

+[unreleased]: https://github.com/deltachat/deltachat-core-rust/compare/v1.111.0...HEAD
 [1.111.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.110.0...v1.111.0
-[1.112.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.111.0...v1.112.0
-[1.112.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.0...v1.112.1
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -368,6 +368,12 @@ dependencies = [
 "rustc-demangle",
 ]

+[[package]]
+name = "base-x"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
+
 [[package]]
 name = "base16ct"
 version = "0.1.1"
@@ -656,11 +662,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
 dependencies = [
 "bitflags",
- "clap_lex",
+ "clap_lex 0.2.4",
 "indexmap",
 "textwrap",
 ]

+[[package]]
+name = "clap"
+version = "4.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5"
+dependencies = [
+ "bitflags",
+ "clap_derive",
+ "clap_lex 0.3.2",
+ "is-terminal",
+ "once_cell",
+ "strsim",
+ "termcolor",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0"
+dependencies = [
+ "heck",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "clap_lex"
 version = "0.2.4"
@@ -670,6 +704,15 @@ dependencies = [
 "os_str_bytes",
 ]

+[[package]]
+name = "clap_lex"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09"
+dependencies = [
+ "os_str_bytes",
+]
+
 [[package]]
 name = "clipboard-win"
 version = "4.5.0"
@@ -712,6 +755,19 @@ dependencies = [
 "crossbeam-utils",
 ]

+[[package]]
+name = "console"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60"
+dependencies = [
+ "encode_unicode",
+ "lazy_static",
+ "libc",
+ "unicode-width",
+ "windows-sys 0.42.0",
+]
+
 [[package]]
 name = "const-oid"
 version = "0.9.2"
@@ -806,7 +862,7 @@ dependencies = [
 "atty",
 "cast",
 "ciborium",
- "clap",
+ "clap 3.2.23",
 "criterion-plot",
 "futures",
 "itertools",
@@ -1043,10 +1099,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"

 [[package]]
-name = "default-net"
-version = "0.14.1"
+name = "data-encoding-macro"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4898b43aed56499fad6b294d15b3e76a51df68079bf492e5daae38ca084e003"
+checksum = "86927b7cd2fe88fa698b87404b287ab98d1a0063a34071d92e575b72d3029aca"
+dependencies = [
+ "data-encoding",
+ "data-encoding-macro-internal",
+]
+
+[[package]]
+name = "data-encoding-macro-internal"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db"
+dependencies = [
+ "data-encoding",
+ "syn",
+]
+
+[[package]]
+name = "default-net"
+version = "0.13.1"
+source = "git+https://github.com/shellrow/default-net.git?branch=main#7e89532b4b0b99f3297fb0e671dac6598a19aff1"
 dependencies = [
 "dlopen2",
 "libc",
@@ -1061,7 +1136,7 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.112.1"
+version = "1.111.0"
 dependencies = [
 "ansi_term",
 "anyhow",
@@ -1126,7 +1201,6 @@ dependencies = [
 "tokio-io-timeout",
 "tokio-stream",
 "tokio-tar",
- "tokio-util",
 "toml",
 "trust-dns-resolver",
 "url",
@@ -1135,7 +1209,7 @@ dependencies = [

 [[package]]
 name = "deltachat-jsonrpc"
-version = "1.112.1"
+version = "1.111.0"
 dependencies = [
 "anyhow",
 "async-channel",
@@ -1158,7 +1232,7 @@ dependencies = [

 [[package]]
 name = "deltachat-repl"
-version = "1.112.1"
+version = "1.111.0"
 dependencies = [
 "ansi_term",
 "anyhow",
@@ -1173,10 +1247,9 @@ dependencies = [

 [[package]]
 name = "deltachat-rpc-server"
-version = "1.112.1"
+version = "1.111.0"
 dependencies = [
 "anyhow",
- "deltachat",
 "deltachat-jsonrpc",
 "env_logger 0.10.0",
 "futures-lite",
@@ -1197,7 +1270,7 @@ dependencies = [

 [[package]]
 name = "deltachat_ffi"
-version = "1.112.1"
+version = "1.111.0"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1488,6 +1561,12 @@ dependencies = [
 "version_check 0.9.4",
 ]

+[[package]]
+name = "encode_unicode"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
 [[package]]
 name = "encoded-words"
 version = "0.2.0"
@@ -1781,7 +1860,7 @@ dependencies = [
 "futures-sink",
 "nanorand",
 "pin-project",
- "spin 0.9.7",
+ "spin 0.9.6",
 ]

 [[package]]
@@ -2277,6 +2356,19 @@ dependencies = [
 "hashbrown",
 ]

+[[package]]
+name = "indicatif"
+version = "0.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729"
+dependencies = [
+ "console",
+ "number_prefix",
+ "portable-atomic 0.3.19",
+ "tokio",
+ "unicode-width",
+]
+
 [[package]]
 name = "inout"
 version = "0.1.3"
@@ -2325,15 +2417,17 @@ checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"

 [[package]]
 name = "iroh"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c019223f5af15f978ff44ae02b8b83d21d53df4c42d4475aa80670819c3ecdce"
+version = "0.3.0"
+source = "git+https://github.com/n0-computer/iroh?branch=main#9ac4cf6e770879c8b2ec0dc6666fe531469e68e3"
 dependencies = [
 "abao",
 "anyhow",
 "base64 0.21.0",
 "blake3",
 "bytes",
+ "clap 4.1.8",
+ "console",
+ "data-encoding",
 "default-net",
 "der",
 "derive_more",
@@ -2341,8 +2435,10 @@ dependencies = [
 "ed25519-dalek",
 "futures",
 "hex",
+ "indicatif",
+ "multibase",
 "num_cpus",
- "portable-atomic",
+ "portable-atomic 1.0.1",
 "postcard",
 "quic-rpc",
 "quinn",
@@ -2356,7 +2452,6 @@ dependencies = [
 "tempfile",
 "thiserror",
 "tokio",
- "tokio-stream",
 "tokio-util",
 "tracing",
 "tracing-futures",
@@ -2634,6 +2729,17 @@ dependencies = [
 "windows-sys 0.45.0",
 ]

+[[package]]
+name = "multibase"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b3539ec3c1f04ac9748a260728e855f261b4977f5c3406612c884564f329404"
+dependencies = [
+ "base-x",
+ "data-encoding",
+ "data-encoding-macro",
+]
+
 [[package]]
 name = "mutate_once"
 version = "0.1.1"
@@ -2868,6 +2974,12 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "number_prefix"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
+
 [[package]]
 name = "object"
 version = "0.30.3"
@@ -2906,9 +3018,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"

 [[package]]
 name = "openssl"
-version = "0.10.48"
+version = "0.10.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2"
+checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"
 dependencies = [
 "bitflags",
 "cfg-if",
@@ -2947,9 +3059,9 @@ dependencies = [

 [[package]]
 name = "openssl-sys"
-version = "0.9.83"
+version = "0.9.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b"
+checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"
 dependencies = [
 "autocfg",
 "cc",
@@ -3231,6 +3343,12 @@ dependencies = [
 "miniz_oxide",
 ]

+[[package]]
+name = "portable-atomic"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26f6a7b87c2e435a3241addceeeff740ff8b7e76b74c13bf9acb17fa454ea00b"
+
 [[package]]
 name = "portable-atomic"
 version = "1.0.1"
@@ -4147,9 +4265,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"

 [[package]]
 name = "spin"
-version = "0.9.7"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0959fd6f767df20b231736396e4f602171e00d95205676286e79d4a4eb67bef"
+checksum = "b5d6e0250b93c8427a177b849d144a96d5acc57006149479403d7861ab721e34"
 dependencies = [
 "lock_api",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.112.1"
+version = "1.111.0"
 edition = "2021"
 license = "MPL-2.0"
 rust-version = "1.64"
@@ -25,6 +25,7 @@ panic = 'abort'
 opt-level = "z"

 [patch.crates-io]
+default-net = { git = "https://github.com/shellrow/default-net.git", branch="main" }
 quinn-udp = { git = "https://github.com/quinn-rs/quinn", branch="main" }
 quinn-proto = { git = "https://github.com/quinn-rs/quinn", branch="main" }

@@ -52,7 +53,8 @@ futures-lite = "1.12.0"
 hex = "0.4.0"
 humansize = "2"
 image = { version = "0.24.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
-iroh = { version = "0.4.0", default-features = false }
+# iroh = { version = "0.3.0", default-features = false }
+iroh = { git = 'https://github.com/n0-computer/iroh', branch = "main" }
 kamadak-exif = "0.5"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 libc = "0.2"
@@ -83,11 +85,10 @@ strum_macros = "0.24"
 tagger = "4.3.4"
 textwrap = "0.16.0"
 thiserror = "1"
-tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
 tokio-io-timeout = "1.2.0"
 tokio-stream = { version = "0.1.11", features = ["fs"] }
 tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
-tokio-util = "0.7.7"
+tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
 toml = "0.7"
 trust-dns-resolver = "0.22"
 url = "2"
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.112.1"
+version = "1.111.0"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -72,6 +72,7 @@ typedef struct _dc_event_emitter dc_accounts_event_emitter_t;
 *
 * The example above uses "pthreads",
 * however, you can also use anything else for thread handling.
+ * All deltachat-core functions, unless stated otherwise, are thread-safe.
 *
 * Now you can **configure the context:**
 *
@@ -141,67 +142,6 @@ typedef struct _dc_event_emitter dc_accounts_event_emitter_t;
 * ~~~
 *
 *
- * ## Thread safety
- *
- * All deltachat-core functions, unless stated otherwise, are thread-safe.
- * In particular, it is safe to pass the same dc_context_t pointer
- * to multiple functions running concurrently in different threads.
- *
- * All the functions are guaranteed not to use the reference passed to them
- * after returning. If the function spawns a long-running process,
- * such as dc_configure() or dc_imex(), it will ensure that the objects
- * passed to them are not deallocated as long as they are needed.
- * For example, it is safe to call dc_imex(context, ...) and
- * call dc_context_unref(context) immediately after return from dc_imex().
- * It is however **not safe** to call dc_context_unref(context) concurrently
- * until dc_imex() returns, because dc_imex() may have not increased
- * the reference count of dc_context_t yet.
- *
- * This means that the context may be still in use after
- * dc_context_unref() call.
- * For example, it is possible to start the import/export process,
- * call dc_context_unref(context) immediately after
- * and observe #DC_EVENT_IMEX_PROGRESS events via the event emitter.
- * Once dc_get_next_event() returns NULL,
- * it is safe to terminate the application.
- *
- * It is recommended to create dc_context_t in the main thread
- * and only call dc_context_unref() once other threads that may use it,
- * such as the event loop thread, are terminated.
- * Common mistake is to use dc_context_unref() as a way
- * to cause dc_get_next_event() return NULL and terminate event loop this way.
- * If event loop thread is inside a function taking dc_context_t
- * as an argument at the moment dc_context_unref() is called on the main thread,
- * the behavior is undefined.
- *
- * Recommended way to safely terminate event loop
- * and shutdown the application is
- * to use a boolean variable
- * indicating that the event loop should stop
- * and check it in the event loop thread
- * every time before calling dc_get_next_event().
- * To terminate the event loop, main thread should:
- * 1. Notify event loop that it should terminate by atomically setting the
- *    boolean flag in the memory shared between the main thread and event loop.
- * 2. Call dc_stop_io() or dc_accounts_stop_io(), depending
- *    on whether a single account or account manager is used.
- *    Stopping I/O is guaranteed to emit at least one event
- *    and interrupt the event loop even if it was blocked on dc_get_next_event().
- * 3. Wait until the event loop thread notices the flag,
- *    exits the event loop and terminates.
- * 4. Call dc_context_unref() or dc_accounts_unref().
- * 5. Keep calling dc_get_next_event() in a loop until it returns NULL,
- *    indicating that the contexts are deallocated.
- * 6. Terminate the application.
- *
- * When using C API via FFI in runtimes that use automatic memory management,
- * such as CPython, JVM or Node.js, take care to ensure the correct
- * shutdown order and avoid calling dc_context_unref() or dc_accounts_unref()
- * on the objects still in use in other threads,
- * e.g. by keeping a reference to the wrapper object.
- * The details depend on the runtime being used.
- *
- *
 * ## Class reference
 *
 * For a class reference, see the "Classes" link atop.
@@ -2775,12 +2715,6 @@ void dc_backup_provider_wait (dc_backup_provider_t* backup_provider);
 /**
 * Frees a dc_backup_provider_t object.
 *
- * If the provider has not yet finished, as indicated by
- * dc_backup_provider_wait() or the #DC_EVENT_IMEX_PROGRESS event with value
- * of 0 (failed) or 1000 (succeeded), this will also abort any in-progress
- * transfer.  If this aborts the provider a #DC_EVENT_IMEX_PROGRESS event with
- * value 0 (failed) will be emitted.
- *
 * @memberof dc_backup_provider_t
 * @param backup_provider The backup provider object as created by
 *    dc_backup_provider_new().
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -4221,26 +4221,15 @@ pub unsafe extern "C" fn dc_backup_provider_wait(provider: *mut dc_backup_provid
    let ffi_provider = &mut *provider;
    let ctx = &*ffi_provider.context;
    let provider = &mut ffi_provider.provider;
-    backup_provider_wait(ctx.clone(), provider.clone());
-}
-
-// Because this is a long-running operation make sure we own the Context and BackupProvider.
-// This stops a FFI user from deallocating it by calling unref on the object while we are
-// using it.
-fn backup_provider_wait(context: Context, provider: BackupProvider) {
    block_on(provider)
-        .log_err(&context, "Failed to await BackupProvider")
+        .log_err(ctx, "Failed to await BackupProvider")
        .context("Failed to await BackupProvider")
-        .set_last_error(&context)
+        .set_last_error(ctx)
        .ok();
 }

 #[no_mangle]
 pub unsafe extern "C" fn dc_backup_provider_unref(provider: *mut dc_backup_provider_t) {
-    if provider.is_null() {
-        eprintln!("ignoring careless call to dc_backup_provider_unref()");
-        return;
-    }
    drop(Box::from_raw(provider));
 }

--- a/deltachat-jsonrpc/Cargo.toml
+++ b/deltachat-jsonrpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.112.1"
+version = "1.111.0"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
--- a/deltachat-jsonrpc/typescript/package.json
+++ b/deltachat-jsonrpc/typescript/package.json
@@ -55,5 +55,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "1.112.1"
+  "version": "1.111.0"
 }
--- a/deltachat-repl/Cargo.toml
+++ b/deltachat-repl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.112.1"
+version = "1.111.0"
 license = "MPL-2.0"
 edition = "2021"

--- a/deltachat-rpc-client/pyproject.toml
+++ b/deltachat-rpc-client/pyproject.toml
@@ -21,9 +21,6 @@ deltachat_rpc_client = [
 [project.entry-points.pytest11]
 "deltachat_rpc_client.pytestplugin" = "deltachat_rpc_client.pytestplugin"

-[tool.setuptools_scm]
-root = ".."
-
 [tool.black]
 line-length = 120

--- a/deltachat-rpc-client/src/deltachat_rpc_client/chat.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/chat.py
@@ -126,7 +126,7 @@ class Chat:
            "file": file,
            "location": location,
            "overrideSenderName": override_sender_name,
-            "quotedMessageId": quoted_msg,
+            "quotedMsg": quoted_msg,
        }
        msg_id = await self._rpc.send_msg(self.account.id, self.id, draft)
        return Message(self.account, msg_id)
--- a/deltachat-rpc-server/Cargo.toml
+++ b/deltachat-rpc-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.112.1"
+version = "1.111.0"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
@@ -9,9 +9,11 @@ license = "MPL-2.0"
 keywords = ["deltachat", "chat", "openpgp", "email", "encryption"]
 categories = ["cryptography", "std", "email"]

+[[bin]]
+name = "deltachat-rpc-server"
+
 [dependencies]
 deltachat-jsonrpc = { path = "../deltachat-jsonrpc", default-features = false }
-deltachat = { path = "..", default-features = false }

 anyhow = "1"
 env_logger = { version = "0.10.0" }
--- a/deltachat-rpc-server/src/bin/deltachat-rpc-server/main.rs
+++ b/deltachat-rpc-server/src/bin/deltachat-rpc-server/main.rs
@@ -1,11 +1,9 @@
-use std::env;
 ///! Delta Chat core RPC server.
 ///!
 ///! It speaks JSON Lines over stdio.
 use std::path::PathBuf;

-use anyhow::{anyhow, Context as _, Result};
-use deltachat::constants::DC_VERSION_STR;
+use anyhow::Result;
 use deltachat_jsonrpc::api::events::event_to_json_rpc_notification;
 use deltachat_jsonrpc::api::{Accounts, CommandApi};
 use futures_lite::stream::StreamExt;
@@ -15,23 +13,6 @@ use yerpc::{RpcClient, RpcSession};

 #[tokio::main(flavor = "multi_thread")]
 async fn main() -> Result<()> {
-    let mut args = env::args_os();
-    let _program_name = args.next().context("no command line arguments found")?;
-    if let Some(first_arg) = args.next() {
-        if first_arg.to_str() == Some("--version") {
-            if let Some(arg) = args.next() {
-                return Err(anyhow!("Unrecognized argument {:?}", arg));
-            }
-            eprintln!("{}", &*DC_VERSION_STR);
-            return Ok(());
-        } else {
-            return Err(anyhow!("Unrecognized option {:?}", first_arg));
-        }
-    }
-    if let Some(arg) = args.next() {
-        return Err(anyhow!("Unrecognized argument {:?}", arg));
-    }
-
    env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();

    let path = std::env::var("DC_ACCOUNTS_PATH").unwrap_or_else(|_| "accounts".to_string());
--- a/deny.toml
+++ b/deny.toml
@@ -11,13 +11,9 @@ ignore = [
 # Accept some duplicate versions, ideally we work towards this list
 # becoming empty.  Adding versions forces us to revisit this at least
 # when upgrading.
-# Please keep this list alphabetically sorted.
 skip = [
     { name = "base64", version = "<0.21" },
     { name = "block-buffer", version = "<0.10" },
-     { name = "clap", version = "3.2.23" },
-     { name = "clap_lex", version = "0.2.4" },
-     { name = "convert_case", version = "0.4.0" },
     { name = "darling", version = "<0.14" },
     { name = "darling_core", version = "<0.14" },
     { name = "darling_macro", version = "<0.14" },
@@ -33,16 +29,24 @@ skip = [
     { name = "rand_chacha", version = "<0.3" },
     { name = "rand_core", version = "<0.6" },
     { name = "sha2", version = "<0.10" },
-     { name = "spin", version = "<0.9.6" },
     { name = "time", version = "<0.3" },
     { name = "version_check", version = "<0.9" },
     { name = "wasi", version = "<0.11" },
     { name = "windows-sys", version = "<0.45" },
-     { name = "windows_aarch64_msvc", version = "<0.42" },
-     { name = "windows_i686_gnu", version = "<0.42" },
-     { name = "windows_i686_msvc", version = "<0.42" },
-     { name = "windows_x86_64_gnu", version = "<0.42" },
     { name = "windows_x86_64_msvc", version = "<0.42" },
+     { name = "windows_x86_64_gnu", version = "<0.42" },
+     { name = "windows_i686_msvc", version = "<0.42" },
+     { name = "windows_i686_gnu", version = "<0.42" },
+     { name = "windows_aarch64_msvc", version = "<0.42" },
+     { name = "unicode-xid", version = "<0.2.4" },
+     { name = "syn", version = "<1.0" },
+     { name = "quote", version = "<1.0" },
+     { name = "proc-macro2", version = "<1.0" },
+     { name = "portable-atomic", version = "<1.0" },
+     { name = "spin", version = "<0.9.6" },
+     { name = "convert_case", version = "0.4.0" },
+     { name = "clap_lex", version = "0.2.4" },
+     { name = "clap", version = "3.2.23" },
 ]


@@ -74,5 +78,7 @@ license-files = [
 github = [
       "async-email",
       "deltachat",
+       "n0-computer",
       "quinn-rs",
+       "dignifiedquire",
 ]
--- a/fuzz/Cargo.lock
+++ b/fuzz/Cargo.lock
--- a/node/constants.js
+++ b/node/constants.js
@@ -37,7 +37,6 @@ module.exports = {
  DC_EVENT_ERROR: 400,
  DC_EVENT_ERROR_SELF_NOT_IN_GROUP: 410,
  DC_EVENT_IMAP_CONNECTED: 102,
-  DC_EVENT_IMAP_INBOX_IDLE: 106,
  DC_EVENT_IMAP_MESSAGE_DELETED: 104,
  DC_EVENT_IMAP_MESSAGE_MOVED: 105,
  DC_EVENT_IMEX_FILE_WRITTEN: 2052,
@@ -113,7 +112,6 @@ module.exports = {
  DC_QR_ADDR: 320,
  DC_QR_ASK_VERIFYCONTACT: 200,
  DC_QR_ASK_VERIFYGROUP: 202,
-  DC_QR_BACKUP: 251,
  DC_QR_ERROR: 400,
  DC_QR_FPR_MISMATCH: 220,
  DC_QR_FPR_OK: 210,
@@ -151,7 +149,6 @@ module.exports = {
  DC_STR_AEAP_EXPLANATION_AND_LINK: 123,
  DC_STR_ARCHIVEDCHATS: 40,
  DC_STR_AUDIO: 11,
-  DC_STR_BACKUP_TRANSFER_QR: 162,
  DC_STR_BAD_TIME_MSG_BODY: 85,
  DC_STR_BROADCAST_LIST: 115,
  DC_STR_CANNOT_LOGIN: 60,
--- a/node/events.js
+++ b/node/events.js
@@ -8,7 +8,6 @@ module.exports = {
  103: 'DC_EVENT_SMTP_MESSAGE_SENT',
  104: 'DC_EVENT_IMAP_MESSAGE_DELETED',
  105: 'DC_EVENT_IMAP_MESSAGE_MOVED',
-  106: 'DC_EVENT_IMAP_INBOX_IDLE',
  150: 'DC_EVENT_NEW_BLOB_FILE',
  151: 'DC_EVENT_DELETED_BLOB_FILE',
  300: 'DC_EVENT_WARNING',
--- a/node/lib/constants.ts
+++ b/node/lib/constants.ts
@@ -37,7 +37,6 @@ export enum C {
  DC_EVENT_ERROR = 400,
  DC_EVENT_ERROR_SELF_NOT_IN_GROUP = 410,
  DC_EVENT_IMAP_CONNECTED = 102,
-  DC_EVENT_IMAP_INBOX_IDLE = 106,
  DC_EVENT_IMAP_MESSAGE_DELETED = 104,
  DC_EVENT_IMAP_MESSAGE_MOVED = 105,
  DC_EVENT_IMEX_FILE_WRITTEN = 2052,
@@ -113,7 +112,6 @@ export enum C {
  DC_QR_ADDR = 320,
  DC_QR_ASK_VERIFYCONTACT = 200,
  DC_QR_ASK_VERIFYGROUP = 202,
-  DC_QR_BACKUP = 251,
  DC_QR_ERROR = 400,
  DC_QR_FPR_MISMATCH = 220,
  DC_QR_FPR_OK = 210,
@@ -151,7 +149,6 @@ export enum C {
  DC_STR_AEAP_EXPLANATION_AND_LINK = 123,
  DC_STR_ARCHIVEDCHATS = 40,
  DC_STR_AUDIO = 11,
-  DC_STR_BACKUP_TRANSFER_QR = 162,
  DC_STR_BAD_TIME_MSG_BODY = 85,
  DC_STR_BROADCAST_LIST = 115,
  DC_STR_CANNOT_LOGIN = 60,
@@ -292,7 +289,6 @@ export const EventId2EventName: { [key: number]: string } = {
  103: 'DC_EVENT_SMTP_MESSAGE_SENT',
  104: 'DC_EVENT_IMAP_MESSAGE_DELETED',
  105: 'DC_EVENT_IMAP_MESSAGE_MOVED',
-  106: 'DC_EVENT_IMAP_INBOX_IDLE',
  150: 'DC_EVENT_NEW_BLOB_FILE',
  151: 'DC_EVENT_DELETED_BLOB_FILE',
  300: 'DC_EVENT_WARNING',
--- a/package.json
+++ b/package.json
@@ -60,5 +60,5 @@
    "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail --exit"
  },
  "types": "node/dist/index.d.ts",
-  "version": "1.112.1"
+  "version": "1.111.0"
 }
--- a/python/tests/auditwheels.py
+++ b/python/tests/auditwheels.py
@@ -0,0 +1,19 @@
+import os
+import subprocess
+import sys
+
+if __name__ == "__main__":
+    assert len(sys.argv) == 2
+    workspacedir = sys.argv[1]
+    for relpath in os.listdir(workspacedir):
+        if relpath.startswith("deltachat"):
+            p = os.path.join(workspacedir, relpath)
+            subprocess.check_call(
+                [
+                    "auditwheel",
+                    "repair",
+                    p,
+                    "-w",
+                    workspacedir,
+                ],
+            )
--- a/python/tests/test_0_complex_or_slow.py
+++ b/python/tests/test_0_complex_or_slow.py
@@ -220,16 +220,16 @@ def test_fetch_existing(acfactory, lp, mvbox_move):
    acfactory.bring_accounts_online()
    assert_folders_configured(ac1)

-    lp.sec("send out message with bcc to ourselves")
-    ac1.set_config("bcc_self", "1")
-    chat = acfactory.get_accepted_chat(ac1, ac2)
-    chat.send_text("message text")
+    assert ac1.direct_imap.select_config_folder("mvbox" if mvbox_move else "inbox")
+    with ac1.direct_imap.idle() as idle1:
+        lp.sec("send out message with bcc to ourselves")
+        ac1.set_config("bcc_self", "1")
+        chat = acfactory.get_accepted_chat(ac1, ac2)
+        chat.send_text("message text")
+        assert_folders_configured(ac1)

-    lp.sec("wait until the bcc_self message arrives in correct folder and is marked seen")
-    if mvbox_move:
-        ac1._evtracker.get_info_contains("Marked messages [0-9]+ in folder DeltaChat as seen.")
-    else:
-        ac1._evtracker.get_info_contains("Marked messages [0-9]+ in folder INBOX as seen.")
+        lp.sec("wait until the bcc_self message arrives in correct folder and is marked seen")
+        assert idle1.wait_for_seen()
    assert_folders_configured(ac1)

    lp.sec("create a cloned ac1 and fetch contact history during configure")
@@ -271,12 +271,12 @@ def test_fetch_existing_msgs_group_and_single(acfactory, lp):
    ac1._evtracker.wait_next_incoming_message()

    lp.sec("send out message with bcc to ourselves")
-    ac1.set_config("bcc_self", "1")
-    ac1_ac2_chat = ac1.create_chat(ac2)
-    ac1_ac2_chat.send_text("outgoing, encrypted direct message, creating a chat")
-
-    # wait until the bcc_self message arrives
-    ac1._evtracker.get_info_contains("Marked messages [0-9]+ in folder INBOX as seen.")
+    with ac1.direct_imap.idle() as idle1:
+        ac1.set_config("bcc_self", "1")
+        ac1_ac2_chat = ac1.create_chat(ac2)
+        ac1_ac2_chat.send_text("outgoing, encrypted direct message, creating a chat")
+        # wait until the bcc_self message arrives
+        assert idle1.wait_for_seen()

    lp.sec("Clone online account and let it fetch the existing messages")
    ac1_clone = acfactory.new_online_configuring_account(cloned_from=ac1)
--- a/python/tests/test_1_online.py
+++ b/python/tests/test_1_online.py
@@ -134,27 +134,22 @@ def test_one_account_send_bcc_setting(acfactory, lp):
    ac1.set_config("bcc_self", "1")

    lp.sec("send out message with bcc to ourselves")
-    msg_out = chat.send_text("message2")
+    with ac1.direct_imap.idle() as idle1:
+        msg_out = chat.send_text("message2")

-    # wait for send out (BCC)
-    ev = ac1._evtracker.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
-    assert ac1.get_config("bcc_self") == "1"
+        # wait for send out (BCC)
+        ev = ac1._evtracker.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
+        assert ac1.get_config("bcc_self") == "1"

-    # Second client receives only second message, but not the first.
+        # now make sure we are sending message to ourselves too
+        assert self_addr in ev.data2
+        assert other_addr in ev.data2
+        assert idle1.wait_for_seen()
+
+    # Second client receives only second message, but not the first
    ev_msg = ac1_clone._evtracker.wait_next_messages_changed()
    assert ev_msg.text == msg_out.text

-    # now make sure we are sending message to ourselves too
-    assert self_addr in ev.data2
-    assert other_addr in ev.data2
-
-    # BCC-self messages are marked as seen by the sender device.
-    ac1._evtracker.get_info_contains("Marked messages [0-9]+ in folder INBOX as seen.")
-
-    # Check that the message is marked as seen on IMAP.
-    ac1.direct_imap.select_folder("Inbox")
-    assert len(list(ac1.direct_imap.conn.fetch(AND(seen=True)))) == 1
-

 def test_send_file_twice_unicode_filename_mangling(tmpdir, acfactory, lp):
    ac1, ac2 = acfactory.get_online_accounts(2)
@@ -319,9 +314,6 @@ def test_webxdc_message(acfactory, data, lp):
    assert msg2.text == "message1"
    assert msg2.is_webxdc()
    assert msg2.filename
-    ac2._evtracker.get_info_contains("Marked messages [0-9]+ in folder INBOX as seen.")
-    ac2.direct_imap.select_folder("Inbox")
-    assert len(list(ac2.direct_imap.conn.fetch(AND(seen=True)))) == 1


 def test_mvbox_sentbox_threads(acfactory, lp):
@@ -521,22 +513,22 @@ def test_send_and_receive_message_markseen(acfactory, lp):
    msg4 = ac2._evtracker.wait_next_incoming_message()

    lp.sec("mark messages as seen on ac2, wait for changes on ac1")
-    ac2.mark_seen_messages([msg2, msg4])
-    ev = ac2._evtracker.get_matching("DC_EVENT_MSGS_NOTICED")
-    assert msg2.chat.id == msg4.chat.id
-    assert ev.data1 == msg2.chat.id
-    assert ev.data2 == 0
-    ac2._evtracker.get_info_contains("Marked messages .* in folder INBOX as seen.")
+    with ac1.direct_imap.idle() as idle1:
+        with ac2.direct_imap.idle() as idle2:
+            ac2.mark_seen_messages([msg2, msg4])
+            ev = ac2._evtracker.get_matching("DC_EVENT_MSGS_NOTICED")
+            assert msg2.chat.id == msg4.chat.id
+            assert ev.data1 == msg2.chat.id
+            assert ev.data2 == 0
+            idle2.wait_for_seen()

-    lp.step("1")
-    for _i in range(2):
-        ev = ac1._evtracker.get_matching("DC_EVENT_MSG_READ")
-        assert ev.data1 > const.DC_CHAT_ID_LAST_SPECIAL
-        assert ev.data2 > const.DC_MSG_ID_LAST_SPECIAL
-    lp.step("2")
-
-    # Check that ac1 marks the read receipt as read.
-    ac1._evtracker.get_info_contains("Marked messages .* in folder INBOX as seen.")
+        lp.step("1")
+        for _i in range(2):
+            ev = ac1._evtracker.get_matching("DC_EVENT_MSG_READ")
+            assert ev.data1 > const.DC_CHAT_ID_LAST_SPECIAL
+            assert ev.data2 > const.DC_MSG_ID_LAST_SPECIAL
+        lp.step("2")
+        idle1.wait_for_seen()  # Check that ac1 marks the read receipt as read

    assert msg1.is_out_mdn_received()
    assert msg3.is_out_mdn_received()
@@ -621,24 +613,18 @@ def test_markseen_message_and_mdn(acfactory, mvbox_move):
    # Do not send BCC to self, we only want to test MDN on ac1.
    ac1.set_config("bcc_self", "0")

-    acfactory.get_accepted_chat(ac1, ac2).send_text("hi")
-    msg = ac2._evtracker.wait_next_incoming_message()
-
-    ac2.mark_seen_messages([msg])
-
    folder = "mvbox" if mvbox_move else "inbox"
-    for ac in [ac1, ac2]:
-        if mvbox_move:
-            ac._evtracker.get_info_contains("Marked messages [0-9]+ in folder DeltaChat as seen.")
-        else:
-            ac._evtracker.get_info_contains("Marked messages [0-9]+ in folder INBOX as seen.")
    ac1.direct_imap.select_config_folder(folder)
    ac2.direct_imap.select_config_folder(folder)
+    with ac1.direct_imap.idle() as idle1:
+        with ac2.direct_imap.idle() as idle2:
+            acfactory.get_accepted_chat(ac1, ac2).send_text("hi")
+            msg = ac2._evtracker.wait_next_incoming_message()

-    # Check that the mdn is marked as seen
-    assert len(list(ac1.direct_imap.conn.fetch(AND(seen=True)))) == 1
-    # Check original message is marked as seen
-    assert len(list(ac2.direct_imap.conn.fetch(AND(seen=True)))) == 1
+            ac2.mark_seen_messages([msg])
+
+            idle2.wait_for_seen()  # Check original message is marked as seen
+            idle1.wait_for_seen()  # Check that the mdn is marked as seen


 def test_reply_privately(acfactory):
@@ -692,24 +678,23 @@ def test_mdn_asymmetric(acfactory, lp):

    assert len(msg.chat.get_messages()) == 1

-    lp.sec("ac2: mark incoming message as seen")
-    ac2.mark_seen_messages([msg])
+    ac1.direct_imap.select_config_folder("mvbox")
+    with ac1.direct_imap.idle() as idle1:
+        lp.sec("ac2: mark incoming message as seen")
+        ac2.mark_seen_messages([msg])

-    lp.sec("ac1: waiting for incoming activity")
-    # MDN should be moved even though MDNs are already disabled
-    ac1._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
+        lp.sec("ac1: waiting for incoming activity")
+        # MDN should be moved even though MDNs are already disabled
+        ac1._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")

-    assert len(chat.get_messages()) == 1
+        assert len(chat.get_messages()) == 1

-    # Wait for the message to be marked as seen on IMAP.
-    ac1._evtracker.get_info_contains("Marked messages 1 in folder DeltaChat as seen.")
+        # Wait for the message to be marked as seen on IMAP.
+        assert idle1.wait_for_seen()

    # MDN is received even though MDNs are already disabled
    assert msg_out.is_out_mdn_received()

-    ac1.direct_imap.select_config_folder("mvbox")
-    assert len(list(ac1.direct_imap.conn.fetch(AND(seen=True)))) == 1
-

 def test_send_and_receive_will_encrypt_decrypt(acfactory, lp):
    ac1, ac2 = acfactory.get_online_accounts(2)
--- a/python/tox.ini
+++ b/python/tox.ini
@@ -8,7 +8,7 @@ envlist =

 [testenv]
 commands = 
-    pytest -n6 --extra-info -v -rsXx --ignored --strict-tls {posargs: tests examples}
+    pytest -n6 --extra-info --reruns 2 --reruns-delay 5 -v -rsXx --ignored --strict-tls {posargs: tests examples}
    pip wheel . -w {toxworkdir}/wheelhouse --no-deps
 setenv =
 # Avoid stack overflow when Rust core is built without optimizations.
@@ -21,6 +21,7 @@ passenv =
    RUSTC_WRAPPER
 deps = 
    pytest
+    pytest-rerunfailures
    pytest-timeout
    pytest-xdist
    pdbpp
@@ -33,6 +34,18 @@ passenv =
    CARGO_TARGET_DIR
    RUSTC_WRAPPER

+[testenv:auditwheels]
+skipsdist = True
+deps = auditwheel
+passenv =
+    DCC_RS_DEV
+    DCC_RS_TARGET
+    AUDITWHEEL_ARCH
+    AUDITWHEEL_PLAT
+    AUDITWHEEL_POLICY
+commands = 
+    python tests/auditwheels.py {toxworkdir}/wheelhouse
+
 [testenv:lint]
 skipsdist = True
 skip_install = True
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -8,8 +8,6 @@ and an own build machine.

 - `clippy.sh` runs `cargo clippy` for all Rust code in the project.

- `deny.sh` runs `cargo deny` for all Rust code in the project.
-
 - `../.github/workflows` contains jobs run by GitHub Actions.

 - `remote_tests_python.sh` rsyncs to a build machine and runs
--- a/scripts/deny.sh
+++ b/scripts/deny.sh
@@ -1,2 +0,0 @@
-#!/bin/sh
-cargo deny --workspace --all-features check -D warnings
--- a/scripts/run_all.sh
+++ b/scripts/run_all.sh
@@ -31,9 +31,7 @@ unset DCC_NEW_TMP_EMAIL

 # Try to build wheels for a range of interpreters, but don't fail if they are not available.
 # E.g. musllinux_1_1 does not have PyPy interpreters as of 2022-07-10
-tox --workdir "$TOXWORKDIR" -e py37,py38,py39,py310,py311,pypy37,pypy38,pypy39 --skip-missing-interpreters true
-
-auditwheel repair "$TOXWORKDIR/wheelhouse/deltachat*" -w "$TOXWORKDIR/wheelhouse"
+tox --workdir "$TOXWORKDIR" -e py37,py38,py39,py310,py311,pypy37,pypy38,pypy39,auditwheels --skip-missing-interpreters true


 echo -----------------------
--- a/scripts/set_core_version.py
+++ b/scripts/set_core_version.py
@@ -93,7 +93,7 @@ def main():
    if "alpha" not in newversion:
        for line in open("CHANGELOG.md"):
            ## 1.25.0
-            if line.startswith("## [") and line[4:].strip().startswith(newversion):
+            if line.startswith("## ") and line[2:].strip().startswith(newversion):
                break
        else:
            raise SystemExit(
--- a/src/accounts.rs
+++ b/src/accounts.rs
@@ -262,7 +262,7 @@ impl Accounts {
    pub async fn stop_io(&self) {
        // Sending an event here wakes up event loop even
        // if there are no accounts.
-        info!(self, "Stopping IO for all accounts.");
+        info!(self, "Stopping IO for all accounts");
        for account in self.accounts.values() {
            account.stop_io().await;
        }
--- a/src/blob.rs
+++ b/src/blob.rs
@@ -417,7 +417,7 @@ impl<'a> BlobObject<'a> {

                            info!(
                                context,
-                                "Final scaled-down image size: {}B ({}px).",
+                                "Final scaled-down image size: {}B ({}px)",
                                encoded.len(),
                                img_wh
                            );
@@ -458,7 +458,7 @@ impl<'a> BlobObject<'a> {
                Some(3) => return Ok(180),
                Some(6) => return Ok(90),
                Some(8) => return Ok(270),
-                other => warn!(context, "Exif orientation value ignored: {other:?}."),
+                other => warn!(context, "exif orientation value ignored: {:?}", other),
            }
        }
        Ok(0)
@@ -490,7 +490,7 @@ impl<'a> BlobDirContents<'a> {
                match entry {
                    Ok(entry) => Some(entry),
                    Err(err) => {
-                        error!(context, "Failed to read blob file: {err}.");
+                        error!(context, "Failed to read blob file: {err}");
                        None
                    }
                }
@@ -501,7 +501,7 @@ impl<'a> BlobDirContents<'a> {
                    false => {
                        warn!(
                            context,
-                            "Export: Found blob dir entry {} that is not a file, ignoring.",
+                            "Export: Found blob dir entry {} that is not a file, ignoring",
                            entry.path().display()
                        );
                        None
@@ -569,7 +569,7 @@ fn encoded_img_exceeds_bytes(
        if encoded.len() > max_bytes {
            info!(
                context,
-                "Image size {}B ({}x{}px) exceeds {}B, need to scale down.",
+                "image size {}B ({}x{}px) exceeds {}B, need to scale down",
                encoded.len(),
                img.width(),
                img.height(),
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -247,7 +247,7 @@ impl ChatId {
                } else {
                    warn!(
                        context,
-                        "Cannot create chat, contact {contact_id} does not exist."
+                        "Cannot create chat, contact {} does not exist.", contact_id,
                    );
                    bail!("Can not create chat for non-existing contact");
                }
@@ -285,7 +285,7 @@ impl ChatId {
        let chat_id = ChatId::new(u32::try_from(row_id)?);
        info!(
            context,
-            "Created group/mailinglist '{}' grpid={} as {}, blocked={}.",
+            "Created group/mailinglist '{}' grpid={} as {}, blocked={}",
            grpname,
            grpid,
            chat_id,
@@ -338,14 +338,14 @@ impl ChatId {
                    if contact_id != ContactId::SELF {
                        info!(
                            context,
-                            "Blocking the contact {contact_id} to block 1:1 chat."
+                            "Blocking the contact {} to block 1:1 chat", contact_id
                        );
                        Contact::block(context, contact_id).await?;
                    }
                }
            }
            Chattype::Group => {
-                info!(context, "Can't block groups yet, deleting the chat.");
+                info!(context, "Can't block groups yet, deleting the chat");
                self.delete(context).await?;
            }
            Chattype::Mailinglist => {
@@ -500,7 +500,7 @@ impl ChatId {
        let chat = Chat::load_from_db(context, self).await?;

        if let Err(e) = self.inner_set_protection(context, protect).await {
-            error!(context, "Cannot set protection: {e:#}."); // make error user-visible
+            error!(context, "Cannot set protection: {}", e); // make error user-visible
            return Err(e);
        }

@@ -1070,7 +1070,7 @@ impl ChatId {
        );
        info!(
            context,
-            "Set gossiped_timestamp for chat {} to {}.", self, timestamp,
+            "set gossiped_timestamp for chat {} to {}.", self, timestamp,
        );

        context
@@ -1211,7 +1211,7 @@ impl Chat {
                    Err(err) => {
                        error!(
                            context,
-                            "Failed to load contacts for {}: {:#}.", chat.id, err
+                            "failed to load contacts for {}: {:#}", chat.id, err
                        );
                    }
                }
@@ -2032,11 +2032,8 @@ async fn prepare_msg_blob(context: &Context, msg: &mut Message) -> Result<()> {
            .with_context(|| format!("attachment missing for message of type #{}", msg.viewtype))?;

        if msg.viewtype == Viewtype::Image {
-            if let Err(err) = blob.recode_to_image_size(context).await {
-                warn!(
-                    context,
-                    "Cannot recode image, using original data: {err:#}."
-                );
+            if let Err(e) = blob.recode_to_image_size(context).await {
+                warn!(context, "Cannot recode image, using original data: {:?}", e);
            }
        }
        msg.param.set(Param::File, blob.as_name());
@@ -2259,7 +2256,7 @@ async fn create_send_msg_job(context: &Context, msg_id: MsgId) -> Result<Option<
    let attach_selfavatar = match shall_attach_selfavatar(context, msg.chat_id).await {
        Ok(attach_selfavatar) => attach_selfavatar,
        Err(err) => {
-            warn!(context, "SMTP job cannot get selfavatar-state: {err:#}.");
+            warn!(context, "job: cannot get selfavatar-state: {:#}", err);
            false
        }
    };
@@ -2286,7 +2283,7 @@ async fn create_send_msg_job(context: &Context, msg_id: MsgId) -> Result<Option<
        // may happen eg. for groups with only SELF and bcc_self disabled
        info!(
            context,
-            "Message {msg_id} has no recipient, skipping smtp-send."
+            "message {} has no recipient, skipping smtp-send", msg_id
        );
        msg_id.set_delivered(context).await?;
        return Ok(None);
@@ -2321,27 +2318,27 @@ async fn create_send_msg_job(context: &Context, msg_id: MsgId) -> Result<Option<

    if 0 != rendered_msg.last_added_location_id {
        if let Err(err) = location::set_kml_sent_timestamp(context, msg.chat_id, time()).await {
-            error!(context, "Failed to set kml sent_timestamp: {err:#}.");
+            error!(context, "Failed to set kml sent_timestamp: {:#}", err);
        }
        if !msg.hidden {
            if let Err(err) =
                location::set_msg_location_id(context, msg.id, rendered_msg.last_added_location_id)
                    .await
            {
-                error!(context, "Failed to set msg_location_id: {err:#}.");
+                error!(context, "Failed to set msg_location_id: {:#}", err);
            }
        }
    }

    if let Some(sync_ids) = rendered_msg.sync_ids_to_delete {
        if let Err(err) = context.delete_sync_ids(sync_ids).await {
-            error!(context, "Failed to delete sync ids: {err:#}.");
+            error!(context, "Failed to delete sync ids: {:#}", err);
        }
    }

    if attach_selfavatar {
        if let Err(err) = msg.chat_id.set_selfavatar_timestamp(context, time()).await {
-            error!(context, "Failed to set selfavatar timestamp: {err:#}.");
+            error!(context, "Failed to set selfavatar timestamp: {:#}", err);
        }
    }

@@ -2696,7 +2693,8 @@ pub(crate) async fn mark_old_messages_as_noticed(
    if !changed_chats.is_empty() {
        info!(
            context,
-            "Marking chats as noticed because there are newer outgoing messages: {changed_chats:?}."
+            "Marking chats as noticed because there are newer outgoing messages: {:?}",
+            changed_chats
        );
    }

@@ -3017,7 +3015,7 @@ pub(crate) async fn add_contact_to_chat_ex(
        // if SELF is not in the group, members cannot be added at all.
        warn!(
            context,
-            "Invalid attempt to add self e-mail address to group."
+            "invalid attempt to add self e-mail address to group"
        );
        return Ok(false);
    }
@@ -3564,7 +3562,7 @@ pub async fn add_device_msg_with_importance(

    if let Some(label) = label {
        if was_device_msg_ever_added(context, label).await? {
-            info!(context, "Device-message {label} already added.");
+            info!(context, "device-message {} already added", label);
            return Ok(msg_id);
        }
    }
--- a/src/chatlist.rs
+++ b/src/chatlist.rs
@@ -176,7 +176,7 @@ impl Chatlist {
            // allow searching over special names that may change at any time
            // when the ui calls set_stock_translation()
            if let Err(err) = update_special_chat_names(context).await {
-                warn!(context, "Cannot update special chat names: {err:#}.")
+                warn!(context, "cannot update special chat names: {:?}", err)
            }

            let str_like_cmd = format!("%{query}%");
--- a/src/imex/transfer.rs
+++ b/src/imex/transfer.rs
@@ -27,16 +27,12 @@ use std::net::Ipv4Addr;
 use std::ops::Deref;
 use std::path::{Path, PathBuf};
 use std::pin::Pin;
-use std::sync::Arc;
 use std::task::Poll;

 use anyhow::{anyhow, bail, ensure, format_err, Context as _, Result};
 use async_channel::Receiver;
-use futures::future::{BoxFuture, Shared};
-use futures::{FutureExt, TryFutureExt};
 use futures_lite::StreamExt;
-use iroh::blobs::Collection;
-use iroh::get::DataStream;
+use iroh::get::{DataStream, Options};
 use iroh::progress::ProgressEmitter;
 use iroh::protocol::AuthToken;
 use iroh::provider::{DataSource, Event, Provider, Ticket};
@@ -45,9 +41,8 @@ use tokio::fs::{self, File};
 use tokio::io::{self, AsyncWriteExt, BufWriter};
 use tokio::sync::broadcast::error::RecvError;
 use tokio::sync::{broadcast, Mutex};
-use tokio::task::JoinSet;
+use tokio::task::{JoinHandle, JoinSet};
 use tokio_stream::wrappers::ReadDirStream;
-use tokio_util::sync::CancellationToken;

 use crate::blob::BlobDirContents;
 use crate::chat::delete_and_reset_all_device_msgs;
@@ -57,8 +52,6 @@ use crate::{e2ee, EventType};

 use super::{export_database, DBFILE_BACKUP_NAME};

-const MAX_CONCURRENT_DIALS: u8 = 16;
-
 /// Provide or send a backup of this device.
 ///
 /// This creates a backup of the current device and starts a service which offers another
@@ -72,14 +65,12 @@ const MAX_CONCURRENT_DIALS: u8 = 16;
 ///
 /// The task implements [`Future`] and awaiting it will complete once a transfer has been
 /// either completed or aborted.
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub struct BackupProvider {
    /// The supervisor task, run by [`BackupProvider::watch_provider`].
-    handle: Shared<BoxFuture<'static, Result<(), String>>>,
+    handle: JoinHandle<Result<()>>,
    /// The ticket to retrieve the backup collection.
    ticket: Ticket,
-    /// Guard to cancel the provider on drop.
-    _drop_guard: Arc<tokio_util::sync::DropGuard>,
 }

 impl BackupProvider {
@@ -131,29 +122,19 @@ impl BackupProvider {
                return Err(err);
            }
        };
-        let drop_token = CancellationToken::new();
        let handle = {
            let context = context.clone();
-            let drop_token = drop_token.clone();
            tokio::spawn(async move {
-                let res = Self::watch_provider(&context, provider, cancel_token, drop_token).await;
+                let res = Self::watch_provider(&context, provider, cancel_token).await;
                context.free_ongoing().await;

                // Explicit drop to move the guards into this future
                drop(paused_guard);
                drop(dbfile);
-                res.map_err(|err| format!("{err:#}"))
+                res
            })
-            .map_err(|err| format!("{err}"))
-            .and_then(futures::future::ready)
-            .boxed()
-            .shared()
        };
-        Ok(Self {
-            handle,
-            ticket,
-            _drop_guard: Arc::new(drop_token.drop_guard()),
-        })
+        Ok(Self { handle, ticket })
    }

    /// Creates the provider task.
@@ -189,7 +170,7 @@ impl BackupProvider {
            .spawn()?;
        context.emit_event(SendProgress::ProviderListening.into());
        info!(context, "Waiting for remote to connect");
-        let ticket = provider.ticket(hash)?;
+        let ticket = provider.ticket(hash);
        Ok((provider, ticket))
    }

@@ -207,8 +188,8 @@ impl BackupProvider {
        context: &Context,
        mut provider: Provider,
        cancel_token: Receiver<()>,
-        drop_token: CancellationToken,
    ) -> Result<()> {
+        // _dbfile exists so we can clean up the file once it is no longer needed
        let mut events = provider.subscribe();
        let mut total_size = 0;
        let mut current_size = 0;
@@ -268,12 +249,8 @@ impl BackupProvider {
                },
                _ = cancel_token.recv() => {
                    provider.shutdown();
-                    break Err(anyhow!("BackupProvider cancelled"));
+                    break Err(anyhow!("BackupSender cancelled"));
                },
-                _ = drop_token.cancelled() => {
-                    provider.shutdown();
-                    break Err(anyhow!("BackupProvider dropped"));
-                }
            }
        };
        match &res {
@@ -300,9 +277,7 @@ impl Future for BackupProvider {
    type Output = Result<()>;

    fn poll(mut self: Pin<&mut Self>, cx: &mut std::task::Context<'_>) -> Poll<Self::Output> {
-        Pin::new(&mut self.handle)
-            .poll(cx)
-            .map_err(anyhow::Error::msg)
+        Pin::new(&mut self.handle).poll(cx)?
    }
 }

@@ -415,67 +390,104 @@ async fn get_backup_inner(context: &Context, qr: Qr) -> Result<()> {
        Qr::Backup { ticket } => ticket,
        _ => bail!("QR code for backup must be of type DCBACKUP"),
    };
-
-    match transfer_from_provider(context, &ticket).await {
-        Ok(()) => {
-            delete_and_reset_all_device_msgs(context).await?;
-            context.emit_event(ReceiveProgress::Completed.into());
-            Ok(())
-        }
-        Err(err) => {
-            // Clean up any blobs we already wrote.
-            let readdir = fs::read_dir(context.get_blobdir()).await?;
-            let mut readdir = ReadDirStream::new(readdir);
-            while let Some(dirent) = readdir.next().await {
-                if let Ok(dirent) = dirent {
-                    fs::remove_file(dirent.path()).await.ok();
-                }
+    if ticket.addrs.is_empty() {
+        bail!("ticket is missing addresses to dial");
+    }
+    for addr in &ticket.addrs {
+        let opts = Options {
+            addr: *addr,
+            peer_id: Some(ticket.peer),
+            keylog: false,
+        };
+        info!(context, "attempting to contact {}", addr);
+        match transfer_from_provider(context, &ticket, opts).await {
+            Ok(_) => {
+                delete_and_reset_all_device_msgs(context).await?;
+                context.emit_event(ReceiveProgress::Completed.into());
+                return Ok(());
+            }
+            Err(TransferError::ConnectionError(err)) => {
+                warn!(context, "Connection error: {err:#}.");
+                continue;
+            }
+            Err(TransferError::Other(err)) => {
+                // Clean up any blobs we already wrote.
+                let readdir = fs::read_dir(context.get_blobdir()).await?;
+                let mut readdir = ReadDirStream::new(readdir);
+                while let Some(dirent) = readdir.next().await {
+                    if let Ok(dirent) = dirent {
+                        fs::remove_file(dirent.path()).await.ok();
+                    }
+                }
+                context.emit_event(ReceiveProgress::Failed.into());
+                return Err(err);
            }
-            context.emit_event(ReceiveProgress::Failed.into());
-            Err(err)
        }
    }
+    Err(anyhow!("failed to contact provider"))
 }

-async fn transfer_from_provider(context: &Context, ticket: &Ticket) -> Result<()> {
+/// Error during a single transfer attempt.
+///
+/// Mostly exists to distinguish between `ConnectionError` and any other errors.
+#[derive(Debug, thiserror::Error)]
+enum TransferError {
+    #[error("connection error")]
+    ConnectionError(#[source] anyhow::Error),
+    #[error("other")]
+    Other(#[source] anyhow::Error),
+}
+
+async fn transfer_from_provider(
+    context: &Context,
+    ticket: &Ticket,
+    opts: Options,
+) -> Result<(), TransferError> {
    let progress = ProgressEmitter::new(0, ReceiveProgress::max_blob_progress());
    spawn_progress_proxy(context.clone(), progress.subscribe());
+    let mut connected = false;
    let on_connected = || {
        context.emit_event(ReceiveProgress::Connected.into());
-        async { Ok(()) }
-    };
-    let on_collection = |collection: &Collection| {
-        context.emit_event(ReceiveProgress::CollectionReceived.into());
-        progress.set_total(collection.total_blobs_size());
+        connected = true;
        async { Ok(()) }
    };
    let jobs = Mutex::new(JoinSet::default());
    let on_blob =
        |hash, reader, name| on_blob(context, &progress, &jobs, ticket, hash, reader, name);
-
-    // Perform the transfer.
-    let keylog = false; // Do not enable rustls SSLKEYLOGFILE env var functionality
-    let stats = iroh::get::run_ticket(
-        ticket,
-        keylog,
-        MAX_CONCURRENT_DIALS,
+    let res = iroh::get::run(
+        ticket.hash,
+        ticket.token,
+        opts,
        on_connected,
-        on_collection,
+        |collection| {
+            context.emit_event(ReceiveProgress::CollectionReceived.into());
+            progress.set_total(collection.total_blobs_size());
+            async { Ok(()) }
+        },
        on_blob,
    )
-    .await?;
+    .await;

    let mut jobs = jobs.lock().await;
    while let Some(job) = jobs.join_next().await {
-        job.context("job failed")?;
+        job.context("job failed").map_err(TransferError::Other)?;
    }
+
    drop(progress);
-    info!(
-        context,
-        "Backup transfer finished, transfer rate was {} Mbps.",
-        stats.mbits()
-    );
-    Ok(())
+    match res {
+        Ok(stats) => {
+            info!(
+                context,
+                "Backup transfer finished, transfer rate is {} Mbps.",
+                stats.mbits()
+            );
+            Ok(())
+        }
+        Err(err) => match connected {
+            true => Err(TransferError::Other(err)),
+            false => Err(TransferError::ConnectionError(err)),
+        },
+    }
 }

 /// Get callback when a blob is received from the provider.
@@ -517,7 +529,7 @@ async fn on_blob(

    if name.starts_with("db/") {
        let context = context.clone();
-        let token = ticket.token().to_string();
+        let token = ticket.token.to_string();
        jobs.lock().await.spawn(async move {
            if let Err(err) = context.sql.import(&path, token).await {
                error!(context, "cannot import database: {:#?}", err);
@@ -679,16 +691,4 @@ mod tests {
            assert_eq!(out, EventType::ImexProgress(progress));
        }
    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_drop_provider() {
-        let mut tcm = TestContextManager::new();
-        let ctx = tcm.alice().await;
-
-        let provider = BackupProvider::prepare(&ctx).await.unwrap();
-        drop(provider);
-        ctx.evtracker
-            .get_matching(|ev| matches!(ev, EventType::ImexProgress(0)))
-            .await;
-    }
 }
--- a/src/job.rs
+++ b/src/job.rs
@@ -153,7 +153,7 @@ impl<'a> Connection<'a> {
 }

 pub(crate) async fn perform_job(context: &Context, mut connection: Connection<'_>, mut job: Job) {
-    info!(context, "Job {} started...", &job);
+    info!(context, "job {} started...", &job);

    let try_res = match perform_job_action(context, &mut job, &mut connection, 0).await {
        Status::RetryNow => perform_job_action(context, &mut job, &mut connection, 1).await,
@@ -165,7 +165,7 @@ pub(crate) async fn perform_job(context: &Context, mut connection: Connection<'_
            let tries = job.tries + 1;

            if tries < JOB_RETRIES {
-                info!(context, "Increase job {job} tries to {tries}.");
+                info!(context, "increase job {} tries to {}", job, tries);
                job.tries = tries;
                let time_offset = get_backoff_time_offset(tries);
                job.desired_timestamp = time() + time_offset;
@@ -177,23 +177,26 @@ pub(crate) async fn perform_job(context: &Context, mut connection: Connection<'_
                    time_offset
                );
                job.save(context).await.unwrap_or_else(|err| {
-                    error!(context, "Failed to save job: {err:#}.");
+                    error!(context, "failed to save job: {:#}", err);
                });
            } else {
                info!(
                    context,
-                    "Remove job {job} as it exhausted {JOB_RETRIES} retries."
+                    "remove job {} as it exhausted {} retries", job, JOB_RETRIES
                );
                job.delete(context).await.unwrap_or_else(|err| {
-                    error!(context, "Failed to delete job: {err:#}.");
+                    error!(context, "failed to delete job: {:#}", err);
                });
            }
        }
        Status::Finished(res) => {
            if let Err(err) = res {
-                warn!(context, "Remove job {job} as it failed with error {err:#}.");
+                warn!(
+                    context,
+                    "remove job {} as it failed with error {:#}", job, err
+                );
            } else {
-                info!(context, "Remove job {job} as it succeeded.");
+                info!(context, "remove job {} as it succeeded", job);
            }

            job.delete(context).await.unwrap_or_else(|err| {
@@ -209,13 +212,13 @@ async fn perform_job_action(
    connection: &mut Connection<'_>,
    tries: u32,
 ) -> Status {
-    info!(context, "Begin immediate try {tries} of job {job}.");
+    info!(context, "begin immediate try {} of job {}", tries, job);

    let try_res = match job.action {
        Action::DownloadMsg => job.download_msg(context, connection.inbox()).await,
    };

-    info!(context, "Finished immediate try {tries} of job {job}.");
+    info!(context, "Finished immediate try {} of job {}", tries, job);

    try_res
 }
@@ -247,7 +250,7 @@ pub(crate) async fn schedule_resync(context: &Context) -> Result<()> {
 pub async fn add(context: &Context, job: Job) -> Result<()> {
    job.save(context).await.context("failed to save job")?;

-    info!(context, "Interrupt: IMAP.");
+    info!(context, "interrupt: imap");
    context
        .scheduler
        .interrupt_inbox(InterruptInfo::new(false))
@@ -261,7 +264,7 @@ pub async fn add(context: &Context, job: Job) -> Result<()> {
 /// jobs, this is tricky and probably wrong currently. Look at the
 /// SQL queries for details.
 pub(crate) async fn load_next(context: &Context, info: &InterruptInfo) -> Result<Option<Job>> {
-    info!(context, "Loading job.");
+    info!(context, "loading job");

    let query;
    let params;
@@ -313,19 +316,19 @@ LIMIT 1;
            Ok(job) => return Ok(job),
            Err(err) => {
                // Remove invalid job from the DB
-                info!(context, "Cleaning up job, because of {err:#}.");
+                info!(context, "cleaning up job, because of {:#}", err);

                // TODO: improve by only doing a single query
                let id = context
                    .sql
                    .query_row(query, params.clone(), |row| row.get::<_, i32>(0))
                    .await
-                    .context("failed to retrieve invalid job ID from the database")?;
+                    .context("Failed to retrieve invalid job ID from the database")?;
                context
                    .sql
                    .execute("DELETE FROM jobs WHERE id=?;", paramsv![id])
                    .await
-                    .with_context(|| format!("failed to delete invalid job {id}"))?;
+                    .with_context(|| format!("Failed to delete invalid job {id}"))?;
            }
        }
    }
--- a/src/receive_imf.rs
+++ b/src/receive_imf.rs
@@ -96,7 +96,7 @@ pub(crate) async fn receive_imf_inner(
    is_partial_download: Option<u32>,
    fetching_existing_messages: bool,
 ) -> Result<Option<ReceivedMsg>> {
-    info!(context, "Receiving message, seen={seen}...");
+    info!(context, "Receiving message, seen={}...", seen);

    if std::env::var(crate::DCC_MIME_DEBUG).is_ok() {
        info!(
@@ -109,7 +109,7 @@ pub(crate) async fn receive_imf_inner(
    let mut mime_parser = match MimeMessage::from_bytes(context, imf_raw, is_partial_download).await
    {
        Err(err) => {
-            warn!(context, "receive_imf: can't parse MIME: {err:#}.");
+            warn!(context, "receive_imf: can't parse MIME: {:#}", err);
            let msg_ids;
            if !rfc724_mid.starts_with(GENERATED_PREFIX) {
                let row_id = context
@@ -138,11 +138,11 @@ pub(crate) async fn receive_imf_inner(

    // we can not add even an empty record if we have no info whatsoever
    if !mime_parser.has_headers() {
-        warn!(context, "receive_imf: no headers found.");
+        warn!(context, "receive_imf: no headers found");
        return Ok(None);
    }

-    info!(context, "Received message has Message-Id: {rfc724_mid}");
+    info!(context, "received message has Message-Id: {}", rfc724_mid);

    // check, if the mail is already in our database.
    // make sure, this check is done eg. before securejoin-processing.
@@ -182,7 +182,7 @@ pub(crate) async fn receive_imf_inner(
            None => {
                warn!(
                    context,
-                    "receive_imf: From field does not contain an acceptable address."
+                    "receive_imf: From field does not contain an acceptable address"
                );
                return Ok(None);
            }
@@ -269,13 +269,13 @@ pub(crate) async fn receive_imf_inner(
        if from_id == ContactId::SELF {
            if mime_parser.was_encrypted() {
                if let Err(err) = context.execute_sync_items(sync_items).await {
-                    warn!(context, "receive_imf cannot execute sync items: {err:#}.");
+                    warn!(context, "receive_imf cannot execute sync items: {:#}", err);
                }
            } else {
-                warn!(context, "Sync items are not encrypted.");
+                warn!(context, "sync items are not encrypted.");
            }
        } else {
-            warn!(context, "Sync items not sent by self.");
+            warn!(context, "sync items not sent by self.");
        }
    }

@@ -284,7 +284,7 @@ pub(crate) async fn receive_imf_inner(
            .receive_status_update(from_id, insert_msg_id, status_update)
            .await
        {
-            warn!(context, "receive_imf cannot update status: {err:#}.");
+            warn!(context, "receive_imf cannot update status: {:#}", err);
        }
    }

@@ -302,7 +302,10 @@ pub(crate) async fn receive_imf_inner(
            )
            .await
            {
-                warn!(context, "receive_imf cannot update profile image: {err:#}.");
+                warn!(
+                    context,
+                    "receive_imf cannot update profile image: {:#}", err
+                );
            };
        }
    }
@@ -328,7 +331,7 @@ pub(crate) async fn receive_imf_inner(
        )
        .await
        {
-            warn!(context, "Cannot update contact status: {err:#}.");
+            warn!(context, "cannot update contact status: {:#}", err);
        }
    }

@@ -391,7 +394,7 @@ pub async fn from_field_to_contact_id(
        Err(err) => {
            warn!(
                context,
-                "Cannot create a contact for the given From field: {err:#}."
+                "Cannot create a contact for the given From field: {:#}.", err
            );
            return Ok(None);
        }
@@ -473,7 +476,7 @@ async fn add_parts(
        // this message is a classic email not a chat-message nor a reply to one
        match show_emails {
            ShowEmails::Off => {
-                info!(context, "Classical email not shown (TRASH).");
+                info!(context, "Classical email not shown (TRASH)");
                chat_id = Some(DC_CHAT_ID_TRASH);
                allow_creation = false;
            }
@@ -516,7 +519,7 @@ async fn add_parts(
                    securejoin_seen = false;
                }
                Err(err) => {
-                    warn!(context, "Error in Secure-Join message handling: {err:#}.");
+                    warn!(context, "Error in Secure-Join message handling: {:#}", err);
                    chat_id = Some(DC_CHAT_ID_TRASH);
                    securejoin_seen = true;
                }
@@ -533,8 +536,7 @@ async fn add_parts(

        if chat_id.is_none() && mime_parser.delivery_report.is_some() {
            chat_id = Some(DC_CHAT_ID_TRASH);
-            info!(context, "Message is a DSN (TRASH).",);
-            markseen_on_imap_table(context, rfc724_mid).await.ok();
+            info!(context, "Message is a DSN (TRASH)",);
        }

        if chat_id.is_none() {
@@ -752,7 +754,7 @@ async fn add_parts(
                    chat_id = None;
                }
                Err(err) => {
-                    warn!(context, "Error in Secure-Join watching: {err:#}.");
+                    warn!(context, "Error in Secure-Join watching: {:#}", err);
                    chat_id = Some(DC_CHAT_ID_TRASH);
                }
            }
@@ -769,7 +771,7 @@ async fn add_parts(

        if is_draft {
            // Most mailboxes have a "Drafts" folder where constantly new emails appear but we don't actually want to show them
-            info!(context, "Email is probably just a draft (TRASH).");
+            info!(context, "Email is probably just a draft (TRASH)");
            chat_id = Some(DC_CHAT_ID_TRASH);
        }

@@ -861,15 +863,14 @@ async fn add_parts(
    if fetching_existing_messages && mime_parser.decrypting_failed {
        chat_id = Some(DC_CHAT_ID_TRASH);
        // We are only gathering old messages on first start. We do not want to add loads of non-decryptable messages to the chats.
-        info!(context, "Existing non-decipherable message (TRASH).");
+        info!(context, "Existing non-decipherable message. (TRASH)");
    }

    if mime_parser.webxdc_status_update.is_some() && mime_parser.parts.len() == 1 {
        if let Some(part) = mime_parser.parts.first() {
            if part.typ == Viewtype::Text && part.msg.is_empty() {
                chat_id = Some(DC_CHAT_ID_TRASH);
-                info!(context, "Message is a status update only (TRASH).");
-                markseen_on_imap_table(context, rfc724_mid).await.ok();
+                info!(context, "Message is a status update only (TRASH)");
            }
        }
    }
@@ -879,7 +880,7 @@ async fn add_parts(
        DC_CHAT_ID_TRASH
    } else {
        chat_id.unwrap_or_else(|| {
-            info!(context, "No chat id for message (TRASH).");
+            info!(context, "No chat id for message (TRASH)");
            DC_CHAT_ID_TRASH
        })
    };
@@ -891,7 +892,10 @@ async fn add_parts(
        match value.parse::<EphemeralTimer>() {
            Ok(timer) => timer,
            Err(err) => {
-                warn!(context, "Can't parse ephemeral timer \"{value}\": {err:#}.");
+                warn!(
+                    context,
+                    "can't parse ephemeral timer \"{}\": {:#}", value, err
+                );
                EphemeralTimer::Disabled
            }
        }
@@ -911,7 +915,12 @@ async fn add_parts(
        && !mime_parser.parts.is_empty()
        && chat_id.get_ephemeral_timer(context).await? != ephemeral_timer
    {
-        info!(context, "Received new ephemeral timer value {ephemeral_timer:?} for chat {chat_id}, checking if it should be applied.");
+        info!(
+            context,
+            "received new ephemeral timer value {:?} for chat {}, checking if it should be applied",
+            ephemeral_timer,
+            chat_id
+        );
        if is_dc_message == MessengerMessage::Yes
            && get_previous_message(context, mime_parser)
                .await?
@@ -927,7 +936,9 @@ async fn add_parts(
            // have seen or sent ourselves, so we ignore incoming timer to prevent a rollback.
            warn!(
                context,
-                "Ignoring ephemeral timer change to {ephemeral_timer:?} for chat {chat_id} to avoid rollback.",
+                "ignoring ephemeral timer change to {:?} for chat {} to avoid rollback",
+                ephemeral_timer,
+                chat_id
            );
        } else if chat_id
            .update_timestamp(context, Param::EphemeralSettingsTimestamp, sent_timestamp)
@@ -939,12 +950,12 @@ async fn add_parts(
            {
                warn!(
                    context,
-                    "Failed to modify timer for chat {chat_id}: {err:#}."
+                    "failed to modify timer for chat {}: {:#}", chat_id, err
                );
            } else {
                info!(
                    context,
-                    "Updated ephemeral timer to {ephemeral_timer:?} for chat {chat_id}."
+                    "updated ephemeral timer to {:?} for chat {}", ephemeral_timer, chat_id
                );
                if mime_parser.is_system_message != SystemMessage::EphemeralTimerChanged {
                    chat::add_info_msg(
@@ -959,7 +970,7 @@ async fn add_parts(
        } else {
            warn!(
                context,
-                "Ignoring ephemeral timer change to {ephemeral_timer:?} because it is outdated."
+                "ignoring ephemeral timer change to {:?} because it's outdated", ephemeral_timer
            );
        }
    }
@@ -988,7 +999,7 @@ async fn add_parts(
        if chat.is_protected() || new_status.is_some() {
            if let Err(err) = check_verified_properties(context, mime_parser, from_id, to_ids).await
            {
-                warn!(context, "Verification problem: {err:#}.");
+                warn!(context, "verification problem: {:#}", err);
                let s = format!("{err}. See 'Info' for more details");
                mime_parser.repl_msg_by_error(&s);
            } else {
@@ -1418,7 +1429,7 @@ async fn lookup_chat_by_reply(

        info!(
            context,
-            "Assigning message to {} as it's a reply to {}.", parent_chat.id, parent.rfc724_mid
+            "Assigning message to {} as it's a reply to {}", parent_chat.id, parent.rfc724_mid
        );
        return Ok(Some((parent_chat.id, parent_chat.blocked)));
    }
@@ -1488,7 +1499,7 @@ async fn create_or_lookup_group(
            .map(|chat_id| (chat_id, create_blocked));
        return Ok(res);
    } else {
-        info!(context, "Creating ad-hoc group prevented from caller.");
+        info!(context, "creating ad-hoc group prevented from caller");
        return Ok(None);
    };

@@ -1514,7 +1525,7 @@ async fn create_or_lookup_group(

    let create_protected = if mime_parser.get_header(HeaderDef::ChatVerified).is_some() {
        if let Err(err) = check_verified_properties(context, mime_parser, from_id, to_ids).await {
-            warn!(context, "Verification problem: {err:#}.");
+            warn!(context, "verification problem: {:#}", err);
            let s = format!("{err}. See 'Info' for more details");
            mime_parser.repl_msg_by_error(&s);
        }
@@ -1546,7 +1557,7 @@ async fn create_or_lookup_group(
    {
        // Group does not exist but should be created.
        if !allow_creation {
-            info!(context, "Creating group forbidden by caller.");
+            info!(context, "creating group forbidden by caller");
            return Ok(None);
        }

@@ -1607,7 +1618,7 @@ async fn create_or_lookup_group(
    } else {
        // The message was decrypted successfully, but contains a late "quit" or otherwise
        // unwanted message.
-        info!(context, "Message belongs to unwanted group (TRASH).");
+        info!(context, "message belongs to unwanted group (TRASH)");
        Ok(Some((DC_CHAT_ID_TRASH, Blocked::Not)))
    }
 }
@@ -1647,7 +1658,7 @@ async fn apply_group_changes(
                    Some(stock_str::msg_del_member(context, &removed_addr, from_id).await)
                };
            }
-            None => warn!(context, "Removed {removed_addr:?} has no contact_id."),
+            None => warn!(context, "removed {:?} has no contact_id", removed_addr),
        }
    } else {
        removed_id = None;
@@ -1672,7 +1683,7 @@ async fn apply_group_changes(
                    .update_timestamp(context, Param::GroupNameTimestamp, sent_timestamp)
                    .await?
                {
-                    info!(context, "Updating grpname for chat {chat_id}.");
+                    info!(context, "updating grpname for chat {}", chat_id);
                    context
                        .sql
                        .execute(
@@ -1712,7 +1723,7 @@ async fn apply_group_changes(

    if mime_parser.get_header(HeaderDef::ChatVerified).is_some() {
        if let Err(err) = check_verified_properties(context, mime_parser, from_id, to_ids).await {
-            warn!(context, "Verification problem: {err:#}.");
+            warn!(context, "verification problem: {:#}", err);
            let s = format!("{err}. See 'Info' for more details");
            mime_parser.repl_msg_by_error(&s);
        }
@@ -1732,7 +1743,9 @@ async fn apply_group_changes(
        {
            warn!(
                context,
-                "Contact {from_id} attempts to modify group chat {chat_id} member list without being a member."
+                "Contact {} attempts to modify group chat {} member list without being a member.",
+                from_id,
+                chat_id
            );
        } else if chat_id
            .update_timestamp(context, Param::MemberListTimestamp, sent_timestamp)
@@ -1765,7 +1778,10 @@ async fn apply_group_changes(
            }
            members_to_add.dedup();

-            info!(context, "Adding {members_to_add:?} to chat id={chat_id}.");
+            info!(
+                context,
+                "adding {:?} to chat id={}", members_to_add, chat_id
+            );
            chat::add_to_chat_contacts_table(context, chat_id, &members_to_add).await?;
            send_event_chat_modified = true;
        }
@@ -1775,15 +1791,17 @@ async fn apply_group_changes(
        if !chat::is_contact_in_chat(context, chat_id, ContactId::SELF).await? {
            warn!(
                context,
-                "Received group avatar update for group chat {chat_id} we are not a member of."
+                "Received group avatar update for group chat {} we are not a member of.", chat_id
            );
        } else if !chat::is_contact_in_chat(context, chat_id, from_id).await? {
            warn!(
                context,
-                "Contact {from_id} attempts to modify group chat {chat_id} avatar without being a member.",
+                "Contact {} attempts to modify group chat {} avatar without being a member.",
+                from_id,
+                chat_id
            );
        } else {
-            info!(context, "Group-avatar change for {chat_id}.");
+            info!(context, "group-avatar change for {}", chat_id);
            if chat
                .param
                .update_timestamp(Param::AvatarTimestamp, sent_timestamp)?
@@ -1917,7 +1935,7 @@ async fn create_or_lookup_mailinglist(
        .await
        .with_context(|| {
            format!(
-                "failed to create mailinglist '{}' for grpid={}",
+                "Failed to create mailinglist '{}' for grpid={}",
                &name, &listid
            )
        })?;
@@ -1925,7 +1943,7 @@ async fn create_or_lookup_mailinglist(
        chat::add_to_chat_contacts_table(context, chat_id, &[ContactId::SELF]).await?;
        Ok(Some((chat_id, blocked)))
    } else {
-        info!(context, "Creating list forbidden by caller.");
+        info!(context, "creating list forbidden by caller");
        Ok(None)
    }
 }
@@ -2017,7 +2035,7 @@ async fn create_adhoc_group(
    if mime_parser.is_mailinglist_message() {
        info!(
            context,
-            "Not creating ad-hoc group for mailing list message."
+            "not creating ad-hoc group for mailing list message"
        );

        return Ok(None);
@@ -2034,13 +2052,13 @@ async fn create_adhoc_group(
        // Instead, assign the message to 1:1 chat with the sender.
        warn!(
            context,
-            "Not creating ad-hoc group for message that cannot be decrypted."
+            "not creating ad-hoc group for message that cannot be decrypted"
        );
        return Ok(None);
    }

    if member_ids.len() < 3 {
-        info!(context, "Not creating ad-hoc group: too few contacts.");
+        info!(context, "not creating ad-hoc group: too few contacts");
        return Ok(None);
    }

@@ -2147,7 +2165,7 @@ async fn check_verified_properties(
    for (to_addr, mut is_verified) in rows {
        info!(
            context,
-            "check_verified_properties: {:?} self={:?}.",
+            "check_verified_properties: {:?} self={:?}",
            to_addr,
            context.is_self_addr(&to_addr).await
        );
--- a/src/sql.rs
+++ b/src/sql.rs
@@ -699,26 +699,26 @@ pub async fn housekeeping(context: &Context) -> Result<()> {
    if let Err(err) = remove_unused_files(context).await {
        warn!(
            context,
-            "Housekeeping: cannot remove unused files: {:#}.", err
+            "Housekeeping: cannot remove unused files: {:#}", err
        );
    }

    if let Err(err) = start_ephemeral_timers(context).await {
        warn!(
            context,
-            "Housekeeping: cannot start ephemeral timers: {:#}.", err
+            "Housekeeping: cannot start ephemeral timers: {:#}", err
        );
    }

    if let Err(err) = prune_tombstones(&context.sql).await {
        warn!(
            context,
-            "Housekeeping: Cannot prune message tombstones: {:#}.", err
+            "Housekeeping: Cannot prune message tombstones: {:#}", err
        );
    }

    if let Err(err) = deduplicate_peerstates(&context.sql).await {
-        warn!(context, "Failed to deduplicate peerstates: {:#}.", err)
+        warn!(context, "Failed to deduplicate peerstates: {:#}", err)
    }

    context.schedule_quota_update().await?;
@@ -731,7 +731,7 @@ pub async fn housekeeping(context: &Context) -> Result<()> {
        .await
    {
        Err(err) => {
-            warn!(context, "Failed to run incremental vacuum: {err:#}.");
+            warn!(context, "Failed to run incremental vacuum: {err:#}");
        }
        Ok(Some(())) => {
            // Incremental vacuum returns a zero-column result if it did anything.
@@ -747,7 +747,7 @@ pub async fn housekeeping(context: &Context) -> Result<()> {
        .set_config(Config::LastHousekeeping, Some(&time().to_string()))
        .await
    {
-        warn!(context, "Can't set config: {e:#}.");
+        warn!(context, "Can't set config: {}", e);
    }

    context
@@ -814,7 +814,7 @@ pub async fn remove_unused_files(context: &Context) -> Result<()> {
        .await
        .context("housekeeping: failed to SELECT value FROM config")?;

-    info!(context, "{} files in use.", files_in_use.len());
+    info!(context, "{} files in use.", files_in_use.len(),);
    /* go through directories and delete unused files */
    let blobdir = context.get_blobdir();
    for p in [&blobdir.join(BLOBS_BACKUP_NAME), blobdir] {
@@ -846,7 +846,7 @@ pub async fn remove_unused_files(context: &Context) -> Result<()> {
                                // environment f.e. So, no warning.
                                info!(
                                    context,
-                                    "Housekeeping: Cannot rmdir {}: {:#}.",
+                                    "Housekeeping: Cannot rmdir {}: {:#}",
                                    entry.path().display(),
                                    e
                                );
@@ -868,7 +868,7 @@ pub async fn remove_unused_files(context: &Context) -> Result<()> {
                        {
                            info!(
                                context,
-                                "Housekeeping: Keeping new unreferenced file #{}: {:?}.",
+                                "Housekeeping: Keeping new unreferenced file #{}: {:?}",
                                unreferenced_count,
                                entry.file_name(),
                            );
@@ -879,7 +879,7 @@ pub async fn remove_unused_files(context: &Context) -> Result<()> {
                    }
                    info!(
                        context,
-                        "Housekeeping: Deleting unreferenced file #{}: {:?}.",
+                        "Housekeeping: Deleting unreferenced file #{}: {:?}",
                        unreferenced_count,
                        entry.file_name()
                    );
@@ -897,7 +897,7 @@ pub async fn remove_unused_files(context: &Context) -> Result<()> {
            Err(err) => {
                warn!(
                    context,
-                    "Housekeeping: Cannot read dir {}: {:#}.",
+                    "Housekeeping: Cannot read dir {}: {:#}",
                    p.display(),
                    err
                );