Simplify logic

fix: Downgrade message state to InNoticed when it's fully downloaded (#2970 )
test: Mark not downloaded message as seen (#2970 )
2026-10-17 10:23:01 +03:00 · 2024-10-15 18:02:55 +02:00 · 2024-10-14 20:20:02 -03:00 · 2024-10-14 20:20:02 -03:00
71 changed files with 495 additions and 1702 deletions
@@ -24,7 +24,7 @@ jobs:
    name: Lint Rust
    runs-on: ubuntu-latest
    env:
-      RUSTUP_TOOLCHAIN: 1.82.0
+      RUSTUP_TOOLCHAIN: 1.81.0
    steps:
      - uses: actions/checkout@v4
        with:
@@ -95,11 +95,11 @@ jobs:
      matrix:
        include:
          - os: ubuntu-latest
-            rust: 1.82.0
+            rust: 1.81.0
          - os: windows-latest
-            rust: 1.82.0
+            rust: 1.81.0
          - os: macos-latest
-            rust: 1.82.0
+            rust: 1.81.0

          # Minimum Supported Rust Version = 1.77.0
          - os: ubuntu-latest
@@ -1,131 +1,5 @@
 # Changelog

-## [1.148.4] - 2024-10-24
-
-### Features / Changes
-
- Jsonrpc: add `private_tag` to `Account::Configured` Object ([#6107](https://github.com/deltachat/deltachat-core-rust/pull/6107)).
-
-### Fixes
-
- Normalize proxy URLs before saving into proxy_url.
- Do not wait for connections in maybe_add_gossip_peers().
-
-## [1.148.3] - 2024-10-24
-
-### Fixes
-
- Fix reception of realtime advertisements.
-
-### Features / Changes
-
- Allow sending realtime messages up to 128 KB in size.
-
-### API-Changes
-
- deltachat-rpc-client: Add EventType.WEBXDC_REALTIME_ADVERTISEMENT_RECEIVED.
-
-### Documentation
-
- Fix DC_QR_PROXY docs ([#6099](https://github.com/deltachat/deltachat-core-rust/pull/6099)).
-
-### Refactor
-
- Generate topic inside create_iroh_header().
-
-### Tests
-
- Test that realtime advertisements work after chatting.
-
-## [1.148.2] - 2024-10-23
-
-### Fixes
-
- Never initialize Iroh if realtime is disabled.
-
-### Features / Changes
-
- Add more logging for iroh initialization and peer addition.
-
-### Build system
-
- `nix flake update nixpkgs`.
- `nix flake update fenix`.
-
-## [1.148.1] - 2024-10-23
-
-### Build system
-
- Revert "build: nix flake update"
-
-This reverts commit 6f22ce2722b51773d7fbb0d89e4764f963cafd91..
-
-## [1.148.0] - 2024-10-22
-
-### API-Changes
-
- Create QR codes from any data ([#6090](https://github.com/deltachat/deltachat-core-rust/pull/6090)).
- Add delta chat logo to QR codes ([#6093](https://github.com/deltachat/deltachat-core-rust/pull/6093)).
- Add realtime advertisement received event ([#6043](https://github.com/deltachat/deltachat-core-rust/pull/6043)).
- Notify adding reactions ([#6072](https://github.com/deltachat/deltachat-core-rust/pull/6072))
- Internal profile names ([#6088](https://github.com/deltachat/deltachat-core-rust/pull/6088)).
-
-### Features / Changes
-
- IMAP COMPRESS support.
- Sort received outgoing message down if it's fresher than all non fresh messages.
- Prioritize cached results if DNS resolver returns many results.
- Add in-memory cache for DNS.
- deltachat-repl: Built-in QR code printer.
- Log the logic for (not) doing AEAP.
- Log when late Autocrypt header is ignored.
- Add more context to `send_msg` errors.
-
-### Fixes
-
- Replace old draft with a new one atomically.
- ChatId::maybe_delete_draft: Don't delete message if it's not a draft anymore ([#6053](https://github.com/deltachat/deltachat-core-rust/pull/6053)).
- Call update_connection_history for proxified connections.
- sql: Set PRAGMA query_only to avoid writing on read-only connections.
- sql: Run `PRAGMA incremental_vacuum` on a write connection.
- Increase MAX_SECONDS_TO_LEND_FROM_FUTURE to 30.
-
-### Build system
-
- Nix flake update.
- Resolve warning about default-features, and make it possible to disable vendoring ([#6079](https://github.com/deltachat/deltachat-core-rust/pull/6079)).
- Silence a rust-analyzer false-positive ([#6077](https://github.com/deltachat/deltachat-core-rust/pull/6077)).
-
-### CI
-
- Update Rust to 1.82.0.
-
-### Documentation
-
- Set_protection_for_timestamp_sort does not send messages.
- Document MimeFactory.req_mdn.
- Fix `too_long_first_doc_paragraph` clippy lint.
-
-### Refactor
-
- Update_msg_state: Don't avoid downgrading OutMdnRcvd to OutDelivered.
- Fix elided_named_lifetimes warning.
- set_protection_for_timestamp_sort: Do not log bubbled up errors.
- Fix clippy::needless_lifetimes warnings.
- Use `HeaderDef` constant for Chat-Disposition-Notification-To.
- Resultify get_self_fingerprint().
- sql: Move write mutex into connection pool.
-
-### Tests
-
- test_qr_setup_contact_svg: Stop testing for no display name.
- Always gossip if gossip_period is set to 0.
- test_aeap_flow_verified: Wait for "member added" before sending messages ([#6057](https://github.com/deltachat/deltachat-core-rust/pull/6057)).
- Make test_verified_group_member_added_recovery more reliable.
- test_aeap_flow_verified: Do not start ac1new.
- Fix `test_securejoin_after_contact_resetup` flakiness.
- Message from old setup preserves contact verification, but breaks 1:1 protection.
-
 ## [1.147.1] - 2024-10-13

 ### Build system
@@ -5134,8 +5008,3 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
 [1.146.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.145.0..v1.146.0
 [1.147.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.146.0..v1.147.0
 [1.147.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.147.0..v1.147.1
-[1.148.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.147.1..v1.148.0
-[1.148.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.148.0..v1.148.1
-[1.148.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.148.1..v1.148.2
-[1.148.3]: https://github.com/deltachat/deltachat-core-rust/compare/v1.148.2..v1.148.3
-[1.148.4]: https://github.com/deltachat/deltachat-core-rust/compare/v1.148.3..v1.148.4
@@ -27,7 +27,7 @@ add_custom_command(
        PREFIX=${CMAKE_INSTALL_PREFIX}
        LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR}
        INCLUDEDIR=${CMAKE_INSTALL_FULL_INCLUDEDIR}
-	${CARGO} build --target-dir=${CMAKE_BINARY_DIR}/target --release --features jsonrpc
+	${CARGO} build --target-dir=${CMAKE_BINARY_DIR}/target --release --no-default-features --features jsonrpc
 	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deltachat-ffi
 )

@@ -1109,28 +1109,6 @@ version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"

-[[package]]
-name = "crossterm"
-version = "0.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
-dependencies = [
- "bitflags 2.6.0",
- "crossterm_winapi",
- "parking_lot",
- "rustix",
- "winapi",
-]
-
-[[package]]
-name = "crossterm_winapi"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "crunchy"
 version = "0.2.2"
@@ -1293,12 +1271,11 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.148.4"
+version = "1.147.1"
 dependencies = [
 "anyhow",
 "async-broadcast",
 "async-channel 2.3.1",
- "async-compression",
 "async-imap",
 "async-native-tls",
 "async-smtp",
@@ -1394,7 +1371,7 @@ dependencies = [

 [[package]]
 name = "deltachat-jsonrpc"
-version = "1.148.4"
+version = "1.147.1"
 dependencies = [
 "anyhow",
 "async-channel 2.3.1",
@@ -1419,14 +1396,13 @@ dependencies = [

 [[package]]
 name = "deltachat-repl"
-version = "1.148.4"
+version = "1.147.1"
 dependencies = [
 "anyhow",
 "deltachat",
 "dirs",
 "log",
 "nu-ansi-term",
- "qr2term",
 "rusqlite",
 "rustyline",
 "tokio",
@@ -1435,7 +1411,7 @@ dependencies = [

 [[package]]
 name = "deltachat-rpc-server"
-version = "1.148.4"
+version = "1.147.1"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1464,7 +1440,7 @@ dependencies = [

 [[package]]
 name = "deltachat_ffi"
-version = "1.148.4"
+version = "1.147.1"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -4481,22 +4457,6 @@ dependencies = [
 "unarray",
 ]

-[[package]]
-name = "qr2term"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6867c60b38e9747a079a19614dbb5981a53f21b9a56c265f3bfdf6011a50a957"
-dependencies = [
- "crossterm",
- "qrcode",
-]
-
-[[package]]
-name = "qrcode"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68782463e408eb1e668cf6152704bd856c78c5b6417adaee3203d8f4c1fc9ec"
-
 [[package]]
 name = "qrcodegen"
 version = "1.8.0"
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.148.4"
+version = "1.147.1"
 edition = "2021"
 license = "MPL-2.0"
 rust-version = "1.77"
@@ -42,7 +42,6 @@ anyhow = { workspace = true }
 async-broadcast = "0.7.1"
 async-channel = { workspace = true }
 async-imap = { version = "0.10.2", default-features = false, features = ["runtime-tokio", "compress"] }
-async-compression = { version = "0.4.15", default-features = false, features = ["tokio", "gzip"] }
 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.17", default-features = false, features = ["deflate", "tokio-fs"] }
@@ -170,8 +169,8 @@ async-channel = "2.3.1"
 base64 = "0.22"
 chrono = { version = "0.4.38", default-features = false }
 deltachat-contact-tools = { path = "deltachat-contact-tools" }
-deltachat-jsonrpc = { path = "deltachat-jsonrpc", default-features = false }
-deltachat = { path = ".", default-features = false }
+deltachat-jsonrpc = { path = "deltachat-jsonrpc" }
+deltachat = { path = "." }
 futures = "0.3.30"
 futures-lite = "2.3.0"
 libc = "0.2"
@@ -1,12 +0,0 @@
-<path
-   style="fill:#ffffff;fill-opacity:1;stroke:none"
-   d="m 24.015419,1.2870249 c -12.549421,0 -22.7283936,10.1789711 -22.7283936,22.7283931 0,12.549422 10.1789726,22.728395 22.7283936,22.728395 14.337742,-0.342877 9.614352,-4.702705 23.697556,0.969161 -7.545453,-13.001555 -1.082973,-13.32964 -0.969161,-23.697556 0,-12.549422 -10.178973,-22.7283931 -22.728395,-22.7283931 z" />
-<path
-   style="fill:#000000;fill-opacity:1;stroke:none"
-   d="M 23.982249,5.3106163 C 13.645822,5.4364005 5.2618355,13.92999 5.2618355,24.275753 c 0,10.345764 8.3839865,18.635301 18.7204135,18.509516 9.827724,-0.03951 7.516769,-5.489695 18.380082,-0.443187 -5.950849,-9.296115 0.201753,-10.533667 0.340336,-18.521947 0,-10.345766 -8.383989,-18.6353031 -18.720418,-18.5095187 z" />
-<g
-    style="fill:#ffffff"
-    transform="scale(1.1342891,0.88160947)">
-  <path
-     d="m 21.360141,23.513382 q -1.218487,-1.364705 -3.387392,-3.265543 -2.388233,-2.095797 -3.216804,-3.289913 -0.828571,-1.218486 -0.828571,-2.6563 0,-2.144536 1.998318,-3.363022 1.998317,-1.2428565 5.215121,-1.2428565 3.216804,0 5.605037,1.0966375 2.412603,1.096638 2.412603,3.021846 0,0.92605 -0.584873,1.535293 -0.584874,0.609243 -1.364705,0.609243 -1.121008,0 -2.631931,-1.681511 -1.535292,-1.705881 -2.60756,-2.388233 -1.047898,-0.706722 -2.461343,-0.706722 -1.803359,0 -2.973106,0.804201 -1.145377,0.804201 -1.145377,2.047057 0,1.169747 0.950419,2.193275 0.950419,1.023529 4.898315,3.728568 4.215963,2.899998 5.946213,4.532769 1.75462,1.632772 2.851258,3.972265 1.096638,2.339494 1.096638,4.947055 0,4.581508 -3.241174,8.090749 -3.216804,3.484871 -7.530245,3.484871 -3.923526,0 -6.628566,-2.802519 -2.705039,-2.802518 -2.705039,-7.481506 0,-4.508399 2.973106,-7.530245 2.997477,-3.021846 7.359658,-3.655459 z m 1.072268,1.121008 q -6.994112,1.145377 -6.994112,9.601672 0,4.36218 1.730251,6.774783 1.75462,2.412603 4.069744,2.412603 2.412603,0 3.972265,-2.315124 1.559663,-2.339493 1.559663,-6.311759 0,-5.751255 -4.337811,-10.162175 z" />
-</g>
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.148.4"
+version = "1.147.1"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
@@ -522,8 +522,6 @@ char*           dc_get_blobdir               (const dc_context_t* context);
 *                    In contrast to `dc_set_chat_mute_duration()`,
 *                    fresh message and badge counters are not changed by this setting,
 *                    but should be tuned down where appropriate.
- * - `private_tag`  = Optional tag as "Work", "Family".
- *                    Meant to help profile owner to differ between profiles with similar names.
 * - `ui.*`         = All keys prefixed by `ui.` can be used by the user-interfaces for system-specific purposes.
 *                    The prefix should be followed by the system and maybe subsystem,
 *                    e.g. `ui.desktop.foo`, `ui.desktop.linux.bar`, `ui.android.foo`, `ui.dc40.bar`, `ui.bot.simplebot.baz`.
@@ -2533,8 +2531,8 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
 *   ask the user if they want to use the given service for video chats;
 *   if so, call dc_set_config_from_qr().
 *
- * - DC_QR_PROXY with dc_lot_t::text1=address:
- *   ask the user if they want to use the given proxy.
+ * - DC_QR_SOCKS5_PROXY with dc_lot_t::text1=host, dc_lot_t::text2=port:
+ *   ask the user if they want to use the given proxy and overwrite the previous one, if any.
 *   if so, call dc_set_config_from_qr() and restart I/O.
 *
 * - DC_QR_ADDR with dc_lot_t::id=Contact ID:
@@ -2611,7 +2609,6 @@ char*           dc_get_securejoin_qr         (dc_context_t* context, uint32_t ch
 * Get QR code image from the QR code text generated by dc_get_securejoin_qr().
 * See dc_get_securejoin_qr() for details about the contained QR code.
 *
- * @deprecated 2024-10 use dc_create_qr_svg(dc_get_securejoin_qr()) instead.
 * @memberof dc_context_t
 * @param context The context object.
 * @param chat_id group-chat-id for secure-join or 0 for setup-contact,
@@ -2792,22 +2789,6 @@ dc_array_t* dc_get_locations                (dc_context_t* context, uint32_t cha
 void        dc_delete_all_locations         (dc_context_t* context);


-// misc
-
-/**
- * Create a QR code from any input data.
- *
- * The QR code is returned as a square SVG image.
- *
- * @memberof dc_context_t
- * @param payload The content for the QR code.
- * @return SVG image with the QR code.
- *     On errors, an empty string is returned.
- *     The returned string must be released using dc_str_unref() after usage.
- */
-char*           dc_create_qr_svg             (const char* payload);
-
-
 /**
 * Get last error string.
 *
@@ -2896,7 +2877,6 @@ char* dc_backup_provider_get_qr (const dc_backup_provider_t* backup_provider);
 * This works like dc_backup_provider_qr() but returns the text of a rendered
 * SVG image containing the QR code.
 *
- * @deprecated 2024-10 use dc_create_qr_svg(dc_backup_provider_get_qr()) instead.
 * @memberof dc_backup_provider_t
 * @param backup_provider The backup provider object as created by
 *    dc_backup_provider_new().
@@ -2936,7 +2916,7 @@ void dc_backup_provider_unref (dc_backup_provider_t* backup_provider);
 * Gets a backup offered by a dc_backup_provider_t object on another device.
 *
 * This function is called on a device that scanned the QR code offered by
- * dc_backup_provider_get_qr().  Typically this is a
+ * dc_backup_sender_qr() or dc_backup_sender_qr_svg().  Typically this is a
 * different device than that which provides the backup.
 *
 * This call will block while the backup is being transferred and only
@@ -6051,21 +6031,6 @@ void dc_event_unref(dc_event_t* event);
 #define DC_EVENT_REACTIONS_CHANGED        2001


-/**
- * A reaction to one's own sent message received.
- * Typically, the UI will show a notification for that.
- *
- * In addition to this event, DC_EVENT_REACTIONS_CHANGED is emitted.
- *
- * @param data1 (int) contact_id ID of the contact sending this reaction.
- * @param data2 (int) msg_id + (char*) reaction.
- *      ID of the message for which a reaction was received in dc_event_get_data2_int(),
- *      and the reaction as dc_event_get_data2_str().
- *      string must be passed to dc_str_unref() afterwards.
- */
-#define DC_EVENT_INCOMING_REACTION        2002
-
-
 /**
 * There is a fresh message. Typically, the user will show an notification
 * when receiving this message.
@@ -6283,7 +6248,7 @@ void dc_event_unref(dc_event_t* event);


 /**
- * Webxdc status update received.
+ * webxdc status update received.
 * To get the received status update, use dc_get_webxdc_status_updates() with
 * `serial` set to the last known update
 * (in case of special bots, `status_update_serial` from `data2`
@@ -6318,15 +6283,6 @@ void dc_event_unref(dc_event_t* event);

 #define DC_EVENT_WEBXDC_REALTIME_DATA             2150

-/**
- * Advertisement for ephemeral peer channel communication received.
- * This can be used by bots to initiate peer-to-peer communication from their side.
- * @param data1 (int) msg_id
- * @param data2 0
- */
-
-#define DC_EVENT_WEBXDC_REALTIME_ADVERTISEMENT    2151
-
 /**
 * Tells that the Background fetch was completed (or timed out).
 *
@@ -30,7 +30,7 @@ use deltachat::ephemeral::Timer as EphemeralTimer;
 use deltachat::imex::BackupProvider;
 use deltachat::key::preconfigure_keypair;
 use deltachat::message::MsgId;
-use deltachat::qr_code_generator::{create_qr_svg, generate_backup_qr, get_securejoin_qr_svg};
+use deltachat::qr_code_generator::{generate_backup_qr, get_securejoin_qr_svg};
 use deltachat::stock_str::StockMessage;
 use deltachat::webxdc::StatusUpdateSerial;
 use deltachat::*;
@@ -541,7 +541,6 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
        EventType::ErrorSelfNotInGroup(_) => 410,
        EventType::MsgsChanged { .. } => 2000,
        EventType::ReactionsChanged { .. } => 2001,
-        EventType::IncomingReaction { .. } => 2002,
        EventType::IncomingMsg { .. } => 2005,
        EventType::IncomingMsgBunch { .. } => 2006,
        EventType::MsgsNoticed { .. } => 2008,
@@ -564,14 +563,10 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
        EventType::WebxdcStatusUpdate { .. } => 2120,
        EventType::WebxdcInstanceDeleted { .. } => 2121,
        EventType::WebxdcRealtimeData { .. } => 2150,
-        EventType::WebxdcRealtimeAdvertisementReceived { .. } => 2151,
        EventType::AccountsBackgroundFetchDone => 2200,
        EventType::ChatlistChanged => 2300,
        EventType::ChatlistItemChanged { .. } => 2301,
        EventType::EventChannelOverflow { .. } => 2400,
-        #[allow(unreachable_patterns)]
-        #[cfg(test)]
-        _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
    }
 }

@@ -602,7 +597,6 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
        | EventType::ErrorSelfNotInGroup(_)
        | EventType::AccountsBackgroundFetchDone => 0,
        EventType::ChatlistChanged => 0,
-        EventType::IncomingReaction { contact_id, .. } => contact_id.to_u32() as libc::c_int,
        EventType::MsgsChanged { chat_id, .. }
        | EventType::ReactionsChanged { chat_id, .. }
        | EventType::IncomingMsg { chat_id, .. }
@@ -627,15 +621,11 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
        }
        EventType::WebxdcRealtimeData { msg_id, .. }
        | EventType::WebxdcStatusUpdate { msg_id, .. }
-        | EventType::WebxdcRealtimeAdvertisementReceived { msg_id }
        | EventType::WebxdcInstanceDeleted { msg_id, .. } => msg_id.to_u32() as libc::c_int,
        EventType::ChatlistItemChanged { chat_id } => {
            chat_id.unwrap_or_default().to_u32() as libc::c_int
        }
        EventType::EventChannelOverflow { n } => *n as libc::c_int,
-        #[allow(unreachable_patterns)]
-        #[cfg(test)]
-        _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
    }
 }

@@ -676,11 +666,9 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
        | EventType::ChatlistItemChanged { .. }
        | EventType::ConfigSynced { .. }
        | EventType::ChatModified(_)
-        | EventType::WebxdcRealtimeAdvertisementReceived { .. }
        | EventType::EventChannelOverflow { .. } => 0,
        EventType::MsgsChanged { msg_id, .. }
        | EventType::ReactionsChanged { msg_id, .. }
-        | EventType::IncomingReaction { msg_id, .. }
        | EventType::IncomingMsg { msg_id, .. }
        | EventType::MsgDelivered { msg_id, .. }
        | EventType::MsgFailed { msg_id, .. }
@@ -694,9 +682,6 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
            ..
        } => status_update_serial.to_u32() as libc::c_int,
        EventType::WebxdcRealtimeData { data, .. } => data.len() as libc::c_int,
-        #[allow(unreachable_patterns)]
-        #[cfg(test)]
-        _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
    }
 }

@@ -748,7 +733,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
        | EventType::IncomingMsgBunch { .. }
        | EventType::ChatlistItemChanged { .. }
        | EventType::ChatlistChanged
-        | EventType::WebxdcRealtimeAdvertisementReceived { .. }
        | EventType::EventChannelOverflow { .. } => ptr::null_mut(),
        EventType::ConfigureProgress { comment, .. } => {
            if let Some(comment) = comment {
@@ -770,14 +754,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
            libc::memcpy(ptr, data.as_ptr() as *mut libc::c_void, data.len());
            ptr as *mut libc::c_char
        }
-        EventType::IncomingReaction { reaction, .. } => reaction
-            .as_str()
-            .to_c_string()
-            .unwrap_or_default()
-            .into_raw(),
-        #[allow(unreachable_patterns)]
-        #[cfg(test)]
-        _ => unreachable!("This is just to silence a rust_analyzer false-positive"),
    }
 }

@@ -2594,18 +2570,6 @@ pub unsafe extern "C" fn dc_delete_all_locations(context: *mut dc_context_t) {
    });
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_create_qr_svg(payload: *const libc::c_char) -> *mut libc::c_char {
-    if payload.is_null() {
-        eprintln!("ignoring careless call to dc_create_qr_svg()");
-        return "".strdup();
-    }
-
-    create_qr_svg(&to_string_lossy(payload))
-        .unwrap_or_else(|_| "".to_string())
-        .strdup()
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_get_last_error(context: *mut dc_context_t) -> *mut libc::c_char {
    if context.is_null() {
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.148.4"
+version = "1.147.1"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
@@ -1946,13 +1946,9 @@ impl CommandApi {

    async fn send_msg(&self, account_id: u32, chat_id: u32, data: MessageData) -> Result<u32> {
        let ctx = self.get_context(account_id).await?;
-        let mut message = data
-            .create_message(&ctx)
-            .await
-            .context("Failed to create message")?;
+        let mut message = data.create_message(&ctx).await?;
        let msg_id = chat::send_msg(&ctx, ChatId::new(chat_id), &mut message)
-            .await
-            .context("Failed to send created message")?
+            .await?
            .to_u32();
        Ok(msg_id)
    }
@@ -17,9 +17,6 @@ pub enum Account {
        // size: u32,
        profile_image: Option<String>, // TODO: This needs to be converted to work with blob http server.
        color: String,
-        /// Optional tag as "Work", "Family".
-        /// Meant to help profile owner to differ between profiles with similar names.
-        private_tag: Option<String>,
    },
    #[serde(rename_all = "camelCase")]
    Unconfigured { id: u32 },
@@ -34,14 +31,12 @@ impl Account {
            let color = color_int_to_hex_string(
                Contact::get_by_id(ctx, ContactId::SELF).await?.get_color(),
            );
-            let private_tag = ctx.get_config(Config::PrivateTag).await?;
            Ok(Account::Configured {
                id,
                display_name,
                addr,
                profile_image,
                color,
-                private_tag,
            })
        } else {
            Ok(Account::Unconfigured { id })
@@ -98,14 +98,6 @@ pub enum EventType {
        contact_id: u32,
    },

-    /// Incoming reaction, should be notified.
-    #[serde(rename_all = "camelCase")]
-    IncomingReaction {
-        contact_id: u32,
-        msg_id: u32,
-        reaction: String,
-    },
-
    /// There is a fresh message. Typically, the user will show an notification
    /// when receiving this message.
    ///
@@ -252,11 +244,6 @@ pub enum EventType {
    #[serde(rename_all = "camelCase")]
    WebxdcRealtimeData { msg_id: u32, data: Vec<u8> },

-    /// Advertisement received over an ephemeral peer channel.
-    /// This can be used by bots to initiate peer-to-peer communication from their side.
-    #[serde(rename_all = "camelCase")]
-    WebxdcRealtimeAdvertisementReceived { msg_id: u32 },
-
    /// Inform that a message containing a webxdc instance has been deleted
    #[serde(rename_all = "camelCase")]
    WebxdcInstanceDeleted { msg_id: u32 },
@@ -310,15 +297,6 @@ impl From<CoreEventType> for EventType {
                msg_id: msg_id.to_u32(),
                contact_id: contact_id.to_u32(),
            },
-            CoreEventType::IncomingReaction {
-                contact_id,
-                msg_id,
-                reaction,
-            } => IncomingReaction {
-                contact_id: contact_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-                reaction: reaction.as_str().to_string(),
-            },
            CoreEventType::IncomingMsg { chat_id, msg_id } => IncomingMsg {
                chat_id: chat_id.to_u32(),
                msg_id: msg_id.to_u32(),
@@ -395,11 +373,6 @@ impl From<CoreEventType> for EventType {
                msg_id: msg_id.to_u32(),
                data,
            },
-            CoreEventType::WebxdcRealtimeAdvertisementReceived { msg_id } => {
-                WebxdcRealtimeAdvertisementReceived {
-                    msg_id: msg_id.to_u32(),
-                }
-            }
            CoreEventType::WebxdcInstanceDeleted { msg_id } => WebxdcInstanceDeleted {
                msg_id: msg_id.to_u32(),
            },
@@ -605,13 +605,16 @@ impl MessageData {
            message.set_location(latitude, longitude);
        }
        if let Some(id) = self.quoted_message_id {
-            let quoted_message = Message::load_from_db(context, MsgId::new(id))
-                .await
-                .context("Failed to load quoted message")?;
            message
-                .set_quote(context, Some(&quoted_message))
-                .await
-                .context("Failed to set quote")?;
+                .set_quote(
+                    context,
+                    Some(
+                        &Message::load_from_db(context, MsgId::new(id))
+                            .await
+                            .context("message to quote could not be loaded")?,
+                    ),
+                )
+                .await?;
        } else if let Some(text) = self.quoted_text {
            let protect = false;
            message.set_quote_text(Some((text, protect)));
@@ -58,5 +58,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "1.148.4"
+  "version": "1.147.1"
 }
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.148.4"
+version = "1.147.1"
 license = "MPL-2.0"
 edition = "2021"
 repository = "https://github.com/deltachat/deltachat-core-rust"
@@ -11,7 +11,6 @@ deltachat = { workspace = true, features = ["internals"]}
 dirs = "5"
 log = { workspace = true }
 nu-ansi-term = { workspace = true }
-qr2term = "0.3.3"
 rusqlite = { workspace = true }
 rustyline = "14"
 tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }
@@ -1,7 +1,9 @@
 #![allow(clippy::format_push_string)]
 extern crate dirs;

+use std::io::Write;
 use std::path::Path;
+use std::process::Command;
 use std::str::FromStr;
 use std::time::Duration;

@@ -22,7 +24,6 @@ use deltachat::mimeparser::SystemMessage;
 use deltachat::peer_channels::{send_webxdc_realtime_advertisement, send_webxdc_realtime_data};
 use deltachat::peerstate::*;
 use deltachat::qr::*;
-use deltachat::qr_code_generator::create_qr_svg;
 use deltachat::reaction::send_reaction;
 use deltachat::receive_imf::*;
 use deltachat::sql;
@@ -426,7 +427,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 checkqr <qr-content>\n\
                 joinqr <qr-content>\n\
                 setqr <qr-content>\n\
-                 createqrsvg <qr-content>\n\
                 providerinfo <addr>\n\
                 fileinfo <file>\n\
                 estimatedeletion <seconds>\n\
@@ -491,7 +491,12 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
            let provider = BackupProvider::prepare(&context).await?;
            let qr = format_backup(&provider.qr())?;
            println!("QR code: {}", qr);
-            qr2term::print_qr(qr.as_str())?;
+            let output = Command::new("qrencode")
+                .args(["-t", "ansiutf8", qr.as_str(), "-o", "-"])
+                .output()
+                .expect("failed to execute process");
+            std::io::stdout().write_all(&output.stdout).unwrap();
+            std::io::stderr().write_all(&output.stderr).unwrap();
            provider.await?;
        }
        "receive-backup" => {
@@ -1251,13 +1256,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                Err(err) => println!("Cannot set config from QR code: {err:?}"),
            }
        }
-        "createqrsvg" => {
-            ensure!(!arg1.is_empty(), "Argument <qr-content> missing.");
-            let svg = create_qr_svg(arg1)?;
-            let file = dirs::home_dir().unwrap_or_default().join("qr.svg");
-            fs::write(&file, svg).await?;
-            println!("{file:#?} written.");
-        }
        "providerinfo" => {
            ensure!(!arg1.is_empty(), "Argument <addr> missing.");
            let proxy_enabled = context
@@ -9,6 +9,8 @@
 extern crate deltachat;

 use std::borrow::Cow::{self, Borrowed, Owned};
+use std::io::{self, Write};
+use std::process::Command;

 use anyhow::{bail, Error};
 use deltachat::chat::ChatId;
@@ -240,13 +242,12 @@ const CONTACT_COMMANDS: [&str; 9] = [
    "unblock",
    "listblocked",
 ];
-const MISC_COMMANDS: [&str; 12] = [
+const MISC_COMMANDS: [&str; 11] = [
    "getqr",
    "getqrsvg",
    "getbadqr",
    "checkqr",
    "joinqr",
-    "createqrsvg",
    "fileinfo",
    "clear",
    "exit",
@@ -449,7 +450,12 @@ async fn handle_cmd(
                    qr.replace_range(12..22, "0000000000")
                }
                println!("{qr}");
-                qr2term::print_qr(qr.as_str())?;
+                let output = Command::new("qrencode")
+                    .args(["-t", "ansiutf8", qr.as_str(), "-o", "-"])
+                    .output()
+                    .expect("failed to execute process");
+                io::stdout().write_all(&output.stdout).unwrap();
+                io::stderr().write_all(&output.stderr).unwrap();
            }
        }
        "getqrsvg" => {
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat-rpc-client"
-version = "1.148.4"
+version = "1.147.1"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
    "Development Status :: 5 - Production/Stable",
@@ -63,7 +63,6 @@ class EventType(str, Enum):
    CHATLIST_ITEM_CHANGED = "ChatlistItemChanged"
    CONFIG_SYNCED = "ConfigSynced"
    WEBXDC_REALTIME_DATA = "WebxdcRealtimeData"
-    WEBXDC_REALTIME_ADVERTISEMENT_RECEIVED = "WebxdcRealtimeAdvertisementReceived"


 class ChatId(IntEnum):
@@ -7,7 +7,6 @@ If you want to debug iroh at rust-trace/log level set
    RUST_LOG=iroh_net=trace,iroh_gossip=trace
 """

-import os
 import sys
 import threading
 import time
@@ -108,15 +107,13 @@ def test_realtime_sequentially(acfactory, path_to_webxdc):
    assert snapshot.text == "ping2"

    log("sending realtime data ac1 -> ac2")
-    # Test that 128 KB of data can be sent in a single message.
-    data = os.urandom(128000)
-    ac1_webxdc_msg.send_webxdc_realtime_data(data)
+    ac1_webxdc_msg.send_webxdc_realtime_data(b"foo")

    log("ac2: waiting for realtime data")
    while 1:
        event = ac2.wait_for_event()
        if event.kind == EventType.WEBXDC_REALTIME_DATA:
-            assert event.data == list(data)
+            assert event.data == list(b"foo")
            break


@@ -211,28 +208,3 @@ def test_no_reordering(acfactory, path_to_webxdc):
                if event.data[0] == i:
                    break
                pytest.fail("Reordering detected")
-
-
-def test_advertisement_after_chatting(acfactory, path_to_webxdc):
-    """Test that realtime advertisement is assigned to the correct message after chatting."""
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac1.set_config("webxdc_realtime_enabled", "1")
-    ac2.set_config("webxdc_realtime_enabled", "1")
-
-    ac1_ac2_chat = ac1.create_chat(ac2)
-    ac1_webxdc_msg = ac1_ac2_chat.send_message(text="WebXDC", file=path_to_webxdc)
-    ac2_webxdc_msg = ac2.wait_for_incoming_msg()
-    assert ac2_webxdc_msg.get_snapshot().text == "WebXDC"
-
-    ac1_ac2_chat.send_text("Hello!")
-    ac2_hello_msg = ac2.wait_for_incoming_msg()
-    ac2_hello_msg_snapshot = ac2_hello_msg.get_snapshot()
-    assert ac2_hello_msg_snapshot.text == "Hello!"
-    ac2_hello_msg_snapshot.chat.accept()
-
-    ac2_webxdc_msg.send_webxdc_realtime_advertisement()
-    while 1:
-        event = ac1.wait_for_event()
-        if event.kind == EventType.WEBXDC_REALTIME_ADVERTISEMENT_RECEIVED:
-            assert event.msg_id == ac1_webxdc_msg.id
-            break
@@ -1,5 +1,4 @@
 import logging
-import time

 import pytest

@@ -45,6 +44,13 @@ def test_qr_setup_contact_svg(acfactory) -> None:

    _qr_code, svg = alice.get_qr_code_svg()

+    # Test that email address is in SVG
+    # when we have no display name.
+    # Check only the domain name, because
+    # long address may be split over multiple lines
+    # and not matched.
+    assert domain in svg
+
    alice.set_config("displayname", "Alice")

    # Test that display name is used
@@ -61,7 +67,7 @@ def test_qr_securejoin(acfactory, protect, tmp_path):
    # Setup second device for Alice
    # to test observing securejoin protocol.
    alice.export_backup(tmp_path)
-    files = list(tmp_path.glob("*.tar.gz"))
+    files = list(tmp_path.glob("*.tar"))
    alice2 = acfactory.get_unconfigured_account()
    alice2.import_backup(files[0])

@@ -326,6 +332,7 @@ def test_verified_group_member_added_recovery(acfactory) -> None:

    ac3_contact_ac2 = ac3.get_contact_by_addr(ac2.get_config("addr"))
    ac3_chat.remove_contact(ac3_contact_ac2)
+    ac3_chat.add_contact(ac3_contact_ac2)

    msg_id = ac2.wait_for_incoming_msg_event().msg_id
    message = ac2.get_message_by_id(msg_id)
@@ -335,8 +342,6 @@ def test_verified_group_member_added_recovery(acfactory) -> None:
    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
    assert "removed" in snapshot.text

-    ac3_chat.add_contact(ac3_contact_ac2)
-
    event = ac2.wait_for_incoming_msg_event()
    msg_id = event.msg_id
    chat_id = event.chat_id
@@ -460,10 +465,7 @@ def test_qr_new_group_unblocked(acfactory):

 def test_aeap_flow_verified(acfactory):
    """Test that a new address is added to a contact when it changes its address."""
-    ac1, ac2 = acfactory.get_online_accounts(2)
-
-    # ac1new is only used to get a new address.
-    ac1new = acfactory.new_preconfigured_account()
+    ac1, ac2, ac1new = acfactory.get_online_accounts(3)

    logging.info("ac1: create verified-group QR, ac2 scans and joins")
    chat = ac1.create_group("hello", protect=True)
@@ -472,7 +474,6 @@ def test_aeap_flow_verified(acfactory):
    logging.info("ac2: start QR-code based join-group protocol")
    ac2.secure_join(qr_code)
    ac1.wait_for_securejoin_inviter_success()
-    ac2.wait_for_securejoin_joiner_success()

    logging.info("sending first message")
    msg_out = chat.send_text("old address").get_snapshot()
@@ -570,7 +571,6 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:

    # ac1 waits for member added message and creates a QR code.
    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Member Me ({}) added by {}.".format(ac1.get_config("addr"), ac3.get_config("addr"))
    ac1_qr_code = snapshot.chat.get_qr_code()

    # ac2 verifies ac1
@@ -585,29 +585,17 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:
    # ac1 resetups the account.
    ac1 = acfactory.resetup_account(ac1)

-    # Loop sending message from ac1 to ac2
-    # until ac2 accepts new ac1 key.
-    #
-    # This may not happen immediately because resetup of ac1
-    # rewinds "smeared timestamp" so Date: header for messages
-    # sent by new ac1 are in the past compared to the last Date:
-    # header sent by old ac1.
-    while True:
-        # ac1 sends a message to ac2.
-        ac1_contact_ac2 = ac1.create_contact(ac2.get_config("addr"), "")
-        ac1_chat_ac2 = ac1_contact_ac2.create_chat()
-        ac1_chat_ac2.send_text("Hello!")
+    # ac1 sends a message to ac2.
+    ac1_contact_ac2 = ac1.create_contact(ac2.get_config("addr"), "")
+    ac1_chat_ac2 = ac1_contact_ac2.create_chat()
+    ac1_chat_ac2.send_text("Hello!")

-        # ac2 receives a message.
-        snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
-        assert snapshot.text == "Hello!"
-        logging.info("ac2 received Hello!")
+    # ac2 receives a message.
+    snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
+    assert snapshot.text == "Hello!"

-        # ac1 is no longer verified for ac2 as new Autocrypt key is not the same as old verified key.
-        logging.info("ac2 addr={}, ac1 addr={}".format(ac2.get_config("addr"), ac1.get_config("addr")))
-        if not ac2_contact_ac1.get_snapshot().is_verified:
-            break
-        time.sleep(1)
+    # ac1 is no longer verified for ac2 as new Autocrypt key is not the same as old verified key.
+    assert not ac2_contact_ac1.get_snapshot().is_verified

    # ac1 goes offline.
    ac1.remove()
@@ -379,7 +379,7 @@ def test_import_export_backup(acfactory, tmp_path) -> None:
    alice = acfactory.new_configured_account()
    alice.export_backup(tmp_path)

-    files = list(tmp_path.glob("*.tar.gz"))
+    files = list(tmp_path.glob("*.tar"))
    alice2 = acfactory.get_unconfigured_account()
    alice2.import_backup(files[0])

@@ -630,7 +630,7 @@ def test_markseen_contact_request(acfactory, tmp_path):

    # Bob sets up a second device.
    bob.export_backup(tmp_path)
-    files = list(tmp_path.glob("*.tar.gz"))
+    files = list(tmp_path.glob("*.tar"))
    bob2 = acfactory.get_unconfigured_account()
    bob2.import_backup(files[0])
    bob2.start_io()
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.148.4"
+version = "1.147.1"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
@@ -15,5 +15,5 @@
  },
  "type": "module",
  "types": "index.d.ts",
-  "version": "1.148.4"
+  "version": "1.147.1"
 }
@@ -48,11 +48,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1729578683,
-        "narHash": "sha256-h0Wmvrkadbyi3IJXFLPi+QyYjCAKDr2xQ6dLxlQ8cXY=",
+        "lastModified": 1714112748,
+        "narHash": "sha256-jq6Cpf/pQH85p+uTwPPrGG8Ky/zUOTwMJ7mcqc5M4So=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "d66cda53e8193a878742dcadb5bb75f4df7c3c0a",
+        "rev": "3ae4b908a795b6a3824d401a0702e11a7157d7e1",
        "type": "github"
      },
      "original": {
@@ -166,11 +166,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1729256560,
-        "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
+        "lastModified": 1713895582,
+        "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
+        "rev": "572af610f6151fd41c212f897c71f7056e3fb518",
        "type": "github"
      },
      "original": {
@@ -195,11 +195,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1729413321,
-        "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
+        "lastModified": 1714076141,
+        "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
+        "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856",
        "type": "github"
      },
      "original": {
@@ -222,11 +222,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1729533545,
-        "narHash": "sha256-A/AuEWcGwwjpfBCZqWDNNg5GwYrJduzLvlMe+A7xG5U=",
+        "lastModified": 1714031783,
+        "narHash": "sha256-xS/niQsq1CQPOe4M4jvVPO2cnXS/EIeRG5gIopUbk+Q=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "de2ff17bc513807412d7bbaba1d995a774938583",
+        "rev": "56bee2ddafa6177b19c631eedc88d43366553223",
        "type": "github"
      },
      "original": {
@@ -50,7 +50,6 @@ module.exports = {
  DC_EVENT_IMEX_PROGRESS: 2051,
  DC_EVENT_INCOMING_MSG: 2005,
  DC_EVENT_INCOMING_MSG_BUNCH: 2006,
-  DC_EVENT_INCOMING_REACTION: 2002,
  DC_EVENT_INFO: 100,
  DC_EVENT_LOCATION_CHANGED: 2035,
  DC_EVENT_MSGS_CHANGED: 2000,
@@ -68,7 +67,6 @@ module.exports = {
  DC_EVENT_SMTP_MESSAGE_SENT: 103,
  DC_EVENT_WARNING: 300,
  DC_EVENT_WEBXDC_INSTANCE_DELETED: 2121,
-  DC_EVENT_WEBXDC_REALTIME_ADVERTISEMENT: 2151,
  DC_EVENT_WEBXDC_REALTIME_DATA: 2150,
  DC_EVENT_WEBXDC_STATUS_UPDATE: 2120,
  DC_GCL_ADD_ALLDONE_HINT: 4,
@@ -16,7 +16,6 @@ module.exports = {
  410: 'DC_EVENT_ERROR_SELF_NOT_IN_GROUP',
  2000: 'DC_EVENT_MSGS_CHANGED',
  2001: 'DC_EVENT_REACTIONS_CHANGED',
-  2002: 'DC_EVENT_INCOMING_REACTION',
  2005: 'DC_EVENT_INCOMING_MSG',
  2006: 'DC_EVENT_INCOMING_MSG_BUNCH',
  2008: 'DC_EVENT_MSGS_NOTICED',
@@ -39,7 +38,6 @@ module.exports = {
  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
  2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED',
  2150: 'DC_EVENT_WEBXDC_REALTIME_DATA',
-  2151: 'DC_EVENT_WEBXDC_REALTIME_ADVERTISEMENT',
  2200: 'DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE',
  2300: 'DC_EVENT_CHATLIST_CHANGED',
  2301: 'DC_EVENT_CHATLIST_ITEM_CHANGED',
@@ -50,7 +50,6 @@ export enum C {
  DC_EVENT_IMEX_PROGRESS = 2051,
  DC_EVENT_INCOMING_MSG = 2005,
  DC_EVENT_INCOMING_MSG_BUNCH = 2006,
-  DC_EVENT_INCOMING_REACTION = 2002,
  DC_EVENT_INFO = 100,
  DC_EVENT_LOCATION_CHANGED = 2035,
  DC_EVENT_MSGS_CHANGED = 2000,
@@ -68,7 +67,6 @@ export enum C {
  DC_EVENT_SMTP_MESSAGE_SENT = 103,
  DC_EVENT_WARNING = 300,
  DC_EVENT_WEBXDC_INSTANCE_DELETED = 2121,
-  DC_EVENT_WEBXDC_REALTIME_ADVERTISEMENT = 2151,
  DC_EVENT_WEBXDC_REALTIME_DATA = 2150,
  DC_EVENT_WEBXDC_STATUS_UPDATE = 2120,
  DC_GCL_ADD_ALLDONE_HINT = 4,
@@ -323,7 +321,6 @@ export const EventId2EventName: { [key: number]: string } = {
  410: 'DC_EVENT_ERROR_SELF_NOT_IN_GROUP',
  2000: 'DC_EVENT_MSGS_CHANGED',
  2001: 'DC_EVENT_REACTIONS_CHANGED',
-  2002: 'DC_EVENT_INCOMING_REACTION',
  2005: 'DC_EVENT_INCOMING_MSG',
  2006: 'DC_EVENT_INCOMING_MSG_BUNCH',
  2008: 'DC_EVENT_MSGS_NOTICED',
@@ -346,7 +343,6 @@ export const EventId2EventName: { [key: number]: string } = {
  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
  2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED',
  2150: 'DC_EVENT_WEBXDC_REALTIME_DATA',
-  2151: 'DC_EVENT_WEBXDC_REALTIME_ADVERTISEMENT',
  2200: 'DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE',
  2300: 'DC_EVENT_CHATLIST_CHANGED',
  2301: 'DC_EVENT_CHATLIST_ITEM_CHANGED',
@@ -55,5 +55,5 @@
    "test:mocha": "mocha node/test/test.mjs --growl --reporter=spec --bail --exit"
  },
  "types": "node/dist/index.d.ts",
-  "version": "1.148.4"
+  "version": "1.147.1"
 }
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat"
-version = "1.148.4"
+version = "1.147.1"
 description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
 readme = "README.rst"
 requires-python = ">=3.7"
@@ -308,7 +308,7 @@ class Chat:
        msg = as_dc_charpointer(text)
        msg_id = lib.dc_send_text_msg(self.account._dc_context, self.id, msg)
        if msg_id == 0:
-            raise ValueError("The message could not be sent. Does the chat exist?")
+            raise ValueError("message could not be send, does chat exist?")
        return Message.from_db(self.account, msg_id)

    def send_file(self, path, mime_type="application/octet-stream"):
@@ -1 +1 @@
-2024-10-24
+2024-10-13
@@ -7,7 +7,7 @@ set -euo pipefail
 #
 # Avoid using rustup here as it depends on reading /proc/self/exe and
 # has problems running under QEMU.
-RUST_VERSION=1.82.0
+RUST_VERSION=1.81.0

 ARCH="$(uname -m)"
 test -f "/lib/libc.musl-$ARCH.so.1" && LIBC=musl || LIBC=gnu
@@ -622,7 +622,7 @@ fn exif_orientation(exif: &exif::Exif, context: &Context) -> i32 {
    0
 }

-impl fmt::Display for BlobObject<'_> {
+impl<'a> fmt::Display for BlobObject<'a> {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        write!(f, "$BLOBDIR/{}", self.name)
    }
@@ -578,7 +578,7 @@ impl ChatId {
        Ok(())
    }

-    /// Sets protection and adds a message.
+    /// Sets protection and sends or adds a message.
    ///
    /// `timestamp_sort` is used as the timestamp of the added message
    /// and should be the timestamp of the change happening.
@@ -589,16 +589,20 @@ impl ChatId {
        timestamp_sort: i64,
        contact_id: Option<ContactId>,
    ) -> Result<()> {
-        let protection_status_modified = self
-            .inner_set_protection(context, protect)
-            .await
-            .with_context(|| format!("Cannot set protection for {self}"))?;
-        if protection_status_modified {
-            self.add_protection_msg(context, protect, contact_id, timestamp_sort)
-                .await?;
-            chatlist_events::emit_chatlist_item_changed(context, self);
+        match self.inner_set_protection(context, protect).await {
+            Ok(protection_status_modified) => {
+                if protection_status_modified {
+                    self.add_protection_msg(context, protect, contact_id, timestamp_sort)
+                        .await?;
+                    chatlist_events::emit_chatlist_item_changed(context, self);
+                }
+                Ok(())
+            }
+            Err(e) => {
+                error!(context, "Cannot set protection: {e:#}."); // make error user-visible
+                Err(e)
+            }
        }
-        Ok(())
    }

    /// Sets protection and sends or adds a message.
@@ -612,9 +616,8 @@ impl ChatId {
        contact_id: Option<ContactId>,
    ) -> Result<()> {
        let sort_to_bottom = true;
-        let (received, incoming) = (false, false);
        let ts = self
-            .calc_sort_timestamp(context, timestamp_sent, sort_to_bottom, received, incoming)
+            .calc_sort_timestamp(context, timestamp_sent, sort_to_bottom, false)
            .await?
            // Always sort protection messages below `SystemMessage::SecurejoinWait{,Timeout}` ones
            // in case of race conditions.
@@ -866,14 +869,13 @@ impl ChatId {
    ///
    /// Returns `true`, if message was deleted, `false` otherwise.
    async fn maybe_delete_draft(self, context: &Context) -> Result<bool> {
-        Ok(context
-            .sql
-            .execute(
-                "DELETE FROM msgs WHERE chat_id=? AND state=?",
-                (self, MessageState::OutDraft),
-            )
-            .await?
-            > 0)
+        match self.get_draft_msg_id(context).await? {
+            Some(msg_id) => {
+                msg_id.delete_from_db(context).await?;
+                Ok(true)
+            }
+            None => Ok(false),
+        }
    }

    /// Set provided message as draft message for specified chat.
@@ -945,18 +947,12 @@ impl ChatId {
            }
        }

+        // insert new draft
+        self.maybe_delete_draft(context).await?;
        let row_id = context
            .sql
-            .transaction(|transaction| {
-                // Delete existing draft if it exists.
-                transaction.execute(
-                    "DELETE FROM msgs WHERE chat_id=? AND state=?",
-                    (self, MessageState::OutDraft),
-                )?;
-
-                // Insert new draft.
-                transaction.execute(
-                    "INSERT INTO msgs (
+            .insert(
+                "INSERT INTO msgs (
                 chat_id,
                 from_id,
                 timestamp,
@@ -968,22 +964,19 @@ impl ChatId {
                 hidden,
                 mime_in_reply_to)
         VALUES (?,?,?,?,?,?,?,?,?,?);",
-                    (
-                        self,
-                        ContactId::SELF,
-                        time(),
-                        msg.viewtype,
-                        MessageState::OutDraft,
-                        &msg.text,
-                        message::normalize_text(&msg.text),
-                        msg.param.to_string(),
-                        1,
-                        msg.in_reply_to.as_deref().unwrap_or_default(),
-                    ),
-                )?;
-
-                Ok(transaction.last_insert_rowid())
-            })
+                (
+                    self,
+                    ContactId::SELF,
+                    time(),
+                    msg.viewtype,
+                    MessageState::OutDraft,
+                    &msg.text,
+                    message::normalize_text(&msg.text),
+                    msg.param.to_string(),
+                    1,
+                    msg.in_reply_to.as_deref().unwrap_or_default(),
+                ),
+            )
            .await?;
        msg.id = MsgId::new(row_id.try_into()?);
        Ok(true)
@@ -1399,14 +1392,12 @@ impl ChatId {
    /// corresponding event in case of a system message (usually the current system time).
    /// `always_sort_to_bottom` makes this ajust the returned timestamp up so that the message goes
    /// to the chat bottom.
-    /// `received` -- whether the message is received. Otherwise being sent.
    /// `incoming` -- whether the message is incoming.
    pub(crate) async fn calc_sort_timestamp(
        self,
        context: &Context,
        message_timestamp: i64,
        always_sort_to_bottom: bool,
-        received: bool,
        incoming: bool,
    ) -> Result<i64> {
        let mut sort_timestamp = cmp::min(message_timestamp, smeared_time(context));
@@ -1427,38 +1418,25 @@ impl ChatId {
                    (self, MessageState::OutDraft),
                )
                .await?
-        } else if received {
-            // Received messages shouldn't mingle with just sent ones and appear somewhere in the
-            // middle of the chat, so we go after the newest non fresh message.
-            //
-            // But if a received outgoing message is older than some seen message, better sort the
-            // received message purely by timestamp. We could place it just before that seen
-            // message, but anyway the user may not notice it.
-            //
-            // NB: Received outgoing messages may break sorting of fresh incoming ones, but this
-            // shouldn't happen frequently. Seen incoming messages don't really break sorting of
-            // fresh ones, they rather mean that older incoming messages are actually seen as well.
+        } else if incoming {
+            // get newest non fresh message for this chat.
+
+            // If a user hasn't been online for some time, the Inbox is fetched first and then the
+            // Sentbox. In order for Inbox and Sent messages to be allowed to mingle, outgoing
+            // messages are purely sorted by their sent timestamp. NB: The Inbox must be fetched
+            // first otherwise Inbox messages would be always below old Sentbox messages. We could
+            // take in the query below only incoming messages, but then new incoming messages would
+            // mingle with just sent outgoing ones and apear somewhere in the middle of the chat.
            context
                .sql
-                .query_row_optional(
-                    "SELECT MAX(timestamp), MAX(IIF(state=?,timestamp_sent,0))
+                .query_get_value(
+                    "SELECT MAX(timestamp)
                     FROM msgs
                     WHERE chat_id=? AND hidden=0 AND state>?
                     HAVING COUNT(*) > 0",
-                    (MessageState::InSeen, self, MessageState::InFresh),
-                    |row| {
-                        let ts: i64 = row.get(0)?;
-                        let ts_sent_seen: i64 = row.get(1)?;
-                        Ok((ts, ts_sent_seen))
-                    },
+                    (self, MessageState::InFresh),
                )
                .await?
-                .and_then(|(ts, ts_sent_seen)| {
-                    match incoming || ts_sent_seen <= message_timestamp {
-                        true => Some(ts),
-                        false => None,
-                    }
-                })
        } else {
            None
        };
@@ -2941,10 +2919,7 @@ async fn prepare_send_msg(
        );
        message::update_msg_state(context, msg.id, MessageState::OutPending).await?;
    }
-    let row_ids = create_send_msg_jobs(context, msg)
-        .await
-        .context("Failed to create send jobs")?;
-    Ok(row_ids)
+    create_send_msg_jobs(context, msg).await
 }

 /// Constructs jobs for sending a message and inserts them into the appropriate table.
@@ -4867,37 +4842,6 @@ mod tests {
        Ok(())
    }

-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_only_one_draft_per_chat() -> Result<()> {
-        let t = TestContext::new_alice().await;
-        let chat_id = create_group_chat(&t, ProtectionStatus::Unprotected, "abc").await?;
-
-        let msgs: Vec<message::Message> = (1..=1000)
-            .map(|i| {
-                let mut msg = Message::new(Viewtype::Text);
-                msg.set_text(i.to_string());
-                msg
-            })
-            .collect();
-        let mut tasks = Vec::new();
-        for mut msg in msgs {
-            let ctx = t.clone();
-            let task = tokio::spawn(async move {
-                let ctx = ctx;
-                chat_id.set_draft(&ctx, Some(&mut msg)).await
-            });
-            tasks.push(task);
-        }
-        futures::future::join_all(tasks.into_iter()).await;
-
-        assert!(chat_id.get_draft(&t).await?.is_some());
-
-        chat_id.set_draft(&t, None).await?;
-        assert!(chat_id.get_draft(&t).await?.is_none());
-
-        Ok(())
-    }
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_change_quotes_on_reused_message_object() -> Result<()> {
        let t = TestContext::new_alice().await;
@@ -321,10 +321,6 @@ pub enum Config {
    /// True if account is muted.
    IsMuted,

-    /// Optional tag as "Work", "Family".
-    /// Meant to help profile owner to differ between profiles with similar names.
-    PrivateTag,
-
    /// All secondary self addresses separated by spaces
    /// (`addr1@example.org addr2@example.org addr3@example.org`)
    SecondaryAddrs,
@@ -4,16 +4,12 @@

 use deltachat_derive::{FromSql, ToSql};
 use once_cell::sync::Lazy;
-use percent_encoding::{AsciiSet, NON_ALPHANUMERIC};
 use serde::{Deserialize, Serialize};

 use crate::chat::ChatId;

 pub static DC_VERSION_STR: Lazy<String> = Lazy::new(|| env!("CARGO_PKG_VERSION").to_string());

-/// Set of characters to percent-encode in email addresses and names.
-pub(crate) const NON_ALPHANUMERIC_WITHOUT_DOT: &AsciiSet = &NON_ALPHANUMERIC.remove(b'.');
-
 #[derive(
    Debug,
    Default,
@@ -183,9 +179,7 @@ pub const DC_DESIRED_TEXT_LEN: usize = DC_DESIRED_TEXT_LINE_LEN * DC_DESIRED_TEX
 // and may be set together with the username, password etc.
 // via dc_set_config() using the key "server_flags".

-/// Force OAuth2 authorization.
-///
-/// This flag does not skip automatic configuration.
+/// Force OAuth2 authorization. This flag does not skip automatic configuration.
 /// Before calling configure() with DC_LP_AUTH_OAUTH2 set,
 /// the user has to confirm access at the URL returned by dc_get_oauth2_url().
 pub const DC_LP_AUTH_OAUTH2: i32 = 0x2;
@@ -857,12 +857,6 @@ impl Context {
            "is_muted",
            self.get_config_bool(Config::IsMuted).await?.to_string(),
        );
-        res.insert(
-            "private_tag",
-            self.get_config(Config::PrivateTag)
-                .await?
-                .unwrap_or_else(|| "<unset>".to_string()),
-        );

        if let Some(metadata) = &*self.metadata.read().await {
            if let Some(comment) = &metadata.comment {
@@ -313,7 +313,7 @@ pub(crate) async fn get_autocrypt_peerstate(
        if let Some(ref mut peerstate) = peerstate {
            if addr_cmp(&peerstate.addr, from) {
                if allow_change {
-                    peerstate.apply_header(context, header, message_time);
+                    peerstate.apply_header(header, message_time);
                    peerstate.save_to_db(&context.sql).await?;
                } else {
                    info!(
@@ -335,9 +335,7 @@ mod tests {
            let msg = Message::load_from_db(&t, msg_id).await?;
            assert_eq!(msg.download_state(), *s);
        }
-        t.sql
-            .execute("DELETE FROM msgs WHERE id=?", (msg_id,))
-            .await?;
+        msg_id.delete_from_db(&t).await?;
        // Nothing to do is ok.
        msg_id
            .update_download_state(&t, DownloadState::Done)
@@ -8,7 +8,6 @@ use crate::config::Config;
 use crate::contact::ContactId;
 use crate::ephemeral::Timer as EphemeralTimer;
 use crate::message::MsgId;
-use crate::reaction::Reaction;
 use crate::webxdc::StatusUpdateSerial;

 /// Event payload.
@@ -95,18 +94,6 @@ pub enum EventType {
        contact_id: ContactId,
    },

-    /// Reactions for the message changed.
-    IncomingReaction {
-        /// ID of the contact whose reaction set is changed.
-        contact_id: ContactId,
-
-        /// ID of the message for which reactions were changed.
-        msg_id: MsgId,
-
-        /// The reaction.
-        reaction: Reaction,
-    },
-
    /// There is a fresh message. Typically, the user will show an notification
    /// when receiving this message.
    ///
@@ -301,13 +288,6 @@ pub enum EventType {
        data: Vec<u8>,
    },

-    /// Advertisement received over an ephemeral peer channel.
-    /// This can be used by bots to initiate peer-to-peer communication from their side.
-    WebxdcRealtimeAdvertisementReceived {
-        /// Message ID of the webxdc instance.
-        msg_id: MsgId,
-    },
-
    /// Inform that a message containing a webxdc instance has been deleted.
    WebxdcInstanceDeleted {
        /// ID of the deleted message.
@@ -180,7 +180,6 @@ impl Client {
                    Client::connect_insecure_proxy(context, host, port, proxy_config).await?
                }
            };
-            update_connection_history(context, "imap", host, port, host, time()).await?;
            Ok(client)
        } else {
            let load_cache = match security {
@@ -11,7 +11,7 @@ use futures_lite::FutureExt;
 use pin_project::pin_project;

 use tokio::fs::{self, File};
-use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt, ReadBuf};
+use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 use tokio_tar::Archive;

 use crate::blob::BlobDirContents;
@@ -123,7 +123,7 @@ pub async fn has_backup(_context: &Context, dir_name: &Path) -> Result<String> {
        let name = dirent.file_name();
        let name: String = name.to_string_lossy().into();
        if name.starts_with("delta-chat")
-            && (name.ends_with(".tar") || name.ends_with(".tar.gz"))
+            && name.ends_with(".tar")
            && (newest_backup_name.is_empty() || name > newest_backup_name)
        {
            // We just use string comparison to determine which backup is newer.
@@ -269,24 +269,30 @@ async fn import_backup(
        context.get_dbfile().display()
    );

-    let backup_file = ProgressReader::new(backup_file, context.clone(), file_size);
-    if backup_to_import.extension() == Some(OsStr::new("gz")) {
-        let backup_file = tokio::io::BufReader::new(backup_file);
-        let backup_file = async_compression::tokio::bufread::GzipDecoder::new(backup_file);
-        import_backup_stream(context, backup_file, passphrase).await?;
-    } else {
-        import_backup_stream(context, backup_file, passphrase).await?;
-    }
+    import_backup_stream(context, backup_file, file_size, passphrase).await?;
    Ok(())
 }

 /// Imports backup by reading a tar file from a stream.
+///
+/// `file_size` is used to calculate the progress
+/// and emit progress events.
+/// Ideally it is the sum of the entry
+/// sizes without the header overhead,
+/// but can be estimated as tar file size
+/// in which case the progress is underestimated
+/// and may not reach 99.9% by the end of import.
+/// Underestimating is better than
+/// overestimating because the progress
+/// jumps to 100% instead of getting stuck at 99.9%
+/// for some time.
 pub(crate) async fn import_backup_stream<R: tokio::io::AsyncRead + Unpin>(
    context: &Context,
    backup_file: R,
+    file_size: u64,
    passphrase: String,
 ) -> Result<()> {
-    import_backup_stream_inner(context, backup_file, passphrase)
+    import_backup_stream_inner(context, backup_file, file_size, passphrase)
        .await
        .0
 }
@@ -313,19 +319,6 @@ struct ProgressReader<R> {
 }

 impl<R> ProgressReader<R> {
-    /// Creates a new `ProgressReader`.
-    ///
-    /// `file_size` is used to calculate the progress
-    /// and emit progress events.
-    /// Ideally it is the sum of the entry
-    /// sizes without the header overhead,
-    /// but can be estimated as tar file size
-    /// in which case the progress is underestimated
-    /// and may not reach 99.9% by the end of import.
-    /// Underestimating is better than
-    /// overestimating because the progress
-    /// jumps to 100% instead of getting stuck at 99.9%
-    /// for some time.
    fn new(r: R, context: Context, file_size: u64) -> Self {
        Self {
            inner: r,
@@ -365,8 +358,10 @@ where
 async fn import_backup_stream_inner<R: tokio::io::AsyncRead + Unpin>(
    context: &Context,
    backup_file: R,
+    file_size: u64,
    passphrase: String,
 ) -> (Result<()>,) {
+    let backup_file = ProgressReader::new(backup_file, context.clone(), file_size);
    let mut archive = Archive::new(backup_file);

    let mut entries = match archive.entries() {
@@ -466,10 +461,10 @@ fn get_next_backup_path(
        tempdbfile.push(format!("{stem}-{i:02}-{addr}.db"));

        let mut tempfile = folder.clone();
-        tempfile.push(format!("{stem}-{i:02}-{addr}.tar.gz.part"));
+        tempfile.push(format!("{stem}-{i:02}-{addr}.tar.part"));

        let mut destfile = folder.clone();
-        destfile.push(format!("{stem}-{i:02}-{addr}.tar.gz"));
+        destfile.push(format!("{stem}-{i:02}-{addr}.tar"));

        if !tempdbfile.exists() && !tempfile.exists() && !destfile.exists() {
            return Ok((tempdbfile, tempfile, destfile));
@@ -509,13 +504,9 @@ async fn export_backup(context: &Context, dir: &Path, passphrase: String) -> Res
        file_size += blob.to_abs_path().metadata()?.len()
    }

-    let gzip_encoder = async_compression::tokio::write::GzipEncoder::new(file);
-    let mut gzip_encoder =
-        export_backup_stream(context, &temp_db_path, blobdir, gzip_encoder, file_size)
-            .await
-            .context("Exporting backup to file failed")?;
-    gzip_encoder.shutdown().await?;
-
+    export_backup_stream(context, &temp_db_path, blobdir, file, file_size)
+        .await
+        .context("Exporting backup to file failed")?;
    fs::rename(temp_path, &dest_path).await?;
    context.emit_event(EventType::ImexFileWritten(dest_path));
    Ok(())
@@ -552,10 +543,6 @@ impl<W> ProgressWriter<W> {
            context,
        }
    }
-
-    fn into_inner(self) -> W {
-        self.inner
-    }
 }

 impl<W> AsyncWrite for ProgressWriter<W>
@@ -603,12 +590,12 @@ pub(crate) async fn export_backup_stream<'a, W>(
    blobdir: BlobDirContents<'a>,
    writer: W,
    file_size: u64,
-) -> Result<W>
+) -> Result<()>
 where
    W: tokio::io::AsyncWrite + tokio::io::AsyncWriteExt + Unpin + Send + 'static,
 {
-    let progress_writer = ProgressWriter::new(writer, context.clone(), file_size);
-    let mut builder = tokio_tar::Builder::new(progress_writer);
+    let writer = ProgressWriter::new(writer, context.clone(), file_size);
+    let mut builder = tokio_tar::Builder::new(writer);

    builder
        .append_path_with_name(temp_db_path, DBFILE_BACKUP_NAME)
@@ -620,9 +607,8 @@ where
        builder.append_file(path_in_archive, &mut file).await?;
    }

-    // Convert tar builder back into the underlying stream.
-    let progress_writer = builder.into_inner().await?;
-    Ok(progress_writer.into_inner())
+    builder.finish().await?;
+    Ok(())
 }

 /// Imports secret key from a file.
@@ -36,13 +36,12 @@ use futures_lite::FutureExt;
 use iroh_net::relay::RelayMode;
 use iroh_net::Endpoint;
 use tokio::fs;
-use tokio::io::AsyncWriteExt;
 use tokio::task::JoinHandle;
 use tokio_util::sync::CancellationToken;

 use crate::chat::add_device_msg;
 use crate::context::Context;
-use crate::imex::{BlobDirContents, ProgressReader};
+use crate::imex::BlobDirContents;
 use crate::message::{Message, Viewtype};
 use crate::qr::Qr;
 use crate::stock_str::backup_transfer_msg_body;
@@ -191,11 +190,9 @@ impl BackupProvider {

        send_stream.write_all(&file_size.to_be_bytes()).await?;

-        let mut send_stream =
-            export_backup_stream(&context, &dbfile, blobdir, send_stream, file_size)
-                .await
-                .context("Failed to write backup into QUIC stream")?;
-        send_stream.shutdown().await?;
+        export_backup_stream(&context, &dbfile, blobdir, send_stream, file_size)
+            .await
+            .context("Failed to write backup into QUIC stream")?;
        info!(context, "Finished writing backup into QUIC stream.");
        let mut buf = [0u8; 1];
        info!(context, "Waiting for acknowledgment.");
@@ -313,8 +310,7 @@ pub async fn get_backup2(
    let mut file_size_buf = [0u8; 8];
    recv_stream.read_exact(&mut file_size_buf).await?;
    let file_size = u64::from_be_bytes(file_size_buf);
-    let recv_stream = ProgressReader::new(recv_stream, context.clone(), file_size);
-    import_backup_stream(context, recv_stream, passphrase)
+    import_backup_stream(context, recv_stream, file_size, passphrase)
        .await
        .context("Failed to import backup from QUIC stream")?;
    info!(context, "Finished importing backup from the stream.");
@@ -148,6 +148,21 @@ impl MsgId {
        Ok(())
    }

+    /// Deletes a message, corresponding MDNs and unsent SMTP messages from the database.
+    pub(crate) async fn delete_from_db(self, context: &Context) -> Result<()> {
+        context
+            .sql
+            .transaction(move |transaction| {
+                transaction.execute("DELETE FROM smtp WHERE msg_id=?", (self,))?;
+                transaction.execute("DELETE FROM msgs_mdns WHERE msg_id=?", (self,))?;
+                transaction.execute("DELETE FROM msgs_status_updates WHERE msg_id=?", (self,))?;
+                transaction.execute("DELETE FROM msgs WHERE id=?", (self,))?;
+                Ok(())
+            })
+            .await?;
+        Ok(())
+    }
+
    pub(crate) async fn set_delivered(self, context: &Context) -> Result<()> {
        update_msg_state(context, self, MessageState::OutDelivered).await?;
        let chat_id: ChatId = context
@@ -1900,7 +1915,6 @@ pub async fn get_request_msg_cnt(context: &Context) -> usize {

 /// Estimates the number of messages that will be deleted
 /// by the options `delete_device_after` or `delete_server_after`.
-///
 /// This is typically used to show the estimated impact to the user
 /// before actually enabling deletion of old messages.
 ///
@@ -2576,6 +2590,60 @@ mod tests {
        Ok(())
    }

+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_markseen_not_downloaded_msg() -> Result<()> {
+        let mut tcm = TestContextManager::new();
+        let alice = &tcm.alice().await;
+        alice.set_config(Config::DownloadLimit, Some("1")).await?;
+        let bob = &tcm.bob().await;
+        let bob_chat_id = tcm.send_recv_accept(alice, bob, "hi").await.chat_id;
+
+        let file_bytes = include_bytes!("../test-data/image/screenshot.png");
+        let mut msg = Message::new(Viewtype::Image);
+        msg.set_file_from_bytes(bob, "a.jpg", file_bytes, None)
+            .await?;
+        let sent_msg = bob.send_msg(bob_chat_id, &mut msg).await;
+        let msg = alice.recv_msg(&sent_msg).await;
+        assert_eq!(msg.download_state, DownloadState::Available);
+        assert!(!msg.param.get_bool(Param::WantsMdn).unwrap_or_default());
+        assert_eq!(msg.state, MessageState::InFresh);
+        markseen_msgs(alice, vec![msg.id]).await?;
+        let msg = Message::load_from_db(alice, msg.id).await?;
+        assert_eq!(msg.state, MessageState::InSeen);
+        assert!(
+            !alice
+                .sql
+                .exists("SELECT COUNT(*) FROM smtp_mdns", ())
+                .await?
+        );
+
+        alice.set_config(Config::DownloadLimit, None).await?;
+        // Simulate that the message is even marked as `\Seen` on IMAP.
+        let rcvd_msg = receive_imf(alice, sent_msg.payload().as_bytes(), true)
+            .await
+            .unwrap()
+            .unwrap();
+        assert_eq!(rcvd_msg.chat_id, msg.chat_id);
+        let msg = Message::load_from_db(alice, *rcvd_msg.msg_ids.last().unwrap())
+            .await
+            .unwrap();
+        assert_eq!(msg.download_state, DownloadState::Done);
+        assert!(msg.param.get_bool(Param::WantsMdn).unwrap_or_default());
+        assert!(msg.get_showpadlock());
+        assert_eq!(msg.state, MessageState::InNoticed);
+        markseen_msgs(alice, vec![msg.id]).await?;
+        let msg = Message::load_from_db(alice, msg.id).await?;
+        assert_eq!(msg.state, MessageState::InSeen);
+        assert_eq!(
+            alice
+                .sql
+                .count("SELECT COUNT(*) FROM smtp_mdns", ())
+                .await?,
+            1
+        );
+        Ok(())
+    }
+
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_get_state() -> Result<()> {
        let alice = TestContext::new_alice().await;
@@ -20,7 +20,6 @@ use crate::e2ee::EncryptHelper;
 use crate::ephemeral::Timer as EphemeralTimer;
 use crate::headerdef::HeaderDef;
 use crate::html::new_html_mimepart;
-use crate::location;
 use crate::message::{self, Message, MsgId, Viewtype};
 use crate::mimeparser::SystemMessage;
 use crate::param::Param;
@@ -33,6 +32,7 @@ use crate::tools::{
    create_outgoing_rfc724_mid, create_smeared_timestamp, remove_subject_prefix, time,
 };
 use crate::webxdc::StatusUpdateSerial;
+use crate::{location, peer_channels};

 // attachments of 25 mb brutto should work on the majority of providers
 // (brutto examples: web.de=50, 1&1=40, t-online.de=32, gmail=25, posteo=50, yahoo=25, all-inkl=100).
@@ -82,10 +82,7 @@ pub struct MimeFactory {
    /// as needed.
    references: String,

-    /// True if the message requests Message Disposition Notification
-    /// using `Chat-Disposition-Notification-To` header.
    req_mdn: bool,
-
    last_added_location_id: Option<u32>,

    /// If the created mime-structure contains sync-items,
@@ -355,11 +352,7 @@ impl MimeFactory {
                    // beside key- and member-changes, force a periodic re-gossip.
                    let gossiped_timestamp = chat.id.get_gossiped_timestamp(context).await?;
                    let gossip_period = context.get_config_i64(Config::GossipPeriod).await?;
-                    // `gossip_period == 0` is a special case for testing,
-                    // enabling gossip in every message.
-                    // Othewise "smeared timestamps" may result in the condition
-                    // to fail even if the clock is monotonic.
-                    if gossip_period == 0 || time() >= gossiped_timestamp + gossip_period {
+                    if time() >= gossiped_timestamp + gossip_period {
                        Ok(true)
                    } else {
                        Ok(false)
@@ -617,9 +610,7 @@ impl MimeFactory {
            // because replies to "Disposition-Notification-To" are weird in many cases
            // eg. are just freetext and/or do not follow any standard.
            headers.push(Header::new(
-                HeaderDef::ChatDispositionNotificationTo
-                    .get_headername()
-                    .to_string(),
+                "Chat-Disposition-Notification-To".into(),
                self.from_addr.clone(),
            ));
        }
@@ -1387,7 +1378,8 @@ impl MimeFactory {
            let json = msg.param.get(Param::Arg).unwrap_or_default();
            parts.push(context.build_status_update_part(json));
        } else if msg.viewtype == Viewtype::Webxdc {
-            headers.push(create_iroh_header(context, msg.id).await?);
+            let topic = peer_channels::create_random_topic();
+            headers.push(create_iroh_header(context, topic, msg.id).await?);
            if let (Some(json), _) = context
                .render_webxdc_status_update_object(
                    msg.id,
@@ -47,14 +47,6 @@ pub(crate) async fn prune_connection_history(context: &Context) -> Result<()> {
    Ok(())
 }

-/// Update the timestamp of the last successfull connection
-/// to the given `host` and `port`
-/// with the given application protocol `alpn`.
-///
-/// `addr` is the string representation of IP address.
-/// If connection is made over a proxy which does
-/// its own DNS resolution,
-/// `addr` should be the same as `host`.
 pub(crate) async fn update_connection_history(
    context: &Context,
    alpn: &str,
@@ -1,44 +1,4 @@
 //! DNS resolution and cache.
-//!
-//! DNS cache in Delta Chat has two layers:
-//! in-memory cache and persistent `dns_cache` SQL table.
-//!
-//! In-memory cache is using a "stale-while-revalidate" strategy.
-//! If there is a cached value, it is returned immediately
-//! and revalidation task is started in the background
-//! to replace old cached IP addresses with new ones.
-//! If there is no cached value yet,
-//! lookup only finishes when `lookup_host` returns first results.
-//! In-memory cache is shared between all accounts
-//! and is never stored on the disk.
-//! It can be thought of as an extension
-//! of the system resolver.
-//!
-//! Persistent `dns_cache` SQL table is used to collect
-//! all IP addresses ever seen for the hostname
-//! together with the timestamp
-//! of the last time IP address has been seen.
-//! Note that this timestamp reflects the time
-//! IP address was returned by the in-memory cache
-//! rather than the underlying system resolver.
-//! Unused entries are removed after 30 days
-//! (`CACHE_TTL` constant) to avoid having
-//! old non-working IP addresses in the cache indefinitely.
-//!
-//! When Delta Chat needs an IP address for the host,
-//! it queries in-memory cache for the next result
-//! and merges the list of IP addresses
-//! with the list of IP addresses from persistent cache.
-//! Resulting list is constructed
-//! by taking the first two results from the resolver
-//! followed up by persistent cache results
-//! and terminated by the rest of resolver results.
-//!
-//! Persistent cache results are sorted
-//! by the time of the most recent successful connection
-//! using the result. For results that have never been
-//! used for successful connection timestamp of
-//! retrieving them from in-memory cache is used.

 use anyhow::{Context as _, Result};
 use std::collections::HashMap;
@@ -82,110 +42,33 @@ pub(crate) async fn prune_dns_cache(context: &Context) -> Result<()> {
    Ok(())
 }

-/// Map from hostname to IP addresses.
-///
-/// NOTE: sync RwLock is used, so it must not be held across `.await`
-/// to avoid deadlocks.
-/// See
-/// <https://docs.rs/tokio/1.40.0/tokio/sync/struct.Mutex.html#which-kind-of-mutex-should-you-use>
-/// and
-/// <https://stackoverflow.com/questions/63712823/why-do-i-get-a-deadlock-when-using-tokio-with-a-stdsyncmutex>.
-static LOOKUP_HOST_CACHE: Lazy<parking_lot::RwLock<HashMap<String, Vec<IpAddr>>>> =
-    Lazy::new(Default::default);
-
-/// Wrapper for `lookup_host` that returns IP addresses.
-async fn lookup_ips(host: impl tokio::net::ToSocketAddrs) -> Result<impl Iterator<Item = IpAddr>> {
-    Ok(lookup_host(host)
-        .await
-        .context("DNS lookup failure")?
-        .map(|addr| addr.ip()))
-}
-
-async fn lookup_host_with_memory_cache(
-    context: &Context,
-    hostname: &str,
-    port: u16,
-) -> Result<Vec<IpAddr>> {
-    let stale_result = {
-        let rwlock_read_guard = LOOKUP_HOST_CACHE.read();
-        rwlock_read_guard.get(hostname).cloned()
-    };
-    if let Some(stale_result) = stale_result {
-        // Revalidate the cache in the background.
-        {
-            let context = context.clone();
-            let hostname = hostname.to_string();
-            tokio::spawn(async move {
-                match lookup_ips((hostname.clone(), port)).await {
-                    Ok(res) => {
-                        LOOKUP_HOST_CACHE.write().insert(hostname, res.collect());
-                    }
-                    Err(err) => {
-                        warn!(
-                            context,
-                            "Failed to revalidate results for {hostname:?}: {err:#}."
-                        );
-                    }
-                }
-            });
-        }
-
-        info!(
-            context,
-            "Using memory-cached DNS resolution for {hostname}."
-        );
-        Ok(stale_result)
-    } else {
-        info!(
-            context,
-            "No memory-cached DNS resolution for {hostname} available, waiting for the resolver."
-        );
-        let res: Vec<IpAddr> = lookup_ips((hostname, port)).await?.collect();
-
-        // Insert initial result into the cache.
-        //
-        // There may already be a result from a parallel
-        // task stored, overwriting it is not a problem.
-        LOOKUP_HOST_CACHE
-            .write()
-            .insert(hostname.to_string(), res.clone());
-        Ok(res)
-    }
-}
-
-/// Looks up the hostname and updates
-/// persistent DNS cache on success.
+/// Looks up the hostname and updates DNS cache
+/// on success.
 async fn lookup_host_and_update_cache(
    context: &Context,
    hostname: &str,
    port: u16,
    now: i64,
 ) -> Result<Vec<SocketAddr>> {
-    let res: Vec<IpAddr> = timeout(
-        super::TIMEOUT,
-        lookup_host_with_memory_cache(context, hostname, port),
-    )
-    .await
-    .context("DNS lookup timeout")?
-    .context("DNS lookup with memory cache failure")?;
+    let res: Vec<SocketAddr> = timeout(super::TIMEOUT, lookup_host((hostname, port)))
+        .await
+        .context("DNS lookup timeout")?
+        .context("DNS lookup failure")?
+        .collect();

-    for ip in &res {
-        let ip_string = ip.to_string();
+    for addr in &res {
+        let ip_string = addr.ip().to_string();
        if ip_string == hostname {
            // IP address resolved into itself, not interesting to cache.
            continue;
        }

-        info!(context, "Resolved {hostname} into {ip}.");
+        info!(context, "Resolved {hostname}:{port} into {addr}.");

        // Update the cache.
        update_cache(context, hostname, &ip_string, now).await?;
    }

-    let res = res
-        .into_iter()
-        .map(|ip| SocketAddr::new(ip, port))
-        .collect();
    Ok(res)
 }

@@ -714,14 +597,9 @@ pub(crate) async fn lookup_host_with_cache(
    load_cache: bool,
 ) -> Result<Vec<SocketAddr>> {
    let now = time();
-    let resolved_addrs = match lookup_host_and_update_cache(context, hostname, port, now).await {
-        Ok(res) => {
-            if alpn.is_empty() {
-                res
-            } else {
-                sort_by_connection_timestamp(context, res, alpn, hostname).await?
-            }
-        }
+    let mut resolved_addrs = match lookup_host_and_update_cache(context, hostname, port, now).await
+    {
+        Ok(res) => res,
        Err(err) => {
            warn!(
                context,
@@ -730,43 +608,29 @@ pub(crate) async fn lookup_host_with_cache(
            Vec::new()
        }
    };
+    if !alpn.is_empty() {
+        resolved_addrs =
+            sort_by_connection_timestamp(context, resolved_addrs, alpn, hostname).await?;
+    }

    if load_cache {
-        let mut cache = lookup_cache(context, hostname, port, alpn, now).await?;
+        for addr in lookup_cache(context, hostname, port, alpn, now).await? {
+            if !resolved_addrs.contains(&addr) {
+                resolved_addrs.push(addr);
+            }
+        }
+
        if let Some(ips) = DNS_PRELOAD.get(hostname) {
            for ip in ips {
                let addr = SocketAddr::new(*ip, port);
-                if !cache.contains(&addr) {
-                    cache.push(addr);
+                if !resolved_addrs.contains(&addr) {
+                    resolved_addrs.push(addr);
                }
            }
        }
-
-        Ok(merge_with_cache(resolved_addrs, cache))
-    } else {
-        Ok(resolved_addrs)
-    }
-}
-
-/// Merges results received from DNS with cached results.
-///
-/// At most 10 results are returned.
-fn merge_with_cache(
-    mut resolved_addrs: Vec<SocketAddr>,
-    cache: Vec<SocketAddr>,
-) -> Vec<SocketAddr> {
-    let rest = resolved_addrs.split_off(std::cmp::min(resolved_addrs.len(), 2));
-
-    for addr in cache.into_iter().chain(rest.into_iter()) {
-        if !resolved_addrs.contains(&addr) {
-            resolved_addrs.push(addr);
-            if resolved_addrs.len() >= 10 {
-                break;
-            }
-        }
    }

-    resolved_addrs
+    Ok(resolved_addrs)
 }

 #[cfg(test)]
@@ -1002,131 +866,4 @@ mod tests {
            ],
        );
    }
-
-    #[test]
-    fn test_merge_with_cache() {
-        let first_addr = IpAddr::V4(Ipv4Addr::new(192, 168, 1, 1));
-        let second_addr = IpAddr::V4(Ipv4Addr::new(192, 168, 1, 2));
-
-        // If there is no cache, just return resolved addresses.
-        {
-            let resolved_addrs = vec![
-                SocketAddr::new(first_addr, 993),
-                SocketAddr::new(second_addr, 993),
-            ];
-            let cache = vec![];
-            assert_eq!(
-                merge_with_cache(resolved_addrs.clone(), cache),
-                resolved_addrs
-            );
-        }
-
-        // If cache contains address that is not in resolution results,
-        // it is inserted in the merged result.
-        {
-            let resolved_addrs = vec![SocketAddr::new(first_addr, 993)];
-            let cache = vec![SocketAddr::new(second_addr, 993)];
-            assert_eq!(
-                merge_with_cache(resolved_addrs, cache),
-                vec![
-                    SocketAddr::new(first_addr, 993),
-                    SocketAddr::new(second_addr, 993),
-                ]
-            );
-        }
-
-        // If cache contains address that is already in resolution results,
-        // it is not duplicated.
-        {
-            let resolved_addrs = vec![
-                SocketAddr::new(first_addr, 993),
-                SocketAddr::new(second_addr, 993),
-            ];
-            let cache = vec![SocketAddr::new(second_addr, 993)];
-            assert_eq!(
-                merge_with_cache(resolved_addrs, cache),
-                vec![
-                    SocketAddr::new(first_addr, 993),
-                    SocketAddr::new(second_addr, 993),
-                ]
-            );
-        }
-
-        // If DNS resolvers returns a lot of results,
-        // we should try cached results before going through all
-        // the resolver results.
-        {
-            let resolved_addrs = vec![
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 2)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 3)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 4)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 5)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 6)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 7)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 8)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 9)), 993),
-            ];
-            let cache = vec![SocketAddr::new(second_addr, 993)];
-            assert_eq!(
-                merge_with_cache(resolved_addrs, cache),
-                vec![
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 2)), 993),
-                    SocketAddr::new(second_addr, 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 3)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 4)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 5)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 6)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 7)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 8)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 9)), 993),
-                ]
-            );
-        }
-
-        // Even if cache already contains all the incorrect results
-        // that resolver returns, this should not result in them being sorted to the top.
-        // Cache has known to work result returned first,
-        // so we should try it after the second result.
-        {
-            let resolved_addrs = vec![
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 2)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 3)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 4)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 5)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 6)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 7)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 8)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 9)), 993),
-            ];
-            let cache = vec![
-                SocketAddr::new(second_addr, 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 9)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 8)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 7)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 6)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 5)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 4)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 3)), 993),
-                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 2)), 993),
-            ];
-            assert_eq!(
-                merge_with_cache(resolved_addrs, cache),
-                vec![
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 2)), 993),
-                    SocketAddr::new(second_addr, 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 9)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 8)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 7)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 6)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 5)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 4)), 993),
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 3)), 993),
-                ]
-            );
-        }
-    }
 }
@@ -12,14 +12,13 @@ use fast_socks5::client::Socks5Stream;
 use fast_socks5::util::target_addr::ToTargetAddr;
 use fast_socks5::AuthenticationMethod;
 use fast_socks5::Socks5Command;
-use percent_encoding::{percent_encode, utf8_percent_encode, NON_ALPHANUMERIC};
+use percent_encoding::{percent_encode, NON_ALPHANUMERIC};
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpStream;
 use tokio_io_timeout::TimeoutStream;
 use url::Url;

 use crate::config::Config;
-use crate::constants::NON_ALPHANUMERIC_WITHOUT_DOT;
 use crate::context::Context;
 use crate::net::connect_tcp;
 use crate::net::session::SessionStream;
@@ -42,12 +41,6 @@ impl PartialEq for ShadowsocksConfig {

 impl Eq for ShadowsocksConfig {}

-impl ShadowsocksConfig {
-    fn to_url(&self) -> String {
-        self.server_config.to_url()
-    }
-}
-
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct HttpConfig {
    /// HTTP proxy host.
@@ -91,17 +84,6 @@ impl HttpConfig {
        };
        Ok(http_config)
    }
-
-    fn to_url(&self, scheme: &str) -> String {
-        let host = utf8_percent_encode(&self.host, NON_ALPHANUMERIC_WITHOUT_DOT);
-        if let Some((user, password)) = &self.user_password {
-            let user = utf8_percent_encode(user, NON_ALPHANUMERIC);
-            let password = utf8_percent_encode(password, NON_ALPHANUMERIC);
-            format!("{scheme}://{user}:{password}@{host}:{}", self.port)
-        } else {
-            format!("{scheme}://{host}:{}", self.port)
-        }
-    }
 }

 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -141,17 +123,6 @@ impl Socks5Config {

        Ok(socks_stream)
    }
-
-    fn to_url(&self) -> String {
-        let host = utf8_percent_encode(&self.host, NON_ALPHANUMERIC_WITHOUT_DOT);
-        if let Some((user, password)) = &self.user_password {
-            let user = utf8_percent_encode(user, NON_ALPHANUMERIC);
-            let password = utf8_percent_encode(password, NON_ALPHANUMERIC);
-            format!("socks5://{user}:{password}@{host}:{}", self.port)
-        } else {
-            format!("socks5://{host}:{}", self.port)
-        }
-    }
 }

 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -246,7 +217,7 @@ where

 impl ProxyConfig {
    /// Creates a new proxy configuration by parsing given proxy URL.
-    pub(crate) fn from_url(url: &str) -> Result<Self> {
+    fn from_url(url: &str) -> Result<Self> {
        let url = Url::parse(url).context("Cannot parse proxy URL")?;
        match url.scheme() {
            "http" => {
@@ -301,19 +272,6 @@ impl ProxyConfig {
        }
    }

-    /// Serializes proxy config into an URL.
-    ///
-    /// This function can be used to normalize proxy URL
-    /// by parsing it and serializing back.
-    pub(crate) fn to_url(&self) -> String {
-        match self {
-            Self::Http(http_config) => http_config.to_url("http"),
-            Self::Https(http_config) => http_config.to_url("https"),
-            Self::Socks5(socks5_config) => socks5_config.to_url(),
-            Self::Shadowsocks(shadowsocks_config) => shadowsocks_config.to_url(),
-        }
-    }
-
    /// Migrates legacy `socks5_host`, `socks5_port`, `socks5_user` and `socks5_password`
    /// config into `proxy_url` if `proxy_url` is unset or empty.
    ///
@@ -23,7 +23,7 @@
 //!    (scoped per WebXDC app instance/message-id). The other peers can then join the gossip with `joinRealtimeChannel().setListener()`
 //!    and `joinRealtimeChannel().send()` just like the other peers.

-use anyhow::{anyhow, bail, Context as _, Result};
+use anyhow::{anyhow, Context as _, Result};
 use email::Header;
 use futures_lite::StreamExt;
 use iroh_gossip::net::{Event, Gossip, GossipEvent, JoinOptions, GOSSIP_ALPN};
@@ -143,10 +143,9 @@ impl Iroh {
                self.endpoint.add_node_addr(peer.clone())?;
            }

-            self.gossip.join_with_opts(
-                topic,
-                JoinOptions::with_bootstrap(peers.into_iter().map(|peer| peer.node_id)),
-            );
+            self.gossip
+                .join(topic, peers.into_iter().map(|peer| peer.node_id).collect())
+                .await?;
        }
        Ok(())
    }
@@ -233,7 +232,6 @@ impl ChannelState {
 impl Context {
    /// Create iroh endpoint and gossip.
    async fn init_peer_channels(&self) -> Result<Iroh> {
-        info!(self, "Initializing peer channels.");
        let secret_key = SecretKey::generate();
        let public_key = secret_key.public();

@@ -260,14 +258,7 @@ impl Context {

        // create gossip
        let my_addr = endpoint.node_addr().await?;
-        let gossip_config = iroh_gossip::proto::topic::Config {
-            // Allow messages up to 128 KB in size.
-            // We set the limit to 128 KiB to account for internal overhead,
-            // but only guarantee 128 KB of payload to WebXDC developers.
-            max_message_size: 128 * 1024,
-            ..Default::default()
-        };
-        let gossip = Gossip::from_endpoint(endpoint.clone(), gossip_config, &my_addr.info);
+        let gossip = Gossip::from_endpoint(endpoint.clone(), Default::default(), &my_addr.info);

        // spawn endpoint loop that forwards incoming connections to the gossiper
        let context = self.clone();
@@ -286,10 +277,6 @@ impl Context {

    /// Get or initialize the iroh peer channel.
    pub async fn get_or_try_init_peer_channel(&self) -> Result<&Iroh> {
-        if !self.get_config_bool(Config::WebxdcRealtimeEnabled).await? {
-            bail!("Attempt to get Iroh when realtime is disabled");
-        }
-
        let ctx = self.clone();
        self.iroh
            .get_or_try_init(|| async { ctx.init_peer_channels().await })
@@ -427,15 +414,15 @@ pub async fn leave_webxdc_realtime(ctx: &Context, msg_id: MsgId) -> Result<()> {
    Ok(())
 }

-/// Creates a new random gossip topic.
-fn create_random_topic() -> TopicId {
+pub(crate) fn create_random_topic() -> TopicId {
    TopicId::from_bytes(rand::random())
 }

-/// Creates `Iroh-Gossip-Header` with a new random topic
-/// and stores the topic for the message.
-pub(crate) async fn create_iroh_header(ctx: &Context, msg_id: MsgId) -> Result<Header> {
-    let topic = create_random_topic();
+pub(crate) async fn create_iroh_header(
+    ctx: &Context,
+    topic: TopicId,
+    msg_id: MsgId,
+) -> Result<Header> {
    insert_topic_stub(ctx, msg_id, topic).await?;
    Ok(Header::new(
        HeaderDef::IrohGossipTopic.get_headername().to_string(),
@@ -589,13 +576,6 @@ mod tests {
            .unwrap();

        bob.recv_msg_trash(&alice.pop_sent_msg().await).await;
-        loop {
-            let event = bob.evtracker.recv().await.unwrap();
-            if let EventType::WebxdcRealtimeAdvertisementReceived { msg_id } = event.typ {
-                assert!(msg_id == alice_webxdc.id);
-                break;
-            }
-        }
        let bob_iroh = bob.get_or_try_init_peer_channel().await.unwrap();

        // Bob adds alice to gossip peers.
@@ -962,10 +942,6 @@ mod tests {
        // creates iroh endpoint as side effect
        leave_webxdc_realtime(alice, MsgId::new(1)).await.unwrap();

-        assert!(alice.ctx.iroh.get().is_none());
-
-        // This internal function should return error
-        // if accidentally called with the setting disabled.
-        assert!(alice.ctx.get_or_try_init_peer_channel().await.is_err());
+        assert!(alice.ctx.iroh.get().is_none())
    }
 }
@@ -343,7 +343,7 @@ impl Peerstate {
    }

    /// Updates peerstate according to the given `Autocrypt` header.
-    pub fn apply_header(&mut self, context: &Context, header: &Aheader, message_time: i64) {
+    pub fn apply_header(&mut self, header: &Aheader, message_time: i64) {
        if !addr_cmp(&self.addr, &header.addr) {
            return;
        }
@@ -362,13 +362,6 @@ impl Peerstate {
                self.public_key = Some(header.public_key.clone());
                self.recalc_fingerprint();
            }
-        } else {
-            warn!(
-                context,
-                "Ignoring outdated Autocrypt header because message_time={} < last_seen={}.",
-                message_time,
-                self.last_seen
-            );
        }
    }

@@ -773,65 +766,23 @@ pub(crate) async fn maybe_do_aeap_transition(

    // If the from addr is different from the peerstate address we know,
    // we may want to do an AEAP transition.
-    if !addr_cmp(&peerstate.addr, &mime_parser.from.addr) {
-        // Check if it's a chat message; we do this to avoid
-        // some accidental transitions if someone writes from multiple
-        // addresses with an MUA.
-        if !mime_parser.has_chat_version() {
-            info!(
-                context,
-                "Not doing AEAP from {} to {} because the message is not a chat message.",
-                &peerstate.addr,
-                &mime_parser.from.addr
-            );
-            return Ok(());
-        }
-
-        // Check if the message is encrypted and signed correctly. If it's not encrypted, it's
-        // probably from a new contact sharing the same key.
-        if mime_parser.signatures.is_empty() {
-            info!(
-                context,
-                "Not doing AEAP from {} to {} because the message is not encrypted and signed.",
-                &peerstate.addr,
-                &mime_parser.from.addr
-            );
-            return Ok(());
-        }
-
-        // Check if the From: address was also in the signed part of the email.
-        // Without this check, an attacker could replay a message from Alice
-        // to Bob. Then Bob's device would do an AEAP transition from Alice's
-        // to the attacker's address, allowing for easier phishing.
-        if !mime_parser.from_is_signed {
-            info!(
-                context,
-                "Not doing AEAP from {} to {} because From: is not signed.",
-                &peerstate.addr,
-                &mime_parser.from.addr
-            );
-            return Ok(());
-        }
-
-        // DC avoids sending messages with the same timestamp, that's why messages
-        // with equal timestamps are ignored here unlike in `Peerstate::apply_header()`.
-        if info.message_time <= peerstate.last_seen {
-            info!(
-                context,
-                "Not doing AEAP from {} to {} because {} < {}.",
-                &peerstate.addr,
-                &mime_parser.from.addr,
-                info.message_time,
-                peerstate.last_seen
-            );
-            return Ok(());
-        }
-
-        info!(
-            context,
-            "Doing AEAP transition from {} to {}.", &peerstate.addr, &mime_parser.from.addr
-        );
-
+    if !addr_cmp(&peerstate.addr, &mime_parser.from.addr)
+            // Check if it's a chat message; we do this to avoid
+            // some accidental transitions if someone writes from multiple
+            // addresses with an MUA.
+            && mime_parser.has_chat_version()
+            // Check if the message is encrypted and signed correctly. If it's not encrypted, it's
+            // probably from a new contact sharing the same key.
+            && !mime_parser.signatures.is_empty()
+            // Check if the From: address was also in the signed part of the email.
+            // Without this check, an attacker could replay a message from Alice
+            // to Bob. Then Bob's device would do an AEAP transition from Alice's
+            // to the attacker's address, allowing for easier phishing.
+            && mime_parser.from_is_signed
+            // DC avoids sending messages with the same timestamp, that's why `>` is here unlike in
+            // `Peerstate::apply_header()`.
+            && info.message_time > peerstate.last_seen
+    {
        let info = &mut mime_parser.decryption_info;
        let peerstate = info.peerstate.as_mut().context("no peerstate??")?;
        // Add info messages to chats with this (verified) contact
@@ -849,7 +800,7 @@ pub(crate) async fn maybe_do_aeap_transition(
        let header = info.autocrypt_header.as_ref().context(
            "Internal error: Tried to do an AEAP transition without an autocrypt header??",
        )?;
-        peerstate.apply_header(context, header, info.message_time);
+        peerstate.apply_header(header, info.message_time);

        peerstate
            .save_to_db_ex(&context.sql, Some(&old_addr))
@@ -1028,8 +979,6 @@ mod tests {

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_peerstate_degrade_reordering() {
-        let ctx = crate::test_utils::TestContext::new().await;
-
        let addr = "example@example.org";
        let pub_key = alice_keypair().public;
        let header = Aheader::new(addr.to_string(), pub_key, EncryptPreference::Mutual);
@@ -1054,7 +1003,7 @@ mod tests {
            fingerprint_changed: false,
        };

-        peerstate.apply_header(&ctx, &header, 100);
+        peerstate.apply_header(&header, 100);
        assert_eq!(peerstate.prefer_encrypt, EncryptPreference::Mutual);

        peerstate.degrade_encryption(300);
@@ -1062,11 +1011,11 @@ mod tests {

        // This has message time 200, while encryption was degraded at timestamp 300.
        // Because of reordering, header should not be applied.
-        peerstate.apply_header(&ctx, &header, 200);
+        peerstate.apply_header(&header, 200);
        assert_eq!(peerstate.prefer_encrypt, EncryptPreference::Reset);

        // Same header will be applied in the future.
-        peerstate.apply_header(&ctx, &header, 300);
+        peerstate.apply_header(&header, 300);
        assert_eq!(peerstate.prefer_encrypt, EncryptPreference::Mutual);
    }
 }
@@ -41,7 +41,7 @@ enum SignedPublicKeyOrSubkey<'a> {
    Subkey(&'a SignedPublicSubKey),
 }

-impl KeyTrait for SignedPublicKeyOrSubkey<'_> {
+impl<'a> KeyTrait for SignedPublicKeyOrSubkey<'a> {
    fn fingerprint(&self) -> Vec<u8> {
        match self {
            Self::Key(k) => k.fingerprint(),
@@ -64,7 +64,7 @@ impl KeyTrait for SignedPublicKeyOrSubkey<'_> {
    }
 }

-impl PublicKeyTrait for SignedPublicKeyOrSubkey<'_> {
+impl<'a> PublicKeyTrait for SignedPublicKeyOrSubkey<'a> {
    fn verify_signature(
        &self,
        hash: HashAlgorithm,
@@ -20,7 +20,7 @@ use crate::events::EventType;
 use crate::key::Fingerprint;
 use crate::message::Message;
 use crate::net::http::post_empty;
-use crate::net::proxy::{ProxyConfig, DEFAULT_SOCKS_PORT};
+use crate::net::proxy::DEFAULT_SOCKS_PORT;
 use crate::peerstate::Peerstate;
 use crate::token;
 use crate::tools::validate_id;
@@ -723,10 +723,6 @@ pub async fn set_config_from_qr(context: &Context, qr: &str) -> Result<()> {
                .get_config(Config::ProxyUrl)
                .await?
                .unwrap_or_default();
-
-            // Normalize the URL.
-            let url = ProxyConfig::from_url(&url)?.to_url();
-
            let proxy_urls: Vec<&str> = std::iter::once(url.as_str())
                .chain(
                    old_proxy_url_value
@@ -1791,17 +1787,6 @@ mod tests {
            )
        );

-        // SOCKS5 config does not have port 1080 explicitly specified,
-        // but should bring `socks5://1.2.3.4:1080` to the top instead of creating another entry.
-        set_config_from_qr(&t, "socks5://1.2.3.4").await?;
-        assert_eq!(
-            t.get_config(Config::ProxyUrl).await?,
-            Some(
-                "socks5://1.2.3.4:1080\nss://YWVzLTEyOC1nY206dGVzdA@192.168.100.1:8888#Example1\nsocks5://foo:666\nsocks5://Da:x%26%25%24X@jau:1080"
-                    .to_string()
-            )
-        );
-
        Ok(())
    }

@@ -14,77 +14,6 @@ use crate::qr::{self, Qr};
 use crate::securejoin;
 use crate::stock_str::{self, backup_transfer_qr};

-/// Create a QR code from any input data.
-pub fn create_qr_svg(qrcode_content: &str) -> Result<String> {
-    let all_size = 512.0;
-    let qr_code_size = 416.0;
-    let logo_size = 96.0;
-
-    let qr = QrCode::encode_text(qrcode_content, QrCodeEcc::Medium)?;
-    let mut svg = String::with_capacity(28000);
-    let mut w = tagger::new(&mut svg);
-
-    w.elem("svg", |d| {
-        d.attr("xmlns", "http://www.w3.org/2000/svg")?;
-        d.attr("viewBox", format_args!("0 0 {all_size} {all_size}"))?;
-        d.attr("xmlns:xlink", "http://www.w3.org/1999/xlink")?; // required for enabling xlink:href on browsers
-        Ok(())
-    })?
-    .build(|w| {
-        // background
-        w.single("rect", |d| {
-            d.attr("x", 0)?;
-            d.attr("y", 0)?;
-            d.attr("width", all_size)?;
-            d.attr("height", all_size)?;
-            d.attr("style", "fill:#ffffff")?;
-            Ok(())
-        })?;
-        // QR code
-        w.elem("g", |d| {
-            d.attr(
-                "transform",
-                format!(
-                    "translate({},{})",
-                    (all_size - qr_code_size) / 2.0,
-                    ((all_size - qr_code_size) / 2.0)
-                ),
-            )
-        })?
-        .build(|w| {
-            w.single("path", |d| {
-                let mut path_data = String::with_capacity(0);
-                let scale = qr_code_size / qr.size() as f32;
-
-                for y in 0..qr.size() {
-                    for x in 0..qr.size() {
-                        if qr.get_module(x, y) {
-                            path_data += &format!("M{x},{y}h1v1h-1z");
-                        }
-                    }
-                }
-
-                d.attr("style", "fill:#000000")?;
-                d.attr("d", path_data)?;
-                d.attr("transform", format!("scale({scale})"))
-            })
-        })?;
-        w.elem("g", |d| {
-            d.attr(
-                "transform",
-                format!(
-                    "translate({},{}) scale(2)", // data in qr_overlay_delta.svg-part are 48 x 48, scaling by 2 results in desired logo_size of 96
-                    (all_size - logo_size) / 2.0,
-                    (all_size - logo_size) / 2.0
-                ),
-            )
-        })?
-        .build(|w| w.put_raw_escapable(include_str!("../assets/qr_overlay_delta.svg-part")))
-    })?;
-
-    Ok(svg)
-}
-
 /// Returns SVG of the QR code to join the group or verify contact.
 ///
 /// If `chat_id` is `None`, returns verification QR code.
@@ -375,14 +304,6 @@ mod tests {

    use super::*;

-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_create_qr_svg() -> Result<()> {
-        let svg = create_qr_svg("this is a test QR code \" < > &")?;
-        assert!(svg.contains("<svg"));
-        assert!(svg.contains("</svg>"));
-        Ok(())
-    }
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_svg_escaping() {
        let svg = inner_generate_secure_join_qr_code(
@@ -25,7 +25,6 @@ pub const QUOTA_ERROR_THRESHOLD_PERCENTAGE: u64 = 95;

 /// if quota is below this value (again),
 /// QuotaExceeding is cleared.
-///
 /// This value should be a bit below QUOTA_WARN_THRESHOLD_PERCENTAGE to
 /// avoid jittering and lots of warnings when quota is exactly at the warning threshold.
 ///
@@ -74,7 +73,7 @@ async fn get_unique_quota_roots_and_usage(

 fn get_highest_usage<'t>(
    unique_quota_roots: &'t BTreeMap<String, Vec<QuotaResource>>,
-) -> Result<(u64, &'t String, &'t QuotaResource)> {
+) -> Result<(u64, &'t String, &QuotaResource)> {
    let mut highest: Option<(u64, &'t String, &QuotaResource)> = None;
    for (name, resources) in unique_quota_roots {
        for r in resources {
@@ -19,7 +19,6 @@ use std::collections::BTreeMap;
 use std::fmt;

 use anyhow::Result;
-use serde::{Deserialize, Serialize};

 use crate::chat::{send_msg, Chat, ChatId};
 use crate::chatlist_events;
@@ -32,7 +31,7 @@ use crate::param::Param;
 /// A single reaction consisting of multiple emoji sequences.
 ///
 /// It is guaranteed to have all emojis sorted and deduplicated inside.
-#[derive(Debug, Default, Clone, Deserialize, Eq, PartialEq, Serialize)]
+#[derive(Debug, Default, Clone)]
 pub struct Reaction {
    /// Canonical representation of reaction as a string of space-separated emojis.
    reaction: String,
@@ -174,7 +173,7 @@ async fn set_msg_id_reaction(
    chat_id: ChatId,
    contact_id: ContactId,
    timestamp: i64,
-    reaction: &Reaction,
+    reaction: Reaction,
 ) -> Result<()> {
    if reaction.is_empty() {
        // Simply remove the record instead of setting it to empty string.
@@ -245,7 +244,7 @@ pub async fn send_reaction(context: &Context, msg_id: MsgId, reaction: &str) ->
        msg.chat_id,
        ContactId::SELF,
        reaction_msg.timestamp_sort,
-        &reaction,
+        reaction,
    )
    .await?;
    Ok(reaction_msg_id)
@@ -276,28 +275,16 @@ pub(crate) async fn set_msg_reaction(
    contact_id: ContactId,
    timestamp: i64,
    reaction: Reaction,
-    is_incoming_fresh: bool,
 ) -> Result<()> {
    if let Some((msg_id, _)) = rfc724_mid_exists(context, in_reply_to).await? {
-        set_msg_id_reaction(context, msg_id, chat_id, contact_id, timestamp, &reaction).await?;
-
-        if is_incoming_fresh
-            && !reaction.is_empty()
-            && msg_id.get_state(context).await?.is_outgoing()
-        {
-            context.emit_event(EventType::IncomingReaction {
-                contact_id,
-                msg_id,
-                reaction,
-            });
-        }
+        set_msg_id_reaction(context, msg_id, chat_id, contact_id, timestamp, reaction).await
    } else {
        info!(
            context,
            "Can't assign reaction to unknown message with Message-ID {}", in_reply_to
        );
+        Ok(())
    }
-    Ok(())
 }

 /// Get our own reaction for a given message.
@@ -576,38 +563,6 @@ Here's my footer -- bob@example.net"
        Ok(())
    }

-    async fn expect_incoming_reactions_event(
-        t: &TestContext,
-        expected_msg_id: MsgId,
-        expected_contact_id: ContactId,
-        expected_reaction: &str,
-    ) -> Result<()> {
-        let event = t
-            .evtracker
-            .get_matching(|evt| matches!(evt, EventType::IncomingReaction { .. }))
-            .await;
-        match event {
-            EventType::IncomingReaction {
-                msg_id,
-                contact_id,
-                reaction,
-            } => {
-                assert_eq!(msg_id, expected_msg_id);
-                assert_eq!(contact_id, expected_contact_id);
-                assert_eq!(reaction, Reaction::from(expected_reaction));
-            }
-            _ => unreachable!(),
-        }
-        Ok(())
-    }
-
-    async fn has_incoming_reactions_event(t: &TestContext) -> bool {
-        t.evtracker
-            .get_matching_opt(t, |evt| matches!(evt, EventType::IncomingReaction { .. }))
-            .await
-            .is_some()
-    }
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_send_reaction() -> Result<()> {
        let alice = TestContext::new_alice().await;
@@ -638,7 +593,6 @@ Here's my footer -- bob@example.net"

        send_reaction(&bob, bob_msg.id, "👍").await.unwrap();
        expect_reactions_changed_event(&bob, bob_msg.chat_id, bob_msg.id, ContactId::SELF).await?;
-        assert!(!has_incoming_reactions_event(&bob).await);
        assert_eq!(get_chat_msgs(&bob, bob_msg.chat_id).await?.len(), 2);

        let bob_reaction_msg = bob.pop_sent_msg().await;
@@ -656,7 +610,6 @@ Here's my footer -- bob@example.net"
        assert_eq!(bob_reaction.as_str(), "👍");
        expect_reactions_changed_event(&alice, chat_alice.id, alice_msg.sender_msg_id, *bob_id)
            .await?;
-        expect_incoming_reactions_event(&alice, alice_msg.sender_msg_id, *bob_id, "👍").await?;

        // Alice reacts to own message.
        send_reaction(&alice, alice_msg.sender_msg_id, "👍 😀")
@@ -697,7 +650,6 @@ Here's my footer -- bob@example.net"
        send_reaction(&bob, bob_msg1.id, "👍").await?;
        let bob_send_reaction = bob.pop_sent_msg().await;
        alice.recv_msg_trash(&bob_send_reaction).await;
-        assert!(has_incoming_reactions_event(&alice).await);

        let chatlist = Chatlist::try_load(&bob, 0, None, None).await?;
        let summary = chatlist.get_summary(&bob, 0, None).await?;
@@ -713,7 +665,6 @@ Here's my footer -- bob@example.net"
        send_reaction(&alice, alice_msg1.sender_msg_id, "🍿").await?;
        let alice_send_reaction = alice.pop_sent_msg().await;
        bob.recv_msg_opt(&alice_send_reaction).await;
-        assert!(!has_incoming_reactions_event(&bob).await);

        assert_summary(&alice, "You reacted 🍿 to \"Party?\"").await;
        assert_summary(&bob, "ALICE reacted 🍿 to \"Party?\"").await;
@@ -1014,7 +1014,10 @@ async fn add_parts(
            }
        }

-        state = if seen
+        state = if replace_msg_id.is_some() {
+            // TODO a comment explaining why we're doing this would be nice
+            MessageState::InNoticed
+        } else if seen
            || fetching_existing_messages
            || is_mdn
            || is_reaction
@@ -1255,13 +1258,11 @@ async fn add_parts(

    let in_fresh = state == MessageState::InFresh;
    let sort_to_bottom = false;
-    let received = true;
    let sort_timestamp = chat_id
        .calc_sort_timestamp(
            context,
            mime_parser.timestamp_sent,
            sort_to_bottom,
-            received,
            mime_parser.incoming,
        )
        .await?;
@@ -1442,59 +1443,24 @@ async fn add_parts(
    }

    if let Some(node_addr) = mime_parser.get_header(HeaderDef::IrohNodeAddr) {
-        chat_id = DC_CHAT_ID_TRASH;
        match serde_json::from_str::<NodeAddr>(node_addr).context("Failed to parse node address") {
            Ok(node_addr) => {
                info!(context, "Adding iroh peer with address {node_addr:?}.");
-                match mime_parser.get_header(HeaderDef::InReplyTo) {
-                    Some(in_reply_to) => match rfc724_mid_exists(context, in_reply_to).await? {
-                        Some((instance_id, _ts_sent)) => {
-                            context.emit_event(EventType::WebxdcRealtimeAdvertisementReceived {
-                                msg_id: instance_id,
-                            });
-                            if let Some(topic) =
-                                get_iroh_topic_for_msg(context, instance_id).await?
-                            {
-                                let node_id = node_addr.node_id;
-                                let relay_server =
-                                    node_addr.relay_url().map(|relay| relay.as_str());
-                                iroh_add_peer_for_topic(
-                                    context,
-                                    instance_id,
-                                    topic,
-                                    node_id,
-                                    relay_server,
-                                )
-                                .await?;
-                                if context
-                                    .get_config_bool(Config::WebxdcRealtimeEnabled)
-                                    .await?
-                                {
-                                    let iroh = context.get_or_try_init_peer_channel().await?;
-                                    iroh.maybe_add_gossip_peers(topic, vec![node_addr]).await?;
-                                }
-                                info!(context, "Added iroh peer to the topic of {instance_id}.");
-                            } else {
-                                warn!(
-                                    context,
-                                    "Could not add iroh peer because {instance_id} has no topic."
-                                );
-                            }
-                        }
-                        None => {
-                            warn!(
-                                context,
-                                "Cannot add iroh peer because WebXDC instance does not exist."
-                            );
-                        }
-                    },
-                    None => {
-                        warn!(
-                            context,
-                            "Cannot add iroh peer because the message has no In-Reply-To."
-                        );
-                    }
+                let instance_id = parent.context("Failed to get parent message")?.id;
+                if let Some(topic) = get_iroh_topic_for_msg(context, instance_id).await? {
+                    let node_id = node_addr.node_id;
+                    let relay_server = node_addr.relay_url().map(|relay| relay.as_str());
+                    iroh_add_peer_for_topic(context, instance_id, topic, node_id, relay_server)
+                        .await?;
+                    let iroh = context.get_or_try_init_peer_channel().await?;
+                    iroh.maybe_add_gossip_peers(topic, vec![node_addr]).await?;
+                } else {
+                    warn!(
+                        context,
+                        "Could not add iroh peer because {instance_id} has no topic"
+                    );
                }
+                chat_id = DC_CHAT_ID_TRASH;
            }
            Err(err) => {
                warn!(context, "Couldn't parse NodeAddr: {err:#}.");
@@ -1505,7 +1471,6 @@ async fn add_parts(
    for part in &mime_parser.parts {
        if part.is_reaction {
            let reaction_str = simplify::remove_footers(part.msg.as_str());
-            let is_incoming_fresh = mime_parser.incoming && !seen && !fetching_existing_messages;
            set_msg_reaction(
                context,
                mime_in_reply_to,
@@ -1513,7 +1478,6 @@ async fn add_parts(
                from_id,
                sort_timestamp,
                Reaction::from(reaction_str.as_str()),
-                is_incoming_fresh,
            )
            .await?;
        }
@@ -1601,7 +1565,7 @@ INSERT INTO msgs
 ON CONFLICT (id) DO UPDATE
 SET rfc724_mid=excluded.rfc724_mid, chat_id=excluded.chat_id,
    from_id=excluded.from_id, to_id=excluded.to_id, timestamp_sent=excluded.timestamp_sent,
-    type=excluded.type, msgrmsg=excluded.msgrmsg,
+    type=excluded.type, state=min(state,excluded.state), msgrmsg=excluded.msgrmsg,
    txt=excluded.txt, txt_normalized=excluded.txt_normalized, subject=excluded.subject,
    txt_raw=excluded.txt_raw, param=excluded.param,
    hidden=excluded.hidden,bytes=excluded.bytes, mime_headers=excluded.mime_headers,
@@ -1652,7 +1616,7 @@ RETURNING id
                    } else {
                        DownloadState::Done
                    },
-                    mime_parser.hop_info
+                    mime_parser.hop_info,
                ],
                |row| {
                    let msg_id: MsgId = row.get(0)?;
@@ -4811,36 +4811,6 @@ async fn test_protected_group_add_remove_member_missing_key() -> Result<()> {
    Ok(())
 }

-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_older_message_from_2nd_device() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice = &tcm.alice().await;
-    let chat_id = alice
-        .create_chat_with_contact("", "bob@example.net")
-        .await
-        .id;
-    alice.send_text(chat_id, "We share this account").await;
-    let received = receive_imf(
-        alice,
-        b"From: alice@example.org\n\
-          To: bob@example.net\n\
-          Message-ID: <1234-2-4@example.org>\n\
-          Date: Sat, 07 Dec 1970 19:00:26 +0000\n\
-          \n\
-          I'm Alice too\n",
-        true,
-    )
-    .await?
-    .unwrap();
-    alice
-        .golden_test_chat(
-            received.chat_id,
-            "receive_imf_older_message_from_2nd_device",
-        )
-        .await;
-    Ok(())
-}
-
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_dont_create_adhoc_group_on_member_removal() -> Result<()> {
    let mut tcm = TestContextManager::new();
@@ -1,13 +1,13 @@
 //! Implementation of [SecureJoin protocols](https://securejoin.delta.chat/).

-use anyhow::{ensure, Context as _, Error, Result};
-use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
+use anyhow::{bail, ensure, Context as _, Error, Result};
+use percent_encoding::{utf8_percent_encode, AsciiSet, NON_ALPHANUMERIC};

 use crate::aheader::EncryptPreference;
 use crate::chat::{self, get_chat_id_by_grpid, Chat, ChatId, ChatIdBlocked, ProtectionStatus};
 use crate::chatlist_events;
 use crate::config::Config;
-use crate::constants::{Blocked, Chattype, NON_ALPHANUMERIC_WITHOUT_DOT};
+use crate::constants::{Blocked, Chattype};
 use crate::contact::{Contact, ContactId, Origin};
 use crate::context::Context;
 use crate::e2ee::ensure_secret_key_exists;
@@ -34,6 +34,9 @@ use qrinvite::QrInvite;

 use crate::token::Namespace;

+/// Set of characters to percent-encode in email addresses and names.
+pub const NON_ALPHANUMERIC_WITHOUT_DOT: &AsciiSet = &NON_ALPHANUMERIC.remove(b'.');
+
 fn inviter_progress(context: &Context, contact_id: ContactId, progress: usize) {
    debug_assert!(
        progress <= 1000,
@@ -86,7 +89,12 @@ pub async fn get_securejoin_qr(context: &Context, group: Option<ChatId>) -> Resu
        .await?
        .unwrap_or_default();

-    let fingerprint = get_self_fingerprint(context).await?;
+    let fingerprint: Fingerprint = match get_self_fingerprint(context).await {
+        Some(fp) => fp,
+        None => {
+            bail!("No fingerprint, cannot generate QR code.");
+        }
+    };

    let self_addr_urlencoded =
        utf8_percent_encode(&self_addr, NON_ALPHANUMERIC_WITHOUT_DOT).to_string();
@@ -132,11 +140,14 @@ pub async fn get_securejoin_qr(context: &Context, group: Option<ChatId>) -> Resu
    Ok(qr)
 }

-async fn get_self_fingerprint(context: &Context) -> Result<Fingerprint> {
-    let key = load_self_public_key(context)
-        .await
-        .context("Failed to load key")?;
-    Ok(key.fingerprint())
+async fn get_self_fingerprint(context: &Context) -> Option<Fingerprint> {
+    match load_self_public_key(context).await {
+        Ok(key) => Some(key.fingerprint()),
+        Err(_) => {
+            warn!(context, "get_self_fingerprint(): failed to load key");
+            None
+        }
+    }
 }

 /// Take a scanned QR-code and do the setup-contact/join-group/invite handshake.
@@ -377,7 +388,7 @@ pub(crate) async fn handle_securejoin_handshake(
                return Ok(HandshakeMessage::Ignore);
            };
            let fingerprint: Fingerprint = fp.parse()?;
-            if !encrypted_and_signed(context, mime_message, &fingerprint) {
+            if !encrypted_and_signed(context, mime_message, Some(&fingerprint)) {
                warn!(
                    context,
                    "Ignoring {step} message because the message is not encrypted."
@@ -566,7 +577,11 @@ pub(crate) async fn observe_securejoin_on_other_device(
        return Ok(HandshakeMessage::Ignore);
    };

-    if !encrypted_and_signed(context, mime_message, &get_self_fingerprint(context).await?) {
+    if !encrypted_and_signed(
+        context,
+        mime_message,
+        get_self_fingerprint(context).await.as_ref(),
+    ) {
        could_not_establish_secure_connection(
            context,
            contact_id,
@@ -725,19 +740,24 @@ async fn mark_peer_as_verified(
 fn encrypted_and_signed(
    context: &Context,
    mimeparser: &MimeMessage,
-    expected_fingerprint: &Fingerprint,
+    expected_fingerprint: Option<&Fingerprint>,
 ) -> bool {
    if !mimeparser.was_encrypted() {
        warn!(context, "Message not encrypted.",);
        false
-    } else if !mimeparser.signatures.contains(expected_fingerprint) {
-        warn!(
-            context,
-            "Message does not match expected fingerprint {}.", expected_fingerprint,
-        );
-        false
+    } else if let Some(expected_fingerprint) = expected_fingerprint {
+        if !mimeparser.signatures.contains(expected_fingerprint) {
+            warn!(
+                context,
+                "Message does not match expected fingerprint {}.", expected_fingerprint,
+            );
+            false
+        } else {
+            true
+        }
    } else {
-        true
+        warn!(context, "Fingerprint for comparison missing.");
+        false
    }
 }

@@ -73,9 +73,8 @@ pub(super) async fn start_protocol(context: &Context, invite: QrInvite) -> Resul
            // Calculate the sort timestamp before checking the chat protection status so that if we
            // race with its change, we don't add our message below the protection message.
            let sort_to_bottom = true;
-            let (received, incoming) = (false, false);
            let ts_sort = chat_id
-                .calc_sort_timestamp(context, 0, sort_to_bottom, received, incoming)
+                .calc_sort_timestamp(context, 0, sort_to_bottom, false)
                .await?;
            if chat_id.is_protected(context).await? == ProtectionStatus::Unprotected {
                let ts_start = time();
@@ -270,7 +270,7 @@ impl BobState {
            context,
            "Bob Step 4 - handling {{vc,vg}}-auth-required message."
        );
-        if !encrypted_and_signed(context, mime_message, self.invite.fingerprint()) {
+        if !encrypted_and_signed(context, mime_message, Some(self.invite.fingerprint())) {
            let reason = if mime_message.was_encrypted() {
                "Valid signature missing"
            } else {
@@ -168,7 +168,6 @@ async fn connect_stream(
                connect_insecure_proxy(context, host, port, proxy_config.clone()).await?
            }
        };
-        update_connection_history(context, "smtp", host, port, host, time()).await?;
        Ok(stream)
    } else {
        let load_cache = match security {
@@ -5,7 +5,7 @@ use std::path::{Path, PathBuf};

 use anyhow::{bail, Context as _, Result};
 use rusqlite::{config::DbConfig, types::ValueRef, Connection, OpenFlags, Row};
-use tokio::sync::RwLock;
+use tokio::sync::{Mutex, MutexGuard, RwLock};

 use crate::blob::BlobObject;
 use crate::chat::{self, add_device_msg, update_device_icon, update_saved_messages_icon};
@@ -60,6 +60,11 @@ pub struct Sql {
    /// Database file path
    pub(crate) dbfile: PathBuf,

+    /// Write transactions mutex.
+    ///
+    /// See [`Self::write_lock`].
+    write_mtx: Mutex<()>,
+
    /// SQL connection pool.
    pool: RwLock<Option<Pool>>,

@@ -76,6 +81,7 @@ impl Sql {
    pub fn new(dbfile: PathBuf) -> Sql {
        Self {
            dbfile,
+            write_mtx: Mutex::new(()),
            pool: Default::default(),
            is_encrypted: Default::default(),
            config_cache: Default::default(),
@@ -141,8 +147,7 @@ impl Sql {
        let mut config_cache = self.config_cache.write().await;
        config_cache.clear();

-        let query_only = false;
-        self.call(query_only, move |conn| {
+        self.call_write(move |conn| {
            // Check that backup passphrase is correct before resetting our database.
            conn.execute("ATTACH DATABASE ? AS backup KEY ?", (path_str, passphrase))
                .context("failed to attach backup database")?;
@@ -320,8 +325,7 @@ impl Sql {
        let mut lock = self.pool.write().await;

        let pool = lock.take().context("SQL connection pool is not open")?;
-        let query_only = false;
-        let conn = pool.get(query_only).await?;
+        let conn = pool.get().await?;
        if !passphrase.is_empty() {
            conn.pragma_update(None, "rekey", passphrase.clone())
                .context("Failed to set PRAGMA rekey")?;
@@ -333,20 +337,59 @@ impl Sql {
        Ok(())
    }

-    /// Allocates a connection and calls `function` with the connection.
+    /// Locks the write transactions mutex in order to make sure that there never are
+    /// multiple write transactions at once.
    ///
-    /// If `query_only` is true, allocates read-only connection,
-    /// otherwise allocates write connection.
+    /// Doing the locking ourselves instead of relying on SQLite has these reasons:
+    ///
+    /// - SQLite's locking mechanism is non-async, blocking a thread
+    /// - SQLite's locking mechanism just sleeps in a loop, which is really inefficient
+    ///
+    /// ---
+    ///
+    /// More considerations on alternatives to the current approach:
+    ///
+    /// We use [DEFERRED](https://www.sqlite.org/lang_transaction.html#deferred_immediate_and_exclusive_transactions) transactions.
+    ///
+    /// In order to never get concurrency issues, we could make all transactions IMMEDIATE,
+    /// but this would mean that there can never be two simultaneous transactions.
+    ///
+    /// Read transactions can simply be made DEFERRED to run in parallel w/o any drawbacks.
+    ///
+    /// DEFERRED write transactions without doing the locking ourselves would have these drawbacks:
+    ///
+    /// 1. As mentioned above, SQLite's locking mechanism is non-async and sleeps in a loop.
+    /// 2. If there are other write transactions, we block the db connection until
+    ///    upgraded. If some reader comes then, it has to get the next, less used connection with a
+    ///    worse per-connection page cache (SQLite allows one write and any number of reads in parallel).
+    /// 3. If a transaction is blocked for more than `busy_timeout`, it fails with SQLITE_BUSY.
+    /// 4. If upon a successful upgrade to a write transaction the db has been modified,
+    ///    the transaction has to be rolled back and retried, which means extra work in terms of
+    ///    CPU/battery.
+    ///
+    /// The only pro of making write transactions DEFERRED w/o the external locking would be some
+    /// parallelism between them.
+    ///
+    /// Another option would be to make write transactions IMMEDIATE, also
+    /// w/o the external locking. But then cons 1. - 3. above would still be valid.
+    pub async fn write_lock(&self) -> MutexGuard<'_, ()> {
+        self.write_mtx.lock().await
+    }
+
+    /// Allocates a connection and calls `function` with the connection. If `function` does write
+    /// queries,
+    /// - either first take a lock using `write_lock()`
+    /// - or use `call_write()` instead.
    ///
    /// Returns the result of the function.
-    async fn call<'a, F, R>(&'a self, query_only: bool, function: F) -> Result<R>
+    async fn call<'a, F, R>(&'a self, function: F) -> Result<R>
    where
        F: 'a + FnOnce(&mut Connection) -> Result<R> + Send,
        R: Send + 'static,
    {
        let lock = self.pool.read().await;
        let pool = lock.as_ref().context("no SQL connection")?;
-        let mut conn = pool.get(query_only).await?;
+        let mut conn = pool.get().await?;
        let res = tokio::task::block_in_place(move || function(&mut conn))?;
        Ok(res)
    }
@@ -360,8 +403,8 @@ impl Sql {
        F: 'a + FnOnce(&mut Connection) -> Result<R> + Send,
        R: Send + 'static,
    {
-        let query_only = false;
-        self.call(query_only, function).await
+        let _lock = self.write_lock().await;
+        self.call(function).await
    }

    /// Execute `query` assuming it is a write query, returning the number of affected rows.
@@ -401,8 +444,7 @@ impl Sql {
        G: Send + FnMut(rusqlite::MappedRows<F>) -> Result<H>,
        H: Send + 'static,
    {
-        let query_only = true;
-        self.call(query_only, move |conn| {
+        self.call(move |conn| {
            let mut stmt = conn.prepare(sql)?;
            let res = stmt.query_map(params, f)?;
            g(res)
@@ -434,8 +476,7 @@ impl Sql {
        F: FnOnce(&rusqlite::Row) -> rusqlite::Result<T> + Send,
        T: Send + 'static,
    {
-        let query_only = true;
-        self.call(query_only, move |conn| {
+        self.call(move |conn| {
            let res = conn.query_row(query, params, f)?;
            Ok(res)
        })
@@ -471,8 +512,7 @@ impl Sql {

    /// Query the database if the requested table already exists.
    pub async fn table_exists(&self, name: &str) -> Result<bool> {
-        let query_only = true;
-        self.call(query_only, move |conn| {
+        self.call(move |conn| {
            let mut exists = false;
            conn.pragma(None, "table_info", name.to_string(), |_row| {
                // will only be executed if the info was found
@@ -487,8 +527,7 @@ impl Sql {

    /// Check if a column exists in a given table.
    pub async fn col_exists(&self, table_name: &str, col_name: &str) -> Result<bool> {
-        let query_only = true;
-        self.call(query_only, move |conn| {
+        self.call(move |conn| {
            let mut exists = false;
            // `PRAGMA table_info` returns one row per column,
            // each row containing 0=cid, 1=name, 2=type, 3=notnull, 4=dflt_value
@@ -516,13 +555,10 @@ impl Sql {
        F: Send + FnOnce(&rusqlite::Row) -> rusqlite::Result<T>,
        T: Send + 'static,
    {
-        let query_only = true;
-        self.call(query_only, move |conn| {
-            match conn.query_row(sql.as_ref(), params, f) {
-                Ok(res) => Ok(Some(res)),
-                Err(rusqlite::Error::QueryReturnedNoRows) => Ok(None),
-                Err(err) => Err(err.into()),
-            }
+        self.call(move |conn| match conn.query_row(sql.as_ref(), params, f) {
+            Ok(res) => Ok(Some(res)),
+            Err(rusqlite::Error::QueryReturnedNoRows) => Ok(None),
+            Err(err) => Err(err.into()),
        })
        .await
    }
@@ -681,36 +717,6 @@ fn new_connection(path: &Path, passphrase: &str) -> Result<Connection> {
    Ok(conn)
 }

-// Tries to clear the freelist to free some space on the disk.
-//
-// This only works if auto_vacuum is enabled.
-async fn incremental_vacuum(context: &Context) -> Result<()> {
-    context
-        .sql
-        .call_write(move |conn| {
-            let mut stmt = conn
-                .prepare("PRAGMA incremental_vacuum")
-                .context("Failed to prepare incremental_vacuum statement")?;
-
-            // It is important to step the statement until it returns no more rows.
-            // Otherwise it will not free as many pages as it can:
-            // <https://stackoverflow.com/questions/53746807/sqlite-incremental-vacuum-removing-only-one-free-page>.
-            let mut rows = stmt
-                .query(())
-                .context("Failed to run incremental_vacuum statement")?;
-            let mut row_count = 0;
-            while let Some(_row) = rows
-                .next()
-                .context("Failed to step incremental_vacuum statement")?
-            {
-                row_count += 1;
-            }
-            info!(context, "Incremental vacuum freed {row_count} pages.");
-            Ok(())
-        })
-        .await
-}
-
 /// Cleanup the account to restore some storage and optimize the database.
 pub async fn housekeeping(context: &Context) -> Result<()> {
    // Setting `Config::LastHousekeeping` at the beginning avoids endless loops when things do not
@@ -743,8 +749,24 @@ pub async fn housekeeping(context: &Context) -> Result<()> {
        );
    }

-    if let Err(err) = incremental_vacuum(context).await {
-        warn!(context, "Failed to run incremental vacuum: {err:#}.");
+    // Try to clear the freelist to free some space on the disk. This
+    // only works if auto_vacuum is enabled.
+    match context
+        .sql
+        .query_row_optional("PRAGMA incremental_vacuum", (), |_row| Ok(()))
+        .await
+    {
+        Err(err) => {
+            warn!(context, "Failed to run incremental vacuum: {err:#}.");
+        }
+        Ok(Some(())) => {
+            // Incremental vacuum returns a zero-column result if it did anything.
+            info!(context, "Successfully ran incremental vacuum.");
+        }
+        Ok(None) => {
+            // Incremental vacuum returned `SQLITE_DONE` immediately,
+            // there were no pages to remove.
+        }
    }

    context
@@ -1070,10 +1092,9 @@ mod tests {
    async fn test_auto_vacuum() -> Result<()> {
        let t = TestContext::new().await;

-        let query_only = true;
        let auto_vacuum = t
            .sql
-            .call(query_only, |conn| {
+            .call(|conn| {
                let auto_vacuum = conn.pragma_query_value(None, "auto_vacuum", |row| {
                    let auto_vacuum: i32 = row.get(0)?;
                    Ok(auto_vacuum)
@@ -1299,9 +1320,8 @@ mod tests {
        {
            let lock = sql.pool.read().await;
            let pool = lock.as_ref().unwrap();
-            let query_only = true;
-            let conn1 = pool.get(query_only).await?;
-            let conn2 = pool.get(query_only).await?;
+            let conn1 = pool.get().await?;
+            let conn2 = pool.get().await?;
            conn1
                .query_row("SELECT count(*) FROM sqlite_master", [], |_row| Ok(()))
                .unwrap();
@@ -1326,72 +1346,4 @@ mod tests {

        Ok(())
    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_query_only() -> Result<()> {
-        let t = TestContext::new().await;
-
-        // `query_row` does not acquire write lock
-        // and operates on read-only connection.
-        // Using it to `INSERT` should fail.
-        let res = t
-            .sql
-            .query_row(
-                "INSERT INTO config (keyname, value) VALUES (?, ?) RETURNING 1",
-                ("xyz", "ijk"),
-                |row| {
-                    let res: u32 = row.get(0)?;
-                    Ok(res)
-                },
-            )
-            .await;
-        assert!(res.is_err());
-
-        // If you want to `INSERT` and get value via `RETURNING`,
-        // use `call_write` or `transaction`.
-
-        let res: Result<u32> = t
-            .sql
-            .call_write(|conn| {
-                let val = conn.query_row(
-                    "INSERT INTO config (keyname, value) VALUES (?, ?) RETURNING 2",
-                    ("foo", "bar"),
-                    |row| {
-                        let res: u32 = row.get(0)?;
-                        Ok(res)
-                    },
-                )?;
-                Ok(val)
-            })
-            .await;
-        assert_eq!(res.unwrap(), 2);
-
-        let res = t
-            .sql
-            .transaction(|t| {
-                let val = t.query_row(
-                    "INSERT INTO config (keyname, value) VALUES (?, ?) RETURNING 3",
-                    ("abc", "def"),
-                    |row| {
-                        let res: u32 = row.get(0)?;
-                        Ok(res)
-                    },
-                )?;
-                Ok(val)
-            })
-            .await;
-        assert_eq!(res.unwrap(), 3);
-
-        Ok(())
-    }
-
-    /// Tests that incremental_vacuum does not fail.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_incremental_vacuum() -> Result<()> {
-        let t = TestContext::new().await;
-
-        incremental_vacuum(&t).await?;
-
-        Ok(())
-    }
 }
@@ -1046,30 +1046,6 @@ CREATE INDEX msgs_status_updates_index2 ON msgs_status_updates (uid);
        .await?;
    }

-    inc_and_check(&mut migration_version, 123)?;
-    if dbversion < migration_version {
-        // Add FOREIGN KEY(msg_id).
-        sql.execute_migration(
-            "CREATE TABLE new_msgs_status_updates (
-                id INTEGER PRIMARY KEY AUTOINCREMENT,
-                msg_id INTEGER,
-                update_item TEXT DEFAULT '',
-                uid TEXT UNIQUE,
-                FOREIGN KEY(msg_id) REFERENCES msgs(id) ON DELETE CASCADE
-            );
-            INSERT OR IGNORE INTO new_msgs_status_updates SELECT
-                id, msg_id, update_item, uid
-            FROM msgs_status_updates;
-            DROP TABLE msgs_status_updates;
-            ALTER TABLE new_msgs_status_updates RENAME TO msgs_status_updates;
-            CREATE INDEX msgs_status_updates_index1 ON msgs_status_updates (msg_id);
-            CREATE INDEX msgs_status_updates_index2 ON msgs_status_updates (uid);
-            ",
-            migration_version,
-        )
-        .await?;
-    }
-
    let new_version = sql
        .get_raw_config_int(VERSION_CFG)
        .await?
@@ -7,67 +7,23 @@
 //! Each SQLite connection has its own page cache, so allocating recently used connections
 //! improves the performance compared to, for example, organizing the pool as a queue
 //! and returning the least recently used connection each time.
-//!
-//! Pool returns at most one write connection (with `PRAGMA query_only=0`).
-//! This ensures that there never are multiple write transactions at once.
-//!
-//! Doing the locking ourselves instead of relying on SQLite has these reasons:
-//!
-//! - SQLite's locking mechanism is non-async, blocking a thread
-//! - SQLite's locking mechanism just sleeps in a loop, which is really inefficient
-//!
-//! ---
-//!
-//! More considerations on alternatives to the current approach:
-//!
-//! We use [DEFERRED](https://www.sqlite.org/lang_transaction.html#deferred_immediate_and_exclusive_transactions) transactions.
-//!
-//! In order to never get concurrency issues, we could make all transactions IMMEDIATE,
-//! but this would mean that there can never be two simultaneous transactions.
-//!
-//! Read transactions can simply be made DEFERRED to run in parallel w/o any drawbacks.
-//!
-//! DEFERRED write transactions without doing the locking ourselves would have these drawbacks:
-//!
-//! 1. As mentioned above, SQLite's locking mechanism is non-async and sleeps in a loop.
-//! 2. If there are other write transactions, we block the db connection until
-//!    upgraded. If some reader comes then, it has to get the next, less used connection with a
-//!    worse per-connection page cache (SQLite allows one write and any number of reads in parallel).
-//! 3. If a transaction is blocked for more than `busy_timeout`, it fails with SQLITE_BUSY.
-//! 4. If upon a successful upgrade to a write transaction the db has been modified,
-//!    the transaction has to be rolled back and retried, which means extra work in terms of
-//!    CPU/battery.
-//!
-//! The only pro of making write transactions DEFERRED w/o the external locking would be some
-//! parallelism between them.
-//!
-//! Another option would be to make write transactions IMMEDIATE, also
-//! w/o the external locking. But then cons 1. - 3. above would still be valid.

 use std::ops::{Deref, DerefMut};
 use std::sync::{Arc, Weak};

 use anyhow::{Context, Result};
+use parking_lot::Mutex;
 use rusqlite::Connection;
-use tokio::sync::{Mutex, OwnedMutexGuard, OwnedSemaphorePermit, Semaphore};
+use tokio::sync::{OwnedSemaphorePermit, Semaphore};

 /// Inner connection pool.
 #[derive(Debug)]
 struct InnerPool {
    /// Available connections.
-    connections: parking_lot::Mutex<Vec<Connection>>,
+    connections: Mutex<Vec<Connection>>,

    /// Counts the number of available connections.
    semaphore: Arc<Semaphore>,
-
-    /// Write mutex.
-    ///
-    /// This mutex ensures there is at most
-    /// one write connection with `query_only=0`.
-    ///
-    /// This mutex is locked when write connection
-    /// is outside the pool.
-    write_mutex: Arc<Mutex<()>>,
 }

 impl InnerPool {
@@ -79,56 +35,6 @@ impl InnerPool {
        connections.push(connection);
        drop(connections);
    }
-
-    /// Retrieves a connection from the pool.
-    ///
-    /// Sets `query_only` pragma to the provided value
-    /// to prevent accidentaly misuse of connection
-    /// for writing when reading is intended.
-    /// Only pass `query_only=false` if you want
-    /// to use the connection for writing.
-    pub async fn get(self: Arc<Self>, query_only: bool) -> Result<PooledConnection> {
-        if query_only {
-            let permit = self.semaphore.clone().acquire_owned().await?;
-            let conn = {
-                let mut connections = self.connections.lock();
-                connections
-                    .pop()
-                    .context("Got a permit when there are no connections in the pool")?
-            };
-            conn.pragma_update(None, "query_only", "1")?;
-            let conn = PooledConnection {
-                pool: Arc::downgrade(&self),
-                conn: Some(conn),
-                _permit: permit,
-                _write_mutex_guard: None,
-            };
-            Ok(conn)
-        } else {
-            // We get write guard first to avoid taking a permit
-            // and not using it, blocking a reader from getting a connection
-            // while being ourselves blocked by another wrtier.
-            let write_mutex_guard = Arc::clone(&self.write_mutex).lock_owned().await;
-
-            // We may still have to wait for a connection
-            // to be returned by some reader.
-            let permit = self.semaphore.clone().acquire_owned().await?;
-            let conn = {
-                let mut connections = self.connections.lock();
-                connections.pop().context(
-                    "Got a permit and write lock when there are no connections in the pool",
-                )?
-            };
-            conn.pragma_update(None, "query_only", "0")?;
-            let conn = PooledConnection {
-                pool: Arc::downgrade(&self),
-                conn: Some(conn),
-                _permit: permit,
-                _write_mutex_guard: Some(write_mutex_guard),
-            };
-            Ok(conn)
-        }
-    }
 }

 /// Pooled connection.
@@ -141,11 +47,6 @@ pub struct PooledConnection {

    /// Semaphore permit, dropped after returning the connection to the pool.
    _permit: OwnedSemaphorePermit,
-
-    /// Write mutex guard.
-    ///
-    /// `None` for read-only connections with `PRAGMA query_only=1`.
-    _write_mutex_guard: Option<OwnedMutexGuard<()>>,
 }

 impl Drop for PooledConnection {
@@ -185,14 +86,24 @@ impl Pool {
    pub fn new(connections: Vec<Connection>) -> Self {
        let semaphore = Arc::new(Semaphore::new(connections.len()));
        let inner = Arc::new(InnerPool {
-            connections: parking_lot::Mutex::new(connections),
+            connections: Mutex::new(connections),
            semaphore,
-            write_mutex: Default::default(),
        });
        Pool { inner }
    }

-    pub async fn get(&self, query_only: bool) -> Result<PooledConnection> {
-        Arc::clone(&self.inner).get(query_only).await
+    /// Retrieves a connection from the pool.
+    pub async fn get(&self) -> Result<PooledConnection> {
+        let permit = self.inner.semaphore.clone().acquire_owned().await?;
+        let mut connections = self.inner.connections.lock();
+        let conn = connections
+            .pop()
+            .context("got a permit when there are no connections in the pool")?;
+        let conn = PooledConnection {
+            pool: Arc::downgrade(&self.inner),
+            conn: Some(conn),
+            _permit: permit,
+        };
+        Ok(conn)
    }
 }
@@ -1106,24 +1106,6 @@ impl EventTracker {
        .expect("timeout waiting for event match")
    }

-    /// Consumes emitted events returning the first matching one if any.
-    pub async fn get_matching_opt<F: Fn(&EventType) -> bool>(
-        &self,
-        ctx: &Context,
-        event_matcher: F,
-    ) -> Option<EventType> {
-        ctx.emit_event(EventType::Test);
-        loop {
-            let event = self.recv().await.unwrap();
-            if event_matcher(&event.typ) {
-                return Some(event.typ);
-            }
-            if let EventType::Test = event.typ {
-                return None;
-            }
-        }
-    }
-
    /// Consumes events looking for an [`EventType::Info`] with substring matching.
    pub async fn get_info_contains(&self, s: &str) -> EventType {
        self.get_matching(|evt| match evt {
@@ -730,46 +730,6 @@ async fn test_break_protection_then_verify_again() -> Result<()> {
    Ok(())
 }

-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_message_from_old_dc_setup() -> Result<()> {
-    let mut tcm = TestContextManager::new();
-    let alice = &tcm.alice().await;
-    let bob_old = &tcm.unconfigured().await;
-    enable_verified_oneonone_chats(&[alice, bob_old]).await;
-    mark_as_verified(bob_old, alice).await;
-    bob_old.configure_addr("bob@example.net").await;
-    let chat = bob_old.create_chat(alice).await;
-    let sent_old = bob_old
-        .send_text(chat.id, "Soon i'll have a new device")
-        .await;
-    SystemTime::shift(std::time::Duration::from_secs(3600));
-
-    tcm.section("Bob reinstalls DC");
-    let bob = &tcm.bob().await;
-    enable_verified_oneonone_chats(&[bob]).await;
-
-    mark_as_verified(alice, bob).await;
-    mark_as_verified(bob, alice).await;
-
-    tcm.send_recv(bob, alice, "Now i have it!").await;
-    assert_verified(alice, bob, ProtectionStatus::Protected).await;
-
-    let msg = alice.recv_msg(&sent_old).await;
-    assert!(!msg.get_showpadlock());
-    let contact = alice.add_or_lookup_contact(bob).await;
-    // The outdated Bob's Autocrypt header isn't applied, so the verification preserves.
-    assert!(contact.is_verified(alice).await.unwrap());
-    let chat = alice.get_chat(bob).await;
-    // But the chat protection is broken because the old message is sorted to the bottom as it
-    // mustn't be sorted over the protection info message (which is `InNoticed` moreover).
-    assert_eq!(chat.is_protected(), false);
-    assert_eq!(chat.is_protection_broken(), true);
-    alice
-        .golden_test_chat(msg.chat_id, "verified_chats_message_from_old_dc_setup")
-        .await;
-    Ok(())
-}
-
 /// Regression test for the following bug:
 ///
 /// - Scan your chat partner's QR Code
@@ -17,7 +17,7 @@
 use std::cmp::{max, min};
 use std::sync::atomic::{AtomicI64, Ordering};

-pub(crate) const MAX_SECONDS_TO_LEND_FROM_FUTURE: i64 = 30;
+pub(crate) const MAX_SECONDS_TO_LEND_FROM_FUTURE: i64 = 5;

 /// Smeared timestamp generator.
 #[derive(Debug)]
@@ -157,11 +157,11 @@ mod tests {
        // because there were not enough timestamps in the past.
        assert_eq!(smeared_timestamp.current(), now + 4);

-        // Forward another 32 messages.
-        // We cannot use more than 30 timestamps from the future,
-        // so we use 30 timestamps from the future,
+        // Forward another 7 messages.
+        // We cannot use more than 5 timestamps from the future,
+        // so we use 5 timestamps from the future,
        // the current timestamp and one timestamp from the past.
-        assert_eq!(smeared_timestamp.create_n(now, 32), now - 1);
+        assert_eq!(smeared_timestamp.create_n(now, forwarded_messages), now - 1);
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -1,5 +0,0 @@
-Single#Chat#10: bob@example.net [bob@example.net] 
--------------------------------------------------------------------------------
-Msg#10: Me (Contact#Contact#Self): We share this account  √
-Msg#11: Me (Contact#Contact#Self): I'm Alice too  √
--------------------------------------------------------------------------------
@@ -1,7 +0,0 @@
-Single#Chat#10: bob@example.net [bob@example.net] 
--------------------------------------------------------------------------------
-Msg#10: info (Contact#Contact#Info): Messages are guaranteed to be end-to-end encrypted from now on. [NOTICED][INFO 🛡️]
-Msg#11🔒:  (Contact#Contact#10): Now i have it! [FRESH]
-Msg#12: info (Contact#Contact#Info): bob@example.net sent a message from another device. [NOTICED][INFO 🛡️❌]
-Msg#13:  (Contact#Contact#10): Soon i'll have a new device [FRESH]
--------------------------------------------------------------------------------
@@ -1 +1 @@
 -10-24
 -10-13