Prepare 1.112.5 release

Run migrations before delete_and_reset_all_device_msgs()
Both when importing a backup from file or receiving it over the network.
2026-04-02 21:42:10 +03:00 · 2023-04-02 09:48:39 +00:00 · 2023-04-02 08:39:13 +00:00 · 2023-04-01 23:56:36 +00:00 · 2023-03-31 01:12:26 +00:00 · 2023-03-31 01:02:41 +00:00
47 changed files with 1976 additions and 799 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -77,6 +77,9 @@ 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,35 +84,15 @@ jobs:
      contents: write
    runs-on: "ubuntu-latest"
    steps:
-      - name: Download deltachat-rpc-server-x86_64
+      - name: Download built binaries
        uses: "actions/download-artifact@v3"
-        with:
-          name: "deltachat-rpc-server-x86_64"
-          path: "dist/deltachat-rpc-server-x86_64"

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

-## [Unreleased]
+## [1.112.5] - 2023-04-02
+
+### Fixes
+
+- Run SQL database migrations after receiving a backup from the network. #4287
+
+## [1.112.4] - 2023-03-31
+
+### Fixes
+- Fix call to `auditwheel` in `scripts/run_all.sh`.
+
+## [1.112.3] - 2023-03-30
+
+### Fixes
+- `transfer::get_backup` now frees ongoing process when cancelled. #4249
+
+## [1.112.2] - 2023-03-30
+
+### 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
+
+### Fixes
+- Do not return media from trashed messages in the "All media" view. #4247
+
+## [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

 ### 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
- More accurate maybe_add_bcc_self device message text #4175
+  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

 ### Fixes
 - Fix segmentation fault if `dc_context_unref()` is called during
@@ -23,6 +60,11 @@
 - Do not emit "Failed to run incremental vacuum" warnings on success. #4160
 - Ability to send backup over network and QR code to setup second device #4007
 - Disable buffering during STARTTLS setup. #4190
+- 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
+

 ## [1.111.0] - 2023-03-05

@@ -2314,5 +2356,10 @@ 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
+[1.112.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.1...v1.112.2
+[1.112.3]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.2...v1.112.3
+[1.112.4]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.3...v1.112.4
+[1.112.5]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.4...v1.112.5
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -146,9 +146,9 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
 dependencies = [
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 "synstructure",
 ]

@@ -158,9 +158,9 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
 dependencies = [
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -265,30 +265,21 @@ version = "0.1.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2"
 dependencies = [
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "async_io_utilities"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b20cffc5590f4bf33f05f97a3ea587feba9c50d20325b401daa096b92ff7da0"
-dependencies = [
- "tokio",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
 name = "async_zip"
-version = "0.0.9"
+version = "0.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a36d43bdefc7215b2b3a97edd03b1553b7969ad76551025eedd3b913c645f6e"
+checksum = "c50d29ab7e2f9e808cca1a69ea56a36f4ff216f54a41a23aae1fd4afc05cc020"
 dependencies = [
 "async-compression",
- "async_io_utilities",
- "chrono",
 "crc32fast",
+ "log",
+ "pin-project",
 "thiserror",
 "tokio",
 ]
@@ -377,12 +368,6 @@ 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"
@@ -671,39 +656,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
 dependencies = [
 "bitflags",
- "clap_lex 0.2.4",
+ "clap_lex",
 "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 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "clap_lex"
 version = "0.2.4"
@@ -713,15 +670,6 @@ 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"
@@ -764,19 +712,6 @@ 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"
@@ -798,9 +733,9 @@ version = "0.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d897f47bf7270cf70d370f8f98c1abb6d2d4cf60a6845d30e05bfb90c6568650"
 dependencies = [
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "unicode-xid 0.2.4",
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
 ]

 [[package]]
@@ -871,7 +806,7 @@ dependencies = [
 "atty",
 "cast",
 "ciborium",
- "clap 3.2.23",
+ "clap",
 "criterion-plot",
 "futures",
 "itertools",
@@ -1008,10 +943,10 @@ dependencies = [
 "cc",
 "codespan-reporting",
 "once_cell",
- "proc-macro2 1.0.51",
- "quote 1.0.23",
+ "proc-macro2",
+ "quote",
 "scratch",
- "syn 1.0.109",
+ "syn",
 ]

 [[package]]
@@ -1026,9 +961,9 @@ version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892"
 dependencies = [
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -1059,10 +994,10 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
 dependencies = [
 "fnv",
 "ident_case",
- "proc-macro2 1.0.51",
- "quote 1.0.23",
+ "proc-macro2",
+ "quote",
 "strsim",
- "syn 1.0.109",
+ "syn",
 ]

 [[package]]
@@ -1073,10 +1008,10 @@ checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb"
 dependencies = [
 "fnv",
 "ident_case",
- "proc-macro2 1.0.51",
- "quote 1.0.23",
+ "proc-macro2",
+ "quote",
 "strsim",
- "syn 1.0.109",
+ "syn",
 ]

 [[package]]
@@ -1086,8 +1021,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
 dependencies = [
 "darling_core 0.13.4",
- "quote 1.0.23",
- "syn 1.0.109",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -1097,8 +1032,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685"
 dependencies = [
 "darling_core 0.14.3",
- "quote 1.0.23",
- "syn 1.0.109",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -1107,32 +1042,13 @@ version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"

-[[package]]
-name = "data-encoding-macro"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-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 1.0.109",
-]
-
 [[package]]
 name = "default-net"
-version = "0.13.1"
-source = "git+https://github.com/dignifiedquire/default-net.git?branch=feat-android#7a257095bac009c4be0b93c2979801624fdd337b"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4898b43aed56499fad6b294d15b3e76a51df68079bf492e5daae38ca084e003"
 dependencies = [
- "dlopen",
+ "dlopen2",
 "libc",
 "memalloc",
 "netlink-packet-core",
@@ -1145,7 +1061,7 @@ dependencies = [

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

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

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

 [[package]]
 name = "deltachat-rpc-server"
-version = "1.111.0"
+version = "1.112.5"
 dependencies = [
 "anyhow",
+ "deltachat",
 "deltachat-jsonrpc",
 "env_logger 0.10.0",
 "futures-lite",
@@ -1273,13 +1191,13 @@ dependencies = [
 name = "deltachat_derive"
 version = "2.0.0"
 dependencies = [
- "quote 1.0.23",
- "syn 1.0.109",
+ "quote",
+ "syn",
 ]

 [[package]]
 name = "deltachat_ffi"
-version = "1.111.0"
+version = "1.112.5"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1288,7 +1206,7 @@ dependencies = [
 "libc",
 "num-traits",
 "once_cell",
- "rand 0.7.3",
+ "rand 0.8.5",
 "serde_json",
 "thiserror",
 "tokio",
@@ -1327,9 +1245,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ef71ddb5b3a1f53dee24817c8f70dfa1cb29e804c18d88c228d4bc9c86ee3b9"
 dependencies = [
 "proc-macro-error",
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -1348,9 +1266,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4"
 dependencies = [
 "darling 0.14.3",
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -1360,7 +1278,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68"
 dependencies = [
 "derive_builder_core",
- "syn 1.0.109",
+ "syn",
 ]

 [[package]]
@@ -1370,10 +1288,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
 dependencies = [
 "convert_case 0.4.0",
- "proc-macro2 1.0.51",
- "quote 1.0.23",
+ "proc-macro2",
+ "quote",
 "rustc_version",
- "syn 1.0.109",
+ "syn",
 ]

 [[package]]
@@ -1453,32 +1371,32 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886"
 dependencies = [
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
-name = "dlopen"
-version = "0.1.8"
+name = "dlopen2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e80ad39f814a9abe68583cd50a2d45c8a67561c3361ab8da240587dda80937"
+checksum = "b121caccfc363e4d9a4589528f3bef7c71b83c6ed01c8dc68cbeeb7fd29ec698"
 dependencies = [
- "dlopen_derive",
- "lazy_static",
+ "dlopen2_derive",
 "libc",
+ "once_cell",
 "winapi",
 ]

 [[package]]
-name = "dlopen_derive"
-version = "0.1.4"
+name = "dlopen2_derive"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f236d9e1b1fbd81cea0f9cbdc8dcc7e8ebcd80e6659cd7cb2ad5f6c05946c581"
+checksum = "3a09ac8bb8c16a282264c379dffba707b9c998afc7506009137f3c6136888078"
 dependencies = [
- "libc",
- "quote 0.6.13",
- "syn 0.15.44",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -1525,9 +1443,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0188e3c3ba8df5753894d54461f0e39bc91741dc5b22e1c46999ec2c71f4e4"
 dependencies = [
 "enum-ordinalize",
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -1570,12 +1488,6 @@ 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"
@@ -1682,9 +1594,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116"
 dependencies = [
 "heck",
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -1695,10 +1607,10 @@ checksum = "a62bb1df8b45ecb7ffa78dca1c17a438fb193eb083db0b1b494d2a61bcb5096a"
 dependencies = [
 "num-bigint",
 "num-traits",
- "proc-macro2 1.0.51",
- "quote 1.0.23",
+ "proc-macro2",
+ "quote",
 "rustc_version",
- "syn 1.0.109",
+ "syn",
 ]

 [[package]]
@@ -1869,7 +1781,7 @@ dependencies = [
 "futures-sink",
 "nanorand",
 "pin-project",
- "spin 0.9.6",
+ "spin 0.9.7",
 ]

 [[package]]
@@ -1975,9 +1887,9 @@ version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"
 dependencies = [
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -2365,19 +2277,6 @@ 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"
@@ -2426,17 +2325,15 @@ checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"

 [[package]]
 name = "iroh"
-version = "0.3.0"
-source = "git+https://github.com/n0-computer/iroh?branch=flub/ticket-multiple-addrs#aacd1d84e11b218e55e9622c4500973224904fe9"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c019223f5af15f978ff44ae02b8b83d21d53df4c42d4475aa80670819c3ecdce"
 dependencies = [
 "abao",
 "anyhow",
 "base64 0.21.0",
 "blake3",
 "bytes",
- "clap 4.1.8",
- "console",
- "data-encoding",
 "default-net",
 "der",
 "derive_more",
@@ -2444,10 +2341,8 @@ dependencies = [
 "ed25519-dalek",
 "futures",
 "hex",
- "indicatif",
- "multibase",
 "num_cpus",
- "portable-atomic 1.0.1",
+ "portable-atomic",
 "postcard",
 "quic-rpc",
 "quinn",
@@ -2461,10 +2356,12 @@ dependencies = [
 "tempfile",
 "thiserror",
 "tokio",
+ "tokio-stream",
 "tokio-util",
 "tracing",
 "tracing-futures",
 "tracing-subscriber",
+ "walkdir",
 "webpki",
 "x509-parser",
 "zeroize",
@@ -2737,17 +2634,6 @@ 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"
@@ -2925,9 +2811,9 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
 dependencies = [
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -2982,12 +2868,6 @@ 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"
@@ -3026,9 +2906,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"

 [[package]]
 name = "openssl"
-version = "0.10.45"
+version = "0.10.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"
+checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2"
 dependencies = [
 "bitflags",
 "cfg-if",
@@ -3045,9 +2925,9 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
 dependencies = [
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -3067,9 +2947,9 @@ dependencies = [

 [[package]]
 name = "openssl-sys"
-version = "0.9.80"
+version = "0.9.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"
+checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b"
 dependencies = [
 "autocfg",
 "cc",
@@ -3114,9 +2994,9 @@ checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7"
 dependencies = [
 "Inflector",
 "proc-macro-error",
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -3266,9 +3146,9 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
 dependencies = [
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -3351,12 +3231,6 @@ 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"
@@ -3381,9 +3255,9 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc4b01218787dd4420daf63875163a787a78294ad48a24e9f6fa8c6507759a79"
 dependencies = [
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -3409,9 +3283,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
 "proc-macro-error-attr",
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 "version_check 0.9.4",
 ]

@@ -3421,20 +3295,11 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2 1.0.51",
- "quote 1.0.23",
+ "proc-macro2",
+ "quote",
 "version_check 0.9.4",
 ]

-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-dependencies = [
- "unicode-xid 0.1.0",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.51"
@@ -3555,22 +3420,13 @@ dependencies = [
 "windows-sys 0.45.0",
 ]

-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-dependencies = [
- "proc-macro2 0.4.30",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
 dependencies = [
- "proc-macro2 1.0.51",
+ "proc-macro2",
 ]

 [[package]]
@@ -4122,9 +3978,9 @@ version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
 dependencies = [
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -4291,9 +4147,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"

 [[package]]
 name = "spin"
-version = "0.9.6"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5d6e0250b93c8427a177b849d144a96d5acc57006149479403d7861ab721e34"
+checksum = "c0959fd6f767df20b231736396e4f602171e00d95205676286e79d4a4eb67bef"
 dependencies = [
 "lock_api",
 ]
@@ -4386,10 +4242,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
 dependencies = [
 "heck",
- "proc-macro2 1.0.51",
- "quote 1.0.23",
+ "proc-macro2",
+ "quote",
 "rustversion",
- "syn 1.0.109",
+ "syn",
 ]

 [[package]]
@@ -4398,25 +4254,14 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"

-[[package]]
-name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "unicode-xid 0.1.0",
-]
-
 [[package]]
 name = "syn"
 version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
- "proc-macro2 1.0.51",
- "quote 1.0.23",
+ "proc-macro2",
+ "quote",
 "unicode-ident",
 ]

@@ -4432,10 +4277,10 @@ version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
 dependencies = [
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
- "unicode-xid 0.2.4",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "unicode-xid",
 ]

 [[package]]
@@ -4541,9 +4386,9 @@ version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -4655,9 +4500,9 @@ version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
 dependencies = [
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -4818,9 +4663,9 @@ version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
 dependencies = [
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -4976,9 +4821,9 @@ dependencies = [
 "darling 0.13.4",
 "ident_case",
 "proc-macro-error",
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -5030,12 +4875,6 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"

-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-
 [[package]]
 name = "unicode-xid"
 version = "0.2.4"
@@ -5169,9 +5008,9 @@ dependencies = [
 "bumpalo",
 "log",
 "once_cell",
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 "wasm-bindgen-shared",
 ]

@@ -5193,7 +5032,7 @@ version = "0.2.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
 dependencies = [
- "quote 1.0.23",
+ "quote",
 "wasm-bindgen-macro-support",
 ]

@@ -5203,9 +5042,9 @@ version = "0.2.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
 dependencies = [
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@@ -5508,9 +5347,9 @@ checksum = "6bd53ff9053698697b92c2535bf7ecb983fd5d546d690b7c725e5070d6d9a620"
 dependencies = [
 "convert_case 0.5.0",
 "darling 0.14.3",
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -5528,8 +5367,8 @@ version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c"
 dependencies = [
- "proc-macro2 1.0.51",
- "quote 1.0.23",
- "syn 1.0.109",
+ "proc-macro2",
+ "quote",
+ "syn",
 "synstructure",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.111.0"
+version = "1.112.5"
 edition = "2021"
 license = "MPL-2.0"
 rust-version = "1.64"
@@ -25,7 +25,6 @@ panic = 'abort'
 opt-level = "z"

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

@@ -39,7 +38,7 @@ async-channel = "1.8.0"
 async-imap = { git = "https://github.com/async-email/async-imap", branch = "master", default-features = false, features = ["runtime-tokio"] }
 async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
 async-smtp = { version = "0.9", default-features = false, features = ["runtime-tokio"] }
-async_zip = { version = "0.0.9", default-features = false, features = ["deflate"] }
+async_zip = { version = "0.0.11", default-features = false, features = ["deflate", "fs"] }
 backtrace = "0.3"
 base64 = "0.21"
 bitflags = "1.3"
@@ -53,8 +52,7 @@ 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.3.0", default-features = false }
-iroh = { git = 'https://github.com/n0-computer/iroh', branch = "flub/ticket-multiple-addrs" }
+iroh = { version = "0.4.0", default-features = false }
 kamadak-exif = "0.5"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 libc = "0.2"
@@ -85,10 +83,11 @@ 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 = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
+tokio-util = "0.7.7"
 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.111.0"
+version = "1.112.5"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
@@ -23,7 +23,7 @@ serde_json = "1.0"
 tokio = { version = "1", features = ["rt-multi-thread"] }
 anyhow = "1"
 thiserror = "1"
-rand = "0.7"
+rand = "0.8"
 once_cell = "1.17.0"

 [features]
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -72,7 +72,6 @@ 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:**
 *
@@ -142,6 +141,67 @@ 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.
@@ -2715,6 +2775,12 @@ 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().
@@ -5705,6 +5771,14 @@ void dc_event_unref(dc_event_t* event);
 */
 #define DC_EVENT_IMAP_MESSAGE_MOVED   105

+/**
+ * Emitted before going into IDLE on the Inbox folder.
+ *
+ * @param data1 0
+ * @param data2 0
+ */
+#define DC_EVENT_IMAP_INBOX_IDLE 106
+
 /**
 * Emitted when a new blob file was successfully written
 *
@@ -6990,6 +7064,11 @@ void dc_event_unref(dc_event_t* event);
 /// `%1$s` will be replaced by name and address of the contact.
 #define DC_STR_PROTECTION_DISABLED_BY_OTHER 161

+/// "Scan to set up second device for %1$s"
+///
+/// `%1$s` will be replaced by name and address of the account.
+#define DC_STR_BACKUP_TRANSFER_QR 162
+
 /**
 * @}
 */
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -500,6 +500,7 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
        EventType::SmtpMessageSent(_) => 103,
        EventType::ImapMessageDeleted(_) => 104,
        EventType::ImapMessageMoved(_) => 105,
+        EventType::ImapInboxIdle => 106,
        EventType::NewBlobFile(_) => 150,
        EventType::DeletedBlobFile(_) => 151,
        EventType::Warning(_) => 300,
@@ -544,6 +545,7 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
        | EventType::SmtpMessageSent(_)
        | EventType::ImapMessageDeleted(_)
        | EventType::ImapMessageMoved(_)
+        | EventType::ImapInboxIdle
        | EventType::NewBlobFile(_)
        | EventType::DeletedBlobFile(_)
        | EventType::Warning(_)
@@ -594,6 +596,7 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
        | EventType::SmtpMessageSent(_)
        | EventType::ImapMessageDeleted(_)
        | EventType::ImapMessageMoved(_)
+        | EventType::ImapInboxIdle
        | EventType::NewBlobFile(_)
        | EventType::DeletedBlobFile(_)
        | EventType::Warning(_)
@@ -653,6 +656,7 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
        EventType::MsgsChanged { .. }
        | EventType::ReactionsChanged { .. }
        | EventType::IncomingMsg { .. }
+        | EventType::ImapInboxIdle
        | EventType::MsgsNoticed(_)
        | EventType::MsgDelivered { .. }
        | EventType::MsgFailed { .. }
@@ -4226,6 +4230,10 @@ pub unsafe extern "C" fn dc_backup_provider_wait(provider: *mut dc_backup_provid

 #[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));
 }

@@ -4240,17 +4248,28 @@ pub unsafe extern "C" fn dc_receive_backup(
    }
    let ctx = &*context;
    let qr_text = to_string_lossy(qr);
-    let qr = match block_on(qr::check_qr(ctx, &qr_text)).log_err(ctx, "Invalid QR code") {
+    receive_backup(ctx.clone(), qr_text)
+}
+
+// Because this is a long-running operation make sure we own the Context.  This stops a FFI
+// user from deallocating it by calling unref on the object while we are using it.
+fn receive_backup(ctx: Context, qr_text: String) -> libc::c_int {
+    let qr = match block_on(qr::check_qr(&ctx, &qr_text))
+        .log_err(&ctx, "Invalid QR code")
+        .context("Invalid QR code")
+        .set_last_error(&ctx)
+    {
        Ok(qr) => qr,
        Err(_) => return 0,
    };
-    spawn(async move {
-        imex::get_backup(ctx, qr)
-            .await
-            .log_err(ctx, "Get backup failed")
-            .ok();
-    });
-    1
+    match block_on(imex::get_backup(&ctx, qr))
+        .log_err(&ctx, "Get backup failed")
+        .context("Get backup failed")
+        .set_last_error(&ctx)
+    {
+        Ok(_) => 1,
+        Err(_) => 0,
+    }
 }

 trait ResultExt<T, E> {
--- a/deltachat-jsonrpc/Cargo.toml
+++ b/deltachat-jsonrpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.111.0"
+version = "1.112.5"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
--- a/deltachat-jsonrpc/src/api/events.rs
+++ b/deltachat-jsonrpc/src/api/events.rs
@@ -47,6 +47,9 @@ pub enum JSONRPCEventType {
        msg: String,
    },

+    /// Emitted before going into IDLE on the Inbox folder.
+    ImapInboxIdle,
+
    /// Emitted when an new file in the $BLOBDIR was created
    NewBlobFile {
        file: String,
@@ -293,6 +296,7 @@ impl From<EventType> for JSONRPCEventType {
            EventType::SmtpMessageSent(msg) => SmtpMessageSent { msg },
            EventType::ImapMessageDeleted(msg) => ImapMessageDeleted { msg },
            EventType::ImapMessageMoved(msg) => ImapMessageMoved { msg },
+            EventType::ImapInboxIdle => ImapInboxIdle,
            EventType::NewBlobFile(file) => NewBlobFile { file },
            EventType::DeletedBlobFile(file) => DeletedBlobFile { file },
            EventType::Warning(msg) => Warning { msg },
--- 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.111.0"
+  "version": "1.112.5"
 }
--- a/deltachat-repl/Cargo.toml
+++ b/deltachat-repl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.111.0"
+version = "1.112.5"
 license = "MPL-2.0"
 edition = "2021"

--- a/deltachat-rpc-client/pyproject.toml
+++ b/deltachat-rpc-client/pyproject.toml
@@ -21,6 +21,9 @@ 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,
-            "quotedMsg": quoted_msg,
+            "quotedMessageId": quoted_msg,
        }
        msg_id = await self._rpc.send_msg(self.account.id, self.id, draft)
        return Message(self.account, msg_id)
--- a/deltachat-rpc-client/src/deltachat_rpc_client/const.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/const.py
@@ -31,6 +31,7 @@ class EventType(str, Enum):
    SMTP_MESSAGE_SENT = "SmtpMessageSent"
    IMAP_MESSAGE_DELETED = "ImapMessageDeleted"
    IMAP_MESSAGE_MOVED = "ImapMessageMoved"
+    IMAP_INBOX_IDLE = "ImapInboxIdle"
    NEW_BLOB_FILE = "NewBlobFile"
    DELETED_BLOB_FILE = "DeletedBlobFile"
    WARNING = "Warning"
--- a/deltachat-rpc-client/src/deltachat_rpc_client/pytestplugin.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/pytestplugin.py
@@ -55,6 +55,11 @@ class ACFactory:
    async def get_online_account(self) -> Account:
        account = await self.new_configured_account()
        await account.start_io()
+        while True:
+            event = await account.wait_for_event()
+            print(event)
+            if event.type == EventType.IMAP_INBOX_IDLE:
+                break
        return account

    async def get_online_accounts(self, num: int) -> List[Account]:
--- a/deltachat-rpc-client/tox.ini
+++ b/deltachat-rpc-client/tox.ini
@@ -15,6 +15,7 @@ passenv =
 deps =
    pytest
    pytest-asyncio
+    pytest-timeout
    aiohttp
    aiodns

@@ -27,3 +28,6 @@ deps =
 commands =
    black --quiet --check --diff src/ examples/ tests/
    ruff src/ examples/ tests/
+
+[pytest]
+timeout = 60
--- a/deltachat-rpc-server/Cargo.toml
+++ b/deltachat-rpc-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.111.0"
+version = "1.112.5"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
@@ -9,11 +9,9 @@ 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,9 +1,11 @@
+use std::env;
 ///! Delta Chat core RPC server.
 ///!
 ///! It speaks JSON Lines over stdio.
 use std::path::PathBuf;

-use anyhow::Result;
+use anyhow::{anyhow, Context as _, Result};
+use deltachat::constants::DC_VERSION_STR;
 use deltachat_jsonrpc::api::events::event_to_json_rpc_notification;
 use deltachat_jsonrpc::api::{Accounts, CommandApi};
 use futures_lite::stream::StreamExt;
@@ -13,6 +15,23 @@ 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,9 +11,13 @@ 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" },
@@ -29,24 +33,16 @@ 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_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" },
+     { 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" },
 ]


@@ -78,7 +74,5 @@ 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,6 +37,7 @@ 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,
@@ -112,6 +113,7 @@ 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,
@@ -149,6 +151,7 @@ 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,6 +8,7 @@ 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,6 +37,7 @@ 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,
@@ -112,6 +113,7 @@ 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,
@@ -149,6 +151,7 @@ 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,
@@ -289,6 +292,7 @@ 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.111.0"
-}
+  "version": "1.112.5"
+}
--- a/python/src/deltachat/events.py
+++ b/python/src/deltachat/events.py
@@ -190,7 +190,7 @@ class FFIEventTracker:
        - ac2 is still running FetchExsistingMsgs job and thinks it's an existing, old message
        - therefore no DC_EVENT_INCOMING_MSG is sent
        """
-        self.get_info_contains("INBOX: Idle entering")
+        self.get_matching("DC_EVENT_IMAP_INBOX_IDLE")

    def wait_next_incoming_message(self):
        """wait for and return next incoming message."""
--- a/python/tests/auditwheels.py
+++ b/python/tests/auditwheels.py
@@ -1,19 +0,0 @@
-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)

-    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("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")

-        lp.sec("wait until the bcc_self message arrives in correct folder and is marked seen")
-        assert idle1.wait_for_seen()
+    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.")
    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")
-    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()
+    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.")

    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,22 +134,27 @@ def test_one_account_send_bcc_setting(acfactory, lp):
    ac1.set_config("bcc_self", "1")

    lp.sec("send out message with bcc to ourselves")
-    with ac1.direct_imap.idle() as idle1:
-        msg_out = chat.send_text("message2")
+    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"

-        # 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
+    # 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)
@@ -314,6 +319,9 @@ 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):
@@ -513,22 +521,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")
-    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()
+    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.")

-        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
+    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.")

    assert msg1.is_out_mdn_received()
    assert msg3.is_out_mdn_received()
@@ -613,18 +621,24 @@ 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()

-            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
+    # 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


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

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

-    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("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.
-        assert idle1.wait_for_seen()
+    # Wait for the message to be marked as seen on IMAP.
+    ac1._evtracker.get_info_contains("Marked messages 1 in folder DeltaChat as 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
@@ -33,18 +33,6 @@ 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,6 +8,8 @@ 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
@@ -0,0 +1,2 @@
+#!/bin/sh
+cargo deny --workspace --all-features check -D warnings
--- a/scripts/run_all.sh
+++ b/scripts/run_all.sh
@@ -31,7 +31,9 @@ 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,auditwheels --skip-missing-interpreters true
+tox --workdir "$TOXWORKDIR" -e py37,py38,py39,py310,py311,pypy37,pypy38,pypy39 --skip-missing-interpreters true
+
+auditwheel repair "$TOXWORKDIR"/wheelhouse/deltachat* -w "$TOXWORKDIR/wheelhouse"


 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[2:].strip().startswith(newversion):
+            if line.startswith("## [") and line[4:].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 {} does not exist.", contact_id,
+                        "Cannot create chat, contact {contact_id} does not exist."
                    );
                    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 {} to block 1:1 chat", contact_id
+                            "Blocking the contact {contact_id} to block 1:1 chat."
                        );
                        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,8 +2032,11 @@ 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(e) = blob.recode_to_image_size(context).await {
-                warn!(context, "Cannot recode image, using original data: {:?}", e);
+            if let Err(err) = blob.recode_to_image_size(context).await {
+                warn!(
+                    context,
+                    "Cannot recode image, using original data: {err:#}."
+                );
            }
        }
        msg.param.set(Param::File, blob.as_name());
@@ -2256,7 +2259,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, "job: cannot get selfavatar-state: {:#}", err);
+            warn!(context, "SMTP job cannot get selfavatar-state: {err:#}.");
            false
        }
    };
@@ -2283,7 +2286,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 {} has no recipient, skipping smtp-send", msg_id
+            "Message {msg_id} has no recipient, skipping smtp-send."
        );
        msg_id.set_delivered(context).await?;
        return Ok(None);
@@ -2318,27 +2321,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:#}.");
        }
    }

@@ -2693,8 +2696,7 @@ 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:?}."
        );
    }

@@ -2725,12 +2727,14 @@ pub async fn get_chat_media(
            "SELECT id
               FROM msgs
              WHERE (1=? OR chat_id=?)
+                AND chat_id != ?
                AND (type=? OR type=? OR type=?)
                AND hidden=0
              ORDER BY timestamp, id;",
            paramsv![
                chat_id.is_none(),
                chat_id.unwrap_or_else(|| ChatId::new(0)),
+                DC_CHAT_ID_TRASH,
                msg_type,
                if msg_type2 != Viewtype::Unknown {
                    msg_type2
@@ -3015,7 +3019,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);
    }
@@ -3562,7 +3566,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 {} already added", label);
+            info!(context, "Device-message {label} already added.");
            return Ok(msg_id);
        }
    }
@@ -3793,6 +3797,7 @@ mod tests {
    use crate::chatlist::{get_archived_cnt, Chatlist};
    use crate::constants::{DC_GCL_ARCHIVED_ONLY, DC_GCL_NO_SPECIALS};
    use crate::contact::{Contact, ContactAddress};
+    use crate::message::delete_msgs;
    use crate::receive_imf::receive_imf;
    use crate::test_utils::TestContext;

@@ -5975,7 +5980,7 @@ mod tests {
            include_bytes!("../test-data/image/avatar64x64.png"),
        )
        .await?;
-        send_media(
+        let second_image_msg_id = send_media(
            &t,
            chat_id2,
            Viewtype::Image,
@@ -6077,6 +6082,21 @@ mod tests {
            4
        );

+        // Delete an image.
+        delete_msgs(&t, &[second_image_msg_id]).await?;
+        assert_eq!(
+            get_chat_media(
+                &t,
+                None,
+                Viewtype::Image,
+                Viewtype::Sticker,
+                Viewtype::Webxdc,
+            )
+            .await?
+            .len(),
+            3
+        );
+
        Ok(())
    }
 }
--- 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/events.rs
+++ b/src/events.rs
@@ -133,6 +133,9 @@ pub enum EventType {
    /// Emitted when an IMAP message has been moved
    ImapMessageMoved(String),

+    /// Emitted before going into IDLE on the Inbox folder.
+    ImapInboxIdle,
+
    /// Emitted when an new file in the $BLOBDIR was created
    NewBlobFile(String),

--- a/src/imex.rs
+++ b/src/imex.rs
@@ -91,15 +91,13 @@ pub async fn imex(
    let cancel = context.alloc_ongoing().await?;

    let res = {
-        let mut guard = context.scheduler.pause(context.clone()).await;
-        let res = imex_inner(context, what, path, passphrase)
+        let _guard = context.scheduler.pause(context.clone()).await;
+        imex_inner(context, what, path, passphrase)
            .race(async {
                cancel.recv().await.ok();
                Err(format_err!("canceled"))
            })
-            .await;
-        guard.resume().await;
-        res
+            .await
    };
    context.free_ongoing().await;

@@ -399,8 +397,7 @@ async fn imex_inner(
            export_backup(context, path, passphrase.unwrap_or_default()).await
        }
        ImexMode::ImportBackup => {
-            import_backup(context, path, passphrase.unwrap_or_default()).await?;
-            context.sql.run_migrations(context).await
+            import_backup(context, path, passphrase.unwrap_or_default()).await
        }
    }
 }
@@ -476,6 +473,7 @@ async fn import_backup(
        }
    }

+    context.sql.run_migrations(context).await?;
    delete_and_reset_all_device_msgs(context).await?;

    Ok(())
--- a/src/imex/transfer.rs
+++ b/src/imex/transfer.rs
@@ -32,7 +32,8 @@ use std::task::Poll;
 use anyhow::{anyhow, bail, ensure, format_err, Context as _, Result};
 use async_channel::Receiver;
 use futures_lite::StreamExt;
-use iroh::get::{DataStream, Options};
+use iroh::blobs::Collection;
+use iroh::get::DataStream;
 use iroh::progress::ProgressEmitter;
 use iroh::protocol::AuthToken;
 use iroh::provider::{DataSource, Event, Provider, Ticket};
@@ -43,6 +44,7 @@ use tokio::sync::broadcast::error::RecvError;
 use tokio::sync::{broadcast, Mutex};
 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;
@@ -52,6 +54,8 @@ 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
@@ -71,6 +75,8 @@ pub struct BackupProvider {
    handle: JoinHandle<Result<()>>,
    /// The ticket to retrieve the backup collection.
    ticket: Ticket,
+    /// Guard to cancel the provider on drop.
+    _drop_guard: tokio_util::sync::DropGuard,
 }

 impl BackupProvider {
@@ -91,7 +97,7 @@ impl BackupProvider {

        // Acquire global "ongoing" mutex.
        let cancel_token = context.alloc_ongoing().await?;
-        let mut paused_guard = context.scheduler.pause(context.clone()).await;
+        let paused_guard = context.scheduler.pause(context.clone()).await;
        let context_dir = context
            .get_blobdir()
            .parent()
@@ -119,21 +125,28 @@ impl BackupProvider {
            Ok((provider, ticket)) => (provider, ticket),
            Err(err) => {
                context.free_ongoing().await;
-                paused_guard.resume().await;
                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).await;
+                let res = Self::watch_provider(&context, provider, cancel_token, drop_token).await;
                context.free_ongoing().await;
-                paused_guard.resume().await;
+
+                // Explicit drop to move the guards into this future
+                drop(paused_guard);
                drop(dbfile);
                res
            })
        };
-        Ok(Self { handle, ticket })
+        Ok(Self {
+            handle,
+            ticket,
+            _drop_guard: drop_token.drop_guard(),
+        })
    }

    /// Creates the provider task.
@@ -169,7 +182,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))
    }

@@ -187,8 +200,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;
@@ -248,8 +261,12 @@ impl BackupProvider {
                },
                _ = cancel_token.recv() => {
                    provider.shutdown();
-                    break Err(anyhow!("BackupSender cancelled"));
+                    break Err(anyhow!("BackupProvider cancelled"));
                },
+                _ = drop_token.cancelled() => {
+                    provider.shutdown();
+                    break Err(anyhow!("BackupProvider dropped"));
+                }
            }
        };
        match &res {
@@ -369,19 +386,16 @@ pub async fn get_backup(context: &Context, qr: Qr) -> Result<()> {
        !context.is_configured().await?,
        "Cannot import backups to accounts in use."
    );
-    let mut guard = context.scheduler.pause(context.clone()).await;
+    let _guard = context.scheduler.pause(context.clone()).await;

    // Acquire global "ongoing" mutex.
    let cancel_token = context.alloc_ongoing().await?;
    let res = tokio::select! {
        biased;
-        res = get_backup_inner(context, qr) => {
-            context.free_ongoing().await;
-            res
-        }
+        res = get_backup_inner(context, qr) => res,
        _ = cancel_token.recv() => Err(format_err!("cancelled")),
    };
-    guard.resume().await;
+    context.free_ongoing().await;
    res
 }

@@ -390,104 +404,68 @@ async fn get_backup_inner(context: &Context, qr: Qr) -> Result<()> {
        Qr::Backup { ticket } => ticket,
        _ => bail!("QR code for backup must be of type DCBACKUP"),
    };
-    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();
-                    }
+
+    match transfer_from_provider(context, &ticket).await {
+        Ok(()) => {
+            context.sql.run_migrations(context).await?;
+            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();
                }
-                context.emit_event(ReceiveProgress::Failed.into());
-                return Err(err);
            }
+            context.emit_event(ReceiveProgress::Failed.into());
+            Err(err)
        }
    }
-    Err(anyhow!("failed to contact provider"))
 }

-/// 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> {
+async fn transfer_from_provider(context: &Context, ticket: &Ticket) -> Result<()> {
    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());
-        connected = true;
+        async { Ok(()) }
+    };
+    let on_collection = |collection: &Collection| {
+        context.emit_event(ReceiveProgress::CollectionReceived.into());
+        progress.set_total(collection.total_blobs_size());
        async { Ok(()) }
    };
    let jobs = Mutex::new(JoinSet::default());
    let on_blob =
        |hash, reader, name| on_blob(context, &progress, &jobs, ticket, hash, reader, name);
-    let res = iroh::get::run(
-        ticket.hash,
-        ticket.token,
-        opts,
+
+    // 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,
        on_connected,
-        |collection| {
-            context.emit_event(ReceiveProgress::CollectionReceived.into());
-            progress.set_total(collection.total_blobs_size());
-            async { Ok(()) }
-        },
+        on_collection,
        on_blob,
    )
-    .await;
+    .await?;

    let mut jobs = jobs.lock().await;
    while let Some(job) = jobs.join_next().await {
-        job.context("job failed").map_err(TransferError::Other)?;
+        job.context("job failed")?;
    }
-
    drop(progress);
-    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)),
-        },
-    }
+    info!(
+        context,
+        "Backup transfer finished, transfer rate was {} Mbps.",
+        stats.mbits()
+    );
+    Ok(())
 }

 /// Get callback when a blob is received from the provider.
@@ -529,7 +507,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);
@@ -691,4 +669,16 @@ 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 {} tries to {}", job, tries);
+                info!(context, "Increase job {job} tries to {tries}.");
                job.tries = tries;
                let time_offset = get_backoff_time_offset(tries);
                job.desired_timestamp = time() + time_offset;
@@ -177,26 +177,23 @@ 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 {} as it exhausted {} retries", job, JOB_RETRIES
+                    "Remove job {job} as it exhausted {JOB_RETRIES} 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 {} as it failed with error {:#}", job, err
-                );
+                warn!(context, "Remove job {job} as it failed with error {err:#}.");
            } else {
-                info!(context, "remove job {} as it succeeded", job);
+                info!(context, "Remove job {job} as it succeeded.");
            }

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

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

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

    try_res
 }
@@ -250,7 +247,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))
@@ -264,7 +261,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;
@@ -316,19 +313,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/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -1976,10 +1976,10 @@ pub(crate) fn get_list_post(headers: &[MailHeader]) -> Option<String> {
        .map(|s| s.addr)
 }

-fn get_all_addresses_from_header<F>(headers: &[MailHeader], pred: F) -> Vec<SingleInfo>
-where
-    F: Fn(String) -> bool,
-{
+fn get_all_addresses_from_header(
+    headers: &[MailHeader],
+    pred: fn(String) -> bool,
+) -> Vec<SingleInfo> {
    let mut result: Vec<SingleInfo> = Default::default();

    headers
--- 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,10 +302,7 @@ 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:#}.");
            };
        }
    }
@@ -331,7 +328,7 @@ pub(crate) async fn receive_imf_inner(
        )
        .await
        {
-            warn!(context, "cannot update contact status: {:#}", err);
+            warn!(context, "Cannot update contact status: {err:#}.");
        }
    }

@@ -394,7 +391,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);
        }
@@ -476,7 +473,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;
            }
@@ -519,7 +516,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;
                }
@@ -536,7 +533,8 @@ 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)",);
+            info!(context, "Message is a DSN (TRASH).",);
+            markseen_on_imap_table(context, rfc724_mid).await.ok();
        }

        if chat_id.is_none() {
@@ -754,7 +752,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);
                }
            }
@@ -771,7 +769,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);
        }

@@ -863,14 +861,15 @@ 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)");
+                info!(context, "Message is a status update only (TRASH).");
+                markseen_on_imap_table(context, rfc724_mid).await.ok();
            }
        }
    }
@@ -880,7 +879,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
        })
    };
@@ -892,10 +891,7 @@ 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
            }
        }
@@ -915,12 +911,7 @@ 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 {:?} for chat {}, checking if it should be applied",
-            ephemeral_timer,
-            chat_id
-        );
+        info!(context, "Received new ephemeral timer value {ephemeral_timer:?} for chat {chat_id}, checking if it should be applied.");
        if is_dc_message == MessengerMessage::Yes
            && get_previous_message(context, mime_parser)
                .await?
@@ -936,9 +927,7 @@ 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 {:?} for chat {} to avoid rollback",
-                ephemeral_timer,
-                chat_id
+                "Ignoring ephemeral timer change to {ephemeral_timer:?} for chat {chat_id} to avoid rollback.",
            );
        } else if chat_id
            .update_timestamp(context, Param::EphemeralSettingsTimestamp, sent_timestamp)
@@ -950,12 +939,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 {:?} for chat {}", ephemeral_timer, chat_id
+                    "Updated ephemeral timer to {ephemeral_timer:?} for chat {chat_id}."
                );
                if mime_parser.is_system_message != SystemMessage::EphemeralTimerChanged {
                    chat::add_info_msg(
@@ -970,7 +959,7 @@ async fn add_parts(
        } else {
            warn!(
                context,
-                "ignoring ephemeral timer change to {:?} because it's outdated", ephemeral_timer
+                "Ignoring ephemeral timer change to {ephemeral_timer:?} because it is outdated."
            );
        }
    }
@@ -999,7 +988,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 {
@@ -1429,7 +1418,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)));
    }
@@ -1499,7 +1488,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);
    };

@@ -1525,7 +1514,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);
        }
@@ -1557,7 +1546,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);
        }

@@ -1618,7 +1607,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)))
    }
 }
@@ -1658,7 +1647,7 @@ async fn apply_group_changes(
                    Some(stock_str::msg_del_member(context, &removed_addr, from_id).await)
                };
            }
-            None => warn!(context, "removed {:?} has no contact_id", removed_addr),
+            None => warn!(context, "Removed {removed_addr:?} has no contact_id."),
        }
    } else {
        removed_id = None;
@@ -1683,7 +1672,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(
@@ -1723,7 +1712,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);
        }
@@ -1743,9 +1732,7 @@ async fn apply_group_changes(
        {
            warn!(
                context,
-                "Contact {} attempts to modify group chat {} member list without being a member.",
-                from_id,
-                chat_id
+                "Contact {from_id} attempts to modify group chat {chat_id} member list without being a member."
            );
        } else if chat_id
            .update_timestamp(context, Param::MemberListTimestamp, sent_timestamp)
@@ -1778,10 +1765,7 @@ async fn apply_group_changes(
            }
            members_to_add.dedup();

-            info!(
-                context,
-                "adding {:?} to chat id={}", members_to_add, chat_id
-            );
+            info!(context, "Adding {members_to_add:?} to chat id={chat_id}.");
            chat::add_to_chat_contacts_table(context, chat_id, &members_to_add).await?;
            send_event_chat_modified = true;
        }
@@ -1791,17 +1775,15 @@ 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 {} we are not a member of.", chat_id
+                "Received group avatar update for group chat {chat_id} we are not a member of."
            );
        } else if !chat::is_contact_in_chat(context, chat_id, from_id).await? {
            warn!(
                context,
-                "Contact {} attempts to modify group chat {} avatar without being a member.",
-                from_id,
-                chat_id
+                "Contact {from_id} attempts to modify group chat {chat_id} avatar without being a member.",
            );
        } 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)?
@@ -1935,7 +1917,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
            )
        })?;
@@ -1943,7 +1925,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)
    }
 }
@@ -2035,7 +2017,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);
@@ -2052,13 +2034,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);
    }

@@ -2165,7 +2147,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/scheduler.rs
+++ b/src/scheduler.rs
@@ -5,7 +5,7 @@ use anyhow::{bail, Context as _, Result};
 use async_channel::{self as channel, Receiver, Sender};
 use futures::future::try_join_all;
 use futures_lite::FutureExt;
-use tokio::sync::{RwLock, RwLockWriteGuard};
+use tokio::sync::{oneshot, RwLock, RwLockWriteGuard};
 use tokio::task;

 use self::connectivity::ConnectivityStore;
@@ -13,6 +13,7 @@ use crate::config::Config;
 use crate::contact::{ContactId, RecentlySeenLoop};
 use crate::context::Context;
 use crate::ephemeral::{self, delete_expired_imap_messages};
+use crate::events::EventType;
 use crate::imap::{FolderMeaning, Imap};
 use crate::job;
 use crate::location;
@@ -89,20 +90,28 @@ impl SchedulerState {

    /// Pauses the IO scheduler.
    ///
-    /// If it is currently running the scheduler will be stopped.  When
-    /// [`IoPausedGuard::resume`] is called the scheduler is started again.
+    /// If it is currently running the scheduler will be stopped.  When the
+    /// [`IoPausedGuard`] is dropped the scheduler is started again.
    ///
    /// If in the meantime [`SchedulerState::start`] or [`SchedulerState::stop`] is called
    /// resume will do the right thing and restore the scheduler to the state requested by
    /// the last call.
    pub(crate) async fn pause<'a>(&'_ self, context: Context) -> IoPausedGuard {
-        let mut inner = self.inner.write().await;
-        inner.paused = true;
-        Self::do_stop(inner, &context).await;
-        IoPausedGuard {
-            context,
-            done: false,
+        {
+            let mut inner = self.inner.write().await;
+            inner.paused = true;
+            Self::do_stop(inner, &context).await;
        }
+        let (tx, rx) = oneshot::channel();
+        tokio::spawn(async move {
+            rx.await.ok();
+            let mut inner = context.scheduler.inner.write().await;
+            inner.paused = false;
+            if inner.started && inner.scheduler.is_none() {
+                SchedulerState::do_start(inner, context.clone()).await;
+            }
+        });
+        IoPausedGuard { sender: Some(tx) }
    }

    /// Restarts the scheduler, only if it is running.
@@ -194,31 +203,21 @@ struct InnerSchedulerState {
    paused: bool,
 }

+/// Guard to make sure the IO Scheduler is resumed.
+///
+/// Returned by [`SchedulerState::pause`].  To resume the IO scheduler simply drop this
+/// guard.
 #[derive(Debug)]
 pub(crate) struct IoPausedGuard {
-    context: Context,
-    done: bool,
-}
-
-impl IoPausedGuard {
-    pub(crate) async fn resume(&mut self) {
-        self.done = true;
-        let mut inner = self.context.scheduler.inner.write().await;
-        inner.paused = false;
-        if inner.started && inner.scheduler.is_none() {
-            SchedulerState::do_start(inner, self.context.clone()).await;
-        }
-    }
+    sender: Option<oneshot::Sender<()>>,
 }

 impl Drop for IoPausedGuard {
    fn drop(&mut self) {
-        if self.done {
-            return;
+        if let Some(sender) = self.sender.take() {
+            // Can only fail if receiver is dropped, but then we're already resumed.
+            sender.send(()).ok();
        }
-
-        // Async .resume() should be called manually due to lack of async drop.
-        error!(self.context, "Pause guard dropped without resuming.");
    }
 }

@@ -479,6 +478,7 @@ async fn fetch_idle(

    connection.connectivity.set_connected(ctx).await;

+    ctx.emit_event(EventType::ImapInboxIdle);
    if let Some(session) = connection.session.take() {
        if !session.can_idle() {
            info!(
--- 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
                );
--- a/src/webxdc.rs
+++ b/src/webxdc.rs
@@ -165,6 +165,19 @@ pub(crate) struct StatusUpdateItemAndSerial {
    max_serial: StatusUpdateSerial,
 }

+/// Returns an entry index and a reference.
+fn find_zip_entry<'a>(
+    file: &'a async_zip::ZipFile,
+    name: &str,
+) -> Option<(usize, &'a async_zip::StoredZipEntry)> {
+    for (i, ent) in file.entries().iter().enumerate() {
+        if ent.entry().filename() == name {
+            return Some((i, ent));
+        }
+    }
+    None
+}
+
 impl Context {
    /// check if a file is an acceptable webxdc for sending or receiving.
    pub(crate) async fn is_webxdc_file(&self, filename: &str, file: &[u8]) -> Result<bool> {
@@ -180,7 +193,7 @@ impl Context {
            return Ok(false);
        }

-        let archive = match async_zip::read::mem::ZipFileReader::new(file).await {
+        let archive = match async_zip::read::mem::ZipFileReader::new(file.to_vec()).await {
            Ok(archive) => archive,
            Err(_) => {
                info!(self, "{} cannot be opened as zip-file", &filename);
@@ -188,7 +201,7 @@ impl Context {
            }
        };

-        if archive.entry("index.html").is_none() {
+        if find_zip_entry(archive.file(), "index.html").is_none() {
            info!(self, "{} misses index.html", &filename);
            return Ok(false);
        }
@@ -215,7 +228,7 @@ impl Context {

        let valid = match async_zip::read::fs::ZipFileReader::new(path).await {
            Ok(archive) => {
-                if archive.entry("index.html").is_none() {
+                if find_zip_entry(archive.file(), "index.html").is_none() {
                    info!(self, "{} misses index.html", filename);
                    false
                } else {
@@ -649,10 +662,9 @@ fn parse_webxdc_manifest(bytes: &[u8]) -> Result<WebxdcManifest> {
 }

 async fn get_blob(archive: &mut async_zip::read::fs::ZipFileReader, name: &str) -> Result<Vec<u8>> {
-    let (i, _) = archive
-        .entry(name)
+    let (i, _) = find_zip_entry(archive.file(), name)
        .ok_or_else(|| anyhow!("no entry found for {}", name))?;
-    let mut reader = archive.entry_reader(i).await?;
+    let mut reader = archive.entry(i).await?;
    let mut buf = Vec::new();
    reader.read_to_end(&mut buf).await?;
    Ok(buf)
@@ -754,9 +766,9 @@ impl Message {
            } else {
                self.get_filename().unwrap_or_default()
            },
-            icon: if archive.entry("icon.png").is_some() {
+            icon: if find_zip_entry(archive.file(), "icon.png").is_some() {
                "icon.png".to_string()
-            } else if archive.entry("icon.jpg").is_some() {
+            } else if find_zip_entry(archive.file(), "icon.jpg").is_some() {
                "icon.jpg".to_string()
            } else {
                WEBXDC_DEFAULT_ICON.to_string()
Author	SHA1	Message	Date
link2xt	c9879f863b	Prepare 1.112.5 release	2023-04-02 09:48:39 +00:00
link2xt	f6d27516cb	Run migrations before delete_and_reset_all_device_msgs() Both when importing a backup from file or receiving it over the network.	2023-04-02 08:39:13 +00:00
link2xt	d6426dc1b6	imex: run migrations after receiving a transferred backup Similarly to how `imex_inner()` runs migrations after successful call to `import_backup()`, migrations should be run after receiving a backup using `transfer_from_provider()`.	2023-04-01 23:56:36 +00:00
link2xt	f24843fbb1	Release 1.112.4	2023-03-31 01:12:26 +00:00
link2xt	6c57bc9438	Fix call to `auditwheel` in scripts/run_all.sh This bugs prevents CI from building wheels.	2023-03-31 01:02:41 +00:00
link2xt	e612927c5d	Fix links in the changelog	2023-03-30 20:36:30 +00:00
link2xt	aff951440c	Release 1.112.3	2023-03-30 20:32:49 +00:00
Floris Bruynooghe	ef63e01632	fix(imex): transfer::get_backup must always free ongoing process (#4249 ) * fix(imex): transfer::get_backup must always free ongoing process When the ongoing process is cancelled it is still the responsibility of whoever took out the ongoing process to free it. This code was only freeing the ongoing process when completed normally but not when cancelled. * add changelog	2023-03-30 20:23:50 +00:00
link2xt	d6fdc7cb67	Release 1.112.2	2023-03-30 14:57:32 +00:00
link2xt	ea87c78d34	Do not return media from trashed messages in the "All media" view.	2023-03-30 08:10:06 +00:00
Floris Bruynooghe	a2927a6586	ref(deps): Upgrade to iroh 0.4.0 (#4245 ) This moves us back to a released version; - Ticket is now opaque, need to use accessor functions. - Ticket now ensures it is valid itself, no need to inspect it's inners. Deserialisation would fail if it was bad. - The git version was accidentally used with default-features enabled and thus pulled in a few too many dependencies. They are now gone.	2023-03-29 15:45:35 +02:00
Floris Bruynooghe	943c8a1ab3	feat(imex): Cancel BackupProvider when dropped (#4242 ) This ensures that the BackupProvider will be stopped as soon as the struct is dropped and the imex progress error event is emitted. This makes it easier to use and also makes sure that the ffi call dc_backup_provider_unref() does not lead to dangling resources.	2023-03-29 14:51:08 +02:00
Floris Bruynooghe	5be558ea68	feat(imex) Connect to all provider addresses concurrently (#4240 ) This uses the new iroh API to connect to all provider addresses concurrently. It simplifies the implementation as well as we no longer need to try the addresses manually.	2023-03-29 09:47:00 +02:00
link2xt	fc25bba514	Add changelog for unreleased 1.112.2	2023-03-28 10:44:07 +00:00
Floris Bruynooghe	20b326415a	deps: Update iroh, remove default-net patch (#4239 ) * deps: Update iroh, remove default-net patch The released version of default-net is now sufficient and iroh makes sure this dependency is recent enough. * Update cargo-deny config * Newer version of spin, previous has been yanked	2023-03-28 10:28:38 +00:00
link2xt	edf0c02bc8	Release 1.112.1	2023-03-27 15:22:31 +00:00
link2xt	1d42907114	deltachat-ffi: document thread safety guarantees	2023-03-27 14:47:40 +00:00
bjoern	070d832580	check against null in dc_backup_provider_unref() (#4232 ) this is what we're doing in most comparable unref() functions.	2023-03-26 19:25:23 +02:00
link2xt	0dfec83b0f	deltachat-rpc-client: configure setuptools_scm This makes `python -m build` produce wheels with a version other than 0.0.0.	2023-03-26 10:00:01 +00:00
link2xt	c84155cbd4	Add scripts/deny.sh This can be used to manually run `cargo deny` without specifying all the parameters manually. Similar to existing scripts/clippy.sh	2023-03-25 19:54:24 +00:00
iequidoo	eb5ddf270f	receive_imf: Mark special messages as seen (#3054 ) Exactly: delivery reports, webxdc status updates.	2023-03-25 15:47:38 -03:00
link2xt	fb093253c6	Update generated nodejs constants files	2023-03-25 10:20:17 +00:00
dependabot[bot]	1864be5c55	Merge pull request #4229 from deltachat/dependabot/cargo/fuzz/openssl-0.10.48	2023-03-25 01:06:43 +00:00
dependabot[bot]	7138d44083	build(deps): bump openssl from 0.10.45 to 0.10.48 in /fuzz Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.45 to 0.10.48. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.45...openssl-v0.10.48) --- updated-dependencies: - dependency-name: openssl dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-03-25 00:31:14 +00:00
Floris Bruynooghe	04daff0608	Add comment	2023-03-24 23:20:14 +00:00
Floris Bruynooghe	801250a9e0	feat(imex): Sort IP addresses for getting from ticket When trying IP addresses from the ticket, have a very rough sort order in which to try them. Basically assume most local wifi's are somewhere on 192.168.0.0/16 so prefer those first.	2023-03-24 23:20:14 +00:00
link2xt	20319b5426	Add --version option to deltachat-rpc-server	2023-03-24 23:11:11 +00:00
link2xt	9cca34bba5	Remove `.wait_for_seen()` calls in flaky tests This is a merge commit for <https://github.com/deltachat/deltachat-core-rust/pull/4226>	2023-03-24 23:09:44 +00:00
link2xt	530981119e	Update Cargo.lock	2023-03-24 23:08:46 +00:00
adbenitez	6d0327d057	deltachat-rpc-client: fix bug in `Chat.send_message()`	2023-03-24 18:56:08 -04:00
adbenitez	580ce5a9e9	deltachat-rpc-client: fix bug in `Chat.send_message()`	2023-03-24 17:34:41 -04:00
link2xt	6f327c950d	Cargo.toml: replace branch with rev in default-net patch entry This makes `cargo install --path deltachat-rpc-server` work again.	2023-03-24 21:16:04 +00:00
link2xt	92ad843ff2	Reduce test code duplication	2023-03-24 20:59:31 +00:00
link2xt	a8059c6bff	python: remove flaky .wait_for_seen() from test_fetch_existing()	2023-03-24 18:09:40 +00:00
link2xt	4b468a25fe	Remove pytest-rerunfailures It is not compatible with pytest-timeout anyway: <https://github.com/pytest-dev/pytest-rerunfailures/issues/99>	2023-03-24 16:13:33 +00:00
link2xt	1e135b649c	Do not use IDLE in test_send_and_receive_message_markseen Fix flakyness in case Dovecot sends only EXISTS but not FETCH unsolicited response.	2023-03-24 16:09:40 +00:00
link2xt	40d32f2d0c	Do not use IDLE in test_fetch_existing_msgs_group_and_single Makes the test less flaky, as Dovecot sometimes sends only the EXISTS response, but not the FETCH response for flags.	2023-03-24 16:09:28 +00:00
link2xt	c9ec087cd8	python: do not use IDLE in test_markseen_message_and_mdn test Make the test less flaky in case Dovecot notifies only about EXISTS but not flag updates.	2023-03-24 16:09:15 +00:00
link2xt	84d79e1479	Do not use IDLE in test_mdn_asymmetric Fixes test flakyness.	2023-03-24 16:08:58 +00:00
link2xt	83af248068	Turn more log messages into proper sentences.	2023-03-24 12:15:42 +00:00
link2xt	4f25edb1a1	Update OpenSSL to fix RUSTSEC-2023-0022 <https://rustsec.org/advisories/RUSTSEC-2023-0022>	2023-03-24 09:56:00 +00:00
link2xt	ded1634b7d	python: look for "Marked messages ... as seen." by regexp Tests reuse accounts, so UIDs may start from the number other than 1.	2023-03-24 09:43:59 +00:00
link2xt	635c73ffc6	python: use locally installed `auditwheel` `auditwheel` is a part of manylinux images, there is no need to create a virtual environment and install it again.	2023-03-23 23:00:46 +00:00
link2xt	fcc1fe73be	Do not use .wait_for_seen() in test_one_account_send_bcc_setting .wait_for_seen() is unreliable, because sometimes Dovecot sends only EXISTS to the IDLE connection, but not the FETCH. Dovecot sends updates like FETCH only if some connection has already observed the message in previous state without the \Seen flag. To avoid this race condition, wait until the core sets the flag, then FETCH the message manually and check that the flag is set.	2023-03-23 22:57:35 +00:00
link2xt	fa278d50f7	Simplify layout of the deltachat-rpc-server crate	2023-03-23 22:10:28 +00:00
link2xt	2f02be4c64	ci: test the core on macOS	2023-03-23 20:46:58 +00:00
link2xt	7add1c116c	Attempt to fix deltachat-rpc-server binary release uploads	2023-03-23 17:19:28 +00:00
link2xt	124a0e90e1	Release 1.112.0	2023-03-23 13:34:24 +00:00
Floris Bruynooghe	1716cdf51c	ref(ffi): dc_receive_backup should block (#4211 ) The documentation says this blocks. This should block because it also means the error reporting is more accurate by calling set_last_error just before returning.	2023-03-23 14:15:34 +01:00
link2xt	3fdcffb314	Increase reference count before spawning background tasks in dc_receive_backup() Merged PR <https://github.com/deltachat/deltachat-core-rust/pull/4206>	2023-03-23 08:54:33 +00:00
link2xt	f033aae25c	Move most of the `dc_receive_backup()` into a safe function	2023-03-23 08:47:58 +00:00
Floris Bruynooghe	c42d942460	explicitly move for good measure	2023-03-23 08:47:58 +00:00
Floris Bruynooghe	0ba8201797	fix(dc_receive_backup): Increase refcount before spawn Otherwise it is possible for the context that is used in the spawn to be unreferenced. Really this should be caught by the borrow checker that ensures we only spawn things with a 'static lifetime, but we're handling raw pointers so it doesn't.	2023-03-23 08:47:49 +00:00
iequidoo	87252ab053	cargo: bump async_zip from 0.0.9 to 0.0.11 Bumps [async_zip](https://github.com/Majored/rs-async-zip) from 0.0.9 to 0.0.11. - [Release notes](https://github.com/Majored/rs-async-zip/releases) - [Commits](https://github.com/Majored/rs-async-zip/compare/v0.0.9...v0.0.11) --- updated-dependencies: - dependency-name: async_zip dependency-type: direct:production update-type: version-update:semver-patch ...	2023-03-23 00:33:25 +00:00
link2xt	53eec521dc	Make `get_all_addresses_from_header` non-generic This saves 1287 lines according to `cargo llvm-lines --release`.	2023-03-22 23:51:41 +00:00
link2xt	238570a7b9	deltachat-ffi: update rand to 0.8.5	2023-03-22 23:37:01 +00:00
link2xt	043ae48806	Set pytest-timeout on async python tests	2023-03-22 20:41:17 +00:00
link2xt	fb88f2e6ab	Reintroduce pytest-rerunfailures Tests on GitHub Actions are very flaky recently.	2023-03-22 20:39:35 +00:00
link2xt	5db867cd1b	Add IMAP_INBOX_IDLE event	2023-03-22 20:20:37 +00:00
B. Petersen	ec00c160c6	add missing define	2023-03-22 20:54:52 +01:00
Floris Bruynooghe	616eabc613	feat: Make the IoPausedGuard a simple sender (#4184 ) This replaces the mechanism by which the IoPauseGuard makes sure the IO scheduler is resumed: it really is a drop guard now by sending a single message on drop. This makes it not have to hold on to anything like the context so makes it a lot easier to use. The trade-off is that a long-running task is spawned when the guard is created, this task needs to receive the message from the drop guard in order for the scheduler to resume.	2023-03-22 17:42:21 +01:00
Floris Bruynooghe	89b32e02c5	deps(iroh): switch back to iroh main branch (#4202 )	2023-03-22 16:05:55 +01:00