Merge branch 'webxdc_delete_event' into webxdc_update_notifications

merge master
method to get busy webxdcs
2026-07-04 22:44:57 +03:00 · 2022-09-11 21:05:36 +02:00 · 2022-09-11 21:04:52 +02:00 · 2022-09-11 20:41:45 +02:00 · 2022-09-11 19:42:45 +02:00 · 2022-09-11 09:39:56 +02:00
408 changed files with 1406 additions and 9087 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,11 +0,0 @@
-[env]
-# In unoptimised builds tokio tends to use a lot of stack space when
-# creating some complicated futures, tokio has an open issue for this:
-# https://github.com/tokio-rs/tokio/issues/2055.  Some of our tests
-# manage to not fit in the default 2MiB stack anymore due to this, so
-# while the issue is not resolved we want to work around this.
-# Because compiling optimised builds takes a very long time we prefer
-# to avoid that.  Setting this environment variable ensures that when
-# invoking `cargo test` threads are allowed to have a large enough
-# stack size without needing to use an optimised build.
-RUST_MIN_STACK = "8388608"
--- a/.github/workflows/jsonrpc-client-npm-package.yml
+++ b/.github/workflows/jsonrpc-client-npm-package.yml
@@ -1,83 +0,0 @@
-name: 'jsonrpc js client build'
-on:
-  pull_request:
-  push:
-    tags:
-    - '*'
-    - '!py-*'
-
-
-jobs:
-  pack-module:
-    name: 'Package @deltachat/jsonrpc-client and upload to download.delta.chat'
-    runs-on: ubuntu-18.04
-    steps:
-      - name: install tree
-        run: sudo apt install tree
-      - name: Checkout
-        uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-      - name: get tag
-        id: tag
-        uses: dawidd6/action-get-tag@v1
-        continue-on-error: true
-      - name: Get Pullrequest ID
-        id: prepare
-        run: |
-          tag=${{ steps.tag.outputs.tag }}
-          if [ -z "$tag" ]; then
-            node -e "console.log('DELTACHAT_JSONRPC_TAR_GZ=deltachat-jsonrpc-client-' + '${{ github.ref }}'.split('/')[2] + '.tar.gz')" >> $GITHUB_ENV
-          else
-            echo "DELTACHAT_JSONRPC_TAR_GZ=deltachat-jsonrpc-client-${{ steps.tag.outputs.tag }}.tar.gz" >> $GITHUB_ENV
-            echo "No preview will be uploaded this time, but the $tag release"
-          fi
-      - name: System info
-        run: |
-          npm --version
-          node --version
-          echo $DELTACHAT_JSONRPC_TAR_GZ
-      - name: install dependencies without running scripts
-        run: |
-          cd deltachat-jsonrpc/typescript
-          npm install --ignore-scripts
-      - name: package
-        shell: bash
-        run: |
-          cd deltachat-jsonrpc/typescript
-          npm run build:tsc
-          npm pack .
-          ls -lah
-          mv $(find deltachat-jsonrpc-client-*) $DELTACHAT_JSONRPC_TAR_GZ
-      - name: Upload Prebuild
-        uses: actions/upload-artifact@v1
-        with:
-          name: deltachat-jsonrpc-client.tgz
-          path: deltachat-jsonrpc/typescript/${{ env.DELTACHAT_JSONRPC_TAR_GZ }}
-      # Upload to download.delta.chat/node/preview/
-      - name: Upload deltachat-jsonrpc-client preview to download.delta.chat/node/preview/
-        if: ${{ ! steps.tag.outputs.tag }}
-        id: upload-preview
-        shell: bash
-        run: |
-          echo -e "${{ secrets.SSH_KEY }}" >__TEMP_INPUT_KEY_FILE
-          chmod 600 __TEMP_INPUT_KEY_FILE
-          scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r deltachat-jsonrpc/typescript/$DELTACHAT_JSONRPC_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/preview/"
-        continue-on-error: true
-      - name: "Post links to details"
-        if: steps.upload-preview.outcome == 'success'
-        run: node ./node/scripts/postLinksToDetails.js
-        env:
-         URL: preview/${{ env.DELTACHAT_JSONRPC_TAR_GZ }}
-         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-         MSG_CONTEXT: Download the deltachat-jsonrpc-client.tgz
-      # Upload to download.delta.chat/node/
-      - name: Upload deltachat-jsonrpc-client build to download.delta.chat/node/
-        if: ${{ steps.tag.outputs.tag }}
-        id: upload
-        shell: bash
-        run: |
-          echo -e "${{ secrets.SSH_KEY }}" >__TEMP_INPUT_KEY_FILE
-          chmod 600 __TEMP_INPUT_KEY_FILE
-          scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r deltachat-jsonrpc/typescript/$DELTACHAT_JSONRPC_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/"
--- a/.github/workflows/jsonrpc.yml
+++ b/.github/workflows/jsonrpc.yml
@@ -8,7 +8,6 @@ on:

 env:
  CARGO_TERM_COLOR: always
-  RUST_MIN_STACK: "8388608"

 jobs:
  build_and_test:
--- a/.github/workflows/node-tests.yml
+++ b/.github/workflows/node-tests.yml
@@ -52,7 +52,6 @@ jobs:
          npm install --verbose

      - name: Test
-        timeout-minutes: 10
        if: runner.os != 'Windows'
        run: |
          cd node
@@ -60,7 +59,6 @@ jobs:
        env:
          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
      - name: Run tests on Windows, except lint
-        timeout-minutes: 10
        if: runner.os == 'Windows'
        run: |
          cd node
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,155 +2,6 @@

 ## Unreleased

-### API-Changes
-
-### Changes
-
-### Fixes
-
-
-## 1.99.0
-
-### API-Changes
- breaking jsonrpc: changed function naming
-  - `autocryptInitiateKeyTransfer` -> `initiateAutocryptKeyTransfer`
-  - `autocryptContinueKeyTransfer` -> `continueAutocryptKeyTransfer`
-  - `chatlistGetFullChatById` -> `getFullChatById`
-  - `messageGetMessage` -> `getMessage`
-  - `messageGetMessages` -> `getMessages`
-  - `messageGetNotificationInfo` -> `getMessageNotificationInfo`
-  - `contactsGetContact` -> `getContact`
-  - `contactsCreateContact` -> `createContact`
-  - `contactsCreateChatByContactId` -> `createChatByContactId`
-  - `contactsBlock` -> `blockContact`
-  - `contactsUnblock` -> `unblockContact`
-  - `contactsGetBlocked` -> `getBlockedContacts`
-  - `contactsGetContactIds` -> `getContactIds`
-  - `contactsGetContacts` -> `getContacts`
-  - `contactsGetContactsByIds` -> `getContactsByIds`
-  - `chatGetMedia` -> `getChatMedia`
-  - `chatGetNeighboringMedia` -> `getNeighboringChatMedia`
-  - `webxdcSendStatusUpdate` -> `sendWebxdcStatusUpdate`
-  - `webxdcGetStatusUpdates` -> `getWebxdcStatusUpdates`
-  - `messageGetWebxdcInfo` -> `getWebxdcInfo`
- jsonrpc: changed method signature
-  - `miscSendTextMessage(accountId, text, chatId)` -> `miscSendTextMessage(accountId, chatId, text)`
- jsonrpc: add `SystemMessageType` to `Message`
- cffi: add missing `DC_INFO_` constants
- Add DC_EVENT_INCOMING_MSG_BUNCH event #3643
- Python bindings: Make get_matching() only match the
-  whole event name, e.g. events.get_matching("DC_EVENT_INCOMING_MSG")
-  won't match DC_EVENT_INCOMING_MSG_BUNCH anymore #3643
-
-
- Rust: Introduce a ContextBuilder #3698
-
-### Changes
- allow sender timestamp to be in the future, but not too much
- Disable the new "Authentication-Results/DKIM checking" security feature
-  until we have tested it a bit #3728
- refactorings #3706
-
-### Fixes
- `dc_search_msgs()` returns unaccepted requests #3694
- emit "contacts changed" event when the contact is no longer "seen recently" #3703
- do not allow peerstate reset if DKIM check failed #3731
-
-
-## 1.98.0
-
-### API-Changes
- jsonrpc: typescript client: export constants under `C` enum, similar to how its exported from `deltachat-node` #3681
- added reactions support #3644
- jsonrpc: reactions: added reactions to `Message` type and the `sendReaction()` method #3686
-
-### Changes
- simplify `UPSERT` queries #3676
-
-### Fixes
-
-
-## 1.97.0
-
-### API-Changes
- jsonrpc: add function: #3641, #3645, #3653
-  - `getChatContacts()`
-  - `createGroupChat()`
-  - `createBroadcastList()`
-  - `setChatName()`
-  - `setChatProfileImage()`
-  - `downloadFullMessage()`
-  - `lookupContactIdByAddr()`
-  - `sendVideochatInvitation()`
-  - `searchMessages()`
-  - `messageIdsToSearchResults()`
-  - `setChatVisibility()`
-  - `getChatEphemeralTimer()`
-  - `setChatEphemeralTimer()`
-  - `getLocations()`
-  - `getAccountFileSize()`
-  - `estimateAutoDeletionCount()`
-  - `setStockStrings()`
-  - `exportSelfKeys()`
-  - `importSelfKeys()`
-  - `sendSticker()`
-  - `changeContactName()`
-  - `deleteContact()`
-  - `joinSecurejoin()`
-  - `stopIoForAllAccounts()`
-  - `startIoForAllAccounts()`
-  - `startIo()`
-  - `stopIo()`
-  - `exportBackup()`
-  - `importBackup()`
-  - `getMessageHtml()` #3671
-  - `miscGetStickerFolder` and `miscGetStickers` #3672
- breaking: jsonrpc: remove function `messageListGetMessageIds()`, it is replaced by `getMessageIds()` and `getMessageListItems()` the latter returns a new `MessageListItem` type, which is the now prefered way of using the message list.
- jsonrpc: add type: #3641, #3645
-  - `MessageSearchResult`
-  - `Location`
- jsonrpc: add `viewType` to quoted message(`MessageQuote` type) in `Message` object type #3651
-
-
-### Changes
- Look at Authentication-Results. Don't accept Autocrypt key changes
-  if they come with negative authentiation results while this contact
-  sent emails with positive authentication results in the past. #3583
- jsonrpc in cffi also sends events now #3662
- jsonrpc: new format for events and better typescript autocompletion
- Join all "[migration] vXX" log messages into one
-
-### Fixes
- share stock string translations across accounts created by the same account manager #3640
- suppress welcome device messages after account import #3642
- fix unix timestamp used for daymarker #3660
-
-## 1.96.0
-
-### Changes
- jsonrpc js client:
-  - Change package name from `deltachat-jsonrpc-client` to `@deltachat/jsonrpc-client`
-  - remove relative file dependency to it from `deltachat-node` (because it did not work anyway and broke the nix build of desktop)
-  - ci: add github ci action to upload it to our download server automaticaly on realease
-
-## 1.95.0
-
-### API-Changes
- jsonrpc: add `mailingListAddress` property to `FullChat` #3607
- jsonrpc: add `MessageNotificationInfo` & `messageGetNotificationInfo()` #3614
- jsonrpc: add `chat_get_neighboring_media` function #3610
-
-### Changes
- added `dclogin:` scheme to allow configuration from a qr code
-  (data inside qrcode, contrary to `dcaccount:` which points to an API to create an account) #3541
- truncate incoming messages by lines instead of just length #3480
- emit separate `DC_EVENT_MSGS_CHANGED` for each expired message,
-  and `DC_EVENT_WEBXDC_INSTANCE_DELETED` when a message contains a webxdc #3605
- enable `bcc_self` by default #3612
-
-
-## 1.94.0
-
 ### API-Changes
 - breaking change: replace `dc_accounts_event_emitter_t` with `dc_event_emitter_t` #3422

@@ -160,7 +11,7 @@
  and `dc_event_emitter_unref()` should be used instead of
  `dc_accounts_event_emitter_unref`.
 - add `dc_contact_was_seen_recently()` #3560
- Fix `get_connectivity_html` and `get_encrinfo` futures not being Send. See rust-lang/rust#101650 for more information
+- Fix get_connectivity_html and get_encrinfo futures not being Send. See rust-lang/rust#101650 for more information
 - jsonrpc: add functions: #3586, #3587, #3590
  - `deleteChat()`
  - `getChatEncryptionInfo()`
@@ -192,15 +43,14 @@
 - jsonrpc: add `last_seen` property to `Contact` #3590
 - breaking! jsonrpc: replace `Message.quoted_text` and `Message.quoted_message_id` with `Message.quote` #3590
 - add separate stock strings for actions done by contacts to make them easier to translate #3518
- `dc_initiate_key_transfer()` is non-blocking now. #3553
-  UIs don't need to display a button to cancel sending Autocrypt Setup Message with
-  `dc_stop_ongoing_process()` anymore.

 ### Changes
 - order contact lists by "last seen";
  this affects `dc_get_chat_contacts()`, `dc_get_contacts()` and `dc_get_blocked_contacts()` #3562
 - add `internet_access` flag to `dc_msg_get_webxdc_info()` #3516
- `DC_EVENT_WEBXDC_INSTANCE_DELETED` is emitted when a message containing a webxdc gets deleted #3592
+- `DC_EVENT_WEBXDC_INSTANCE_DELETED` is emitted when a message containing a webxdc gets deleted #3105
+- `DC_EVENT_WEBXDC_BUSY_UPDATING` is emitted when a new update has to be sent by an webxdc #3320
+- `DC_EVENT_WEBXDC_UP_TO_DATE` is emitted when a webxdc has sent all updates #3320

 ### Fixes
 - do not emit notifications for blocked chats #3557
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -87,9 +87,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.66"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
+checksum = "a26fa4d7e3f2eebadf743988fc8aec9fa9a9e82611acafd77c1462ed6262440a"

 [[package]]
 name = "ascii_utils"
@@ -128,7 +128,7 @@ source = "git+https://github.com/async-email/async-imap?branch=master#8755b666fc
 dependencies = [
 "async-channel",
 "async-native-tls",
- "base64 0.13.1",
+ "base64 0.13.0",
 "byte-pool",
 "chrono",
 "futures",
@@ -172,7 +172,7 @@ checksum = "6da21e1dd19fbad3e095ad519fb1558ab77fd82e5c4778dca8f9be0464589e1e"
 dependencies = [
 "async-native-tls",
 "async-trait",
- "base64 0.13.1",
+ "base64 0.13.0",
 "bufstream",
 "fast-socks5",
 "futures",
@@ -236,13 +236,13 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

 [[package]]
 name = "axum"
-version = "0.5.17"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43"
+checksum = "9de18bc5f2e9df8f52da03856bf40e29b747de5a84e43aefff90e3dc4a21529b"
 dependencies = [
 "async-trait",
 "axum-core",
- "base64 0.13.1",
+ "base64 0.13.0",
 "bitflags",
 "bytes",
 "futures-util",
@@ -270,9 +270,9 @@ dependencies = [

 [[package]]
 name = "axum-core"
-version = "0.2.9"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc"
+checksum = "e4f44a0e6200e9d11a1cdc989e4b358f6e3d354fbf48478f345a17f4e43f8635"
 dependencies = [
 "async-trait",
 "bytes",
@@ -280,8 +280,6 @@ dependencies = [
 "http",
 "http-body",
 "mime",
- "tower-layer",
- "tower-service",
 ]

 [[package]]
@@ -313,9 +311,9 @@ checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"

 [[package]]
 name = "base64"
-version = "0.13.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"

 [[package]]
 name = "base64ct"
@@ -493,7 +491,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "18e9079d1a12a2cc2bffb5db039c43661836ead4082120d5844f02555aca2d46"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.13.0",
 "encoding_rs",
 ]

@@ -895,7 +893,7 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.99.0"
+version = "1.93.0"
 dependencies = [
 "ansi_term",
 "anyhow",
@@ -905,7 +903,7 @@ dependencies = [
 "async-smtp",
 "async_zip",
 "backtrace",
- "base64 0.13.1",
+ "base64 0.13.0",
 "bitflags",
 "chrono",
 "criterion",
@@ -948,13 +946,13 @@ dependencies = [
 "serde",
 "serde_json",
 "sha-1 0.10.0",
- "sha2 0.10.6",
+ "sha2 0.10.3",
 "smallvec",
 "strum",
 "strum_macros",
 "tagger",
 "tempfile",
- "textwrap 0.16.0",
+ "textwrap 0.15.0",
 "thiserror",
 "tokio",
 "tokio-stream",
@@ -962,18 +960,18 @@ dependencies = [
 "toml",
 "trust-dns-resolver",
 "url",
- "uuid 1.2.1",
+ "uuid 1.1.2",
 ]

 [[package]]
 name = "deltachat-jsonrpc"
-version = "1.99.0"
+version = "1.93.0"
 dependencies = [
 "anyhow",
 "async-channel",
 "axum",
 "deltachat",
- "env_logger 0.9.1",
+ "env_logger 0.9.0",
 "futures",
 "log",
 "num-traits",
@@ -982,7 +980,6 @@ dependencies = [
 "tempfile",
 "tokio",
 "typescript-type-def",
- "walkdir",
 "yerpc",
 ]

@@ -996,7 +993,7 @@ dependencies = [

 [[package]]
 name = "deltachat_ffi"
-version = "1.99.0"
+version = "1.93.0"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1069,9 +1066,9 @@ dependencies = [

 [[package]]
 name = "digest"
-version = "0.10.5"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c"
+checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
 dependencies = [
 "block-buffer 0.10.2",
 "crypto-common",
@@ -1263,9 +1260,9 @@ checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca"

 [[package]]
 name = "enum-as-inner"
-version = "0.5.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116"
+checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73"
 dependencies = [
 "heck",
 "proc-macro2",
@@ -1288,9 +1285,9 @@ dependencies = [

 [[package]]
 name = "env_logger"
-version = "0.9.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272"
+checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
 dependencies = [
 "atty",
 "humantime 2.1.0",
@@ -1396,7 +1393,7 @@ checksum = "e11dcc7e4d79a8c89b9ab4c6f5c30b1fc4a83c420792da3542fd31179ed5f517"
 dependencies = [
 "cfg-if",
 "rustix",
- "windows-sys 0.36.1",
+ "windows-sys",
 ]

 [[package]]
@@ -1408,7 +1405,7 @@ dependencies = [
 "cfg-if",
 "libc",
 "redox_syscall",
- "windows-sys 0.36.1",
+ "windows-sys",
 ]

 [[package]]
@@ -1444,18 +1441,19 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"

 [[package]]
 name = "form_urlencoded"
-version = "1.1.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
 dependencies = [
+ "matches",
 "percent-encoding",
 ]

 [[package]]
 name = "futures"
-version = "0.3.25"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
+checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -1468,9 +1466,9 @@ dependencies = [

 [[package]]
 name = "futures-channel"
-version = "0.3.25"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
+checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
 dependencies = [
 "futures-core",
 "futures-sink",
@@ -1478,15 +1476,15 @@ dependencies = [

 [[package]]
 name = "futures-core"
-version = "0.3.25"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
+checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"

 [[package]]
 name = "futures-executor"
-version = "0.3.25"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
+checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
 dependencies = [
 "futures-core",
 "futures-task",
@@ -1495,9 +1493,9 @@ dependencies = [

 [[package]]
 name = "futures-io"
-version = "0.3.25"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
+checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"

 [[package]]
 name = "futures-lite"
@@ -1516,9 +1514,9 @@ dependencies = [

 [[package]]
 name = "futures-macro"
-version = "0.3.25"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
+checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1527,21 +1525,21 @@ dependencies = [

 [[package]]
 name = "futures-sink"
-version = "0.3.25"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
+checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56"

 [[package]]
 name = "futures-task"
-version = "0.3.25"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
+checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"

 [[package]]
 name = "futures-util"
-version = "0.3.25"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
+checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -1642,9 +1640,6 @@ name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash",
-]

 [[package]]
 name = "hashlink"
@@ -1830,21 +1825,11 @@ dependencies = [
 "unicode-normalization",
 ]

-[[package]]
-name = "idna"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
 [[package]]
 name = "image"
-version = "0.24.4"
+version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd8e4fb07cf672b1642304e731ef8a6a4c7891d67bb4fd4f5ce58cd6ed86803c"
+checksum = "7e30ca2ecf7666107ff827a8e481de6a132a9b687ed3bb20bb1c144a36c00964"
 dependencies = [
 "bytemuck",
 "byteorder",
@@ -1946,9 +1931,9 @@ dependencies = [

 [[package]]
 name = "kamadak-exif"
-version = "0.5.5"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077"
+checksum = "70494964492bf8e491eb3951c5d70c9627eb7100ede6cc56d748b9a3f302cfb6"
 dependencies = [
 "mutate_once",
 ]
@@ -1994,9 +1979,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.137"
+version = "0.2.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
+checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"

 [[package]]
 name = "libm"
@@ -2134,14 +2119,14 @@ dependencies = [

 [[package]]
 name = "mio"
-version = "0.8.5"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
+checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
 dependencies = [
 "libc",
 "log",
 "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.42.0",
+ "windows-sys",
 ]

 [[package]]
@@ -2152,9 +2137,9 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b"

 [[package]]
 name = "native-tls"
-version = "0.2.11"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9"
 dependencies = [
 "lazy_static",
 "libc",
@@ -2300,9 +2285,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.16.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
+checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e"

 [[package]]
 name = "oorandom"
@@ -2429,7 +2414,7 @@ dependencies = [
 "libc",
 "redox_syscall",
 "smallvec",
- "windows-sys 0.36.1",
+ "windows-sys",
 ]

 [[package]]
@@ -2443,9 +2428,9 @@ dependencies = [

 [[package]]
 name = "percent-encoding"
-version = "2.2.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"

 [[package]]
 name = "pgp"
@@ -2454,7 +2439,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0c63db779c3f090b540dfa0484f8adc2d380e3aa60cdb0f3a7a97454e22edc5"
 dependencies = [
 "aes",
- "base64 0.13.1",
+ "base64 0.13.0",
 "bitfield",
 "block-modes",
 "block-padding",
@@ -2638,9 +2623,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.46"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b"
+checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
 dependencies = [
 "unicode-ident",
 ]
@@ -2893,11 +2878,11 @@ dependencies = [

 [[package]]
 name = "reqwest"
-version = "0.11.12"
+version = "0.11.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc"
+checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.13.0",
 "bytes",
 "encoding_rs",
 "futures-core",
@@ -2909,10 +2894,10 @@ dependencies = [
 "hyper-tls",
 "ipnet",
 "js-sys",
+ "lazy_static",
 "log",
 "mime",
 "native-tls",
- "once_cell",
 "percent-encoding",
 "pin-project-lite",
 "serde",
@@ -2956,7 +2941,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4cf22754c49613d2b3b119f0e5d46e34a2c628a937e3024b8762de4e7d8c710b"
 dependencies = [
 "byteorder",
- "digest 0.10.5",
+ "digest 0.10.3",
 "num-bigint-dig",
 "num-integer",
 "num-iter",
@@ -3007,7 +2992,7 @@ dependencies = [
 "io-lifetimes",
 "libc",
 "linux-raw-sys",
- "windows-sys 0.36.1",
+ "windows-sys",
 ]

 [[package]]
@@ -3077,7 +3062,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
 dependencies = [
 "lazy_static",
- "windows-sys 0.36.1",
+ "windows-sys",
 ]

 [[package]]
@@ -3120,9 +3105,9 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.147"
+version = "1.0.144"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
+checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
 dependencies = [
 "serde_derive",
 ]
@@ -3139,9 +3124,9 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.147"
+version = "1.0.144"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
+checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3150,9 +3135,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.87"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45"
+checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
 dependencies = [
 "itoa 1.0.3",
 "ryu",
@@ -3192,7 +3177,7 @@ checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
 dependencies = [
 "cfg-if",
 "cpufeatures",
- "digest 0.10.5",
+ "digest 0.10.3",
 ]

 [[package]]
@@ -3210,13 +3195,13 @@ dependencies = [

 [[package]]
 name = "sha2"
-version = "0.10.6"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+checksum = "899bf02746a2c92bf1053d9327dadb252b01af1f81f90cdb902411f518bc7215"
 dependencies = [
 "cfg-if",
 "cpufeatures",
- "digest 0.10.5",
+ "digest 0.10.3",
 ]

 [[package]]
@@ -3257,9 +3242,9 @@ dependencies = [

 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"

 [[package]]
 name = "smawk"
@@ -3356,9 +3341,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"

 [[package]]
 name = "syn"
-version = "1.0.103"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
+checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3423,9 +3408,9 @@ dependencies = [

 [[package]]
 name = "textwrap"
-version = "0.16.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
+checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
 dependencies = [
 "smawk",
 "unicode-linebreak",
@@ -3434,18 +3419,18 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.37"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+checksum = "3d0a539a918745651435ac7db7a18761589a94cd7e94cd56999f828bf73c8a57"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.37"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+checksum = "c251e90f708e16c49a16f4917dc2131e75222b72edfa9cb7f7c58ae56aae0c09"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3490,9 +3475,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"

 [[package]]
 name = "tokio"
-version = "1.21.2"
+version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099"
+checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581"
 dependencies = [
 "autocfg",
 "bytes",
@@ -3500,6 +3485,7 @@ dependencies = [
 "memchr",
 "mio",
 "num_cpus",
+ "once_cell",
 "parking_lot",
 "pin-project-lite",
 "signal-hook-registry",
@@ -3531,9 +3517,9 @@ dependencies = [

 [[package]]
 name = "tokio-stream"
-version = "0.1.11"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce"
+checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9"
 dependencies = [
 "futures-core",
 "pin-project-lite",
@@ -3672,9 +3658,9 @@ dependencies = [

 [[package]]
 name = "trust-dns-proto"
-version = "0.22.0"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26"
+checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d"
 dependencies = [
 "async-trait",
 "cfg-if",
@@ -3683,35 +3669,35 @@ dependencies = [
 "futures-channel",
 "futures-io",
 "futures-util",
- "idna 0.2.3",
+ "idna",
 "ipnet",
 "lazy_static",
+ "log",
 "rand 0.8.5",
 "smallvec",
 "thiserror",
 "tinyvec",
 "tokio",
- "tracing",
 "url",
 ]

 [[package]]
 name = "trust-dns-resolver"
-version = "0.22.0"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe"
+checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558"
 dependencies = [
 "cfg-if",
 "futures-util",
 "ipconfig",
 "lazy_static",
+ "log",
 "lru-cache",
 "parking_lot",
 "resolv-conf",
 "smallvec",
 "thiserror",
 "tokio",
- "tracing",
 "trust-dns-proto",
 ]

@@ -3727,7 +3713,7 @@ version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.13.0",
 "byteorder",
 "bytes",
 "http",
@@ -3795,11 +3781,10 @@ checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"

 [[package]]
 name = "unicode-linebreak"
-version = "0.1.4"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137"
+checksum = "3a52dcaab0c48d931f7cc8ef826fa51690a08e1ea55117ef26f89864f532383f"
 dependencies = [
- "hashbrown 0.12.3",
 "regex",
 ]

@@ -3820,9 +3805,9 @@ checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"

 [[package]]
 name = "unicode-width"
-version = "0.1.10"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"

 [[package]]
 name = "unicode-xid"
@@ -3832,12 +3817,13 @@ checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"

 [[package]]
 name = "url"
-version = "2.3.1"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
 dependencies = [
 "form_urlencoded",
- "idna 0.3.0",
+ "idna",
+ "matches",
 "percent-encoding",
 ]

@@ -3864,9 +3850,9 @@ dependencies = [

 [[package]]
 name = "uuid"
-version = "1.2.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83"
+checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
 dependencies = [
 "getrandom 0.2.7",
 "serde",
@@ -4060,100 +4046,43 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
 dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_msvc",
 ]

-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.0",
- "windows_i686_gnu 0.42.0",
- "windows_i686_msvc 0.42.0",
- "windows_x86_64_gnu 0.42.0",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.0",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"

-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"

-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"

-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"

-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"

-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
-
 [[package]]
 name = "winreg"
 version = "0.7.0"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.99.0"
+version = "1.93.0"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
 license = "MPL-2.0"
@@ -11,9 +11,6 @@ debug = 0
 panic = 'abort'
 opt-level = 1

-[profile.test]
-opt-level = 0
-
 [profile.release]
 lto = true
 panic = 'abort'
@@ -26,7 +23,7 @@ anyhow = "1"
 async-imap = { git = "https://github.com/async-email/async-imap", branch = "master", default-features = false, features = ["runtime-tokio"] }
 async-native-tls = { version = "0.4", default-features = false, features = ["runtime-tokio"] }
 async-smtp = { version = "0.5", default-features = false, features = ["smtp-transport", "socks5", "runtime-tokio"] }
-trust-dns-resolver = "0.22"
+trust-dns-resolver = "0.21"
 tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
 tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
 backtrace = "0.3"
@@ -39,7 +36,7 @@ encoded-words = { git = "https://github.com/async-email/encoded-words", branch =
 escaper = "0.1"
 futures = "0.3"
 hex = "0.4.0"
-image = { version = "0.24.4", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+image = { version = "0.24.3", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
 kamadak-exif = "0.5"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 libc = "0.2"
@@ -49,8 +46,8 @@ native-tls = "0.2"
 num_cpus = "1.13"
 num-derive = "0.3"
 num-traits = "0.2"
-once_cell = "1.16.0"
-percent-encoding = "2.2"
+once_cell = "1.13.1"
+percent-encoding = "2.0"
 pgp = { version = "0.8", default-features = false }
 pretty_env_logger = { version = "0.4", optional = true }
 quick-xml = "0.23"
@@ -77,11 +74,11 @@ fast-socks5 = "0.8"
 humansize = "1"
 qrcodegen = "1.7.0"
 tagger = "4.3.3"
-textwrap = "0.16.0"
+textwrap = "0.15.0"
 async-channel = "1.6.1"
 futures-lite = "1.12.0"
-tokio-stream = { version = "0.1.11", features = ["fs"] }
-reqwest = { version = "0.11.12", features = ["json"] }
+tokio-stream = { version = "0.1.9", features = ["fs"] }
+reqwest = { version = "0.11.11", features = ["json"] }
 async_zip = { git = "https://github.com/dignifiedquire/rs-async-zip", branch = "main", default-features = false, features = ["deflate"] }

 [dev-dependencies]
--- a/README.md
+++ b/README.md
@@ -125,12 +125,10 @@ $ cargo test -- --ignored
 Language bindings are available for:

 - **C** \[[📂 source](./deltachat-ffi) | [📚 docs](https://c.delta.chat)\]
- **Node.js** 
-  - over cffi (legacy): \[[📂 source](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat)\]
-  - over jsonrpc built with napi.rs: \[[📂 source](https://github.com/deltachat/napi-jsonrpc) | [📦 npm](https://www.npmjs.com/package/@deltachat/napi-jsonrpc)\]
+- **Node.js** \[[📂 source](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat)\]
 - **Python** \[[📂 source](./python) | [📦 pypi](https://pypi.org/project/deltachat) | [📚 docs](https://py.delta.chat)\]
- **Go**[^1] \[[📂 source](https://github.com/deltachat/go-deltachat/)\]
- **Free Pascal**[^1] \[[📂 source](https://github.com/deltachat/deltachat-fp/)\]
+- **Go** \[[📂 source](https://github.com/deltachat/go-deltachat/)\]
+- **Free Pascal** \[[📂 source](https://github.com/deltachat/deltachat-fp/)\]
 - **Java** and **Swift** (contained in the Android/iOS repos)

 The following "frontend" projects make use of the Rust-library
@@ -142,5 +140,3 @@ or its language bindings:
 - [Pidgin](https://code.ur.gs/lupine/purple-plugin-delta/)
 - [Telepathy](https://code.ur.gs/lupine/telepathy-padfoot/)
 - several **Bots**
-
-[^1]: Out of date / unmaintained, if you like those languages feel free to start maintaining them. If you have questions we'll help you, please ask in the issues.
--- a/benches/contacts.rs
+++ b/benches/contacts.rs
@@ -1,7 +1,6 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::contact::Contact;
 use deltachat::context::Context;
-use deltachat::stock_str::StockStrings;
 use deltachat::Events;
 use tempfile::tempdir;

@@ -9,9 +8,7 @@ async fn address_book_benchmark(n: u32, read_count: u32) {
    let dir = tempdir().unwrap();
    let dbfile = dir.path().join("db.sqlite");
    let id = 100;
-    let context = Context::new(&dbfile, id, Events::new(), StockStrings::new())
-        .await
-        .unwrap();
+    let context = Context::new(&dbfile, id, Events::new()).await.unwrap();

    let book = (0..n)
        .map(|i| format!("Name {}\naddr{}@example.org\n", i, i))
--- a/benches/get_chat_msgs.rs
+++ b/benches/get_chat_msgs.rs
@@ -5,14 +5,11 @@ use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::chat::{self, ChatId};
 use deltachat::chatlist::Chatlist;
 use deltachat::context::Context;
-use deltachat::stock_str::StockStrings;
 use deltachat::Events;

 async fn get_chat_msgs_benchmark(dbfile: &Path, chats: &[ChatId]) {
    let id = 100;
-    let context = Context::new(dbfile, id, Events::new(), StockStrings::new())
-        .await
-        .unwrap();
+    let context = Context::new(dbfile, id, Events::new()).await.unwrap();

    for c in chats.iter().take(10) {
        black_box(chat::get_chat_msgs(&context, *c, 0).await.ok());
@@ -26,7 +23,7 @@ fn criterion_benchmark(c: &mut Criterion) {
        let rt = tokio::runtime::Runtime::new().unwrap();

        let chats: Vec<_> = rt.block_on(async {
-            let context = Context::new(Path::new(&path), 100, Events::new(), StockStrings::new())
+            let context = Context::new(Path::new(&path), 100, Events::new())
                .await
                .unwrap();
            let chatlist = Chatlist::try_load(&context, 0, None, None).await.unwrap();
--- a/benches/get_chatlist.rs
+++ b/benches/get_chatlist.rs
@@ -4,7 +4,6 @@ use criterion::{black_box, criterion_group, criterion_main, Criterion};

 use deltachat::chatlist::Chatlist;
 use deltachat::context::Context;
-use deltachat::stock_str::StockStrings;
 use deltachat::Events;

 async fn get_chat_list_benchmark(context: &Context) {
@@ -17,7 +16,7 @@ fn criterion_benchmark(c: &mut Criterion) {
    if let Ok(path) = std::env::var("DELTACHAT_BENCHMARK_DATABASE") {
        let rt = tokio::runtime::Runtime::new().unwrap();
        let context = rt.block_on(async {
-            Context::new(Path::new(&path), 100, Events::new(), StockStrings::new())
+            Context::new(Path::new(&path), 100, Events::new())
                .await
                .unwrap()
        });
--- a/benches/receive_emails.rs
+++ b/benches/receive_emails.rs
@@ -6,7 +6,6 @@ use deltachat::{
    context::Context,
    imex::{imex, ImexMode},
    receive_imf::receive_imf,
-    stock_str::StockStrings,
    Events,
 };
 use tempfile::tempdir;
@@ -42,9 +41,7 @@ async fn create_context() -> Context {
    let dir = tempdir().unwrap();
    let dbfile = dir.path().join("db.sqlite");
    let id = 100;
-    let context = Context::new(&dbfile, id, Events::new(), StockStrings::new())
-        .await
-        .unwrap();
+    let context = Context::new(&dbfile, id, Events::new()).await.unwrap();

    let backup: PathBuf = std::env::current_dir()
        .unwrap()
--- a/benches/search_msgs.rs
+++ b/benches/search_msgs.rs
@@ -1,12 +1,11 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::context::Context;
-use deltachat::stock_str::StockStrings;
 use deltachat::Events;
 use std::path::Path;

 async fn search_benchmark(dbfile: impl AsRef<Path>) {
    let id = 100;
-    let context = Context::new(dbfile.as_ref(), id, Events::new(), StockStrings::new())
+    let context = Context::new(dbfile.as_ref(), id, Events::new())
        .await
        .unwrap();

--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.99.0"
+version = "1.93.0"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
@@ -25,7 +25,7 @@ tokio = { version = "1", features = ["rt-multi-thread"] }
 anyhow = "1"
 thiserror = "1"
 rand = "0.7"
-once_cell = "1.16.0"
+once_cell = "1.13.1"

 [features]
 default = ["vendored"]
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -11,17 +11,16 @@ extern "C" {
 #endif


-typedef struct _dc_context   dc_context_t;
-typedef struct _dc_accounts  dc_accounts_t;
-typedef struct _dc_array     dc_array_t;
-typedef struct _dc_chatlist  dc_chatlist_t;
-typedef struct _dc_chat      dc_chat_t;
-typedef struct _dc_msg       dc_msg_t;
-typedef struct _dc_reactions dc_reactions_t;
-typedef struct _dc_contact   dc_contact_t;
-typedef struct _dc_lot       dc_lot_t;
-typedef struct _dc_provider  dc_provider_t;
-typedef struct _dc_event     dc_event_t;
+typedef struct _dc_context  dc_context_t;
+typedef struct _dc_accounts dc_accounts_t;
+typedef struct _dc_array    dc_array_t;
+typedef struct _dc_chatlist dc_chatlist_t;
+typedef struct _dc_chat     dc_chat_t;
+typedef struct _dc_msg      dc_msg_t;
+typedef struct _dc_contact  dc_contact_t;
+typedef struct _dc_lot      dc_lot_t;
+typedef struct _dc_provider dc_provider_t;
+typedef struct _dc_event    dc_event_t;
 typedef struct _dc_event_emitter dc_event_emitter_t;
 typedef struct _dc_jsonrpc_instance dc_jsonrpc_instance_t;

@@ -469,10 +468,10 @@ int             dc_set_stock_translation(dc_context_t* context, uint32_t stock_i
 /**
 * Set configuration values from a QR code.
 * Before this function is called, dc_check_qr() should confirm the type of the
- * QR code is DC_QR_ACCOUNT, DC_QR_LOGIN or DC_QR_WEBRTC_INSTANCE.
+ * QR code is DC_QR_ACCOUNT or DC_QR_WEBRTC_INSTANCE.
 *
 * Internally, the function will call dc_set_config() with the appropriate keys,
- * e.g. `addr` and `mail_pw` for DC_QR_ACCOUNT and DC_QR_LOGIN
+ * e.g. `addr` and `mail_pw` for DC_QR_ACCOUNT
 * or `webrtc_instance` for DC_QR_WEBRTC_INSTANCE.
 *
 * @memberof dc_context_t
@@ -992,34 +991,6 @@ uint32_t        dc_send_text_msg             (dc_context_t* context, uint32_t ch
 uint32_t dc_send_videochat_invitation (dc_context_t* context, uint32_t chat_id);


-/**
- * Send a reaction to message.
- *
- * Reaction is a string of emojis separated by spaces. Reaction to a
- * single message can be sent multiple times. The last reaction
- * received overrides all previously received reactions. It is
- * possible to remove all reactions by sending an empty string.
- *
- * @memberof dc_context_t
- * @param context The context object.
- * @param msg_id ID of the message you react to.
- * @param reaction A string consisting of emojis separated by spaces.
- * @return The ID of the message sent out or 0 for errors.
- */
-uint32_t dc_send_reaction (dc_context_t* context, uint32_t msg_id, char *reaction);
-
-
-/**
- * Get a structure with reactions to the message.
- *
- * @memberof dc_context_t
- * @param context The context object.
- * @param msg_id The message ID to get reactions for.
- * @return A structure with all reactions to the message.
- */
-dc_reactions_t* dc_get_msg_reactions (dc_context_t *context, int msg_id);
-
-
 /**
 * A webxdc instance sends a status update to its other members.
 *
@@ -2203,10 +2174,11 @@ char*           dc_imex_has_backup           (dc_context_t* context, const char*
 * ~~~
 *
 * After that, this function should be called to send the Autocrypt Setup Message.
- * The function creates the setup message and adds it to outgoing message queue.
- * The message is sent asynchronously.
+ * The function creates the setup message and waits until it is really sent.
+ * As this may take a while, it is recommended to start the function in a separate thread;
+ * to interrupt it, you can use dc_stop_ongoing_process().
 *
- * The required setup code is returned in the following format:
+ * After everything succeeded, the required setup code is returned in the following format:
 *
 * ~~~
 * 1234-1234-1234-1234-1234-1234-1234-1234-1234
@@ -2272,8 +2244,8 @@ int             dc_continue_key_transfer     (dc_context_t* context, uint32_t ms
 * The ongoing process will return ASAP then, however, it may
 * still take a moment.
 *
- * Typical ongoing processes are started by dc_configure()
- * or dc_imex(). As there is always at most only
+ * Typical ongoing processes are started by dc_configure(),
+ * dc_initiate_key_transfer() or dc_imex(). As there is always at most only
 * one onging process at the same time, there is no need to define _which_ process to exit.
 *
 * @memberof dc_context_t
@@ -2299,7 +2271,6 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
 #define         DC_QR_WITHDRAW_VERIFYGROUP   502 // text1=groupname
 #define         DC_QR_REVIVE_VERIFYCONTACT   510
 #define         DC_QR_REVIVE_VERIFYGROUP     512 // text1=groupname
-#define         DC_QR_LOGIN                  520 // text1=email_address

 /**
 * Check a scanned QR code.
@@ -2372,10 +2343,6 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
 *   ask the user if they want to revive the withdrawn group-invite code;
 *   if so, call dc_set_config_from_qr().
 *
- * - DC_QR_LOGIN with dc_lot_t::text1=email_address:
- *   ask the user if they want to login with the email_address,
- *   if so, call dc_set_config_from_qr() and then dc_configure().
- *
 * @memberof dc_context_t
 * @param context The context object.
 * @param qr The text of the scanned QR code.
@@ -4097,19 +4064,9 @@ int             dc_msg_get_info_type          (const dc_msg_t* msg);


 // DC_INFO* uses the same values as SystemMessage in rust-land
-#define         DC_INFO_UNKNOWN                    0
-#define         DC_INFO_GROUP_NAME_CHANGED         2
-#define         DC_INFO_GROUP_IMAGE_CHANGED        3
-#define         DC_INFO_MEMBER_ADDED_TO_GROUP      4
-#define         DC_INFO_MEMBER_REMOVED_FROM_GROUP  5
-#define         DC_INFO_AUTOCRYPT_SETUP_MESSAGE    6
-#define         DC_INFO_SECURE_JOIN_MESSAGE        7
-#define         DC_INFO_LOCATIONSTREAMING_ENABLED  8
-#define         DC_INFO_LOCATION_ONLY              9
-#define         DC_INFO_EPHEMERAL_TIMER_CHANGED   10
-#define         DC_INFO_PROTECTION_ENABLED        11
-#define         DC_INFO_PROTECTION_DISABLED       12
-#define         DC_INFO_WEBXDC_INFO_MESSAGE       32
+#define         DC_INFO_PROTECTION_ENABLED     11
+#define         DC_INFO_PROTECTION_DISABLED    12
+

 /**
 * Check if a message is still in creation. A message is in creation between
@@ -4921,49 +4878,7 @@ uint32_t        dc_lot_get_id            (const dc_lot_t* lot);
 * @param lot The lot object.
 * @return The timestamp as defined by the creator of the object. 0 if there is not timestamp or on errors.
 */
-int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
-
-
-/**
- * @class dc_reactions_t
- *
- * An object representing all reactions for a single message.
- */
-
-/**
- * Returns array of contacts which reacted to the given message.
- *
- * @memberof dc_reactions_t
- * @param reactions The object containing message reactions.
- * @return array of contact IDs. Use dc_array_get_cnt() to get array length and
- *         dc_array_get_id() to get the IDs. Should be freed using `dc_array_unref()` after usage.
- */
-dc_array_t*     dc_reactions_get_contacts(dc_reactions_t* reactions);
-
-
-/**
- * Returns a string containing space-separated reactions of a single contact.
- *
- * @memberof dc_reactions_t
- * @param reactions The object containing message reactions.
- * @param contact_id ID of the contact.
- * @return Space-separated list of emoji sequences, which could be empty.
- *         Returned string should not be modified and should be freed
- *         with dc_str_unref() after usage.
- */
-char*           dc_reactions_get_by_contact_id(dc_reactions_t* reactions, uint32_t contact_id);
-
-
-/**
- * Frees an object containing message reactions.
- *
- * Reactions objects are created by dc_get_msg_reactions().
- *
- * @memberof dc_reactions_t
- * @param reactions The object to free.
- *     If NULL is given, nothing is done.
- */
-void            dc_reactions_unref       (dc_reactions_t* reactions);
+int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);


 /**
@@ -5614,15 +5529,6 @@ void dc_event_unref(dc_event_t* event);
 #define DC_EVENT_MSGS_CHANGED             2000


-/**
- * Message reactions changed.
- *
- * @param data1 (int) chat_id ID of the chat affected by the changes.
- * @param data2 (int) msg_id ID of the message for which reactions were changed.
- */
-#define DC_EVENT_REACTIONS_CHANGED        2001
-
-
 /**
 * There is a fresh message. Typically, the user will show an notification
 * when receiving this message.
@@ -5634,17 +5540,6 @@ void dc_event_unref(dc_event_t* event);
 */
 #define DC_EVENT_INCOMING_MSG             2005

-/**
- * Downloading a bunch of messages just finished. This is an experimental
- * event to allow the UI to only show one notification per message bunch,
- * instead of cluttering the user with many notifications.
- * For each of the msg_ids, an additional #DC_EVENT_INCOMING_MSG event was emitted before.
- * 
- * @param data1 0
- * @param data2 (char*) msg_ids, a json object with the message ids.
- */
-#define DC_EVENT_INCOMING_MSG_BUNCH       2006
-

 /**
 * Messages were marked noticed or seen.
@@ -5836,10 +5731,24 @@ void dc_event_unref(dc_event_t* event);
 *
 * @param data1 (int) msg_id
 */
-
 #define DC_EVENT_WEBXDC_INSTANCE_DELETED          2121


+/**
+ * Webxdc has some updates that need to be sent
+ *
+ * @param data1 (int) msg_id
+ */
+#define DC_EVENT_WEBXDC_BUSY_UPDATING             2122
+
+
+/**
+ * Webxdc has finished sending updates
+ *
+ * @param data1 (int) msg_id
+ */
+#define DC_EVENT_WEBXDC_UP_TO_DATE                2123
+
 /**
 * @}
 */
--- a/deltachat-ffi/src/dc_array.rs
+++ b/deltachat-ffi/src/dc_array.rs
@@ -1,6 +1,5 @@
 use crate::chat::ChatItem;
 use crate::constants::DC_MSG_ID_DAYMARKER;
-use crate::contact::ContactId;
 use crate::location::Location;
 use crate::message::MsgId;

@@ -8,7 +7,6 @@ use crate::message::MsgId;
 #[derive(Debug, Clone)]
 pub enum dc_array_t {
    MsgIds(Vec<MsgId>),
-    ContactIds(Vec<ContactId>),
    Chat(Vec<ChatItem>),
    Locations(Vec<Location>),
    Uint(Vec<u32>),
@@ -18,7 +16,6 @@ impl dc_array_t {
    pub(crate) fn get_id(&self, index: usize) -> u32 {
        match self {
            Self::MsgIds(array) => array[index].to_u32(),
-            Self::ContactIds(array) => array[index].to_u32(),
            Self::Chat(array) => match array[index] {
                ChatItem::Message { msg_id } => msg_id.to_u32(),
                ChatItem::DayMarker { .. } => DC_MSG_ID_DAYMARKER,
@@ -31,7 +28,6 @@ impl dc_array_t {
    pub(crate) fn get_timestamp(&self, index: usize) -> Option<i64> {
        match self {
            Self::MsgIds(_) => None,
-            Self::ContactIds(_) => None,
            Self::Chat(array) => array.get(index).and_then(|item| match item {
                ChatItem::Message { .. } => None,
                ChatItem::DayMarker { timestamp } => Some(*timestamp),
@@ -44,7 +40,6 @@ impl dc_array_t {
    pub(crate) fn get_marker(&self, index: usize) -> Option<&str> {
        match self {
            Self::MsgIds(_) => None,
-            Self::ContactIds(_) => None,
            Self::Chat(_) => None,
            Self::Locations(array) => array
                .get(index)
@@ -65,7 +60,6 @@ impl dc_array_t {
    pub(crate) fn len(&self) -> usize {
        match self {
            Self::MsgIds(array) => array.len(),
-            Self::ContactIds(array) => array.len(),
            Self::Chat(array) => array.len(),
            Self::Locations(array) => array.len(),
            Self::Uint(array) => array.len(),
@@ -89,12 +83,6 @@ impl From<Vec<MsgId>> for dc_array_t {
    }
 }

-impl From<Vec<ContactId>> for dc_array_t {
-    fn from(array: Vec<ContactId>) -> Self {
-        dc_array_t::ContactIds(array)
-    }
-}
-
 impl From<Vec<ChatItem>> for dc_array_t {
    fn from(array: Vec<ChatItem>) -> Self {
        dc_array_t::Chat(array)
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -37,9 +37,7 @@ use deltachat::context::Context;
 use deltachat::ephemeral::Timer as EphemeralTimer;
 use deltachat::key::DcKey;
 use deltachat::message::MsgId;
-use deltachat::reaction::{get_msg_reactions, send_reaction, Reactions};
 use deltachat::stock_str::StockMessage;
-use deltachat::stock_str::StockStrings;
 use deltachat::webxdc::StatusUpdateSerial;
 use deltachat::*;
 use deltachat::{accounts::Accounts, log::LogExt};
@@ -67,8 +65,6 @@ use deltachat::chatlist::Chatlist;
 /// Struct representing the deltachat context.
 pub type dc_context_t = Context;

-pub type dc_reactions_t = Reactions;
-
 static RT: Lazy<Runtime> = Lazy::new(|| Runtime::new().expect("unable to create tokio runtime"));

 fn block_on<T>(fut: T) -> T::Output
@@ -102,12 +98,7 @@ pub unsafe extern "C" fn dc_context_new(
    let ctx = if blobdir.is_null() || *blobdir == 0 {
        // generate random ID as this functionality is not yet available on the C-api.
        let id = rand::thread_rng().gen();
-        block_on(Context::new(
-            as_path(dbfile),
-            id,
-            Events::new(),
-            StockStrings::new(),
-        ))
+        block_on(Context::new(as_path(dbfile), id, Events::new()))
    } else {
        eprintln!("blobdir can not be defined explicitly anymore");
        return ptr::null_mut();
@@ -131,12 +122,7 @@ pub unsafe extern "C" fn dc_context_new_closed(dbfile: *const libc::c_char) -> *
    }

    let id = rand::thread_rng().gen();
-    match block_on(Context::new_closed(
-        as_path(dbfile),
-        id,
-        Events::new(),
-        StockStrings::new(),
-    )) {
+    match block_on(Context::new_closed(as_path(dbfile), id, Events::new())) {
        Ok(context) => Box::into_raw(Box::new(context)),
        Err(err) => {
            eprintln!("failed to create context: {:#}", err);
@@ -183,7 +169,7 @@ pub unsafe extern "C" fn dc_context_unref(context: *mut dc_context_t) {
        eprintln!("ignoring careless call to dc_context_unref()");
        return;
    }
-    drop(Box::from_raw(context));
+    Box::from_raw(context);
 }

 #[no_mangle]
@@ -477,7 +463,7 @@ pub unsafe extern "C" fn dc_event_unref(a: *mut dc_event_t) {
        return;
    }

-    drop(Box::from_raw(a));
+    Box::from_raw(a);
 }

 #[no_mangle]
@@ -501,9 +487,7 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
        EventType::Error(_) => 400,
        EventType::ErrorSelfNotInGroup(_) => 410,
        EventType::MsgsChanged { .. } => 2000,
-        EventType::ReactionsChanged { .. } => 2001,
        EventType::IncomingMsg { .. } => 2005,
-        EventType::IncomingMsgBunch { .. } => 2006,
        EventType::MsgsNoticed { .. } => 2008,
        EventType::MsgDelivered { .. } => 2010,
        EventType::MsgFailed { .. } => 2012,
@@ -521,6 +505,8 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
        EventType::SelfavatarChanged => 2110,
        EventType::WebxdcStatusUpdate { .. } => 2120,
        EventType::WebxdcInstanceDeleted { .. } => 2121,
+        EventType::WebxdcBusyUpdating { .. } => 2022,
+        EventType::WebxdcUpToDate { .. } => 2023,
    }
 }

@@ -545,10 +531,8 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
        | EventType::Error(_)
        | EventType::ConnectivityChanged
        | EventType::SelfavatarChanged
-        | EventType::IncomingMsgBunch { .. }
        | EventType::ErrorSelfNotInGroup(_) => 0,
        EventType::MsgsChanged { chat_id, .. }
-        | EventType::ReactionsChanged { chat_id, .. }
        | EventType::IncomingMsg { chat_id, .. }
        | EventType::MsgsNoticed(chat_id)
        | EventType::MsgDelivered { chat_id, .. }
@@ -570,6 +554,8 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
        }
        EventType::WebxdcStatusUpdate { msg_id, .. } => msg_id.to_u32() as libc::c_int,
        EventType::WebxdcInstanceDeleted { msg_id, .. } => msg_id.to_u32() as libc::c_int,
+        EventType::WebxdcBusyUpdating { msg_id } => msg_id.to_u32() as libc::c_int,
+        EventType::WebxdcUpToDate { msg_id } => msg_id.to_u32() as libc::c_int,
    }
 }

@@ -602,11 +588,11 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
        | EventType::MsgsNoticed(_)
        | EventType::ConnectivityChanged
        | EventType::WebxdcInstanceDeleted { .. }
-        | EventType::IncomingMsgBunch { .. }
+        | EventType::WebxdcBusyUpdating { .. }
+        | EventType::WebxdcUpToDate { .. }
        | EventType::SelfavatarChanged => 0,
        EventType::ChatModified(_) => 0,
        EventType::MsgsChanged { msg_id, .. }
-        | EventType::ReactionsChanged { msg_id, .. }
        | EventType::IncomingMsg { msg_id, .. }
        | EventType::MsgDelivered { msg_id, .. }
        | EventType::MsgFailed { msg_id, .. }
@@ -646,7 +632,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
            data2.into_raw()
        }
        EventType::MsgsChanged { .. }
-        | EventType::ReactionsChanged { .. }
        | EventType::IncomingMsg { .. }
        | EventType::MsgsNoticed(_)
        | EventType::MsgDelivered { .. }
@@ -662,6 +647,8 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
        | EventType::SelfavatarChanged
        | EventType::WebxdcStatusUpdate { .. }
        | EventType::WebxdcInstanceDeleted { .. }
+        | EventType::WebxdcBusyUpdating { .. }
+        | EventType::WebxdcUpToDate { .. }
        | EventType::ChatEphemeralTimerModified { .. } => ptr::null_mut(),
        EventType::ConfigureProgress { comment, .. } => {
            if let Some(comment) = comment {
@@ -674,11 +661,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
            let data2 = file.to_c_string().unwrap_or_default();
            data2.into_raw()
        }
-        EventType::IncomingMsgBunch { msg_ids } => serde_json::to_string(msg_ids)
-            .unwrap_or_default()
-            .to_c_string()
-            .unwrap_or_default()
-            .into_raw(),
    }
 }

@@ -713,7 +695,7 @@ pub unsafe extern "C" fn dc_event_emitter_unref(emitter: *mut dc_event_emitter_t
        return;
    }

-    drop(Box::from_raw(emitter));
+    Box::from_raw(emitter);
 }

 #[no_mangle]
@@ -963,48 +945,6 @@ pub unsafe extern "C" fn dc_send_videochat_invitation(
    })
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_send_reaction(
-    context: *mut dc_context_t,
-    msg_id: u32,
-    reaction: *const libc::c_char,
-) -> u32 {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_send_reaction()");
-        return 0;
-    }
-    let ctx = &*context;
-
-    block_on(async move {
-        send_reaction(ctx, MsgId::new(msg_id), &to_string_lossy(reaction))
-            .await
-            .map(|msg_id| msg_id.to_u32())
-            .unwrap_or_log_default(ctx, "Failed to send reaction")
-    })
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_get_msg_reactions(
-    context: *mut dc_context_t,
-    msg_id: u32,
-) -> *mut dc_reactions_t {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_get_msg_reactions()");
-        return ptr::null_mut();
-    }
-    let ctx = &*context;
-
-    let reactions = if let Ok(reactions) = block_on(get_msg_reactions(ctx, MsgId::new(msg_id)))
-        .log_err(ctx, "failed dc_get_msg_reactions() call")
-    {
-        reactions
-    } else {
-        return ptr::null_mut();
-    };
-
-    Box::into_raw(Box::new(reactions))
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_send_webxdc_status_update(
    context: *mut dc_context_t,
@@ -2494,7 +2434,7 @@ pub unsafe extern "C" fn dc_array_unref(a: *mut dc_array::dc_array_t) {
        return;
    }

-    drop(Box::from_raw(a));
+    Box::from_raw(a);
 }

 #[no_mangle]
@@ -2675,7 +2615,7 @@ pub unsafe extern "C" fn dc_chatlist_unref(chatlist: *mut dc_chatlist_t) {
        eprintln!("ignoring careless call to dc_chatlist_unref()");
        return;
    }
-    drop(Box::from_raw(chatlist));
+    Box::from_raw(chatlist);
 }

 #[no_mangle]
@@ -2820,7 +2760,7 @@ pub unsafe extern "C" fn dc_chat_unref(chat: *mut dc_chat_t) {
        return;
    }

-    drop(Box::from_raw(chat));
+    Box::from_raw(chat);
 }

 #[no_mangle]
@@ -2860,11 +2800,7 @@ pub unsafe extern "C" fn dc_chat_get_mailinglist_addr(chat: *mut dc_chat_t) -> *
        return "".strdup();
    }
    let ffi_chat = &*chat;
-    ffi_chat
-        .chat
-        .get_mailinglist_addr()
-        .unwrap_or_default()
-        .strdup()
+    ffi_chat.chat.get_mailinglist_addr().strdup()
 }

 #[no_mangle]
@@ -3094,7 +3030,7 @@ pub unsafe extern "C" fn dc_msg_unref(msg: *mut dc_msg_t) {
        return;
    }

-    drop(Box::from_raw(msg));
+    Box::from_raw(msg);
 }

 #[no_mangle]
@@ -3816,7 +3752,7 @@ pub unsafe extern "C" fn dc_contact_unref(contact: *mut dc_contact_t) {
        eprintln!("ignoring careless call to dc_contact_unref()");
        return;
    }
-    drop(Box::from_raw(contact));
+    Box::from_raw(contact);
 }

 #[no_mangle]
@@ -3980,7 +3916,7 @@ pub unsafe extern "C" fn dc_lot_unref(lot: *mut dc_lot_t) {
        return;
    }

-    drop(Box::from_raw(lot));
+    Box::from_raw(lot);
 }

 #[no_mangle]
@@ -4049,45 +3985,6 @@ pub unsafe extern "C" fn dc_lot_get_timestamp(lot: *mut dc_lot_t) -> i64 {
    lot.get_timestamp()
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_reactions_get_contacts(
-    reactions: *mut dc_reactions_t,
-) -> *mut dc_array::dc_array_t {
-    if reactions.is_null() {
-        eprintln!("ignoring careless call to dc_reactions_get_contacts()");
-        return ptr::null_mut();
-    }
-
-    let reactions = &*reactions;
-    let array: dc_array_t = reactions.contacts().into();
-
-    Box::into_raw(Box::new(array))
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_reactions_get_by_contact_id(
-    reactions: *mut dc_reactions_t,
-    contact_id: u32,
-) -> *mut libc::c_char {
-    if reactions.is_null() {
-        eprintln!("ignoring careless call to dc_reactions_get_by_contact_id()");
-        return ptr::null_mut();
-    }
-
-    let reactions = &*reactions;
-    reactions.get(ContactId::new(contact_id)).as_str().strdup()
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_reactions_unref(reactions: *mut dc_reactions_t) {
-    if reactions.is_null() {
-        eprintln!("ignoring careless call to dc_reactions_unref()");
-        return;
-    }
-
-    drop(Box::from_raw(reactions));
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_str_unref(s: *mut libc::c_char) {
    libc::free(s as *mut _)
@@ -4311,8 +4208,7 @@ pub unsafe extern "C" fn dc_accounts_get_account(
    }

    let accounts = &*accounts;
-    block_on(accounts.read())
-        .get_account(id)
+    block_on(async move { accounts.read().await.get_account(id).await })
        .map(|ctx| Box::into_raw(Box::new(ctx)))
        .unwrap_or_else(std::ptr::null_mut)
 }
@@ -4327,8 +4223,7 @@ pub unsafe extern "C" fn dc_accounts_get_selected_account(
    }

    let accounts = &*accounts;
-    block_on(accounts.read())
-        .get_selected_account()
+    block_on(async move { accounts.read().await.get_selected_account().await })
        .map(|ctx| Box::into_raw(Box::new(ctx)))
        .unwrap_or_else(std::ptr::null_mut)
 }
@@ -4473,7 +4368,7 @@ pub unsafe extern "C" fn dc_accounts_get_all(accounts: *mut dc_accounts_t) -> *m
    }

    let accounts = &*accounts;
-    let list = block_on(accounts.read()).get_all();
+    let list = block_on(async move { accounts.read().await.get_all().await });
    let array: dc_array_t = list.into();

    Box::into_raw(Box::new(array))
@@ -4543,7 +4438,7 @@ pub unsafe extern "C" fn dc_accounts_get_event_emitter(
    }

    let accounts = &*accounts;
-    let emitter = block_on(accounts.read()).get_event_emitter();
+    let emitter = block_on(async move { accounts.read().await.get_event_emitter().await });

    Box::into_raw(Box::new(emitter))
 }
@@ -4552,13 +4447,11 @@ pub unsafe extern "C" fn dc_accounts_get_event_emitter(
 mod jsonrpc {
    use super::*;
    use deltachat_jsonrpc::api::CommandApi;
-    use deltachat_jsonrpc::events::event_to_json_rpc_notification;
    use deltachat_jsonrpc::yerpc::{OutReceiver, RpcClient, RpcSession};

    pub struct dc_jsonrpc_instance_t {
        receiver: OutReceiver,
        handle: RpcSession<CommandApi>,
-        event_thread: JoinHandle<Result<(), anyhow::Error>>,
    }

    #[no_mangle]
@@ -4574,36 +4467,9 @@ mod jsonrpc {
            deltachat_jsonrpc::api::CommandApi::from_arc((*account_manager).inner.clone());

        let (request_handle, receiver) = RpcClient::new();
-        let request_handle2 = request_handle.clone();
        let handle = RpcSession::new(request_handle, cmd_api);

-        let events = block_on({
-            async {
-                let am = (*account_manager).inner.clone();
-                let ev = am.read().await.get_event_emitter();
-                drop(am);
-                ev
-            }
-        });
-
-        let event_thread = spawn({
-            async move {
-                while let Some(event) = events.recv().await {
-                    let event = event_to_json_rpc_notification(event);
-                    request_handle2
-                        .send_notification("event", Some(event))
-                        .await?;
-                }
-                let res: Result<(), anyhow::Error> = Ok(());
-                res
-            }
-        });
-
-        let instance = dc_jsonrpc_instance_t {
-            receiver,
-            handle,
-            event_thread,
-        };
+        let instance = dc_jsonrpc_instance_t { receiver, handle };

        Box::into_raw(Box::new(instance))
    }
@@ -4614,8 +4480,8 @@ mod jsonrpc {
            eprintln!("ignoring careless call to dc_jsonrpc_unref()");
            return;
        }
-        (*jsonrpc_instance).event_thread.abort();
-        drop(Box::from_raw(jsonrpc_instance));
+
+        Box::from_raw(jsonrpc_instance);
    }

    #[no_mangle]
--- a/deltachat-ffi/src/lot.rs
+++ b/deltachat-ffi/src/lot.rs
@@ -58,7 +58,6 @@ impl Lot {
                Qr::WithdrawVerifyGroup { grpname, .. } => Some(grpname),
                Qr::ReviveVerifyContact { .. } => None,
                Qr::ReviveVerifyGroup { grpname, .. } => Some(grpname),
-                Qr::Login { address, .. } => Some(address),
            },
            Self::Error(err) => Some(err),
        }
@@ -109,7 +108,6 @@ impl Lot {
                Qr::WithdrawVerifyGroup { .. } => LotState::QrWithdrawVerifyGroup,
                Qr::ReviveVerifyContact { .. } => LotState::QrReviveVerifyContact,
                Qr::ReviveVerifyGroup { .. } => LotState::QrReviveVerifyGroup,
-                Qr::Login { .. } => LotState::QrLogin,
            },
            Self::Error(_err) => LotState::QrError,
        }
@@ -133,7 +131,6 @@ impl Lot {
                Qr::WithdrawVerifyGroup { .. } => Default::default(),
                Qr::ReviveVerifyContact { contact_id, .. } => contact_id.to_u32(),
                Qr::ReviveVerifyGroup { .. } => Default::default(),
-                Qr::Login { .. } => Default::default(),
            },
            Self::Error(_) => Default::default(),
        }
@@ -198,9 +195,6 @@ pub enum LotState {
    /// text1=groupname
    QrReviveVerifyGroup = 512,

-    /// text1=email_address
-    QrLogin = 520,
-
    // Message States
    MsgInFresh = 10,
    MsgInNoticed = 13,
--- a/deltachat-jsonrpc/Cargo.toml
+++ b/deltachat-jsonrpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.99.0"
+version = "1.93.0"
 description = "DeltaChat JSON-RPC API"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
@@ -20,19 +20,18 @@ serde = { version = "1.0", features = ["derive"] }
 tempfile = "3.3.0"
 log = "0.4"
 async-channel = { version = "1.6.1" }
-futures = { version = "0.3.25" }
-serde_json = "1.0.87"
+futures = { version = "0.3.24" }
+serde_json = "1.0.85"
 yerpc = { version = "^0.3.1", features = ["anyhow_expose"] }
 typescript-type-def = { version = "0.5.3", features = ["json_value"] }
-tokio = { version = "1.21.2" }
+tokio = { version = "1.19.2" }

 # optional dependencies
-axum = { version = "0.5.17", optional = true, features = ["ws"] }
-env_logger = { version = "0.9.1", optional = true }
-walkdir = "2.3.2"
+axum = { version = "0.5.9", optional = true, features = ["ws"] }
+env_logger = { version = "0.9.0", optional = true }

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


 [features]
--- a/deltachat-jsonrpc/src/api/events.rs
+++ b/deltachat-jsonrpc/src/api/events.rs
@@ -4,383 +4,148 @@ use serde_json::{json, Value};
 use typescript_type_def::TypeDef;

 pub fn event_to_json_rpc_notification(event: Event) -> Value {
-    let id: JSONRPCEventType = event.typ.into();
+    let (field1, field2): (Value, Value) = match &event.typ {
+        // events with a single string in field1
+        EventType::Info(txt)
+        | EventType::SmtpConnected(txt)
+        | EventType::ImapConnected(txt)
+        | EventType::SmtpMessageSent(txt)
+        | EventType::ImapMessageDeleted(txt)
+        | EventType::ImapMessageMoved(txt)
+        | EventType::NewBlobFile(txt)
+        | EventType::DeletedBlobFile(txt)
+        | EventType::Warning(txt)
+        | EventType::Error(txt)
+        | EventType::ErrorSelfNotInGroup(txt) => (json!(txt), Value::Null),
+        EventType::ImexFileWritten(path) => (json!(path.to_str()), Value::Null),
+        // single number
+        EventType::MsgsNoticed(chat_id) | EventType::ChatModified(chat_id) => {
+            (json!(chat_id), Value::Null)
+        }
+        EventType::ImexProgress(progress) => (json!(progress), Value::Null),
+        // both fields contain numbers
+        EventType::MsgsChanged { chat_id, msg_id }
+        | EventType::IncomingMsg { chat_id, msg_id }
+        | EventType::MsgDelivered { chat_id, msg_id }
+        | EventType::MsgFailed { chat_id, msg_id }
+        | EventType::MsgRead { chat_id, msg_id } => (json!(chat_id), json!(msg_id)),
+        EventType::ChatEphemeralTimerModified { chat_id, timer } => (json!(chat_id), json!(timer)),
+        EventType::SecurejoinInviterProgress {
+            contact_id,
+            progress,
+        }
+        | EventType::SecurejoinJoinerProgress {
+            contact_id,
+            progress,
+        } => (json!(contact_id), json!(progress)),
+        // field 1 number or null
+        EventType::ContactsChanged(maybe_number) | EventType::LocationChanged(maybe_number) => (
+            match maybe_number {
+                Some(number) => json!(number),
+                None => Value::Null,
+            },
+            Value::Null,
+        ),
+        // number and maybe string
+        EventType::ConfigureProgress { progress, comment } => (
+            json!(progress),
+            match comment {
+                Some(content) => json!(content),
+                None => Value::Null,
+            },
+        ),
+        EventType::ConnectivityChanged => (Value::Null, Value::Null),
+        EventType::SelfavatarChanged => (Value::Null, Value::Null),
+        EventType::WebxdcStatusUpdate {
+            msg_id,
+            status_update_serial,
+        } => (json!(msg_id), json!(status_update_serial)),
+        EventType::WebxdcInstanceDeleted { msg_id } => (json!(msg_id), Value::Null),
+        EventType::WebxdcBusyUpdating { msg_id } => (json!(msg_id), Value::Null),
+        EventType::WebxdcUpToDate { msg_id } => (json!(msg_id), Value::Null),
+    };
+
+    let id: EventTypeName = event.typ.into();
    json!({
-        "event": id,
+        "id": id,
        "contextId": event.id,
+        "field1": field1,
+        "field2": field2
    })
 }

 #[derive(Serialize, TypeDef)]
-#[serde(tag = "type", rename = "Event")]
-pub enum JSONRPCEventType {
-    /// The library-user may write an informational string to the log.
-    ///
-    /// This event should *not* be reported to the end-user using a popup or something like
-    /// that.
-    Info {
-        msg: String,
-    },
-
-    /// Emitted when SMTP connection is established and login was successful.
-    SmtpConnected {
-        msg: String,
-    },
-
-    /// Emitted when IMAP connection is established and login was successful.
-    ImapConnected {
-        msg: String,
-    },
-
-    /// Emitted when a message was successfully sent to the SMTP server.
-    SmtpMessageSent {
-        msg: String,
-    },
-
-    /// Emitted when an IMAP message has been marked as deleted
-    ImapMessageDeleted {
-        msg: String,
-    },
-
-    /// Emitted when an IMAP message has been moved
-    ImapMessageMoved {
-        msg: String,
-    },
-
-    /// Emitted when an new file in the $BLOBDIR was created
-    NewBlobFile {
-        file: String,
-    },
-
-    /// Emitted when an file in the $BLOBDIR was deleted
-    DeletedBlobFile {
-        file: String,
-    },
-
-    /// The library-user should write a warning string to the log.
-    ///
-    /// This event should *not* be reported to the end-user using a popup or something like
-    /// that.
-    Warning {
-        msg: String,
-    },
-
-    /// The library-user should report an error to the end-user.
-    ///
-    /// As most things are asynchronous, things may go wrong at any time and the user
-    /// should not be disturbed by a dialog or so.  Instead, use a bubble or so.
-    ///
-    /// However, for ongoing processes (eg. configure())
-    /// or for functions that are expected to fail (eg. autocryptContinueKeyTransfer())
-    /// it might be better to delay showing these events until the function has really
-    /// failed (returned false). It should be sufficient to report only the *last* error
-    /// in a messasge box then.
-    Error {
-        msg: String,
-    },
-
-    /// An action cannot be performed because the user is not in the group.
-    /// Reported eg. after a call to
-    /// setChatName(), setChatProfileImage(),
-    /// addContactToChat(), removeContactFromChat(),
-    /// and messages sending functions.
-    ErrorSelfNotInGroup {
-        msg: String,
-    },
-
-    /// Messages or chats changed.  One or more messages or chats changed for various
-    /// reasons in the database:
-    /// - Messages sent, received or removed
-    /// - Chats created, deleted or archived
-    /// - A draft has been set
-    ///
-    /// `chatId` is set if only a single chat is affected by the changes, otherwise 0.
-    /// `msgId` is set if only a single message is affected by the changes, otherwise 0.
-    #[serde(rename_all = "camelCase")]
-    MsgsChanged {
-        chat_id: u32,
-        msg_id: u32,
-    },
-
-    /// Reactions for the message changed.
-    #[serde(rename_all = "camelCase")]
-    ReactionsChanged {
-        chat_id: u32,
-        msg_id: u32,
-        contact_id: u32,
-    },
-
-    /// There is a fresh message. Typically, the user will show an notification
-    /// when receiving this message.
-    ///
-    /// There is no extra #DC_EVENT_MSGS_CHANGED event send together with this event.
-    #[serde(rename_all = "camelCase")]
-    IncomingMsg {
-        chat_id: u32,
-        msg_id: u32,
-    },
-
-    /// Downloading a bunch of messages just finished. This is an experimental
-    /// event to allow the UI to only show one notification per message bunch,
-    /// instead of cluttering the user with many notifications.
-    ///
-    /// msg_ids contains the message ids.
-    #[serde(rename_all = "camelCase")]
-    IncomingMsgBunch {
-        msg_ids: Vec<u32>,
-    },
-
-    /// Messages were seen or noticed.
-    /// chat id is always set.
-    #[serde(rename_all = "camelCase")]
-    MsgsNoticed {
-        chat_id: u32,
-    },
-
-    /// A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to
-    /// DC_STATE_OUT_DELIVERED, see `Message.state`.
-    #[serde(rename_all = "camelCase")]
-    MsgDelivered {
-        chat_id: u32,
-        msg_id: u32,
-    },
-
-    /// A single message could not be sent. State changed from DC_STATE_OUT_PENDING or DC_STATE_OUT_DELIVERED to
-    /// DC_STATE_OUT_FAILED, see `Message.state`.
-    #[serde(rename_all = "camelCase")]
-    MsgFailed {
-        chat_id: u32,
-        msg_id: u32,
-    },
-
-    /// A single message is read by the receiver. State changed from DC_STATE_OUT_DELIVERED to
-    /// DC_STATE_OUT_MDN_RCVD, see `Message.state`.
-    #[serde(rename_all = "camelCase")]
-    MsgRead {
-        chat_id: u32,
-        msg_id: u32,
-    },
-
-    /// Chat changed.  The name or the image of a chat group was changed or members were added or removed.
-    /// Or the verify state of a chat has changed.
-    /// See setChatName(), setChatProfileImage(), addContactToChat()
-    /// and removeContactFromChat().
-    ///
-    /// This event does not include ephemeral timer modification, which
-    /// is a separate event.
-    #[serde(rename_all = "camelCase")]
-    ChatModified {
-        chat_id: u32,
-    },
-
-    /// Chat ephemeral timer changed.
-    #[serde(rename_all = "camelCase")]
-    ChatEphemeralTimerModified {
-        chat_id: u32,
-        timer: u32,
-    },
-
-    /// Contact(s) created, renamed, blocked or deleted.
-    ///
-    /// @param data1 (int) If set, this is the contact_id of an added contact that should be selected.
-    #[serde(rename_all = "camelCase")]
-    ContactsChanged {
-        contact_id: Option<u32>,
-    },
-
-    /// Location of one or more contact has changed.
-    ///
-    /// @param data1 (u32) contact_id of the contact for which the location has changed.
-    ///     If the locations of several contacts have been changed,
-    ///     this parameter is set to `None`.
-    #[serde(rename_all = "camelCase")]
-    LocationChanged {
-        contact_id: Option<u32>,
-    },
-
-    /// Inform about the configuration progress started by configure().
-    ConfigureProgress {
-        /// Progress.
-        ///
-        /// 0=error, 1-999=progress in permille, 1000=success and done
-        progress: usize,
-
-        /// Progress comment or error, something to display to the user.
-        comment: Option<String>,
-    },
-
-    /// Inform about the import/export progress started by imex().
-    ///
-    /// @param data1 (usize) 0=error, 1-999=progress in permille, 1000=success and done
-    /// @param data2 0
-    #[serde(rename_all = "camelCase")]
-    ImexProgress {
-        progress: usize,
-    },
-
-    /// A file has been exported. A file has been written by imex().
-    /// This event may be sent multiple times by a single call to imex().
-    ///
-    /// A typical purpose for a handler of this event may be to make the file public to some system
-    /// services.
-    ///
-    /// @param data2 0
-    #[serde(rename_all = "camelCase")]
-    ImexFileWritten {
-        path: String,
-    },
-
-    /// Progress information of a secure-join handshake from the view of the inviter
-    /// (Alice, the person who shows the QR code).
-    ///
-    /// These events are typically sent after a joiner has scanned the QR code
-    /// generated by getChatSecurejoinQrCodeSvg().
-    ///
-    /// @param data1 (int) ID of the contact that wants to join.
-    /// @param data2 (int) Progress as:
-    ///     300=vg-/vc-request received, typically shown as "bob@addr joins".
-    ///     600=vg-/vc-request-with-auth received, vg-member-added/vc-contact-confirm sent, typically shown as "bob@addr verified".
-    ///     800=vg-member-added-received received, shown as "bob@addr securely joined GROUP", only sent for the verified-group-protocol.
-    ///     1000=Protocol finished for this contact.
-    #[serde(rename_all = "camelCase")]
-    SecurejoinInviterProgress {
-        contact_id: u32,
-        progress: usize,
-    },
-
-    /// Progress information of a secure-join handshake from the view of the joiner
-    /// (Bob, the person who scans the QR code).
-    /// The events are typically sent while secureJoin(), which
-    /// may take some time, is executed.
-    /// @param data1 (int) ID of the inviting contact.
-    /// @param data2 (int) Progress as:
-    ///     400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself."
-    ///     (Bob has verified alice and waits until Alice does the same for him)
-    #[serde(rename_all = "camelCase")]
-    SecurejoinJoinerProgress {
-        contact_id: u32,
-        progress: usize,
-    },
-
-    /// The connectivity to the server changed.
-    /// This means that you should refresh the connectivity view
-    /// and possibly the connectivtiy HTML; see getConnectivity() and
-    /// getConnectivityHtml() for details.
+pub enum EventTypeName {
+    Info,
+    SmtpConnected,
+    ImapConnected,
+    SmtpMessageSent,
+    ImapMessageDeleted,
+    ImapMessageMoved,
+    NewBlobFile,
+    DeletedBlobFile,
+    Warning,
+    Error,
+    ErrorSelfNotInGroup,
+    MsgsChanged,
+    IncomingMsg,
+    MsgsNoticed,
+    MsgDelivered,
+    MsgFailed,
+    MsgRead,
+    ChatModified,
+    ChatEphemeralTimerModified,
+    ContactsChanged,
+    LocationChanged,
+    ConfigureProgress,
+    ImexProgress,
+    ImexFileWritten,
+    SecurejoinInviterProgress,
+    SecurejoinJoinerProgress,
    ConnectivityChanged,
-
    SelfavatarChanged,
-
-    #[serde(rename_all = "camelCase")]
-    WebxdcStatusUpdate {
-        msg_id: u32,
-        status_update_serial: u32,
-    },
-
-    /// Inform that a message containing a webxdc instance has been deleted
-    #[serde(rename_all = "camelCase")]
-    WebxdcInstanceDeleted {
-        msg_id: u32,
-    },
+    WebxdcStatusUpdate,
+    WebxdcInstanceDeleted,
+    WebxdcBusyUpdating,
+    WebxdcUpToDate,
 }

-impl From<EventType> for JSONRPCEventType {
+impl From<EventType> for EventTypeName {
    fn from(event: EventType) -> Self {
-        use JSONRPCEventType::*;
+        use EventTypeName::*;
        match event {
-            EventType::Info(msg) => Info { msg },
-            EventType::SmtpConnected(msg) => SmtpConnected { msg },
-            EventType::ImapConnected(msg) => ImapConnected { msg },
-            EventType::SmtpMessageSent(msg) => SmtpMessageSent { msg },
-            EventType::ImapMessageDeleted(msg) => ImapMessageDeleted { msg },
-            EventType::ImapMessageMoved(msg) => ImapMessageMoved { msg },
-            EventType::NewBlobFile(file) => NewBlobFile { file },
-            EventType::DeletedBlobFile(file) => DeletedBlobFile { file },
-            EventType::Warning(msg) => Warning { msg },
-            EventType::Error(msg) => Error { msg },
-            EventType::ErrorSelfNotInGroup(msg) => ErrorSelfNotInGroup { msg },
-            EventType::MsgsChanged { chat_id, msg_id } => MsgsChanged {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            EventType::ReactionsChanged {
-                chat_id,
-                msg_id,
-                contact_id,
-            } => ReactionsChanged {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-                contact_id: contact_id.to_u32(),
-            },
-            EventType::IncomingMsg { chat_id, msg_id } => IncomingMsg {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            EventType::IncomingMsgBunch { msg_ids } => IncomingMsgBunch {
-                msg_ids: msg_ids.into_iter().map(|id| id.to_u32()).collect(),
-            },
-            EventType::MsgsNoticed(chat_id) => MsgsNoticed {
-                chat_id: chat_id.to_u32(),
-            },
-            EventType::MsgDelivered { chat_id, msg_id } => MsgDelivered {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            EventType::MsgFailed { chat_id, msg_id } => MsgFailed {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            EventType::MsgRead { chat_id, msg_id } => MsgRead {
-                chat_id: chat_id.to_u32(),
-                msg_id: msg_id.to_u32(),
-            },
-            EventType::ChatModified(chat_id) => ChatModified {
-                chat_id: chat_id.to_u32(),
-            },
-            EventType::ChatEphemeralTimerModified { chat_id, timer } => {
-                ChatEphemeralTimerModified {
-                    chat_id: chat_id.to_u32(),
-                    timer: timer.to_u32(),
-                }
-            }
-            EventType::ContactsChanged(contact) => ContactsChanged {
-                contact_id: contact.map(|c| c.to_u32()),
-            },
-            EventType::LocationChanged(contact) => LocationChanged {
-                contact_id: contact.map(|c| c.to_u32()),
-            },
-            EventType::ConfigureProgress { progress, comment } => {
-                ConfigureProgress { progress, comment }
-            }
-            EventType::ImexProgress(progress) => ImexProgress { progress },
-            EventType::ImexFileWritten(path) => ImexFileWritten {
-                path: path.to_str().unwrap_or_default().to_owned(),
-            },
-            EventType::SecurejoinInviterProgress {
-                contact_id,
-                progress,
-            } => SecurejoinInviterProgress {
-                contact_id: contact_id.to_u32(),
-                progress,
-            },
-            EventType::SecurejoinJoinerProgress {
-                contact_id,
-                progress,
-            } => SecurejoinJoinerProgress {
-                contact_id: contact_id.to_u32(),
-                progress,
-            },
+            EventType::Info(_) => Info,
+            EventType::SmtpConnected(_) => SmtpConnected,
+            EventType::ImapConnected(_) => ImapConnected,
+            EventType::SmtpMessageSent(_) => SmtpMessageSent,
+            EventType::ImapMessageDeleted(_) => ImapMessageDeleted,
+            EventType::ImapMessageMoved(_) => ImapMessageMoved,
+            EventType::NewBlobFile(_) => NewBlobFile,
+            EventType::DeletedBlobFile(_) => DeletedBlobFile,
+            EventType::Warning(_) => Warning,
+            EventType::Error(_) => Error,
+            EventType::ErrorSelfNotInGroup(_) => ErrorSelfNotInGroup,
+            EventType::MsgsChanged { .. } => MsgsChanged,
+            EventType::IncomingMsg { .. } => IncomingMsg,
+            EventType::MsgsNoticed(_) => MsgsNoticed,
+            EventType::MsgDelivered { .. } => MsgDelivered,
+            EventType::MsgFailed { .. } => MsgFailed,
+            EventType::MsgRead { .. } => MsgRead,
+            EventType::ChatModified(_) => ChatModified,
+            EventType::ChatEphemeralTimerModified { .. } => ChatEphemeralTimerModified,
+            EventType::ContactsChanged(_) => ContactsChanged,
+            EventType::LocationChanged(_) => LocationChanged,
+            EventType::ConfigureProgress { .. } => ConfigureProgress,
+            EventType::ImexProgress(_) => ImexProgress,
+            EventType::ImexFileWritten(_) => ImexFileWritten,
+            EventType::SecurejoinInviterProgress { .. } => SecurejoinInviterProgress,
+            EventType::SecurejoinJoinerProgress { .. } => SecurejoinJoinerProgress,
            EventType::ConnectivityChanged => ConnectivityChanged,
            EventType::SelfavatarChanged => SelfavatarChanged,
-            EventType::WebxdcStatusUpdate {
-                msg_id,
-                status_update_serial,
-            } => WebxdcStatusUpdate {
-                msg_id: msg_id.to_u32(),
-                status_update_serial: status_update_serial.to_u32(),
-            },
-            EventType::WebxdcInstanceDeleted { msg_id } => WebxdcInstanceDeleted {
-                msg_id: msg_id.to_u32(),
-            },
+            EventType::WebxdcStatusUpdate { .. } => WebxdcStatusUpdate,
+            EventType::WebxdcInstanceDeleted { .. } => WebxdcInstanceDeleted,
+            EventType::WebxdcBusyUpdating { .. } => WebxdcBusyUpdating,
+            EventType::WebxdcUpToDate { .. } => WebxdcUpToDate,
        }
    }
 }
@@ -394,8 +159,7 @@ fn generate_events_ts_types_definition() {
            root_namespace: None,
            ..typescript_type_def::DefinitionFileOptions::default()
        };
-        typescript_type_def::write_definition_file::<_, JSONRPCEventType>(&mut buf, options)
-            .unwrap();
+        typescript_type_def::write_definition_file::<_, EventTypeName>(&mut buf, options).unwrap();
        String::from_utf8(buf).unwrap()
    };
    std::fs::write("typescript/generated/events.ts", events).unwrap();
--- a/deltachat-jsonrpc/src/api/mod.rs
+++ b/deltachat-jsonrpc/src/api/mod.rs
@@ -2,31 +2,23 @@ use anyhow::{anyhow, bail, Context, Result};
 use deltachat::{
    chat::{
        self, add_contact_to_chat, forward_msgs, get_chat_media, get_chat_msgs, marknoticed_chat,
-        remove_contact_from_chat, Chat, ChatId, ChatItem, ProtectionStatus,
+        remove_contact_from_chat, Chat, ChatId, ChatItem,
    },
    chatlist::Chatlist,
    config::Config,
-    constants::DC_MSG_ID_DAYMARKER,
-    contact::{may_be_valid_addr, Contact, ContactId, Origin},
+    contact::{may_be_valid_addr, Contact, ContactId},
    context::get_info,
-    ephemeral::Timer,
-    imex, location,
-    message::{
-        self, delete_msgs, get_msg_info, markseen_msgs, Message, MessageState, MsgId, Viewtype,
-    },
+    message::{delete_msgs, get_msg_info, markseen_msgs, Message, MessageState, MsgId, Viewtype},
    provider::get_provider_info,
    qr,
    qr_code_generator::get_securejoin_qr_svg,
-    reaction::send_reaction,
    securejoin,
-    stock_str::StockMessage,
    webxdc::StatusUpdateSerial,
 };
 use std::collections::BTreeMap;
 use std::sync::Arc;
 use std::{collections::HashMap, str::FromStr};
-use tokio::{fs, sync::RwLock};
-use walkdir::WalkDir;
+use tokio::sync::RwLock;
 use yerpc::rpc;

 pub use deltachat::accounts::Accounts;
@@ -35,7 +27,7 @@ pub mod events;
 pub mod types;

 use crate::api::types::chat_list::{get_chat_list_item_by_id, ChatListItemFetchResult};
-use crate::api::types::qr::QrObject;
+use crate::api::types::QrObject;

 use types::account::Account;
 use types::chat::FullChat;
@@ -46,15 +38,10 @@ use types::provider_info::ProviderInfo;
 use types::webxdc::WebxdcMessageInfo;

 use self::types::{
-    chat::{BasicChat, JSONRPCChatVisibility, MuteDuration},
-    location::JsonrpcLocation,
-    message::{
-        JSONRPCMessageListItem, MessageNotificationInfo, MessageSearchResult, MessageViewtype,
-    },
+    chat::{BasicChat, MuteDuration},
+    message::MessageViewtype,
 };

-use num_traits::FromPrimitive;
-
 #[derive(Clone, Debug)]
 pub struct CommandApi {
    pub(crate) accounts: Arc<RwLock<Accounts>>,
@@ -78,6 +65,7 @@ impl CommandApi {
            .read()
            .await
            .get_account(id)
+            .await
            .ok_or_else(|| anyhow!("account with id {} not found", id))?;
        Ok(sc)
    }
@@ -112,7 +100,7 @@ impl CommandApi {
    }

    async fn get_all_account_ids(&self) -> Vec<u32> {
-        self.accounts.read().await.get_all()
+        self.accounts.read().await.get_all().await
    }

    /// Select account id for internally selected state.
@@ -124,14 +112,14 @@ impl CommandApi {
    /// Get the selected account id of the internal state..
    /// TODO: Likely this is deprecated as all methods take an account id now.
    async fn get_selected_account_id(&self) -> Option<u32> {
-        self.accounts.read().await.get_selected_account_id()
+        self.accounts.read().await.get_selected_account_id().await
    }

    /// Get a list of all configured accounts.
    async fn get_all_accounts(&self) -> Result<Vec<Account>> {
        let mut accounts = Vec::new();
-        for id in self.accounts.read().await.get_all() {
-            let context_option = self.accounts.read().await.get_account(id);
+        for id in self.accounts.read().await.get_all().await {
+            let context_option = self.accounts.read().await.get_account(id).await;
            if let Some(ctx) = context_option {
                accounts.push(Account::from_context(&ctx, id).await?)
            } else {
@@ -141,35 +129,13 @@ impl CommandApi {
        Ok(accounts)
    }

-    async fn start_io_for_all_accounts(&self) -> Result<()> {
-        self.accounts.read().await.start_io().await;
-        Ok(())
-    }
-
-    async fn stop_io_for_all_accounts(&self) -> Result<()> {
-        self.accounts.read().await.stop_io().await;
-        Ok(())
-    }
-
    // ---------------------------------------------
    // Methods that work on individual accounts
    // ---------------------------------------------

-    async fn start_io(&self, id: u32) -> Result<()> {
-        let ctx = self.get_context(id).await?;
-        ctx.start_io().await;
-        Ok(())
-    }
-
-    async fn stop_io(&self, id: u32) -> Result<()> {
-        let ctx = self.get_context(id).await?;
-        ctx.stop_io().await;
-        Ok(())
-    }
-
    /// Get top-level info for an account.
    async fn get_account_info(&self, account_id: u32) -> Result<Account> {
-        let context_option = self.accounts.read().await.get_account(account_id);
+        let context_option = self.accounts.read().await.get_account(account_id).await;
        if let Some(ctx) = context_option {
            Ok(Account::from_context(&ctx, account_id).await?)
        } else {
@@ -180,21 +146,6 @@ impl CommandApi {
        }
    }

-    /// Get the combined filesize of an account in bytes
-    async fn get_account_file_size(&self, account_id: u32) -> Result<u64> {
-        let ctx = self.get_context(account_id).await?;
-        let dbfile = ctx.get_dbfile().metadata()?.len();
-        let total_size = WalkDir::new(ctx.get_blobdir())
-            .max_depth(2)
-            .into_iter()
-            .filter_map(|entry| entry.ok())
-            .filter_map(|entry| entry.metadata().ok())
-            .filter(|metadata| metadata.is_file())
-            .fold(0, |acc, m| acc + m.len());
-
-        Ok(dbfile + total_size)
-    }
-
    /// Returns provider for the given domain.
    ///
    /// This function looks up domain in offline database.
@@ -283,18 +234,6 @@ impl CommandApi {
        Ok(result)
    }

-    async fn set_stock_strings(&self, strings: HashMap<u32, String>) -> Result<()> {
-        let accounts = self.accounts.read().await;
-        for (stock_id, stock_message) in strings {
-            if let Some(stock_id) = StockMessage::from_u32(stock_id) {
-                accounts
-                    .set_stock_translation(stock_id, stock_message)
-                    .await?;
-            }
-        }
-        Ok(())
-    }
-
    /// Configures this account with the currently set parameters.
    /// Setup the credential config before calling this.
    async fn configure(&self, account_id: u32) -> Result<()> {
@@ -318,38 +257,6 @@ impl CommandApi {
        Ok(())
    }

-    async fn export_self_keys(
-        &self,
-        account_id: u32,
-        path: String,
-        passphrase: Option<String>,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        imex::imex(
-            &ctx,
-            imex::ImexMode::ExportSelfKeys,
-            path.as_ref(),
-            passphrase,
-        )
-        .await
-    }
-
-    async fn import_self_keys(
-        &self,
-        account_id: u32,
-        path: String,
-        passphrase: Option<String>,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        imex::imex(
-            &ctx,
-            imex::ImexMode::ImportSelfKeys,
-            path.as_ref(),
-            passphrase,
-        )
-        .await
-    }
-
    /// Returns the message IDs of all _fresh_ messages of any chat.
    /// Typically used for implementing notification summaries
    /// or badge counters e.g. on the app icon.
@@ -382,30 +289,16 @@ impl CommandApi {
        ChatId::new(chat_id).get_fresh_msg_cnt(&ctx).await
    }

-    /// Estimate the number of messages that will be deleted
-    /// by the set_config()-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.
-    async fn estimate_auto_deletion_count(
-        &self,
-        account_id: u32,
-        from_server: bool,
-        seconds: i64,
-    ) -> Result<usize> {
-        let ctx = self.get_context(account_id).await?;
-        message::estimate_deletion_cnt(&ctx, from_server, seconds).await
-    }
-
    // ---------------------------------------------
    //  autocrypt
    // ---------------------------------------------

-    async fn initiate_autocrypt_key_transfer(&self, account_id: u32) -> Result<String> {
+    async fn autocrypt_initiate_key_transfer(&self, account_id: u32) -> Result<String> {
        let ctx = self.get_context(account_id).await?;
        deltachat::imex::initiate_key_transfer(&ctx).await
    }

-    async fn continue_autocrypt_key_transfer(
+    async fn autocrypt_continue_key_transfer(
        &self,
        account_id: u32,
        message_id: u32,
@@ -472,7 +365,11 @@ impl CommandApi {
    //  chat
    // ---------------------------------------------

-    async fn get_full_chat_by_id(&self, account_id: u32, chat_id: u32) -> Result<FullChat> {
+    async fn chatlist_get_full_chat_by_id(
+        &self,
+        account_id: u32,
+        chat_id: u32,
+    ) -> Result<FullChat> {
        let ctx = self.get_context(account_id).await?;
        FullChat::try_from_dc_chat_id(&ctx, chat_id).await
    }
@@ -511,7 +408,9 @@ impl CommandApi {
    ///   really unexpected when deletion results in contacting all members again,
    ///   (3) only leaving groups is also a valid usecase.
    ///
-    /// To leave a chat explicitly, use leave_group()
+    /// To leave a chat explicitly, use dc_remove_contact_from_chat() with
+    /// chat_id=DC_CONTACT_ID_SELF)
+    // TODO fix doc comment after adding dc_remove_contact_from_chat
    async fn delete_chat(&self, account_id: u32, chat_id: u32) -> Result<()> {
        let ctx = self.get_context(account_id).await?;
        ChatId::new(chat_id).delete(&ctx).await
@@ -533,7 +432,7 @@ impl CommandApi {
    ///
    /// The scanning device will pass the scanned content to `checkQr()` then;
    /// if `checkQr()` returns `askVerifyContact` or `askVerifyGroup`
-    /// an out-of-band-verification can be joined using `secure_join()`
+    /// an out-of-band-verification can be joined using dc_join_securejoin()
    ///
    /// chat_id: If set to a group-chat-id,
    ///     the Verified-Group-Invite protocol is offered in the QR code;
@@ -543,6 +442,7 @@ impl CommandApi {
    ///     for details about both protocols.
    ///
    /// return format: `[code, svg]`
+    // TODO fix doc comment after adding dc_join_securejoin
    async fn get_chat_securejoin_qr_code_svg(
        &self,
        account_id: u32,
@@ -556,33 +456,6 @@ impl CommandApi {
        ))
    }

-    /// Continue a Setup-Contact or Verified-Group-Invite protocol
-    /// started on another device with `get_chat_securejoin_qr_code_svg()`.
-    /// This function is typically called when `check_qr()` returns
-    /// type=AskVerifyContact or type=AskVerifyGroup.
-    ///
-    /// The function returns immediately and the handshake runs in background,
-    /// sending and receiving several messages.
-    /// During the handshake, info messages are added to the chat,
-    /// showing progress, success or errors.
-    ///
-    /// Subsequent calls of `secure_join()` will abort previous, unfinished handshakes.
-    ///
-    /// See https://countermitm.readthedocs.io/en/latest/new.html
-    /// for details about both protocols.
-    ///
-    /// **qr**: The text of the scanned QR code. Typically, the same string as given
-    ///     to `check_qr()`.
-    ///
-    /// **returns**: The chat ID of the joined chat, the UI may redirect to the this chat.
-    ///         A returned chat ID does not guarantee that the chat is protected or the belonging contact is verified.
-    ///
-    async fn secure_join(&self, account_id: u32, qr: String) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-        let chat_id = securejoin::join_securejoin(&ctx, &qr).await?;
-        Ok(chat_id.to_u32())
-    }
-
    async fn leave_group(&self, account_id: u32, chat_id: u32) -> Result<()> {
        let ctx = self.get_context(account_id).await?;
        remove_contact_from_chat(&ctx, ChatId::new(chat_id), ContactId::SELF).await
@@ -622,153 +495,6 @@ impl CommandApi {
        add_contact_to_chat(&ctx, ChatId::new(chat_id), ContactId::new(contact_id)).await
    }

-    /// Get the contact IDs belonging to a chat.
-    ///
-    /// - for normal chats, the function always returns exactly one contact,
-    ///   DC_CONTACT_ID_SELF is returned only for SELF-chats.
-    ///
-    /// - for group chats all members are returned, DC_CONTACT_ID_SELF is returned
-    ///   explicitly as it may happen that oneself gets removed from a still existing
-    ///   group
-    ///
-    /// - for broadcasts, all recipients are returned, DC_CONTACT_ID_SELF is not included
-    ///
-    /// - for mailing lists, the behavior is not documented currently, we will decide on that later.
-    ///   for now, the UI should not show the list for mailing lists.
-    ///   (we do not know all members and there is not always a global mailing list address,
-    ///   so we could return only SELF or the known members; this is not decided yet)
-    async fn get_chat_contacts(&self, account_id: u32, chat_id: u32) -> Result<Vec<u32>> {
-        let ctx = self.get_context(account_id).await?;
-        let contacts = chat::get_chat_contacts(&ctx, ChatId::new(chat_id)).await?;
-        Ok(contacts.iter().map(|id| id.to_u32()).collect::<Vec<u32>>())
-    }
-
-    /// Create a new group chat.
-    ///
-    /// After creation,
-    /// the group has one member with the ID DC_CONTACT_ID_SELF
-    /// and is in _unpromoted_ state.
-    /// This means, you can add or remove members, change the name,
-    /// the group image and so on without messages being sent to all group members.
-    ///
-    /// This changes as soon as the first message is sent to the group members
-    /// and the group becomes _promoted_.
-    /// After that, all changes are synced with all group members
-    /// by sending status message.
-    ///
-    /// To check, if a chat is still unpromoted, you can look at the `is_unpromoted` property of `BasicChat` or `FullChat`.
-    /// This may be useful if you want to show some help for just created groups.
-    ///
-    /// @param protect If set to 1 the function creates group with protection initially enabled.
-    ///     Only verified members are allowed in these groups
-    ///     and end-to-end-encryption is always enabled.
-    async fn create_group_chat(&self, account_id: u32, name: String, protect: bool) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-        let protect = match protect {
-            true => ProtectionStatus::Protected,
-            false => ProtectionStatus::Unprotected,
-        };
-        chat::create_group_chat(&ctx, protect, &name)
-            .await
-            .map(|id| id.to_u32())
-    }
-
-    /// Create a new broadcast list.
-    ///
-    /// Broadcast lists are similar to groups on the sending device,
-    /// however, recipients get the messages in normal one-to-one chats
-    /// and will not be aware of other members.
-    ///
-    /// Replies to broadcasts go only to the sender
-    /// and not to all broadcast recipients.
-    /// Moreover, replies will not appear in the broadcast list
-    /// but in the one-to-one chat with the person answering.
-    ///
-    /// The name and the image of the broadcast list is set automatically
-    /// and is visible to the sender only.
-    /// Not asking for these data allows more focused creation
-    /// and we bypass the question who will get which data.
-    /// Also, many users will have at most one broadcast list
-    /// so, a generic name and image is sufficient at the first place.
-    ///
-    /// Later on, however, the name can be changed using dc_set_chat_name().
-    /// The image cannot be changed to have a unique, recognizable icon in the chat lists.
-    /// All in all, this is also what other messengers are doing here.
-    async fn create_broadcast_list(&self, account_id: u32) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-        chat::create_broadcast_list(&ctx)
-            .await
-            .map(|id| id.to_u32())
-    }
-
-    /// Set group name.
-    ///
-    /// If the group is already _promoted_ (any message was sent to the group),
-    /// all group members are informed by a special status message that is sent automatically by this function.
-    ///
-    /// Sends out #DC_EVENT_CHAT_MODIFIED and #DC_EVENT_MSGS_CHANGED if a status message was sent.
-    async fn set_chat_name(&self, account_id: u32, chat_id: u32, new_name: String) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        chat::set_chat_name(&ctx, ChatId::new(chat_id), &new_name).await
-    }
-
-    /// Set group profile image.
-    ///
-    /// If the group is already _promoted_ (any message was sent to the group),
-    /// all group members are informed by a special status message that is sent automatically by this function.
-    ///
-    /// Sends out #DC_EVENT_CHAT_MODIFIED and #DC_EVENT_MSGS_CHANGED if a status message was sent.
-    ///
-    /// To find out the profile image of a chat, use dc_chat_get_profile_image()
-    ///
-    /// @param image_path Full path of the image to use as the group image. The image will immediately be copied to the
-    ///     `blobdir`; the original image will not be needed anymore.
-    ///      If you pass null here, the group image is deleted (for promoted groups, all members are informed about
-    ///      this change anyway).
-    async fn set_chat_profile_image(
-        &self,
-        account_id: u32,
-        chat_id: u32,
-        image_path: Option<String>,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        chat::set_chat_profile_image(&ctx, ChatId::new(chat_id), image_path.unwrap_or_default())
-            .await
-    }
-
-    async fn set_chat_visibility(
-        &self,
-        account_id: u32,
-        chat_id: u32,
-        visibility: JSONRPCChatVisibility,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-
-        ChatId::new(chat_id)
-            .set_visibility(&ctx, visibility.into_core_type())
-            .await
-    }
-
-    async fn set_chat_ephemeral_timer(
-        &self,
-        account_id: u32,
-        chat_id: u32,
-        timer: u32,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ChatId::new(chat_id)
-            .set_ephemeral_timer(&ctx, Timer::from_u32(timer))
-            .await
-    }
-
-    async fn get_chat_ephemeral_timer(&self, account_id: u32, chat_id: u32) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-        Ok(ChatId::new(chat_id)
-            .get_ephemeral_timer(&ctx)
-            .await?
-            .to_u32())
-    }
-
    // for now only text messages, because we only used text messages in desktop thusfar
    async fn add_device_message(
        &self,
@@ -879,45 +605,29 @@ impl CommandApi {
        markseen_msgs(&ctx, msg_ids.into_iter().map(MsgId::new).collect()).await
    }

-    async fn get_message_ids(&self, account_id: u32, chat_id: u32, flags: u32) -> Result<Vec<u32>> {
-        let ctx = self.get_context(account_id).await?;
-        let msg = get_chat_msgs(&ctx, ChatId::new(chat_id), flags).await?;
-        Ok(msg
-            .iter()
-            .map(|chat_item| -> u32 {
-                match chat_item {
-                    deltachat::chat::ChatItem::Message { msg_id } => msg_id.to_u32(),
-                    deltachat::chat::ChatItem::DayMarker { .. } => DC_MSG_ID_DAYMARKER,
-                }
-            })
-            .collect())
-    }
-
-    async fn get_message_list_items(
+    async fn message_list_get_message_ids(
        &self,
        account_id: u32,
        chat_id: u32,
        flags: u32,
-    ) -> Result<Vec<JSONRPCMessageListItem>> {
+    ) -> Result<Vec<u32>> {
        let ctx = self.get_context(account_id).await?;
        let msg = get_chat_msgs(&ctx, ChatId::new(chat_id), flags).await?;
        Ok(msg
            .iter()
-            .map(|chat_item| (*chat_item).into())
-            .collect::<Vec<JSONRPCMessageListItem>>())
+            .filter_map(|chat_item| match chat_item {
+                deltachat::chat::ChatItem::Message { msg_id } => Some(msg_id.to_u32()),
+                _ => None,
+            })
+            .collect())
    }

-    async fn get_message(&self, account_id: u32, message_id: u32) -> Result<MessageObject> {
+    async fn message_get_message(&self, account_id: u32, message_id: u32) -> Result<MessageObject> {
        let ctx = self.get_context(account_id).await?;
        MessageObject::from_message_id(&ctx, message_id).await
    }

-    async fn get_message_html(&self, account_id: u32, message_id: u32) -> Result<Option<String>> {
-        let ctx = self.get_context(account_id).await?;
-        MsgId::new(message_id).get_html(&ctx).await
-    }
-
-    async fn get_messages(
+    async fn message_get_messages(
        &self,
        account_id: u32,
        message_ids: Vec<u32>,
@@ -933,16 +643,6 @@ impl CommandApi {
        Ok(messages)
    }

-    /// Fetch info desktop needs for creating a notification for a message
-    async fn get_message_notification_info(
-        &self,
-        account_id: u32,
-        message_id: u32,
-    ) -> Result<MessageNotificationInfo> {
-        let ctx = self.get_context(account_id).await?;
-        MessageNotificationInfo::from_msg_id(&ctx, MsgId::new(message_id)).await
-    }
-
    /// Delete messages. The messages are deleted on the current device and
    /// on the IMAP server.
    async fn delete_messages(&self, account_id: u32, message_ids: Vec<u32>) -> Result<()> {
@@ -961,71 +661,16 @@ impl CommandApi {
        get_msg_info(&ctx, MsgId::new(message_id)).await
    }

-    /// Asks the core to start downloading a message fully.
-    /// This function is typically called when the user hits the "Download" button
-    /// that is shown by the UI in case `download_state` is `'Available'` or `'Failure'`
-    ///
-    /// On success, the @ref DC_MSG "view type of the message" may change
-    /// or the message may be replaced completely by one or more messages with other message IDs.
-    /// That may happen e.g. in cases where the message was encrypted
-    /// and the type could not be determined without fully downloading.
-    /// Downloaded content can be accessed as usual after download.
-    ///
-    /// To reflect these changes a @ref DC_EVENT_MSGS_CHANGED event will be emitted.
-    async fn download_full_message(&self, account_id: u32, message_id: u32) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        MsgId::new(message_id).download_full(&ctx).await
-    }
-
-    /// Search messages containing the given query string.
-    /// Searching can be done globally (chat_id=0) or in a specified chat only (chat_id set).
-    ///
-    /// Global chat results are typically displayed using dc_msg_get_summary(), chat
-    /// search results may just hilite the corresponding messages and present a
-    /// prev/next button.
-    ///
-    /// For global search, result is limited to 1000 messages,
-    /// this allows incremental search done fast.
-    /// So, when getting exactly 1000 results, the result may be truncated;
-    /// the UIs may display sth. as "1000+ messages found" in this case.
-    /// Chat search (if a chat_id is set) is not limited.
-    async fn search_messages(
-        &self,
-        account_id: u32,
-        query: String,
-        chat_id: Option<u32>,
-    ) -> Result<Vec<u32>> {
-        let ctx = self.get_context(account_id).await?;
-        let messages = ctx.search_msgs(chat_id.map(ChatId::new), &query).await?;
-        Ok(messages
-            .iter()
-            .map(|msg_id| msg_id.to_u32())
-            .collect::<Vec<u32>>())
-    }
-
-    async fn message_ids_to_search_results(
-        &self,
-        account_id: u32,
-        message_ids: Vec<u32>,
-    ) -> Result<HashMap<u32, MessageSearchResult>> {
-        let ctx = self.get_context(account_id).await?;
-        let mut results: HashMap<u32, MessageSearchResult> =
-            HashMap::with_capacity(message_ids.len());
-        for id in message_ids {
-            results.insert(
-                id,
-                MessageSearchResult::from_msg_id(&ctx, MsgId::new(id)).await?,
-            );
-        }
-        Ok(results)
-    }
-
    // ---------------------------------------------
    //  contact
    // ---------------------------------------------

    /// Get a single contact options by ID.
-    async fn get_contact(&self, account_id: u32, contact_id: u32) -> Result<ContactObject> {
+    async fn contacts_get_contact(
+        &self,
+        account_id: u32,
+        contact_id: u32,
+    ) -> Result<ContactObject> {
        let ctx = self.get_context(account_id).await?;
        let contact_id = ContactId::new(contact_id);

@@ -1039,7 +684,7 @@ impl CommandApi {
    /// Add a single contact as a result of an explicit user action.
    ///
    /// Returns contact id of the created or existing contact
-    async fn create_contact(
+    async fn contacts_create_contact(
        &self,
        account_id: u32,
        email: String,
@@ -1056,7 +701,11 @@ impl CommandApi {
    }

    /// Returns contact id of the created or existing DM chat with that contact
-    async fn create_chat_by_contact_id(&self, account_id: u32, contact_id: u32) -> Result<u32> {
+    async fn contacts_create_chat_by_contact_id(
+        &self,
+        account_id: u32,
+        contact_id: u32,
+    ) -> Result<u32> {
        let ctx = self.get_context(account_id).await?;
        let contact = Contact::get_by_id(&ctx, ContactId::new(contact_id)).await?;
        ChatId::create_for_contact(&ctx, contact.id)
@@ -1064,17 +713,17 @@ impl CommandApi {
            .map(|id| id.to_u32())
    }

-    async fn block_contact(&self, account_id: u32, contact_id: u32) -> Result<()> {
+    async fn contacts_block(&self, account_id: u32, contact_id: u32) -> Result<()> {
        let ctx = self.get_context(account_id).await?;
        Contact::block(&ctx, ContactId::new(contact_id)).await
    }

-    async fn unblock_contact(&self, account_id: u32, contact_id: u32) -> Result<()> {
+    async fn contacts_unblock(&self, account_id: u32, contact_id: u32) -> Result<()> {
        let ctx = self.get_context(account_id).await?;
        Contact::unblock(&ctx, ContactId::new(contact_id)).await
    }

-    async fn get_blocked_contacts(&self, account_id: u32) -> Result<Vec<ContactObject>> {
+    async fn contacts_get_blocked(&self, account_id: u32) -> Result<Vec<ContactObject>> {
        let ctx = self.get_context(account_id).await?;
        let blocked_ids = Contact::get_all_blocked(&ctx).await?;
        let mut contacts: Vec<ContactObject> = Vec::with_capacity(blocked_ids.len());
@@ -1090,7 +739,7 @@ impl CommandApi {
        Ok(contacts)
    }

-    async fn get_contact_ids(
+    async fn contacts_get_contact_ids(
        &self,
        account_id: u32,
        list_flags: u32,
@@ -1103,7 +752,7 @@ impl CommandApi {

    /// Get a list of contacts.
    /// (formerly called getContacts2 in desktop)
-    async fn get_contacts(
+    async fn contacts_get_contacts(
        &self,
        account_id: u32,
        list_flags: u32,
@@ -1124,7 +773,7 @@ impl CommandApi {
        Ok(contacts)
    }

-    async fn get_contacts_by_ids(
+    async fn contacts_get_contacts_by_ids(
        &self,
        account_id: u32,
        ids: Vec<u32>,
@@ -1145,28 +794,6 @@ impl CommandApi {
        Ok(contacts)
    }

-    async fn delete_contact(&self, account_id: u32, contact_id: u32) -> Result<bool> {
-        let ctx = self.get_context(account_id).await?;
-        let contact_id = ContactId::new(contact_id);
-
-        Contact::delete(&ctx, contact_id).await?;
-        Ok(true)
-    }
-
-    async fn change_contact_name(
-        &self,
-        account_id: u32,
-        contact_id: u32,
-        name: String,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        let contact_id = ContactId::new(contact_id);
-        let contact = Contact::load_from_db(&ctx, contact_id).await?;
-        let addr = contact.get_addr();
-        Contact::create(&ctx, &name, addr).await?;
-        Ok(())
-    }
-
    /// Get encryption info for a contact.
    /// Get a multi-line encryption info, containing your fingerprint and the
    /// fingerprint of the contact, used e.g. to compare the fingerprints for a simple out-of-band verification.
@@ -1179,21 +806,6 @@ impl CommandApi {
        Contact::get_encrinfo(&ctx, ContactId::new(contact_id)).await
    }

-    /// Check if an e-mail address belongs to a known and unblocked contact.
-    /// To get a list of all known and unblocked contacts, use contacts_get_contacts().
-    ///
-    /// To validate an e-mail address independently of the contact database
-    /// use check_email_validity().
-    async fn lookup_contact_id_by_addr(
-        &self,
-        account_id: u32,
-        addr: String,
-    ) -> Result<Option<u32>> {
-        let ctx = self.get_context(account_id).await?;
-        let contact_id = Contact::lookup_id_by_addr(&ctx, &addr, Origin::IncomingReplyTo).await?;
-        Ok(contact_id.map(|id| id.to_u32()))
-    }
-
    // ---------------------------------------------
    //                   chat
    // ---------------------------------------------
@@ -1207,7 +819,7 @@ impl CommandApi {
    ///
    /// Setting `chat_id` to `None` (`null` in typescript) means get messages with media
    /// from any chat of the currently used account.
-    async fn get_chat_media(
+    async fn chat_get_media(
        &self,
        account_id: u32,
        chat_id: Option<u32>,
@@ -1229,90 +841,6 @@ impl CommandApi {
        Ok(media.iter().map(|msg_id| msg_id.to_u32()).collect())
    }

-    /// Search next/previous message based on a given message and a list of types.
-    /// Typically used to implement the "next" and "previous" buttons
-    /// in a gallery or in a media player.
-    ///
-    /// one combined call for getting chat::get_next_media for both directions
-    /// the manual chat::get_next_media in only one direction is not exposed by the jsonrpc yet
-    async fn get_neighboring_chat_media(
-        &self,
-        account_id: u32,
-        msg_id: u32,
-        message_type: MessageViewtype,
-        or_message_type2: Option<MessageViewtype>,
-        or_message_type3: Option<MessageViewtype>,
-    ) -> Result<(Option<u32>, Option<u32>)> {
-        let ctx = self.get_context(account_id).await?;
-
-        let msg_type: Viewtype = message_type.into();
-        let msg_type2: Viewtype = or_message_type2.map(|v| v.into()).unwrap_or_default();
-        let msg_type3: Viewtype = or_message_type3.map(|v| v.into()).unwrap_or_default();
-
-        let prev = chat::get_next_media(
-            &ctx,
-            MsgId::new(msg_id),
-            chat::Direction::Backward,
-            msg_type,
-            msg_type2,
-            msg_type3,
-        )
-        .await?
-        .map(|id| id.to_u32());
-
-        let next = chat::get_next_media(
-            &ctx,
-            MsgId::new(msg_id),
-            chat::Direction::Forward,
-            msg_type,
-            msg_type2,
-            msg_type3,
-        )
-        .await?
-        .map(|id| id.to_u32());
-
-        Ok((prev, next))
-    }
-
-    // ---------------------------------------------
-    //                   backup
-    // ---------------------------------------------
-
-    async fn export_backup(
-        &self,
-        account_id: u32,
-        destination: String,
-        passphrase: Option<String>,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        ctx.stop_io().await;
-        let result = imex::imex(
-            &ctx,
-            imex::ImexMode::ExportBackup,
-            destination.as_ref(),
-            passphrase,
-        )
-        .await;
-        ctx.start_io().await;
-        result
-    }
-
-    async fn import_backup(
-        &self,
-        account_id: u32,
-        path: String,
-        passphrase: Option<String>,
-    ) -> Result<()> {
-        let ctx = self.get_context(account_id).await?;
-        imex::imex(
-            &ctx,
-            imex::ImexMode::ImportBackup,
-            path.as_ref(),
-            passphrase,
-        )
-        .await
-    }
-
    // ---------------------------------------------
    //                connectivity
    // ---------------------------------------------
@@ -1357,37 +885,11 @@ impl CommandApi {
        ctx.get_connectivity_html().await
    }

-    // ---------------------------------------------
-    //                  locations
-    // ---------------------------------------------
-
-    async fn get_locations(
-        &self,
-        account_id: u32,
-        chat_id: Option<u32>,
-        contact_id: Option<u32>,
-        timestamp_begin: i64,
-        timestamp_end: i64,
-    ) -> Result<Vec<JsonrpcLocation>> {
-        let ctx = self.get_context(account_id).await?;
-
-        let locations = location::get_range(
-            &ctx,
-            chat_id.map(ChatId::new),
-            contact_id,
-            timestamp_begin,
-            timestamp_end,
-        )
-        .await?;
-
-        Ok(locations.into_iter().map(|l| l.into()).collect())
-    }
-
    // ---------------------------------------------
    //                   webxdc
    // ---------------------------------------------

-    async fn send_webxdc_status_update(
+    async fn webxdc_send_status_update(
        &self,
        account_id: u32,
        instance_msg_id: u32,
@@ -1399,7 +901,7 @@ impl CommandApi {
            .await
    }

-    async fn get_webxdc_status_updates(
+    async fn webxdc_get_status_updates(
        &self,
        account_id: u32,
        instance_msg_id: u32,
@@ -1414,7 +916,7 @@ impl CommandApi {
    }

    /// Get info from a webxdc message
-    async fn get_webxdc_info(
+    async fn message_get_webxdc_info(
        &self,
        account_id: u32,
        instance_msg_id: u32,
@@ -1440,38 +942,6 @@ impl CommandApi {
        forward_msgs(&ctx, &message_ids, ChatId::new(chat_id)).await
    }

-    async fn send_sticker(
-        &self,
-        account_id: u32,
-        chat_id: u32,
-        sticker_path: String,
-    ) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-
-        let mut msg = Message::new(Viewtype::Sticker);
-        msg.set_file(&sticker_path, None);
-
-        let message_id = deltachat::chat::send_msg(&ctx, ChatId::new(chat_id), &mut msg).await?;
-        Ok(message_id.to_u32())
-    }
-
-    /// Send a reaction to message.
-    ///
-    /// Reaction is a string of emojis separated by spaces. Reaction to a
-    /// single message can be sent multiple times. The last reaction
-    /// received overrides all previously received reactions. It is
-    /// possible to remove all reactions by sending an empty string.
-    async fn send_reaction(
-        &self,
-        account_id: u32,
-        message_id: u32,
-        reaction: Vec<String>,
-    ) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-        let message_id = send_reaction(&ctx, MsgId::new(message_id), &reaction.join(" ")).await?;
-        Ok(message_id.to_u32())
-    }
-
    // ---------------------------------------------
    //           functions for the composer
    //    the composer is the message input field
@@ -1494,81 +964,17 @@ impl CommandApi {
        }
    }

-    async fn send_videochat_invitation(&self, account_id: u32, chat_id: u32) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-        chat::send_videochat_invitation(&ctx, ChatId::new(chat_id))
-            .await
-            .map(|msg_id| msg_id.to_u32())
-    }
-
    // ---------------------------------------------
    //           misc prototyping functions
    //       that might get removed later again
    // ---------------------------------------------

-    async fn misc_get_sticker_folder(&self, account_id: u32) -> Result<String> {
-        let ctx = self.get_context(account_id).await?;
-        let account_folder = ctx
-            .get_dbfile()
-            .parent()
-            .context("account folder not found")?;
-        let sticker_folder_path = account_folder.join("./stickers");
-        fs::create_dir_all(&sticker_folder_path).await?;
-        sticker_folder_path
-            .to_str()
-            .map(|s| s.to_owned())
-            .context("path conversion to string failed")
-    }
-
-    /// for desktop, get stickers from stickers folder,
-    /// grouped by the folder they are in.
-    async fn misc_get_stickers(&self, account_id: u32) -> Result<HashMap<String, Vec<String>>> {
-        let ctx = self.get_context(account_id).await?;
-        let account_folder = ctx
-            .get_dbfile()
-            .parent()
-            .context("account folder not found")?;
-        let sticker_folder_path = account_folder.join("./stickers");
-        fs::create_dir_all(&sticker_folder_path).await?;
-        let mut result = HashMap::new();
-
-        let mut packs = tokio::fs::read_dir(sticker_folder_path).await?;
-        while let Some(entry) = packs.next_entry().await? {
-            if !entry.file_type().await?.is_dir() {
-                continue;
-            }
-            let pack_name = entry.file_name().into_string().unwrap_or_default();
-            let mut stickers = tokio::fs::read_dir(entry.path()).await?;
-            let mut sticker_paths = Vec::new();
-            while let Some(sticker_entry) = stickers.next_entry().await? {
-                if !sticker_entry.file_type().await?.is_file() {
-                    continue;
-                }
-                let sticker_name = sticker_entry.file_name().into_string().unwrap_or_default();
-                if sticker_name.ends_with(".png") || sticker_name.ends_with(".webp") {
-                    sticker_paths.push(
-                        sticker_entry
-                            .path()
-                            .to_str()
-                            .map(|s| s.to_owned())
-                            .context("path conversion to string failed")?,
-                    );
-                }
-            }
-            if !sticker_paths.is_empty() {
-                result.insert(pack_name, sticker_paths);
-            }
-        }
-
-        Ok(result)
-    }
-
    /// Returns the messageid of the sent message
    async fn misc_send_text_message(
        &self,
        account_id: u32,
-        chat_id: u32,
        text: String,
+        chat_id: u32,
    ) -> Result<u32> {
        let ctx = self.get_context(account_id).await?;

--- a/deltachat-jsonrpc/src/api/types/chat.rs
+++ b/deltachat-jsonrpc/src/api/types/chat.rs
@@ -1,7 +1,7 @@
 use std::time::{Duration, SystemTime};

 use anyhow::{anyhow, bail, Result};
-use deltachat::chat::{self, get_chat_contacts, ChatVisibility};
+use deltachat::chat::{self, get_chat_contacts};
 use deltachat::chat::{Chat, ChatId};
 use deltachat::constants::Chattype;
 use deltachat::contact::{Contact, ContactId};
@@ -37,7 +37,6 @@ pub struct FullChat {
    ephemeral_timer: u32, //TODO look if there are more important properties in newer core versions
    can_send: bool,
    was_seen_recently: bool,
-    mailing_list_address: Option<String>,
 }

 impl FullChat {
@@ -81,8 +80,6 @@ impl FullChat {
            false
        };

-        let mailing_list_address = chat.get_mailinglist_addr().map(|s| s.to_string());
-
        Ok(FullChat {
            id: chat_id,
            name: chat.name.clone(),
@@ -106,7 +103,6 @@ impl FullChat {
            ephemeral_timer,
            can_send,
            was_seen_recently,
-            mailing_list_address,
        })
    }
 }
@@ -193,21 +189,3 @@ impl MuteDuration {
        }
    }
 }
-
-#[derive(Clone, Serialize, Deserialize, TypeDef)]
-#[serde(rename = "ChatVisibility")]
-pub enum JSONRPCChatVisibility {
-    Normal,
-    Archived,
-    Pinned,
-}
-
-impl JSONRPCChatVisibility {
-    pub fn into_core_type(self) -> ChatVisibility {
-        match self {
-            JSONRPCChatVisibility::Normal => ChatVisibility::Normal,
-            JSONRPCChatVisibility::Archived => ChatVisibility::Archived,
-            JSONRPCChatVisibility::Pinned => ChatVisibility::Pinned,
-        }
-    }
-}
--- a/deltachat-jsonrpc/src/api/types/location.rs
+++ b/deltachat-jsonrpc/src/api/types/location.rs
@@ -1,47 +0,0 @@
-use deltachat::location::Location;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename = "Location", rename_all = "camelCase")]
-pub struct JsonrpcLocation {
-    pub location_id: u32,
-    pub is_independent: bool,
-    pub latitude: f64,
-    pub longitude: f64,
-    pub accuracy: f64,
-    pub timestamp: i64,
-    pub contact_id: u32,
-    pub msg_id: u32,
-    pub chat_id: u32,
-    pub marker: Option<String>,
-}
-
-impl From<Location> for JsonrpcLocation {
-    fn from(location: Location) -> Self {
-        let Location {
-            location_id,
-            independent,
-            latitude,
-            longitude,
-            accuracy,
-            timestamp,
-            contact_id,
-            msg_id,
-            chat_id,
-            marker,
-        } = location;
-        Self {
-            location_id,
-            is_independent: independent != 0,
-            latitude,
-            longitude,
-            accuracy,
-            timestamp,
-            contact_id: contact_id.to_u32(),
-            msg_id,
-            chat_id: chat_id.to_u32(),
-            marker,
-        }
-    }
-}
--- a/deltachat-jsonrpc/src/api/types/message.rs
+++ b/deltachat-jsonrpc/src/api/types/message.rs
@@ -1,14 +1,10 @@
 use anyhow::{anyhow, Result};
-use deltachat::chat::Chat;
-use deltachat::chat::ChatItem;
-use deltachat::constants::Chattype;
 use deltachat::contact::Contact;
 use deltachat::context::Context;
 use deltachat::download;
 use deltachat::message::Message;
 use deltachat::message::MsgId;
 use deltachat::message::Viewtype;
-use deltachat::reaction::get_msg_reactions;
 use num_traits::cast::ToPrimitive;
 use serde::Deserialize;
 use serde::Serialize;
@@ -16,7 +12,6 @@ use typescript_type_def::TypeDef;

 use super::color_int_to_hex_string;
 use super::contact::ContactObject;
-use super::reactions::JSONRPCReactions;
 use super::webxdc::WebxdcMessageInfo;

 #[derive(Serialize, TypeDef)]
@@ -45,8 +40,6 @@ pub struct MessageObject {
    is_setupmessage: bool,
    is_info: bool,
    is_forwarded: bool,
-    /// when is_info is true this describes what type of system message it is
-    system_message_type: SystemMessageType,

    duration: i32,
    dimensions_height: i32,
@@ -68,8 +61,6 @@ pub struct MessageObject {
    webxdc_info: Option<WebxdcMessageInfo>,

    download_state: DownloadState,
-
-    reactions: Option<JSONRPCReactions>,
 }

 #[derive(Serialize, TypeDef)]
@@ -87,7 +78,6 @@ enum MessageQuote {
        override_sender_name: Option<String>,
        image: Option<String>,
        is_forwarded: bool,
-        view_type: MessageViewtype,
    },
 }

@@ -136,7 +126,6 @@ impl MessageObject {
                            None
                        },
                        is_forwarded: quote.is_forwarded(),
-                        view_type: quote.get_viewtype().into(),
                    })
                }
                None => Some(MessageQuote::JustText { text: quoted_text }),
@@ -145,13 +134,6 @@ impl MessageObject {
            None
        };

-        let reactions = get_msg_reactions(context, msg_id).await?;
-        let reactions = if reactions.is_empty() {
-            None
-        } else {
-            Some(reactions.into())
-        };
-
        Ok(MessageObject {
            id: msg_id.to_u32(),
            chat_id: message.get_chat_id().to_u32(),
@@ -177,7 +159,6 @@ impl MessageObject {
            is_setupmessage: message.is_setupmessage(),
            is_info: message.is_info(),
            is_forwarded: message.is_forwarded(),
-            system_message_type: message.get_info_type().into(),

            duration: message.get_duration(),
            dimensions_height: message.get_height(),
@@ -207,8 +188,6 @@ impl MessageObject {
            webxdc_info,

            download_state,
-
-            reactions,
        })
    }
 }
@@ -307,181 +286,3 @@ impl From<download::DownloadState> for DownloadState {
        }
    }
 }
-
-#[derive(Serialize, TypeDef)]
-pub enum SystemMessageType {
-    Unknown,
-    GroupNameChanged,
-    GroupImageChanged,
-    MemberAddedToGroup,
-    MemberRemovedFromGroup,
-    AutocryptSetupMessage,
-    SecurejoinMessage,
-    LocationStreamingEnabled,
-    LocationOnly,
-
-    /// Chat ephemeral message timer is changed.
-    EphemeralTimerChanged,
-
-    // Chat protection state changed
-    ChatProtectionEnabled,
-    ChatProtectionDisabled,
-
-    /// Self-sent-message that contains only json used for multi-device-sync;
-    /// if possible, we attach that to other messages as for locations.
-    MultiDeviceSync,
-
-    // Sync message that contains a json payload
-    // sent to the other webxdc instances
-    // These messages are not shown in the chat.
-    WebxdcStatusUpdate,
-
-    /// Webxdc info added with `info` set in `send_webxdc_status_update()`.
-    WebxdcInfoMessage,
-}
-
-impl From<deltachat::mimeparser::SystemMessage> for SystemMessageType {
-    fn from(system_message_type: deltachat::mimeparser::SystemMessage) -> Self {
-        use deltachat::mimeparser::SystemMessage;
-        match system_message_type {
-            SystemMessage::Unknown => SystemMessageType::Unknown,
-            SystemMessage::GroupNameChanged => SystemMessageType::GroupNameChanged,
-            SystemMessage::GroupImageChanged => SystemMessageType::GroupImageChanged,
-            SystemMessage::MemberAddedToGroup => SystemMessageType::MemberAddedToGroup,
-            SystemMessage::MemberRemovedFromGroup => SystemMessageType::MemberRemovedFromGroup,
-            SystemMessage::AutocryptSetupMessage => SystemMessageType::AutocryptSetupMessage,
-            SystemMessage::SecurejoinMessage => SystemMessageType::SecurejoinMessage,
-            SystemMessage::LocationStreamingEnabled => SystemMessageType::LocationStreamingEnabled,
-            SystemMessage::LocationOnly => SystemMessageType::LocationOnly,
-            SystemMessage::EphemeralTimerChanged => SystemMessageType::EphemeralTimerChanged,
-            SystemMessage::ChatProtectionEnabled => SystemMessageType::ChatProtectionEnabled,
-            SystemMessage::ChatProtectionDisabled => SystemMessageType::ChatProtectionDisabled,
-            SystemMessage::MultiDeviceSync => SystemMessageType::MultiDeviceSync,
-            SystemMessage::WebxdcStatusUpdate => SystemMessageType::WebxdcStatusUpdate,
-            SystemMessage::WebxdcInfoMessage => SystemMessageType::WebxdcInfoMessage,
-        }
-    }
-}
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename_all = "camelCase")]
-pub struct MessageNotificationInfo {
-    id: u32,
-    chat_id: u32,
-    account_id: u32,
-
-    image: Option<String>,
-    image_mime_type: Option<String>,
-
-    chat_name: String,
-    chat_profile_image: Option<String>,
-
-    /// also known as summary_text1
-    summary_prefix: Option<String>,
-    /// also known as summary_text2
-    summary_text: String,
-}
-
-impl MessageNotificationInfo {
-    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
-        let message = Message::load_from_db(context, msg_id).await?;
-        let chat = Chat::load_from_db(context, message.get_chat_id()).await?;
-
-        let image = if matches!(
-            message.get_viewtype(),
-            Viewtype::Image | Viewtype::Gif | Viewtype::Sticker
-        ) {
-            message
-                .get_file(context)
-                .map(|path_buf| path_buf.to_str().map(|s| s.to_owned()))
-                .unwrap_or_default()
-        } else {
-            None
-        };
-
-        let chat_profile_image = chat
-            .get_profile_image(context)
-            .await?
-            .map(|path_buf| path_buf.to_str().map(|s| s.to_owned()))
-            .unwrap_or_default();
-
-        let summary = message.get_summary(context, Some(&chat)).await?;
-
-        Ok(MessageNotificationInfo {
-            id: msg_id.to_u32(),
-            chat_id: message.get_chat_id().to_u32(),
-            account_id: context.get_id(),
-            image,
-            image_mime_type: message.get_filemime(),
-            chat_name: chat.name,
-            chat_profile_image,
-            summary_prefix: summary.prefix.map(|s| s.to_string()),
-            summary_text: summary.text,
-        })
-    }
-}
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename_all = "camelCase")]
-pub struct MessageSearchResult {
-    id: u32,
-    author_profile_image: Option<String>,
-    author_name: String,
-    author_color: String,
-    chat_name: Option<String>,
-    message: String,
-    timestamp: i64,
-}
-
-impl MessageSearchResult {
-    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
-        let message = Message::load_from_db(context, msg_id).await?;
-        let chat = Chat::load_from_db(context, message.get_chat_id()).await?;
-        let sender = Contact::load_from_db(context, message.get_from_id()).await?;
-
-        let profile_image = match sender.get_profile_image(context).await? {
-            Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
-            None => None,
-        };
-
-        Ok(Self {
-            id: msg_id.to_u32(),
-            author_profile_image: profile_image,
-            author_name: sender.get_display_name().to_owned(),
-            author_color: color_int_to_hex_string(sender.get_color()),
-            chat_name: if chat.get_type() == Chattype::Single {
-                Some(chat.get_name().to_owned())
-            } else {
-                None
-            },
-            message: message.get_text().unwrap_or_default(),
-            timestamp: message.get_timestamp(),
-        })
-    }
-}
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename_all = "camelCase", rename = "MessageListItem", tag = "kind")]
-pub enum JSONRPCMessageListItem {
-    Message {
-        msg_id: u32,
-    },
-
-    /// Day marker, separating messages that correspond to different
-    /// days according to local time.
-    DayMarker {
-        /// Marker timestamp, for day markers, in unix milliseconds
-        timestamp: i64,
-    },
-}
-
-impl From<ChatItem> for JSONRPCMessageListItem {
-    fn from(item: ChatItem) -> Self {
-        match item {
-            ChatItem::Message { msg_id } => JSONRPCMessageListItem::Message {
-                msg_id: msg_id.to_u32(),
-            },
-            ChatItem::DayMarker { timestamp } => JSONRPCMessageListItem::DayMarker { timestamp },
-        }
-    }
-}
--- a/deltachat-jsonrpc/src/api/types/mod.rs
+++ b/deltachat-jsonrpc/src/api/types/mod.rs
@@ -1,12 +1,13 @@
+use deltachat::qr::Qr;
+use serde::Serialize;
+use typescript_type_def::TypeDef;
+
 pub mod account;
 pub mod chat;
 pub mod chat_list;
 pub mod contact;
-pub mod location;
 pub mod message;
 pub mod provider_info;
-pub mod qr;
-pub mod reactions;
 pub mod webxdc;

 pub fn color_int_to_hex_string(color: u32) -> String {
@@ -20,3 +21,209 @@ fn maybe_empty_string_to_option(string: String) -> Option<String> {
        Some(string)
    }
 }
+
+#[derive(Serialize, TypeDef)]
+#[serde(rename = "Qr", rename_all = "camelCase")]
+#[serde(tag = "type")]
+pub enum QrObject {
+    AskVerifyContact {
+        contact_id: u32,
+        fingerprint: String,
+        invitenumber: String,
+        authcode: String,
+    },
+    AskVerifyGroup {
+        grpname: String,
+        grpid: String,
+        contact_id: u32,
+        fingerprint: String,
+        invitenumber: String,
+        authcode: String,
+    },
+    FprOk {
+        contact_id: u32,
+    },
+    FprMismatch {
+        contact_id: Option<u32>,
+    },
+    FprWithoutAddr {
+        fingerprint: String,
+    },
+    Account {
+        domain: String,
+    },
+    WebrtcInstance {
+        domain: String,
+        instance_pattern: String,
+    },
+    Addr {
+        contact_id: u32,
+        draft: Option<String>,
+    },
+    Url {
+        url: String,
+    },
+    Text {
+        text: String,
+    },
+    WithdrawVerifyContact {
+        contact_id: u32,
+        fingerprint: String,
+        invitenumber: String,
+        authcode: String,
+    },
+    WithdrawVerifyGroup {
+        grpname: String,
+        grpid: String,
+        contact_id: u32,
+        fingerprint: String,
+        invitenumber: String,
+        authcode: String,
+    },
+    ReviveVerifyContact {
+        contact_id: u32,
+        fingerprint: String,
+        invitenumber: String,
+        authcode: String,
+    },
+    ReviveVerifyGroup {
+        grpname: String,
+        grpid: String,
+        contact_id: u32,
+        fingerprint: String,
+        invitenumber: String,
+        authcode: String,
+    },
+}
+
+impl From<Qr> for QrObject {
+    fn from(qr: Qr) -> Self {
+        match qr {
+            Qr::AskVerifyContact {
+                contact_id,
+                fingerprint,
+                invitenumber,
+                authcode,
+            } => {
+                let contact_id = contact_id.to_u32();
+                let fingerprint = fingerprint.to_string();
+                QrObject::AskVerifyContact {
+                    contact_id,
+                    fingerprint,
+                    invitenumber,
+                    authcode,
+                }
+            }
+            Qr::AskVerifyGroup {
+                grpname,
+                grpid,
+                contact_id,
+                fingerprint,
+                invitenumber,
+                authcode,
+            } => {
+                let contact_id = contact_id.to_u32();
+                let fingerprint = fingerprint.to_string();
+                QrObject::AskVerifyGroup {
+                    grpname,
+                    grpid,
+                    contact_id,
+                    fingerprint,
+                    invitenumber,
+                    authcode,
+                }
+            }
+            Qr::FprOk { contact_id } => {
+                let contact_id = contact_id.to_u32();
+                QrObject::FprOk { contact_id }
+            }
+            Qr::FprMismatch { contact_id } => {
+                let contact_id = contact_id.map(|contact_id| contact_id.to_u32());
+                QrObject::FprMismatch { contact_id }
+            }
+            Qr::FprWithoutAddr { fingerprint } => QrObject::FprWithoutAddr { fingerprint },
+            Qr::Account { domain } => QrObject::Account { domain },
+            Qr::WebrtcInstance {
+                domain,
+                instance_pattern,
+            } => QrObject::WebrtcInstance {
+                domain,
+                instance_pattern,
+            },
+            Qr::Addr { contact_id, draft } => {
+                let contact_id = contact_id.to_u32();
+                QrObject::Addr { contact_id, draft }
+            }
+            Qr::Url { url } => QrObject::Url { url },
+            Qr::Text { text } => QrObject::Text { text },
+            Qr::WithdrawVerifyContact {
+                contact_id,
+                fingerprint,
+                invitenumber,
+                authcode,
+            } => {
+                let contact_id = contact_id.to_u32();
+                let fingerprint = fingerprint.to_string();
+                QrObject::WithdrawVerifyContact {
+                    contact_id,
+                    fingerprint,
+                    invitenumber,
+                    authcode,
+                }
+            }
+            Qr::WithdrawVerifyGroup {
+                grpname,
+                grpid,
+                contact_id,
+                fingerprint,
+                invitenumber,
+                authcode,
+            } => {
+                let contact_id = contact_id.to_u32();
+                let fingerprint = fingerprint.to_string();
+                QrObject::WithdrawVerifyGroup {
+                    grpname,
+                    grpid,
+                    contact_id,
+                    fingerprint,
+                    invitenumber,
+                    authcode,
+                }
+            }
+            Qr::ReviveVerifyContact {
+                contact_id,
+                fingerprint,
+                invitenumber,
+                authcode,
+            } => {
+                let contact_id = contact_id.to_u32();
+                let fingerprint = fingerprint.to_string();
+                QrObject::ReviveVerifyContact {
+                    contact_id,
+                    fingerprint,
+                    invitenumber,
+                    authcode,
+                }
+            }
+            Qr::ReviveVerifyGroup {
+                grpname,
+                grpid,
+                contact_id,
+                fingerprint,
+                invitenumber,
+                authcode,
+            } => {
+                let contact_id = contact_id.to_u32();
+                let fingerprint = fingerprint.to_string();
+                QrObject::ReviveVerifyGroup {
+                    grpname,
+                    grpid,
+                    contact_id,
+                    fingerprint,
+                    invitenumber,
+                    authcode,
+                }
+            }
+        }
+    }
+}
--- a/deltachat-jsonrpc/src/api/types/qr.rs
+++ b/deltachat-jsonrpc/src/api/types/qr.rs
@@ -1,213 +0,0 @@
-use deltachat::qr::Qr;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename = "Qr", rename_all = "camelCase")]
-#[serde(tag = "type")]
-pub enum QrObject {
-    AskVerifyContact {
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    AskVerifyGroup {
-        grpname: String,
-        grpid: String,
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    FprOk {
-        contact_id: u32,
-    },
-    FprMismatch {
-        contact_id: Option<u32>,
-    },
-    FprWithoutAddr {
-        fingerprint: String,
-    },
-    Account {
-        domain: String,
-    },
-    WebrtcInstance {
-        domain: String,
-        instance_pattern: String,
-    },
-    Addr {
-        contact_id: u32,
-        draft: Option<String>,
-    },
-    Url {
-        url: String,
-    },
-    Text {
-        text: String,
-    },
-    WithdrawVerifyContact {
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    WithdrawVerifyGroup {
-        grpname: String,
-        grpid: String,
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    ReviveVerifyContact {
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    ReviveVerifyGroup {
-        grpname: String,
-        grpid: String,
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    Login {
-        address: String,
-    },
-}
-
-impl From<Qr> for QrObject {
-    fn from(qr: Qr) -> Self {
-        match qr {
-            Qr::AskVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::AskVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::AskVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::AskVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::FprOk { contact_id } => {
-                let contact_id = contact_id.to_u32();
-                QrObject::FprOk { contact_id }
-            }
-            Qr::FprMismatch { contact_id } => {
-                let contact_id = contact_id.map(|contact_id| contact_id.to_u32());
-                QrObject::FprMismatch { contact_id }
-            }
-            Qr::FprWithoutAddr { fingerprint } => QrObject::FprWithoutAddr { fingerprint },
-            Qr::Account { domain } => QrObject::Account { domain },
-            Qr::WebrtcInstance {
-                domain,
-                instance_pattern,
-            } => QrObject::WebrtcInstance {
-                domain,
-                instance_pattern,
-            },
-            Qr::Addr { contact_id, draft } => {
-                let contact_id = contact_id.to_u32();
-                QrObject::Addr { contact_id, draft }
-            }
-            Qr::Url { url } => QrObject::Url { url },
-            Qr::Text { text } => QrObject::Text { text },
-            Qr::WithdrawVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::WithdrawVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::WithdrawVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::WithdrawVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::ReviveVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::ReviveVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::ReviveVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::ReviveVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::Login { address, .. } => QrObject::Login { address },
-        }
-    }
-}
--- a/deltachat-jsonrpc/src/api/types/reactions.rs
+++ b/deltachat-jsonrpc/src/api/types/reactions.rs
@@ -1,47 +0,0 @@
-use std::collections::BTreeMap;
-
-use deltachat::reaction::Reactions;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-/// Structure representing all reactions to a particular message.
-#[derive(Serialize, TypeDef)]
-#[serde(rename = "Reactions", rename_all = "camelCase")]
-pub struct JSONRPCReactions {
-    /// Map from a contact to it's reaction to message.
-    reactions_by_contact: BTreeMap<u32, Vec<String>>,
-    /// Unique reactions and their count
-    reactions: BTreeMap<String, u32>,
-}
-
-impl From<Reactions> for JSONRPCReactions {
-    fn from(reactions: Reactions) -> Self {
-        let mut reactions_by_contact: BTreeMap<u32, Vec<String>> = BTreeMap::new();
-        let mut unique_reactions: BTreeMap<String, u32> = BTreeMap::new();
-
-        for contact_id in reactions.contacts() {
-            let reaction = reactions.get(contact_id);
-            if reaction.is_empty() {
-                continue;
-            }
-            let emojis: Vec<String> = reaction
-                .emojis()
-                .into_iter()
-                .map(|emoji| emoji.to_owned())
-                .collect();
-            reactions_by_contact.insert(contact_id.to_u32(), emojis.clone());
-            for emoji in emojis {
-                if let Some(x) = unique_reactions.get_mut(&emoji) {
-                    *x += 1;
-                } else {
-                    unique_reactions.insert(emoji, 1);
-                }
-            }
-        }
-
-        JSONRPCReactions {
-            reactions_by_contact,
-            reactions: unique_reactions,
-        }
-    }
-}
--- a/deltachat-jsonrpc/src/webserver.rs
+++ b/deltachat-jsonrpc/src/webserver.rs
@@ -44,7 +44,7 @@ async fn handler(ws: WebSocketUpgrade, Extension(api): Extension<CommandApi>) ->
    let (client, out_receiver) = RpcClient::new();
    let session = RpcSession::new(client.clone(), api.clone());
    tokio::spawn(async move {
-        let events = api.accounts.read().await.get_event_emitter();
+        let events = api.accounts.read().await.get_event_emitter().await;
        while let Some(event) = events.recv().await {
            let event = event_to_json_rpc_notification(event);
            client.send_notification("event", Some(event)).await.ok();
--- a/deltachat-jsonrpc/typescript/example/example.ts
+++ b/deltachat-jsonrpc/typescript/example/example.ts
@@ -1,4 +1,4 @@
-import { DcEvent, DeltaChat } from "../deltachat.js";
+import { DeltaChat, DeltaChatEvent } from "../deltachat.js";

 var SELECTED_ACCOUNT = 0;

@@ -7,7 +7,7 @@ window.addEventListener("DOMContentLoaded", (_event) => {
    SELECTED_ACCOUNT = Number(id);
    window.dispatchEvent(new Event("account-changed"));
  };
-  console.log("launch run script...");
+  console.log('launch run script...')
  run().catch((err) => console.error("run failed", err));
 });

@@ -16,13 +16,13 @@ async function run() {
  const $side = document.getElementById("side")!;
  const $head = document.getElementById("header")!;

-  const client = new DeltaChat("ws://localhost:20808/ws");
+  const client = new DeltaChat('ws://localhost:20808/ws')

-  (window as any).client = client.rpc;
+  ;(window as any).client = client.rpc;

-  client.on("ALL", (accountId, event) => {
-    onIncomingEvent(accountId, event);
-  });
+  client.on("ALL", event => {
+    onIncomingEvent(event)
+  })

  window.addEventListener("account-changed", async (_event: Event) => {
    listChatsForSelectedAccount();
@@ -31,9 +31,9 @@ async function run() {
  await Promise.all([loadAccountsInHeader(), listChatsForSelectedAccount()]);

  async function loadAccountsInHeader() {
-    console.log("load accounts");
+    console.log('load accounts')
    const accounts = await client.rpc.getAllAccounts();
-    console.log("accounts loaded", accounts);
+    console.log('accounts loaded', accounts)
    for (const account of accounts) {
      if (account.type === "Configured") {
        write(
@@ -48,14 +48,14 @@ async function run() {
          `<a href="#">
          ${account.id}: (unconfigured)
          </a>&nbsp;`
-        );
+        )
      }
    }
  }

  async function listChatsForSelectedAccount() {
    clear($main);
-    const selectedAccount = SELECTED_ACCOUNT;
+    const selectedAccount = SELECTED_ACCOUNT
    const info = await client.rpc.getAccountInfo(selectedAccount);
    if (info.type !== "Configured") {
      return write($main, "Account is not configured");
@@ -68,17 +68,17 @@ async function run() {
      null
    );
    for (const [chatId, _messageId] of chats) {
-      const chat = await client.rpc.getFullChatById(
+      const chat = await client.rpc.chatlistGetFullChatById(
        selectedAccount,
        chatId
      );
      write($main, `<h3>${chat.name}</h3>`);
-      const messageIds = await client.rpc.getMessageIds(
+      const messageIds = await client.rpc.messageListGetMessageIds(
        selectedAccount,
        chatId,
        0
      );
-      const messages = await client.rpc.getMessages(
+      const messages = await client.rpc.messageGetMessages(
        selectedAccount,
        messageIds
      );
@@ -88,15 +88,14 @@ async function run() {
    }
  }

-  function onIncomingEvent(accountId: number, event: DcEvent) {
+  function onIncomingEvent(event: DeltaChatEvent) {
    write(
      $side,
      `
        <p class="message">
-          [<strong>${event.type}</strong> on account ${accountId}]<br>
-          <em>f1:</em> ${JSON.stringify(
-            Object.assign({}, event, { type: undefined })
-          )}
+          [<strong>${event.id}</strong> on account ${event.contextId}]<br>
+          <em>f1:</em> ${JSON.stringify(event.field1)}<br>
+          <em>f2:</em> ${JSON.stringify(event.field2)}
        </p>`
    );
  }
--- a/deltachat-jsonrpc/typescript/generated/client.ts
+++ b/deltachat-jsonrpc/typescript/generated/client.ts
@@ -66,26 +66,6 @@ export class RawClient {
    return (this._transport.request('get_all_accounts', [] as RPC.Params)) as Promise<(T.Account)[]>;
  }

-
-  public startIoForAllAccounts(): Promise<null> {
-    return (this._transport.request('start_io_for_all_accounts', [] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public stopIoForAllAccounts(): Promise<null> {
-    return (this._transport.request('stop_io_for_all_accounts', [] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public startIo(id: T.U32): Promise<null> {
-    return (this._transport.request('start_io', [id] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public stopIo(id: T.U32): Promise<null> {
-    return (this._transport.request('stop_io', [id] as RPC.Params)) as Promise<null>;
-  }
-
  /**
   * Get top-level info for an account.
   */
@@ -93,13 +73,6 @@ export class RawClient {
    return (this._transport.request('get_account_info', [accountId] as RPC.Params)) as Promise<T.Account>;
  }

-  /**
-   * Get the combined filesize of an account in bytes
-   */
-  public getAccountFileSize(accountId: T.U32): Promise<T.U64> {
-    return (this._transport.request('get_account_file_size', [accountId] as RPC.Params)) as Promise<T.U64>;
-  }
-
  /**
   * Returns provider for the given domain.
   *
@@ -162,11 +135,6 @@ export class RawClient {
    return (this._transport.request('batch_get_config', [accountId, keys] as RPC.Params)) as Promise<Record<string,(string|null)>>;
  }

-
-  public setStockStrings(strings: Record<T.U32,string>): Promise<null> {
-    return (this._transport.request('set_stock_strings', [strings] as RPC.Params)) as Promise<null>;
-  }
-
  /**
   * Configures this account with the currently set parameters.
   * Setup the credential config before calling this.
@@ -182,16 +150,6 @@ export class RawClient {
    return (this._transport.request('stop_ongoing_process', [accountId] as RPC.Params)) as Promise<null>;
  }

-
-  public exportSelfKeys(accountId: T.U32, path: string, passphrase: (string|null)): Promise<null> {
-    return (this._transport.request('export_self_keys', [accountId, path, passphrase] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public importSelfKeys(accountId: T.U32, path: string, passphrase: (string|null)): Promise<null> {
-    return (this._transport.request('import_self_keys', [accountId, path, passphrase] as RPC.Params)) as Promise<null>;
-  }
-
  /**
   * Returns the message IDs of all _fresh_ messages of any chat.
   * Typically used for implementing notification summaries
@@ -221,24 +179,14 @@ export class RawClient {
    return (this._transport.request('get_fresh_msg_cnt', [accountId, chatId] as RPC.Params)) as Promise<T.Usize>;
  }

-  /**
-   * Estimate the number of messages that will be deleted
-   * by the set_config()-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.
-   */
-  public estimateAutoDeletionCount(accountId: T.U32, fromServer: boolean, seconds: T.I64): Promise<T.Usize> {
-    return (this._transport.request('estimate_auto_deletion_count', [accountId, fromServer, seconds] as RPC.Params)) as Promise<T.Usize>;
+
+  public autocryptInitiateKeyTransfer(accountId: T.U32): Promise<string> {
+    return (this._transport.request('autocrypt_initiate_key_transfer', [accountId] as RPC.Params)) as Promise<string>;
  }


-  public initiateAutocryptKeyTransfer(accountId: T.U32): Promise<string> {
-    return (this._transport.request('initiate_autocrypt_key_transfer', [accountId] as RPC.Params)) as Promise<string>;
-  }
-
-
-  public continueAutocryptKeyTransfer(accountId: T.U32, messageId: T.U32, setupCode: string): Promise<null> {
-    return (this._transport.request('continue_autocrypt_key_transfer', [accountId, messageId, setupCode] as RPC.Params)) as Promise<null>;
+  public autocryptContinueKeyTransfer(accountId: T.U32, messageId: T.U32, setupCode: string): Promise<null> {
+    return (this._transport.request('autocrypt_continue_key_transfer', [accountId, messageId, setupCode] as RPC.Params)) as Promise<null>;
  }


@@ -252,8 +200,8 @@ export class RawClient {
  }


-  public getFullChatById(accountId: T.U32, chatId: T.U32): Promise<T.FullChat> {
-    return (this._transport.request('get_full_chat_by_id', [accountId, chatId] as RPC.Params)) as Promise<T.FullChat>;
+  public chatlistGetFullChatById(accountId: T.U32, chatId: T.U32): Promise<T.FullChat> {
+    return (this._transport.request('chatlist_get_full_chat_by_id', [accountId, chatId] as RPC.Params)) as Promise<T.FullChat>;
  }

  /**
@@ -292,7 +240,8 @@ export class RawClient {
   *   really unexpected when deletion results in contacting all members again,
   *   (3) only leaving groups is also a valid usecase.
   *
-   * To leave a chat explicitly, use leave_group()
+   * To leave a chat explicitly, use dc_remove_contact_from_chat() with
+   * chat_id=DC_CONTACT_ID_SELF)
   */
  public deleteChat(accountId: T.U32, chatId: T.U32): Promise<null> {
    return (this._transport.request('delete_chat', [accountId, chatId] as RPC.Params)) as Promise<null>;
@@ -316,7 +265,7 @@ export class RawClient {
   *
   * The scanning device will pass the scanned content to `checkQr()` then;
   * if `checkQr()` returns `askVerifyContact` or `askVerifyGroup`
-   * an out-of-band-verification can be joined using `secure_join()`
+   * an out-of-band-verification can be joined using dc_join_securejoin()
   *
   * chat_id: If set to a group-chat-id,
   *     the Verified-Group-Invite protocol is offered in the QR code;
@@ -331,33 +280,6 @@ export class RawClient {
    return (this._transport.request('get_chat_securejoin_qr_code_svg', [accountId, chatId] as RPC.Params)) as Promise<[string,string]>;
  }

-  /**
-   * Continue a Setup-Contact or Verified-Group-Invite protocol
-   * started on another device with `get_chat_securejoin_qr_code_svg()`.
-   * This function is typically called when `check_qr()` returns
-   * type=AskVerifyContact or type=AskVerifyGroup.
-   *
-   * The function returns immediately and the handshake runs in background,
-   * sending and receiving several messages.
-   * During the handshake, info messages are added to the chat,
-   * showing progress, success or errors.
-   *
-   * Subsequent calls of `secure_join()` will abort previous, unfinished handshakes.
-   *
-   * See https://countermitm.readthedocs.io/en/latest/new.html
-   * for details about both protocols.
-   *
-   * **qr**: The text of the scanned QR code. Typically, the same string as given
-   *     to `check_qr()`.
-   *
-   * **returns**: The chat ID of the joined chat, the UI may redirect to the this chat.
-   *         A returned chat ID does not guarantee that the chat is protected or the belonging contact is verified.
-   *
-   */
-  public secureJoin(accountId: T.U32, qr: string): Promise<T.U32> {
-    return (this._transport.request('secure_join', [accountId, qr] as RPC.Params)) as Promise<T.U32>;
-  }
-

  public leaveGroup(accountId: T.U32, chatId: T.U32): Promise<null> {
    return (this._transport.request('leave_group', [accountId, chatId] as RPC.Params)) as Promise<null>;
@@ -389,125 +311,6 @@ export class RawClient {
    return (this._transport.request('add_contact_to_chat', [accountId, chatId, contactId] as RPC.Params)) as Promise<null>;
  }

-  /**
-   * Get the contact IDs belonging to a chat.
-   *
-   * - for normal chats, the function always returns exactly one contact,
-   *   DC_CONTACT_ID_SELF is returned only for SELF-chats.
-   *
-   * - for group chats all members are returned, DC_CONTACT_ID_SELF is returned
-   *   explicitly as it may happen that oneself gets removed from a still existing
-   *   group
-   *
-   * - for broadcasts, all recipients are returned, DC_CONTACT_ID_SELF is not included
-   *
-   * - for mailing lists, the behavior is not documented currently, we will decide on that later.
-   *   for now, the UI should not show the list for mailing lists.
-   *   (we do not know all members and there is not always a global mailing list address,
-   *   so we could return only SELF or the known members; this is not decided yet)
-   */
-  public getChatContacts(accountId: T.U32, chatId: T.U32): Promise<(T.U32)[]> {
-    return (this._transport.request('get_chat_contacts', [accountId, chatId] as RPC.Params)) as Promise<(T.U32)[]>;
-  }
-
-  /**
-   * Create a new group chat.
-   *
-   * After creation,
-   * the group has one member with the ID DC_CONTACT_ID_SELF
-   * and is in _unpromoted_ state.
-   * This means, you can add or remove members, change the name,
-   * the group image and so on without messages being sent to all group members.
-   *
-   * This changes as soon as the first message is sent to the group members
-   * and the group becomes _promoted_.
-   * After that, all changes are synced with all group members
-   * by sending status message.
-   *
-   * To check, if a chat is still unpromoted, you can look at the `is_unpromoted` property of `BasicChat` or `FullChat`.
-   * This may be useful if you want to show some help for just created groups.
-   *
-   * @param protect If set to 1 the function creates group with protection initially enabled.
-   *     Only verified members are allowed in these groups
-   *     and end-to-end-encryption is always enabled.
-   */
-  public createGroupChat(accountId: T.U32, name: string, protect: boolean): Promise<T.U32> {
-    return (this._transport.request('create_group_chat', [accountId, name, protect] as RPC.Params)) as Promise<T.U32>;
-  }
-
-  /**
-   * Create a new broadcast list.
-   *
-   * Broadcast lists are similar to groups on the sending device,
-   * however, recipients get the messages in normal one-to-one chats
-   * and will not be aware of other members.
-   *
-   * Replies to broadcasts go only to the sender
-   * and not to all broadcast recipients.
-   * Moreover, replies will not appear in the broadcast list
-   * but in the one-to-one chat with the person answering.
-   *
-   * The name and the image of the broadcast list is set automatically
-   * and is visible to the sender only.
-   * Not asking for these data allows more focused creation
-   * and we bypass the question who will get which data.
-   * Also, many users will have at most one broadcast list
-   * so, a generic name and image is sufficient at the first place.
-   *
-   * Later on, however, the name can be changed using dc_set_chat_name().
-   * The image cannot be changed to have a unique, recognizable icon in the chat lists.
-   * All in all, this is also what other messengers are doing here.
-   */
-  public createBroadcastList(accountId: T.U32): Promise<T.U32> {
-    return (this._transport.request('create_broadcast_list', [accountId] as RPC.Params)) as Promise<T.U32>;
-  }
-
-  /**
-   * Set group name.
-   *
-   * If the group is already _promoted_ (any message was sent to the group),
-   * all group members are informed by a special status message that is sent automatically by this function.
-   *
-   * Sends out #DC_EVENT_CHAT_MODIFIED and #DC_EVENT_MSGS_CHANGED if a status message was sent.
-   */
-  public setChatName(accountId: T.U32, chatId: T.U32, newName: string): Promise<null> {
-    return (this._transport.request('set_chat_name', [accountId, chatId, newName] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Set group profile image.
-   *
-   * If the group is already _promoted_ (any message was sent to the group),
-   * all group members are informed by a special status message that is sent automatically by this function.
-   *
-   * Sends out #DC_EVENT_CHAT_MODIFIED and #DC_EVENT_MSGS_CHANGED if a status message was sent.
-   *
-   * To find out the profile image of a chat, use dc_chat_get_profile_image()
-   *
-   * @param image_path Full path of the image to use as the group image. The image will immediately be copied to the
-   *     `blobdir`; the original image will not be needed anymore.
-   *      If you pass null here, the group image is deleted (for promoted groups, all members are informed about
-   *      this change anyway).
-   */
-  public setChatProfileImage(accountId: T.U32, chatId: T.U32, imagePath: (string|null)): Promise<null> {
-    return (this._transport.request('set_chat_profile_image', [accountId, chatId, imagePath] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public setChatVisibility(accountId: T.U32, chatId: T.U32, visibility: T.ChatVisibility): Promise<null> {
-    return (this._transport.request('set_chat_visibility', [accountId, chatId, visibility] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public setChatEphemeralTimer(accountId: T.U32, chatId: T.U32, timer: T.U32): Promise<null> {
-    return (this._transport.request('set_chat_ephemeral_timer', [accountId, chatId, timer] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public getChatEphemeralTimer(accountId: T.U32, chatId: T.U32): Promise<T.U32> {
-    return (this._transport.request('get_chat_ephemeral_timer', [accountId, chatId] as RPC.Params)) as Promise<T.U32>;
-  }
-

  public addDeviceMessage(accountId: T.U32, label: string, text: string): Promise<T.U32> {
    return (this._transport.request('add_device_message', [accountId, label, text] as RPC.Params)) as Promise<T.U32>;
@@ -583,35 +386,18 @@ export class RawClient {
  }


-  public getMessageIds(accountId: T.U32, chatId: T.U32, flags: T.U32): Promise<(T.U32)[]> {
-    return (this._transport.request('get_message_ids', [accountId, chatId, flags] as RPC.Params)) as Promise<(T.U32)[]>;
+  public messageListGetMessageIds(accountId: T.U32, chatId: T.U32, flags: T.U32): Promise<(T.U32)[]> {
+    return (this._transport.request('message_list_get_message_ids', [accountId, chatId, flags] as RPC.Params)) as Promise<(T.U32)[]>;
  }


-  public getMessageListItems(accountId: T.U32, chatId: T.U32, flags: T.U32): Promise<(T.MessageListItem)[]> {
-    return (this._transport.request('get_message_list_items', [accountId, chatId, flags] as RPC.Params)) as Promise<(T.MessageListItem)[]>;
+  public messageGetMessage(accountId: T.U32, messageId: T.U32): Promise<T.Message> {
+    return (this._transport.request('message_get_message', [accountId, messageId] as RPC.Params)) as Promise<T.Message>;
  }


-  public getMessage(accountId: T.U32, messageId: T.U32): Promise<T.Message> {
-    return (this._transport.request('get_message', [accountId, messageId] as RPC.Params)) as Promise<T.Message>;
-  }
-
-
-  public getMessageHtml(accountId: T.U32, messageId: T.U32): Promise<(string|null)> {
-    return (this._transport.request('get_message_html', [accountId, messageId] as RPC.Params)) as Promise<(string|null)>;
-  }
-
-
-  public getMessages(accountId: T.U32, messageIds: (T.U32)[]): Promise<Record<T.U32,T.Message>> {
-    return (this._transport.request('get_messages', [accountId, messageIds] as RPC.Params)) as Promise<Record<T.U32,T.Message>>;
-  }
-
-  /**
-   * Fetch info desktop needs for creating a notification for a message
-   */
-  public getMessageNotificationInfo(accountId: T.U32, messageId: T.U32): Promise<T.MessageNotificationInfo> {
-    return (this._transport.request('get_message_notification_info', [accountId, messageId] as RPC.Params)) as Promise<T.MessageNotificationInfo>;
+  public messageGetMessages(accountId: T.U32, messageIds: (T.U32)[]): Promise<Record<T.U32,T.Message>> {
+    return (this._transport.request('message_get_messages', [accountId, messageIds] as RPC.Params)) as Promise<Record<T.U32,T.Message>>;
  }

  /**
@@ -633,51 +419,11 @@ export class RawClient {
    return (this._transport.request('get_message_info', [accountId, messageId] as RPC.Params)) as Promise<string>;
  }

-  /**
-   * Asks the core to start downloading a message fully.
-   * This function is typically called when the user hits the "Download" button
-   * that is shown by the UI in case `download_state` is `'Available'` or `'Failure'`
-   *
-   * On success, the @ref DC_MSG "view type of the message" may change
-   * or the message may be replaced completely by one or more messages with other message IDs.
-   * That may happen e.g. in cases where the message was encrypted
-   * and the type could not be determined without fully downloading.
-   * Downloaded content can be accessed as usual after download.
-   *
-   * To reflect these changes a @ref DC_EVENT_MSGS_CHANGED event will be emitted.
-   */
-  public downloadFullMessage(accountId: T.U32, messageId: T.U32): Promise<null> {
-    return (this._transport.request('download_full_message', [accountId, messageId] as RPC.Params)) as Promise<null>;
-  }
-
-  /**
-   * Search messages containing the given query string.
-   * Searching can be done globally (chat_id=0) or in a specified chat only (chat_id set).
-   *
-   * Global chat results are typically displayed using dc_msg_get_summary(), chat
-   * search results may just hilite the corresponding messages and present a
-   * prev/next button.
-   *
-   * For global search, result is limited to 1000 messages,
-   * this allows incremental search done fast.
-   * So, when getting exactly 1000 results, the result may be truncated;
-   * the UIs may display sth. as "1000+ messages found" in this case.
-   * Chat search (if a chat_id is set) is not limited.
-   */
-  public searchMessages(accountId: T.U32, query: string, chatId: (T.U32|null)): Promise<(T.U32)[]> {
-    return (this._transport.request('search_messages', [accountId, query, chatId] as RPC.Params)) as Promise<(T.U32)[]>;
-  }
-
-
-  public messageIdsToSearchResults(accountId: T.U32, messageIds: (T.U32)[]): Promise<Record<T.U32,T.MessageSearchResult>> {
-    return (this._transport.request('message_ids_to_search_results', [accountId, messageIds] as RPC.Params)) as Promise<Record<T.U32,T.MessageSearchResult>>;
-  }
-
  /**
   * Get a single contact options by ID.
   */
-  public getContact(accountId: T.U32, contactId: T.U32): Promise<T.Contact> {
-    return (this._transport.request('get_contact', [accountId, contactId] as RPC.Params)) as Promise<T.Contact>;
+  public contactsGetContact(accountId: T.U32, contactId: T.U32): Promise<T.Contact> {
+    return (this._transport.request('contacts_get_contact', [accountId, contactId] as RPC.Params)) as Promise<T.Contact>;
  }

  /**
@@ -685,58 +431,48 @@ export class RawClient {
   *
   * Returns contact id of the created or existing contact
   */
-  public createContact(accountId: T.U32, email: string, name: (string|null)): Promise<T.U32> {
-    return (this._transport.request('create_contact', [accountId, email, name] as RPC.Params)) as Promise<T.U32>;
+  public contactsCreateContact(accountId: T.U32, email: string, name: (string|null)): Promise<T.U32> {
+    return (this._transport.request('contacts_create_contact', [accountId, email, name] as RPC.Params)) as Promise<T.U32>;
  }

  /**
   * Returns contact id of the created or existing DM chat with that contact
   */
-  public createChatByContactId(accountId: T.U32, contactId: T.U32): Promise<T.U32> {
-    return (this._transport.request('create_chat_by_contact_id', [accountId, contactId] as RPC.Params)) as Promise<T.U32>;
+  public contactsCreateChatByContactId(accountId: T.U32, contactId: T.U32): Promise<T.U32> {
+    return (this._transport.request('contacts_create_chat_by_contact_id', [accountId, contactId] as RPC.Params)) as Promise<T.U32>;
  }


-  public blockContact(accountId: T.U32, contactId: T.U32): Promise<null> {
-    return (this._transport.request('block_contact', [accountId, contactId] as RPC.Params)) as Promise<null>;
+  public contactsBlock(accountId: T.U32, contactId: T.U32): Promise<null> {
+    return (this._transport.request('contacts_block', [accountId, contactId] as RPC.Params)) as Promise<null>;
  }


-  public unblockContact(accountId: T.U32, contactId: T.U32): Promise<null> {
-    return (this._transport.request('unblock_contact', [accountId, contactId] as RPC.Params)) as Promise<null>;
+  public contactsUnblock(accountId: T.U32, contactId: T.U32): Promise<null> {
+    return (this._transport.request('contacts_unblock', [accountId, contactId] as RPC.Params)) as Promise<null>;
  }


-  public getBlockedContacts(accountId: T.U32): Promise<(T.Contact)[]> {
-    return (this._transport.request('get_blocked_contacts', [accountId] as RPC.Params)) as Promise<(T.Contact)[]>;
+  public contactsGetBlocked(accountId: T.U32): Promise<(T.Contact)[]> {
+    return (this._transport.request('contacts_get_blocked', [accountId] as RPC.Params)) as Promise<(T.Contact)[]>;
  }


-  public getContactIds(accountId: T.U32, listFlags: T.U32, query: (string|null)): Promise<(T.U32)[]> {
-    return (this._transport.request('get_contact_ids', [accountId, listFlags, query] as RPC.Params)) as Promise<(T.U32)[]>;
+  public contactsGetContactIds(accountId: T.U32, listFlags: T.U32, query: (string|null)): Promise<(T.U32)[]> {
+    return (this._transport.request('contacts_get_contact_ids', [accountId, listFlags, query] as RPC.Params)) as Promise<(T.U32)[]>;
  }

  /**
   * Get a list of contacts.
   * (formerly called getContacts2 in desktop)
   */
-  public getContacts(accountId: T.U32, listFlags: T.U32, query: (string|null)): Promise<(T.Contact)[]> {
-    return (this._transport.request('get_contacts', [accountId, listFlags, query] as RPC.Params)) as Promise<(T.Contact)[]>;
+  public contactsGetContacts(accountId: T.U32, listFlags: T.U32, query: (string|null)): Promise<(T.Contact)[]> {
+    return (this._transport.request('contacts_get_contacts', [accountId, listFlags, query] as RPC.Params)) as Promise<(T.Contact)[]>;
  }


-  public getContactsByIds(accountId: T.U32, ids: (T.U32)[]): Promise<Record<T.U32,T.Contact>> {
-    return (this._transport.request('get_contacts_by_ids', [accountId, ids] as RPC.Params)) as Promise<Record<T.U32,T.Contact>>;
-  }
-
-
-  public deleteContact(accountId: T.U32, contactId: T.U32): Promise<boolean> {
-    return (this._transport.request('delete_contact', [accountId, contactId] as RPC.Params)) as Promise<boolean>;
-  }
-
-
-  public changeContactName(accountId: T.U32, contactId: T.U32, name: string): Promise<null> {
-    return (this._transport.request('change_contact_name', [accountId, contactId, name] as RPC.Params)) as Promise<null>;
+  public contactsGetContactsByIds(accountId: T.U32, ids: (T.U32)[]): Promise<Record<T.U32,T.Contact>> {
+    return (this._transport.request('contacts_get_contacts_by_ids', [accountId, ids] as RPC.Params)) as Promise<Record<T.U32,T.Contact>>;
  }

  /**
@@ -748,17 +484,6 @@ export class RawClient {
    return (this._transport.request('get_contact_encryption_info', [accountId, contactId] as RPC.Params)) as Promise<string>;
  }

-  /**
-   * Check if an e-mail address belongs to a known and unblocked contact.
-   * To get a list of all known and unblocked contacts, use contacts_get_contacts().
-   *
-   * To validate an e-mail address independently of the contact database
-   * use check_email_validity().
-   */
-  public lookupContactIdByAddr(accountId: T.U32, addr: string): Promise<(T.U32|null)> {
-    return (this._transport.request('lookup_contact_id_by_addr', [accountId, addr] as RPC.Params)) as Promise<(T.U32|null)>;
-  }
-
  /**
   * Returns all message IDs of the given types in a chat.
   * Typically used to show a gallery.
@@ -770,30 +495,8 @@ export class RawClient {
   * Setting `chat_id` to `None` (`null` in typescript) means get messages with media
   * from any chat of the currently used account.
   */
-  public getChatMedia(accountId: T.U32, chatId: (T.U32|null), messageType: T.Viewtype, orMessageType2: (T.Viewtype|null), orMessageType3: (T.Viewtype|null)): Promise<(T.U32)[]> {
-    return (this._transport.request('get_chat_media', [accountId, chatId, messageType, orMessageType2, orMessageType3] as RPC.Params)) as Promise<(T.U32)[]>;
-  }
-
-  /**
-   * Search next/previous message based on a given message and a list of types.
-   * Typically used to implement the "next" and "previous" buttons
-   * in a gallery or in a media player.
-   *
-   * one combined call for getting chat::get_next_media for both directions
-   * the manual chat::get_next_media in only one direction is not exposed by the jsonrpc yet
-   */
-  public getNeighboringChatMedia(accountId: T.U32, msgId: T.U32, messageType: T.Viewtype, orMessageType2: (T.Viewtype|null), orMessageType3: (T.Viewtype|null)): Promise<[(T.U32|null),(T.U32|null)]> {
-    return (this._transport.request('get_neighboring_chat_media', [accountId, msgId, messageType, orMessageType2, orMessageType3] as RPC.Params)) as Promise<[(T.U32|null),(T.U32|null)]>;
-  }
-
-
-  public exportBackup(accountId: T.U32, destination: string, passphrase: (string|null)): Promise<null> {
-    return (this._transport.request('export_backup', [accountId, destination, passphrase] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public importBackup(accountId: T.U32, path: string, passphrase: (string|null)): Promise<null> {
-    return (this._transport.request('import_backup', [accountId, path, passphrase] as RPC.Params)) as Promise<null>;
+  public chatGetMedia(accountId: T.U32, chatId: (T.U32|null), messageType: T.Viewtype, orMessageType2: (T.Viewtype|null), orMessageType3: (T.Viewtype|null)): Promise<(T.U32)[]> {
+    return (this._transport.request('chat_get_media', [accountId, chatId, messageType, orMessageType2, orMessageType3] as RPC.Params)) as Promise<(T.U32)[]>;
  }

  /**
@@ -840,25 +543,20 @@ export class RawClient {
  }


-  public getLocations(accountId: T.U32, chatId: (T.U32|null), contactId: (T.U32|null), timestampBegin: T.I64, timestampEnd: T.I64): Promise<(T.Location)[]> {
-    return (this._transport.request('get_locations', [accountId, chatId, contactId, timestampBegin, timestampEnd] as RPC.Params)) as Promise<(T.Location)[]>;
+  public webxdcSendStatusUpdate(accountId: T.U32, instanceMsgId: T.U32, updateStr: string, description: string): Promise<null> {
+    return (this._transport.request('webxdc_send_status_update', [accountId, instanceMsgId, updateStr, description] as RPC.Params)) as Promise<null>;
  }


-  public sendWebxdcStatusUpdate(accountId: T.U32, instanceMsgId: T.U32, updateStr: string, description: string): Promise<null> {
-    return (this._transport.request('send_webxdc_status_update', [accountId, instanceMsgId, updateStr, description] as RPC.Params)) as Promise<null>;
-  }
-
-
-  public getWebxdcStatusUpdates(accountId: T.U32, instanceMsgId: T.U32, lastKnownSerial: T.U32): Promise<string> {
-    return (this._transport.request('get_webxdc_status_updates', [accountId, instanceMsgId, lastKnownSerial] as RPC.Params)) as Promise<string>;
+  public webxdcGetStatusUpdates(accountId: T.U32, instanceMsgId: T.U32, lastKnownSerial: T.U32): Promise<string> {
+    return (this._transport.request('webxdc_get_status_updates', [accountId, instanceMsgId, lastKnownSerial] as RPC.Params)) as Promise<string>;
  }

  /**
   * Get info from a webxdc message
   */
-  public getWebxdcInfo(accountId: T.U32, instanceMsgId: T.U32): Promise<T.WebxdcMessageInfo> {
-    return (this._transport.request('get_webxdc_info', [accountId, instanceMsgId] as RPC.Params)) as Promise<T.WebxdcMessageInfo>;
+  public messageGetWebxdcInfo(accountId: T.U32, instanceMsgId: T.U32): Promise<T.WebxdcMessageInfo> {
+    return (this._transport.request('message_get_webxdc_info', [accountId, instanceMsgId] as RPC.Params)) as Promise<T.WebxdcMessageInfo>;
  }

  /**
@@ -874,23 +572,6 @@ export class RawClient {
  }


-  public sendSticker(accountId: T.U32, chatId: T.U32, stickerPath: string): Promise<T.U32> {
-    return (this._transport.request('send_sticker', [accountId, chatId, stickerPath] as RPC.Params)) as Promise<T.U32>;
-  }
-
-  /**
-   * Send a reaction to message.
-   *
-   * Reaction is a string of emojis separated by spaces. Reaction to a
-   * single message can be sent multiple times. The last reaction
-   * received overrides all previously received reactions. It is
-   * possible to remove all reactions by sending an empty string.
-   */
-  public sendReaction(accountId: T.U32, messageId: T.U32, reaction: (string)[]): Promise<T.U32> {
-    return (this._transport.request('send_reaction', [accountId, messageId, reaction] as RPC.Params)) as Promise<T.U32>;
-  }
-
-
  public removeDraft(accountId: T.U32, chatId: T.U32): Promise<null> {
    return (this._transport.request('remove_draft', [accountId, chatId] as RPC.Params)) as Promise<null>;
  }
@@ -902,29 +583,11 @@ export class RawClient {
    return (this._transport.request('get_draft', [accountId, chatId] as RPC.Params)) as Promise<(T.Message|null)>;
  }

-
-  public sendVideochatInvitation(accountId: T.U32, chatId: T.U32): Promise<T.U32> {
-    return (this._transport.request('send_videochat_invitation', [accountId, chatId] as RPC.Params)) as Promise<T.U32>;
-  }
-
-
-  public miscGetStickerFolder(accountId: T.U32): Promise<string> {
-    return (this._transport.request('misc_get_sticker_folder', [accountId] as RPC.Params)) as Promise<string>;
-  }
-
-  /**
-   * for desktop, get stickers from stickers folder,
-   * grouped by the folder they are in.
-   */
-  public miscGetStickers(accountId: T.U32): Promise<Record<string,(string)[]>> {
-    return (this._transport.request('misc_get_stickers', [accountId] as RPC.Params)) as Promise<Record<string,(string)[]>>;
-  }
-
  /**
   * Returns the messageid of the sent message
   */
-  public miscSendTextMessage(accountId: T.U32, chatId: T.U32, text: string): Promise<T.U32> {
-    return (this._transport.request('misc_send_text_message', [accountId, chatId, text] as RPC.Params)) as Promise<T.U32>;
+  public miscSendTextMessage(accountId: T.U32, text: string, chatId: T.U32): Promise<T.U32> {
+    return (this._transport.request('misc_send_text_message', [accountId, text, chatId] as RPC.Params)) as Promise<T.U32>;
  }


--- a/deltachat-jsonrpc/typescript/generated/constants.ts
+++ b/deltachat-jsonrpc/typescript/generated/constants.ts
@@ -1,199 +0,0 @@
-// Generated!
-
-export enum C {
-  DC_CERTCK_ACCEPT_INVALID_CERTIFICATES = 3,
-  DC_CERTCK_AUTO = 0,
-  DC_CERTCK_STRICT = 1,
-  DC_CHAT_ID_ALLDONE_HINT = 7,
-  DC_CHAT_ID_ARCHIVED_LINK = 6,
-  DC_CHAT_ID_LAST_SPECIAL = 9,
-  DC_CHAT_ID_TRASH = 3,
-  DC_CHAT_TYPE_BROADCAST = 160,
-  DC_CHAT_TYPE_GROUP = 120,
-  DC_CHAT_TYPE_MAILINGLIST = 140,
-  DC_CHAT_TYPE_SINGLE = 100,
-  DC_CHAT_TYPE_UNDEFINED = 0,
-  DC_CONNECTIVITY_CONNECTED = 4000,
-  DC_CONNECTIVITY_CONNECTING = 2000,
-  DC_CONNECTIVITY_NOT_CONNECTED = 1000,
-  DC_CONNECTIVITY_WORKING = 3000,
-  DC_CONTACT_ID_DEVICE = 5,
-  DC_CONTACT_ID_INFO = 2,
-  DC_CONTACT_ID_LAST_SPECIAL = 9,
-  DC_CONTACT_ID_SELF = 1,
-  DC_GCL_ADD_ALLDONE_HINT = 4,
-  DC_GCL_ADD_SELF = 2,
-  DC_GCL_ARCHIVED_ONLY = 1,
-  DC_GCL_FOR_FORWARDING = 8,
-  DC_GCL_NO_SPECIALS = 2,
-  DC_GCL_VERIFIED_ONLY = 1,
-  DC_GCM_ADDDAYMARKER = 1,
-  DC_GCM_INFO_ONLY = 2,
-  DC_KEY_GEN_DEFAULT = 0,
-  DC_KEY_GEN_ED25519 = 2,
-  DC_KEY_GEN_RSA2048 = 1,
-  DC_LP_AUTH_NORMAL = 4,
-  DC_LP_AUTH_OAUTH2 = 2,
-  DC_MEDIA_QUALITY_BALANCED = 0,
-  DC_MEDIA_QUALITY_WORSE = 1,
-  DC_MSG_ID_DAYMARKER = 9,
-  DC_MSG_ID_LAST_SPECIAL = 9,
-  DC_MSG_ID_MARKER1 = 1,
-  DC_PROVIDER_STATUS_BROKEN = 3,
-  DC_PROVIDER_STATUS_OK = 1,
-  DC_PROVIDER_STATUS_PREPARATION = 2,
-  DC_SHOW_EMAILS_ACCEPTED_CONTACTS = 1,
-  DC_SHOW_EMAILS_ALL = 2,
-  DC_SHOW_EMAILS_OFF = 0,
-  DC_SOCKET_AUTO = 0,
-  DC_SOCKET_PLAIN = 3,
-  DC_SOCKET_SSL = 1,
-  DC_SOCKET_STARTTLS = 2,
-  DC_STATE_IN_FRESH = 10,
-  DC_STATE_IN_NOTICED = 13,
-  DC_STATE_IN_SEEN = 16,
-  DC_STATE_OUT_DELIVERED = 26,
-  DC_STATE_OUT_DRAFT = 19,
-  DC_STATE_OUT_FAILED = 24,
-  DC_STATE_OUT_MDN_RCVD = 28,
-  DC_STATE_OUT_PENDING = 20,
-  DC_STATE_OUT_PREPARING = 18,
-  DC_STATE_UNDEFINED = 0,
-  DC_STR_AC_SETUP_MSG_BODY = 43,
-  DC_STR_AC_SETUP_MSG_SUBJECT = 42,
-  DC_STR_ADD_MEMBER_BY_OTHER = 129,
-  DC_STR_ADD_MEMBER_BY_YOU = 128,
-  DC_STR_AEAP_ADDR_CHANGED = 122,
-  DC_STR_AEAP_EXPLANATION_AND_LINK = 123,
-  DC_STR_ARCHIVEDCHATS = 40,
-  DC_STR_AUDIO = 11,
-  DC_STR_BAD_TIME_MSG_BODY = 85,
-  DC_STR_BROADCAST_LIST = 115,
-  DC_STR_CANNOT_LOGIN = 60,
-  DC_STR_CANTDECRYPT_MSG_BODY = 29,
-  DC_STR_CONFIGURATION_FAILED = 84,
-  DC_STR_CONNECTED = 107,
-  DC_STR_CONNTECTING = 108,
-  DC_STR_CONTACT_NOT_VERIFIED = 36,
-  DC_STR_CONTACT_SETUP_CHANGED = 37,
-  DC_STR_CONTACT_VERIFIED = 35,
-  DC_STR_DEVICE_MESSAGES = 68,
-  DC_STR_DEVICE_MESSAGES_HINT = 70,
-  DC_STR_DOWNLOAD_AVAILABILITY = 100,
-  DC_STR_DRAFT = 3,
-  DC_STR_E2E_AVAILABLE = 25,
-  DC_STR_E2E_PREFERRED = 34,
-  DC_STR_ENCRYPTEDMSG = 24,
-  DC_STR_ENCR_NONE = 28,
-  DC_STR_ENCR_TRANSP = 27,
-  DC_STR_EPHEMERAL_DAY = 79,
-  DC_STR_EPHEMERAL_DAYS = 95,
-  DC_STR_EPHEMERAL_DISABLED = 75,
-  DC_STR_EPHEMERAL_FOUR_WEEKS = 81,
-  DC_STR_EPHEMERAL_HOUR = 78,
-  DC_STR_EPHEMERAL_HOURS = 94,
-  DC_STR_EPHEMERAL_MINUTE = 77,
-  DC_STR_EPHEMERAL_MINUTES = 93,
-  DC_STR_EPHEMERAL_SECONDS = 76,
-  DC_STR_EPHEMERAL_TIMER_1_DAY_BY_OTHER = 147,
-  DC_STR_EPHEMERAL_TIMER_1_DAY_BY_YOU = 146,
-  DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_OTHER = 145,
-  DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_YOU = 144,
-  DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_OTHER = 143,
-  DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_YOU = 142,
-  DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_OTHER = 149,
-  DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_YOU = 148,
-  DC_STR_EPHEMERAL_TIMER_DAYS_BY_OTHER = 155,
-  DC_STR_EPHEMERAL_TIMER_DAYS_BY_YOU = 154,
-  DC_STR_EPHEMERAL_TIMER_DISABLED_BY_OTHER = 139,
-  DC_STR_EPHEMERAL_TIMER_DISABLED_BY_YOU = 138,
-  DC_STR_EPHEMERAL_TIMER_HOURS_BY_OTHER = 153,
-  DC_STR_EPHEMERAL_TIMER_HOURS_BY_YOU = 152,
-  DC_STR_EPHEMERAL_TIMER_MINUTES_BY_OTHER = 151,
-  DC_STR_EPHEMERAL_TIMER_MINUTES_BY_YOU = 150,
-  DC_STR_EPHEMERAL_TIMER_SECONDS_BY_OTHER = 141,
-  DC_STR_EPHEMERAL_TIMER_SECONDS_BY_YOU = 140,
-  DC_STR_EPHEMERAL_TIMER_WEEKS_BY_OTHER = 157,
-  DC_STR_EPHEMERAL_TIMER_WEEKS_BY_YOU = 156,
-  DC_STR_EPHEMERAL_WEEK = 80,
-  DC_STR_EPHEMERAL_WEEKS = 96,
-  DC_STR_ERROR = 112,
-  DC_STR_ERROR_NO_NETWORK = 87,
-  DC_STR_FAILED_SENDING_TO = 74,
-  DC_STR_FILE = 12,
-  DC_STR_FINGERPRINTS = 30,
-  DC_STR_FORWARDED = 97,
-  DC_STR_GIF = 23,
-  DC_STR_GROUP_IMAGE_CHANGED_BY_OTHER = 127,
-  DC_STR_GROUP_IMAGE_CHANGED_BY_YOU = 126,
-  DC_STR_GROUP_IMAGE_DELETED_BY_OTHER = 135,
-  DC_STR_GROUP_IMAGE_DELETED_BY_YOU = 134,
-  DC_STR_GROUP_LEFT_BY_OTHER = 133,
-  DC_STR_GROUP_LEFT_BY_YOU = 132,
-  DC_STR_GROUP_NAME_CHANGED_BY_OTHER = 125,
-  DC_STR_GROUP_NAME_CHANGED_BY_YOU = 124,
-  DC_STR_IMAGE = 9,
-  DC_STR_INCOMING_MESSAGES = 103,
-  DC_STR_LAST_MSG_SENT_SUCCESSFULLY = 111,
-  DC_STR_LOCATION = 66,
-  DC_STR_LOCATION_ENABLED_BY_OTHER = 137,
-  DC_STR_LOCATION_ENABLED_BY_YOU = 136,
-  DC_STR_MESSAGES = 114,
-  DC_STR_MSGACTIONBYME = 63,
-  DC_STR_MSGACTIONBYUSER = 62,
-  DC_STR_MSGADDMEMBER = 17,
-  DC_STR_MSGDELMEMBER = 18,
-  DC_STR_MSGGROUPLEFT = 19,
-  DC_STR_MSGGRPIMGCHANGED = 16,
-  DC_STR_MSGGRPIMGDELETED = 33,
-  DC_STR_MSGGRPNAME = 15,
-  DC_STR_MSGLOCATIONDISABLED = 65,
-  DC_STR_MSGLOCATIONENABLED = 64,
-  DC_STR_NOMESSAGES = 1,
-  DC_STR_NOT_CONNECTED = 121,
-  DC_STR_NOT_SUPPORTED_BY_PROVIDER = 113,
-  DC_STR_ONE_MOMENT = 106,
-  DC_STR_OUTGOING_MESSAGES = 104,
-  DC_STR_PARTIAL_DOWNLOAD_MSG_BODY = 99,
-  DC_STR_PART_OF_TOTAL_USED = 116,
-  DC_STR_PROTECTION_DISABLED = 89,
-  DC_STR_PROTECTION_DISABLED_BY_OTHER = 161,
-  DC_STR_PROTECTION_DISABLED_BY_YOU = 160,
-  DC_STR_PROTECTION_ENABLED = 88,
-  DC_STR_PROTECTION_ENABLED_BY_OTHER = 159,
-  DC_STR_PROTECTION_ENABLED_BY_YOU = 158,
-  DC_STR_QUOTA_EXCEEDING_MSG_BODY = 98,
-  DC_STR_READRCPT = 31,
-  DC_STR_READRCPT_MAILBODY = 32,
-  DC_STR_REMOVE_MEMBER_BY_OTHER = 131,
-  DC_STR_REMOVE_MEMBER_BY_YOU = 130,
-  DC_STR_REPLY_NOUN = 90,
-  DC_STR_SAVED_MESSAGES = 69,
-  DC_STR_SECURE_JOIN_GROUP_QR_DESC = 120,
-  DC_STR_SECURE_JOIN_REPLIES = 118,
-  DC_STR_SECURE_JOIN_STARTED = 117,
-  DC_STR_SELF = 2,
-  DC_STR_SELF_DELETED_MSG_BODY = 91,
-  DC_STR_SENDING = 110,
-  DC_STR_SERVER_TURNED_OFF = 92,
-  DC_STR_SETUP_CONTACT_QR_DESC = 119,
-  DC_STR_STICKER = 67,
-  DC_STR_STORAGE_ON_DOMAIN = 105,
-  DC_STR_SUBJECT_FOR_NEW_CONTACT = 73,
-  DC_STR_SYNC_MSG_BODY = 102,
-  DC_STR_SYNC_MSG_SUBJECT = 101,
-  DC_STR_UNKNOWN_SENDER_FOR_CHAT = 72,
-  DC_STR_UPDATE_REMINDER_MSG_BODY = 86,
-  DC_STR_UPDATING = 109,
-  DC_STR_VIDEO = 10,
-  DC_STR_VIDEOCHAT_INVITATION = 82,
-  DC_STR_VIDEOCHAT_INVITE_MSG_BODY = 83,
-  DC_STR_VOICEMESSAGE = 7,
-  DC_STR_WELCOME_MESSAGE = 71,
-  DC_TEXT1_DRAFT = 1,
-  DC_TEXT1_SELF = 3,
-  DC_TEXT1_USERNAME = 2,
-  DC_VIDEOCHATTYPE_BASICWEBRTC = 1,
-  DC_VIDEOCHATTYPE_JITSI = 2,
-  DC_VIDEOCHATTYPE_UNKNOWN = 0,
-}
--- a/deltachat-jsonrpc/typescript/generated/events.ts
+++ b/deltachat-jsonrpc/typescript/generated/events.ts
@@ -1,214 +1,3 @@
 // AUTO-GENERATED by typescript-type-def

-export type U32=number;
-export type Usize=number;
-export type Event=(({
-/**
- * The library-user may write an informational string to the log.
- * 
- * This event should *not* be reported to the end-user using a popup or something like
- * that.
- */
-"type":"Info";}&{"msg":string;})|({
-/**
- * Emitted when SMTP connection is established and login was successful.
- */
-"type":"SmtpConnected";}&{"msg":string;})|({
-/**
- * Emitted when IMAP connection is established and login was successful.
- */
-"type":"ImapConnected";}&{"msg":string;})|({
-/**
- * Emitted when a message was successfully sent to the SMTP server.
- */
-"type":"SmtpMessageSent";}&{"msg":string;})|({
-/**
- * Emitted when an IMAP message has been marked as deleted
- */
-"type":"ImapMessageDeleted";}&{"msg":string;})|({
-/**
- * Emitted when an IMAP message has been moved
- */
-"type":"ImapMessageMoved";}&{"msg":string;})|({
-/**
- * Emitted when an new file in the $BLOBDIR was created
- */
-"type":"NewBlobFile";}&{"file":string;})|({
-/**
- * Emitted when an file in the $BLOBDIR was deleted
- */
-"type":"DeletedBlobFile";}&{"file":string;})|({
-/**
- * The library-user should write a warning string to the log.
- * 
- * This event should *not* be reported to the end-user using a popup or something like
- * that.
- */
-"type":"Warning";}&{"msg":string;})|({
-/**
- * The library-user should report an error to the end-user.
- * 
- * As most things are asynchronous, things may go wrong at any time and the user
- * should not be disturbed by a dialog or so.  Instead, use a bubble or so.
- * 
- * However, for ongoing processes (eg. configure())
- * or for functions that are expected to fail (eg. autocryptContinueKeyTransfer())
- * it might be better to delay showing these events until the function has really
- * failed (returned false). It should be sufficient to report only the *last* error
- * in a messasge box then.
- */
-"type":"Error";}&{"msg":string;})|({
-/**
- * An action cannot be performed because the user is not in the group.
- * Reported eg. after a call to
- * setChatName(), setChatProfileImage(),
- * addContactToChat(), removeContactFromChat(),
- * and messages sending functions.
- */
-"type":"ErrorSelfNotInGroup";}&{"msg":string;})|({
-/**
- * Messages or chats changed.  One or more messages or chats changed for various
- * reasons in the database:
- * - Messages sent, received or removed
- * - Chats created, deleted or archived
- * - A draft has been set
- * 
- * `chatId` is set if only a single chat is affected by the changes, otherwise 0.
- * `msgId` is set if only a single message is affected by the changes, otherwise 0.
- */
-"type":"MsgsChanged";}&{"chatId":U32;"msgId":U32;})|({
-/**
- * Reactions for the message changed.
- */
-"type":"ReactionsChanged";}&{"chatId":U32;"msgId":U32;"contactId":U32;})|({
-/**
- * There is a fresh message. Typically, the user will show an notification
- * when receiving this message.
- * 
- * There is no extra #DC_EVENT_MSGS_CHANGED event send together with this event.
- */
-"type":"IncomingMsg";}&{"chatId":U32;"msgId":U32;})|({
-/**
- * Downloading a bunch of messages just finished. This is an experimental
- * event to allow the UI to only show one notification per message bunch,
- * instead of cluttering the user with many notifications.
- * 
- * msg_ids contains the message ids.
- */
-"type":"IncomingMsgBunch";}&{"msgIds":(U32)[];})|({
-/**
- * Messages were seen or noticed.
- * chat id is always set.
- */
-"type":"MsgsNoticed";}&{"chatId":U32;})|({
-/**
- * A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to
- * DC_STATE_OUT_DELIVERED, see `Message.state`.
- */
-"type":"MsgDelivered";}&{"chatId":U32;"msgId":U32;})|({
-/**
- * A single message could not be sent. State changed from DC_STATE_OUT_PENDING or DC_STATE_OUT_DELIVERED to
- * DC_STATE_OUT_FAILED, see `Message.state`.
- */
-"type":"MsgFailed";}&{"chatId":U32;"msgId":U32;})|({
-/**
- * A single message is read by the receiver. State changed from DC_STATE_OUT_DELIVERED to
- * DC_STATE_OUT_MDN_RCVD, see `Message.state`.
- */
-"type":"MsgRead";}&{"chatId":U32;"msgId":U32;})|({
-/**
- * Chat changed.  The name or the image of a chat group was changed or members were added or removed.
- * Or the verify state of a chat has changed.
- * See setChatName(), setChatProfileImage(), addContactToChat()
- * and removeContactFromChat().
- * 
- * This event does not include ephemeral timer modification, which
- * is a separate event.
- */
-"type":"ChatModified";}&{"chatId":U32;})|({
-/**
- * Chat ephemeral timer changed.
- */
-"type":"ChatEphemeralTimerModified";}&{"chatId":U32;"timer":U32;})|({
-/**
- * Contact(s) created, renamed, blocked or deleted.
- * 
- * @param data1 (int) If set, this is the contact_id of an added contact that should be selected.
- */
-"type":"ContactsChanged";}&{"contactId":(U32|null);})|({
-/**
- * Location of one or more contact has changed.
- * 
- * @param data1 (u32) contact_id of the contact for which the location has changed.
- *     If the locations of several contacts have been changed,
- *     this parameter is set to `None`.
- */
-"type":"LocationChanged";}&{"contactId":(U32|null);})|({
-/**
- * Inform about the configuration progress started by configure().
- */
-"type":"ConfigureProgress";}&{
-/**
- * Progress.
- * 
- * 0=error, 1-999=progress in permille, 1000=success and done
- */
-"progress":Usize;
-/**
- * Progress comment or error, something to display to the user.
- */
-"comment":(string|null);})|({
-/**
- * Inform about the import/export progress started by imex().
- * 
- * @param data1 (usize) 0=error, 1-999=progress in permille, 1000=success and done
- * @param data2 0
- */
-"type":"ImexProgress";}&{"progress":Usize;})|({
-/**
- * A file has been exported. A file has been written by imex().
- * This event may be sent multiple times by a single call to imex().
- * 
- * A typical purpose for a handler of this event may be to make the file public to some system
- * services.
- * 
- * @param data2 0
- */
-"type":"ImexFileWritten";}&{"path":string;})|({
-/**
- * Progress information of a secure-join handshake from the view of the inviter
- * (Alice, the person who shows the QR code).
- * 
- * These events are typically sent after a joiner has scanned the QR code
- * generated by getChatSecurejoinQrCodeSvg().
- * 
- * @param data1 (int) ID of the contact that wants to join.
- * @param data2 (int) Progress as:
- *     300=vg-/vc-request received, typically shown as "bob@addr joins".
- *     600=vg-/vc-request-with-auth received, vg-member-added/vc-contact-confirm sent, typically shown as "bob@addr verified".
- *     800=vg-member-added-received received, shown as "bob@addr securely joined GROUP", only sent for the verified-group-protocol.
- *     1000=Protocol finished for this contact.
- */
-"type":"SecurejoinInviterProgress";}&{"contactId":U32;"progress":Usize;})|({
-/**
- * Progress information of a secure-join handshake from the view of the joiner
- * (Bob, the person who scans the QR code).
- * The events are typically sent while secureJoin(), which
- * may take some time, is executed.
- * @param data1 (int) ID of the inviting contact.
- * @param data2 (int) Progress as:
- *     400=vg-/vc-request-with-auth sent, typically shown as "alice@addr verified, introducing myself."
- *     (Bob has verified alice and waits until Alice does the same for him)
- */
-"type":"SecurejoinJoinerProgress";}&{"contactId":U32;"progress":Usize;})|{
-/**
- * The connectivity to the server changed.
- * This means that you should refresh the connectivity view
- * and possibly the connectivtiy HTML; see getConnectivity() and
- * getConnectivityHtml() for details.
- */
-"type":"ConnectivityChanged";}|{"type":"SelfavatarChanged";}|({"type":"WebxdcStatusUpdate";}&{"msgId":U32;"statusUpdateSerial":U32;})|({
-/**
- * Inform that a message containing a webxdc instance has been deleted
- */
-"type":"WebxdcInstanceDeleted";}&{"msgId":U32;}));
+export type EventTypeName=("Info"|"SmtpConnected"|"ImapConnected"|"SmtpMessageSent"|"ImapMessageDeleted"|"ImapMessageMoved"|"NewBlobFile"|"DeletedBlobFile"|"Warning"|"Error"|"ErrorSelfNotInGroup"|"MsgsChanged"|"IncomingMsg"|"MsgsNoticed"|"MsgDelivered"|"MsgFailed"|"MsgRead"|"ChatModified"|"ChatEphemeralTimerModified"|"ContactsChanged"|"LocationChanged"|"ConfigureProgress"|"ImexProgress"|"ImexFileWritten"|"SecurejoinInviterProgress"|"SecurejoinJoinerProgress"|"ConnectivityChanged"|"SelfavatarChanged"|"WebxdcStatusUpdate"|"WebXdInstanceDeleted");
--- a/deltachat-jsonrpc/typescript/generated/types.ts
+++ b/deltachat-jsonrpc/typescript/generated/types.ts
@@ -2,12 +2,11 @@

 export type U32=number;
 export type Account=(({"type":"Configured";}&{"id":U32;"displayName":(string|null);"addr":(string|null);"profileImage":(string|null);"color":string;})|({"type":"Unconfigured";}&{"id":U32;}));
-export type U64=number;
 export type ProviderInfo={"beforeLoginHint":string;"overviewPage":string;"status":U32;};
-export type Qr=(({"type":"askVerifyContact";}&{"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"askVerifyGroup";}&{"grpname":string;"grpid":string;"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"fprOk";}&{"contact_id":U32;})|({"type":"fprMismatch";}&{"contact_id":(U32|null);})|({"type":"fprWithoutAddr";}&{"fingerprint":string;})|({"type":"account";}&{"domain":string;})|({"type":"webrtcInstance";}&{"domain":string;"instance_pattern":string;})|({"type":"addr";}&{"contact_id":U32;"draft":(string|null);})|({"type":"url";}&{"url":string;})|({"type":"text";}&{"text":string;})|({"type":"withdrawVerifyContact";}&{"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"withdrawVerifyGroup";}&{"grpname":string;"grpid":string;"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"reviveVerifyContact";}&{"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"reviveVerifyGroup";}&{"grpname":string;"grpid":string;"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"login";}&{"address":string;}));
+export type Qr=(({"type":"askVerifyContact";}&{"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"askVerifyGroup";}&{"grpname":string;"grpid":string;"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"fprOk";}&{"contact_id":U32;})|({"type":"fprMismatch";}&{"contact_id":(U32|null);})|({"type":"fprWithoutAddr";}&{"fingerprint":string;})|({"type":"account";}&{"domain":string;})|({"type":"webrtcInstance";}&{"domain":string;"instance_pattern":string;})|({"type":"addr";}&{"contact_id":U32;"draft":(string|null);})|({"type":"url";}&{"url":string;})|({"type":"text";}&{"text":string;})|({"type":"withdrawVerifyContact";}&{"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"withdrawVerifyGroup";}&{"grpname":string;"grpid":string;"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"reviveVerifyContact";}&{"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"reviveVerifyGroup";}&{"grpname":string;"grpid":string;"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;}));
 export type Usize=number;
-export type I64=number;
 export type ChatListEntry=[U32,U32];
+export type I64=number;
 export type ChatListItemFetchResult=(({"type":"ChatListItem";}&{"id":U32;"name":string;"avatarPath":(string|null);"color":string;"lastUpdated":(I64|null);"summaryText1":string;"summaryText2":string;"summaryStatus":U32;"isProtected":boolean;"isGroup":boolean;"freshMessageCounter":Usize;"isSelfTalk":boolean;"isDeviceTalk":boolean;"isSendingLocation":boolean;"isSelfInGroup":boolean;"isArchived":boolean;"isPinned":boolean;"isMuted":boolean;"isContactRequest":boolean;
 /**
 * true when chat is a broadcastlist
@@ -22,7 +21,7 @@ export type Contact={"address":string;"color":string;"authName":string;"status":
 * the contact's last seen timestamp
 */
 "lastSeen":I64;"wasSeenRecently":boolean;};
-export type FullChat={"id":U32;"name":string;"isProtected":boolean;"profileImage":(string|null);"archived":boolean;"chatType":U32;"isUnpromoted":boolean;"isSelfTalk":boolean;"contacts":(Contact)[];"contactIds":(U32)[];"color":string;"freshMessageCounter":Usize;"isContactRequest":boolean;"isDeviceChat":boolean;"selfInGroup":boolean;"isMuted":boolean;"ephemeralTimer":U32;"canSend":boolean;"wasSeenRecently":boolean;"mailingListAddress":(string|null);};
+export type FullChat={"id":U32;"name":string;"isProtected":boolean;"profileImage":(string|null);"archived":boolean;"chatType":U32;"isUnpromoted":boolean;"isSelfTalk":boolean;"contacts":(Contact)[];"contactIds":(U32)[];"color":string;"freshMessageCounter":Usize;"isContactRequest":boolean;"isDeviceChat":boolean;"selfInGroup":boolean;"isMuted":boolean;"ephemeralTimer":U32;"canSend":boolean;"wasSeenRecently":boolean;};

 /**
 * cheaper version of fullchat, omits:
@@ -50,18 +49,8 @@ export type BasicChat=
 * used when you only need the basic metadata of a chat like type, name, profile picture
 */
 {"id":U32;"name":string;"isProtected":boolean;"profileImage":(string|null);"archived":boolean;"chatType":U32;"isUnpromoted":boolean;"isSelfTalk":boolean;"color":string;"isContactRequest":boolean;"isDeviceChat":boolean;"isMuted":boolean;};
-export type ChatVisibility=("Normal"|"Archived"|"Pinned");
 export type MuteDuration=("NotMuted"|"Forever"|{"Until":I64;});
-export type MessageListItem=(({"kind":"message";}&{"msg_id":U32;})|({
-/**
- * Day marker, separating messages that correspond to different
- * days according to local time.
- */
-"kind":"dayMarker";}&{
-/**
- * Marker timestamp, for day markers, in unix milliseconds
- */
-"timestamp":I64;}));
+export type MessageQuote=(({"kind":"JustText";}&{"text":string;})|({"kind":"WithMessage";}&{"text":string;"messageId":U32;"authorDisplayName":string;"authorDisplayColor":string;"overrideSenderName":(string|null);"image":(string|null);"isForwarded":boolean;}));
 export type Viewtype=("Unknown"|
 /**
 * Text message.
@@ -107,22 +96,8 @@ export type Viewtype=("Unknown"|
 * Message is an webxdc instance.
 */
 "Webxdc");
-export type MessageQuote=(({"kind":"JustText";}&{"text":string;})|({"kind":"WithMessage";}&{"text":string;"messageId":U32;"authorDisplayName":string;"authorDisplayColor":string;"overrideSenderName":(string|null);"image":(string|null);"isForwarded":boolean;"viewType":Viewtype;}));
-export type SystemMessageType=("Unknown"|"GroupNameChanged"|"GroupImageChanged"|"MemberAddedToGroup"|"MemberRemovedFromGroup"|"AutocryptSetupMessage"|"SecurejoinMessage"|"LocationStreamingEnabled"|"LocationOnly"|
-/**
- * Chat ephemeral message timer is changed.
- */
-"EphemeralTimerChanged"|"ChatProtectionEnabled"|"ChatProtectionDisabled"|
-/**
- * Self-sent-message that contains only json used for multi-device-sync;
- * if possible, we attach that to other messages as for locations.
- */
-"MultiDeviceSync"|"WebxdcStatusUpdate"|
-/**
- * Webxdc info added with `info` set in `send_webxdc_status_update()`.
- */
-"WebxdcInfoMessage");
 export type I32=number;
+export type U64=number;
 export type WebxdcMessageInfo={
 /**
 * The name of the app.
@@ -160,39 +135,5 @@ export type WebxdcMessageInfo={
 * True if full internet access should be granted to the app.
 */
 "internetAccess":boolean;};
-export type DownloadState=("Done"|"Available"|"Failure"|"InProgress");
-
-/**
- * Structure representing all reactions to a particular message.
- */
-export type Reactions=
-/**
- * Structure representing all reactions to a particular message.
- */
-{
-/**
- * Map from a contact to it's reaction to message.
- */
-"reactionsByContact":Record<U32,(string)[]>;
-/**
- * Unique reactions and their count
- */
-"reactions":Record<string,U32>;};
-export type Message={"id":U32;"chatId":U32;"fromId":U32;"quote":(MessageQuote|null);"parentId":(U32|null);"text":(string|null);"hasLocation":boolean;"hasHtml":boolean;"viewType":Viewtype;"state":U32;"timestamp":I64;"sortTimestamp":I64;"receivedTimestamp":I64;"hasDeviatingTimestamp":boolean;"subject":string;"showPadlock":boolean;"isSetupmessage":boolean;"isInfo":boolean;"isForwarded":boolean;
-/**
- * when is_info is true this describes what type of system message it is
- */
-"systemMessageType":SystemMessageType;"duration":I32;"dimensionsHeight":I32;"dimensionsWidth":I32;"videochatType":(U32|null);"videochatUrl":(string|null);"overrideSenderName":(string|null);"sender":Contact;"setupCodeBegin":(string|null);"file":(string|null);"fileMime":(string|null);"fileBytes":U64;"fileName":(string|null);"webxdcInfo":(WebxdcMessageInfo|null);"downloadState":DownloadState;"reactions":(Reactions|null);};
-export type MessageNotificationInfo={"id":U32;"chatId":U32;"accountId":U32;"image":(string|null);"imageMimeType":(string|null);"chatName":string;"chatProfileImage":(string|null);
-/**
- * also known as summary_text1
- */
-"summaryPrefix":(string|null);
-/**
- * also known as summary_text2
- */
-"summaryText":string;};
-export type MessageSearchResult={"id":U32;"authorProfileImage":(string|null);"authorName":string;"authorColor":string;"chatName":(string|null);"message":string;"timestamp":I64;};
-export type F64=number;
-export type Location={"locationId":U32;"isIndependent":boolean;"latitude":F64;"longitude":F64;"accuracy":F64;"timestamp":I64;"contactId":U32;"msgId":U32;"chatId":U32;"marker":(string|null);};
-export type __AllTyps=[string,boolean,Record<string,string>,U32,U32,null,(U32)[],U32,null,(U32|null),(Account)[],null,null,U32,null,U32,null,U32,Account,U32,U64,U32,string,(ProviderInfo|null),U32,boolean,U32,Record<string,string>,U32,string,(string|null),null,U32,Record<string,(string|null)>,null,U32,string,null,U32,string,Qr,U32,string,(string|null),U32,(string)[],Record<string,(string|null)>,Record<U32,string>,null,U32,null,U32,null,U32,string,(string|null),null,U32,string,(string|null),null,U32,(U32)[],U32,U32,Usize,U32,boolean,I64,Usize,U32,string,U32,U32,string,null,U32,(U32|null),(string|null),(U32|null),(ChatListEntry)[],U32,(ChatListEntry)[],Record<U32,ChatListItemFetchResult>,U32,U32,FullChat,U32,U32,BasicChat,U32,U32,null,U32,U32,null,U32,U32,null,U32,U32,string,U32,(U32|null),[string,string],U32,string,U32,U32,U32,null,U32,U32,U32,null,U32,U32,U32,null,U32,U32,(U32)[],U32,string,boolean,U32,U32,U32,U32,U32,string,null,U32,U32,(string|null),null,U32,U32,ChatVisibility,null,U32,U32,U32,null,U32,U32,U32,U32,string,string,U32,U32,U32,null,U32,U32,(U32|null),U32,U32,MuteDuration,null,U32,U32,boolean,U32,(U32)[],null,U32,U32,U32,(U32)[],U32,U32,U32,(MessageListItem)[],U32,U32,Message,U32,U32,(string|null),U32,(U32)[],Record<U32,Message>,U32,U32,MessageNotificationInfo,U32,(U32)[],null,U32,U32,string,U32,U32,null,U32,string,(U32|null),(U32)[],U32,(U32)[],Record<U32,MessageSearchResult>,U32,U32,Contact,U32,string,(string|null),U32,U32,U32,U32,U32,U32,null,U32,U32,null,U32,(Contact)[],U32,U32,(string|null),(U32)[],U32,U32,(string|null),(Contact)[],U32,(U32)[],Record<U32,Contact>,U32,U32,boolean,U32,U32,string,null,U32,U32,string,U32,string,(U32|null),U32,(U32|null),Viewtype,(Viewtype|null),(Viewtype|null),(U32)[],U32,U32,Viewtype,(Viewtype|null),(Viewtype|null),[(U32|null),(U32|null)],U32,string,(string|null),null,U32,string,(string|null),null,null,U32,U32,U32,string,U32,(U32|null),(U32|null),I64,I64,(Location)[],U32,U32,string,string,null,U32,U32,U32,string,U32,U32,WebxdcMessageInfo,U32,(U32)[],U32,null,U32,U32,string,U32,U32,U32,(string)[],U32,U32,U32,null,U32,U32,(Message|null),U32,U32,U32,U32,string,U32,Record<string,(string)[]>,U32,U32,string,U32,U32,U32,(string|null),(string|null),([F64,F64]|null),(U32|null),[U32,Message],U32,U32,(string|null),(string|null),(U32|null),null];
+export type Message={"id":U32;"chatId":U32;"fromId":U32;"quotedText":(string|null);"quotedMessageId":(U32|null);"text":(string|null);"hasLocation":boolean;"hasHtml":boolean;"viewType":Viewtype;"state":U32;"timestamp":I64;"sortTimestamp":I64;"receivedTimestamp":I64;"hasDeviatingTimestamp":boolean;"subject":string;"showPadlock":boolean;"isSetupmessage":boolean;"isInfo":boolean;"isForwarded":boolean;"duration":I32;"dimensionsHeight":I32;"dimensionsWidth":I32;"videochatType":(U32|null);"videochatUrl":(string|null);"overrideSenderName":(string|null);"sender":Contact;"setupCodeBegin":(string|null);"file":(string|null);"fileMime":(string|null);"fileBytes":U64;"fileName":(string|null);"webxdcInfo":(WebxdcMessageInfo|null);};
+export type __AllTyps=[string,boolean,Record<string,string>,U32,U32,null,(U32)[],U32,null,(U32|null),(Account)[],U32,Account,U32,string,(ProviderInfo|null),U32,boolean,U32,Record<string,string>,U32,string,(string|null),null,U32,Record<string,(string|null)>,null,U32,string,null,U32,string,Qr,U32,string,(string|null),U32,(string)[],Record<string,(string|null)>,U32,null,U32,null,U32,(U32)[],U32,U32,Usize,U32,string,U32,U32,string,null,U32,(U32|null),(string|null),(U32|null),(ChatListEntry)[],U32,(ChatListEntry)[],Record<U32,ChatListItemFetchResult>,U32,U32,FullChat,U32,U32,null,U32,U32,null,U32,U32,null,U32,U32,string,U32,(U32|null),[string,string],U32,U32,null,U32,U32,U32,null,U32,U32,U32,null,U32,string,string,U32,U32,U32,U32,(U32)[],U32,U32,Message,U32,(U32)[],Record<U32,Message>,U32,(U32)[],null,U32,U32,string,U32,U32,Contact,U32,string,(string|null),U32,U32,U32,U32,U32,U32,null,U32,U32,null,U32,(Contact)[],U32,U32,(string|null),(U32)[],U32,U32,(string|null),(Contact)[],U32,(U32)[],Record<U32,Contact>,U32,(U32|null),Viewtype,(Viewtype|null),(Viewtype|null),(U32)[],U32,U32,string,string,null,U32,U32,U32,string,U32,U32,WebxdcMessageInfo,U32,string,U32,U32];
--- a/deltachat-jsonrpc/typescript/package.json
+++ b/deltachat-jsonrpc/typescript/package.json
@@ -26,9 +26,9 @@
  },
  "license": "MPL-2.0",
  "main": "dist/deltachat.js",
-  "name": "@deltachat/jsonrpc-client",
+  "name": "deltachat-jsonrpc-client",
  "scripts": {
-    "build": "run-s generate-bindings extract-constants build:tsc build:bundle",
+    "build": "run-s generate-bindings build:tsc build:bundle",
    "build:bundle": "esbuild --format=esm --bundle dist/deltachat.js --outfile=dist/deltachat.bundle.js",
    "build:tsc": "tsc",
    "docs": "typedoc --out docs deltachat.ts",
@@ -36,7 +36,6 @@
    "example:build": "esbuild --bundle dist/example/example.js --outfile=dist/example.bundle.js",
    "example:dev": "esbuild example/example.ts --bundle --outfile=dist/example.bundle.js --servedir=.",
    "example:start": "http-server .",
-    "extract-constants": "node ./scripts/generate-constants.js",
    "generate-bindings": "cargo test",
    "prettier:check": "prettier --check **.ts",
    "prettier:fix": "prettier --write **.ts",
@@ -48,5 +47,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "1.99.0"
+  "version": "1.93.0"
 }
--- a/deltachat-jsonrpc/typescript/scripts/generate-constants.js
+++ b/deltachat-jsonrpc/typescript/scripts/generate-constants.js
@@ -1,54 +0,0 @@
-#!/usr/bin/env node
-import { readFileSync, writeFileSync } from "fs";
-import { resolve } from "path";
-import { fileURLToPath } from "url";
-import { dirname } from "path";
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-const data = [];
-const header = resolve(__dirname, "../../../deltachat-ffi/deltachat.h");
-
-console.log("Generating constants...");
-
-const header_data = readFileSync(header, "UTF-8");
-const regex = /^#define\s+(\w+)\s+(\w+)/gm;
-let match;
-while (null != (match = regex.exec(header_data))) {
-  const key = match[1];
-  const value = parseInt(match[2]);
-  if (!isNaN(value)) {
-    data.push({ key, value });
-  }
-}
-
-const constants = data
-  .filter(
-    ({ key }) => key.toUpperCase()[0] === key[0] // check if define name is uppercase
-  )
-  .sort((lhs, rhs) => {
-    if (lhs.key < rhs.key) return -1;
-    else if (lhs.key > rhs.key) return 1;
-    return 0;
-  })
-  .filter(({ key }) => {
-    // filter out what we don't need it
-    return !(
-      key.startsWith("DC_EVENT_") ||
-      key.startsWith("DC_IMEX_") ||
-      key.startsWith("DC_CHAT_VISIBILITY") ||
-      key.startsWith("DC_DOWNLOAD") ||
-      key.startsWith("DC_INFO_") ||
-      (key.startsWith("DC_MSG") && !key.startsWith("DC_MSG_ID")) ||
-      key.startsWith("DC_QR_")
-    );
-  })
-  .map((row) => {
-    return `  ${row.key}: ${row.value}`;
-  })
-  .join(",\n");
-
-writeFileSync(
-  resolve(__dirname, "../generated/constants.ts"),
-  `// Generated!\n\nexport enum C {\n${constants.replace(/:/g, " =")},\n}\n`
-);
--- a/deltachat-jsonrpc/typescript/src/client.ts
+++ b/deltachat-jsonrpc/typescript/src/client.ts
@@ -1,57 +1,40 @@
 import * as T from "../generated/types.js";
 import * as RPC from "../generated/jsonrpc.js";
 import { RawClient } from "../generated/client.js";
-import { Event } from "../generated/events.js";
+import { EventTypeName } from "../generated/events.js";
 import { WebsocketTransport, BaseTransport, Request } from "yerpc";
 import { TinyEmitter } from "tiny-emitter";

-type DCWireEvent<T extends Event> = {
-  event: T;
+export type DeltaChatEvent = {
+  id: EventTypeName;
  contextId: number;
+  field1: any;
+  field2: any;
 };
-// export type Events = Record<
-//   Event["type"] | "ALL",
-//   (event: DeltaChatEvent<Event>) => void
-// >;
-
-type Events = { ALL: (accountId: number, event: Event) => void } & {
-  [Property in Event["type"]]: (
-    accountId: number,
-    event: Extract<Event, { type: Property }>
-  ) => void;
-};
-
-type ContextEvents = { ALL: (event: Event) => void } & {
-  [Property in Event["type"]]: (
-    event: Extract<Event, { type: Property }>
-  ) => void;
-};
-
-export type DcEvent = Event;
-export type DcEventType<T extends Event["type"]> = Extract<Event, { type: T }>
+export type Events = Record<
+  EventTypeName | "ALL",
+  (event: DeltaChatEvent) => void
+>;

 export class BaseDeltaChat<
  Transport extends BaseTransport<any>
 > extends TinyEmitter<Events> {
  rpc: RawClient;
  account?: T.Account;
-  private contextEmitters: TinyEmitter<ContextEvents>[] = [];
+  private contextEmitters: TinyEmitter<Events>[] = [];
  constructor(public transport: Transport) {
    super();
    this.rpc = new RawClient(this.transport);
    this.transport.on("request", (request: Request) => {
      const method = request.method;
      if (method === "event") {
-        const event = request.params! as DCWireEvent<Event>;
-        this.emit(event.event.type, event.contextId, event.event as any);
-        this.emit("ALL", event.contextId, event.event as any);
+        const event = request.params! as DeltaChatEvent;
+        this.emit(event.id, event);
+        this.emit("ALL", event);

        if (this.contextEmitters[event.contextId]) {
-          this.contextEmitters[event.contextId].emit(
-            event.event.type,
-            event.event as any
-          );
-          this.contextEmitters[event.contextId].emit("ALL", event.event);
+          this.contextEmitters[event.contextId].emit(event.id, event);
+          this.contextEmitters[event.contextId].emit("ALL", event);
        }
      }
    });
@@ -87,7 +70,7 @@ export class DeltaChat extends BaseDeltaChat<WebsocketTransport> {
    if (typeof opts === "string") opts = { url: opts };
    if (opts) opts = { ...DEFAULT_OPTS, ...opts };
    else opts = { ...DEFAULT_OPTS };
-    const transport = new WebsocketTransport(opts.url);
+    const transport = new WebsocketTransport(opts.url)
    super(transport);
    this.opts = opts;
  }
--- a/deltachat-jsonrpc/typescript/src/lib.ts
+++ b/deltachat-jsonrpc/typescript/src/lib.ts
@@ -4,4 +4,3 @@ export * from "../generated/events.js";
 export { RawClient } from "../generated/client.js";
 export * from "./client.js";
 export * as yerpc from "yerpc";
-export { C } from "../generated/constants.js";
--- a/deltachat-jsonrpc/typescript/test/basic.ts
+++ b/deltachat-jsonrpc/typescript/test/basic.ts
@@ -84,21 +84,21 @@ describe("basic tests", () => {
      accountId = await dc.rpc.addAccount();
    });
    it("should block and unblock contact", async function () {
-      const contactId = await dc.rpc.createContact(
+      const contactId = await dc.rpc.contactsCreateContact(
        accountId,
        "example@delta.chat",
        null
      );
-      expect((await dc.rpc.getContact(accountId, contactId)).isBlocked).to.be
+      expect((await dc.rpc.contactsGetContact(accountId, contactId)).isBlocked).to.be
        .false;
-      await dc.rpc.blockContact(accountId, contactId);
-      expect((await dc.rpc.getContact(accountId, contactId)).isBlocked).to.be
+      await dc.rpc.contactsBlock(accountId, contactId);
+      expect((await dc.rpc.contactsGetContact(accountId, contactId)).isBlocked).to.be
        .true;
-      expect(await dc.rpc.getBlockedContacts(accountId)).to.have.length(1);
-      await dc.rpc.unblockContact(accountId, contactId);
-      expect((await dc.rpc.getContact(accountId, contactId)).isBlocked).to.be
+      expect(await dc.rpc.contactsGetBlocked(accountId)).to.have.length(1);
+      await dc.rpc.contactsUnblock(accountId, contactId);
+      expect((await dc.rpc.contactsGetContact(accountId, contactId)).isBlocked).to.be
        .false;
-      expect(await dc.rpc.getBlockedContacts(accountId)).to.have.length(0);
+      expect(await dc.rpc.contactsGetBlocked(accountId)).to.have.length(0);
    });
  });

--- a/deltachat-jsonrpc/typescript/test/online.ts
+++ b/deltachat-jsonrpc/typescript/test/online.ts
@@ -1,8 +1,12 @@
 import { assert, expect } from "chai";
-import { DeltaChat, DcEvent } from "../deltachat.js";
-import { RpcServerHandle, createTempUser, startServer } from "./test_base.js";
+import { DeltaChat, DeltaChatEvent, EventTypeName } from "../deltachat.js";
+import {
+  RpcServerHandle,
+  createTempUser,
+  startServer,
+} from "./test_base.js";

-const EVENT_TIMEOUT = 20000;
+const EVENT_TIMEOUT = 20000

 describe("online tests", function () {
  let serverHandle: RpcServerHandle;
@@ -12,7 +16,7 @@ describe("online tests", function () {
  let accountId1: number, accountId2: number;

  before(async function () {
-    this.timeout(12000);
+    this.timeout(12000)
    if (!process.env.DCC_NEW_TMP_EMAIL) {
      if (process.env.COVERAGE && !process.env.COVERAGE_OFFLINE) {
        console.error(
@@ -27,10 +31,10 @@ describe("online tests", function () {
      this.skip();
    }
    serverHandle = await startServer();
-    dc = new DeltaChat(serverHandle.url);
+    dc = new DeltaChat(serverHandle.url)

-    dc.on("ALL", (contextId, { type }) => {
-      if (type !== "Info") console.log(contextId, type);
+    dc.on("ALL", ({ id, contextId }) => {
+      if (id !== "Info") console.log(contextId, id);
    });

    account1 = await createTempUser(process.env.DCC_NEW_TMP_EMAIL);
@@ -70,7 +74,7 @@ describe("online tests", function () {
      addr: account2.email,
      mail_pw: account2.password,
    });
-    await dc.rpc.configure(accountId2);
+    await dc.rpc.configure(accountId2)
    accountsConfigured = true;
  });

@@ -80,28 +84,28 @@ describe("online tests", function () {
    }
    this.timeout(15000);

-    const contactId = await dc.rpc.createContact(
+    const contactId = await dc.rpc.contactsCreateContact(
      accountId1,
      account2.email,
      null
    );
-    const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
+    const chatId = await dc.rpc.contactsCreateChatByContactId(accountId1, contactId);
    const eventPromise = Promise.race([
      waitForEvent(dc, "MsgsChanged", accountId2),
      waitForEvent(dc, "IncomingMsg", accountId2),
    ]);

-    await dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello");
-    const { chatId: chatIdOnAccountB } = await eventPromise;
+    await dc.rpc.miscSendTextMessage(accountId1, "Hello", chatId);
+    const { field1: chatIdOnAccountB } = await eventPromise;
    await dc.rpc.acceptChat(accountId2, chatIdOnAccountB);
-    const messageList = await dc.rpc.getMessageIds(
+    const messageList = await dc.rpc.messageListGetMessageIds(
      accountId2,
      chatIdOnAccountB,
      0
    );

    expect(messageList).have.length(1);
-    const message = await dc.rpc.getMessage(accountId2, messageList[0]);
+    const message = await dc.rpc.messageGetMessage(accountId2, messageList[0]);
    expect(message.text).equal("Hello");
  });

@@ -112,30 +116,30 @@ describe("online tests", function () {
    this.timeout(10000);

    // send message from A to B
-    const contactId = await dc.rpc.createContact(
+    const contactId = await dc.rpc.contactsCreateContact(
      accountId1,
      account2.email,
      null
    );
-    const chatId = await dc.rpc.createChatByContactId(accountId1, contactId);
+    const chatId = await dc.rpc.contactsCreateChatByContactId(accountId1, contactId);
    const eventPromise = Promise.race([
      waitForEvent(dc, "MsgsChanged", accountId2),
      waitForEvent(dc, "IncomingMsg", accountId2),
    ]);
-    dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello2");
+    dc.rpc.miscSendTextMessage(accountId1, "Hello2", chatId);
    // wait for message from A
    console.log("wait for message from A");

    const event = await eventPromise;
-    const { chatId: chatIdOnAccountB } = event;
+    const { field1: chatIdOnAccountB } = event;

    await dc.rpc.acceptChat(accountId2, chatIdOnAccountB);
-    const messageList = await dc.rpc.getMessageIds(
+    const messageList = await dc.rpc.messageListGetMessageIds(
      accountId2,
      chatIdOnAccountB,
      0
    );
-    const message = await dc.rpc.getMessage(
+    const message = await dc.rpc.messageGetMessage(
      accountId2,
      messageList.reverse()[0]
    );
@@ -145,14 +149,14 @@ describe("online tests", function () {
      waitForEvent(dc, "MsgsChanged", accountId1),
      waitForEvent(dc, "IncomingMsg", accountId1),
    ]);
-    dc.rpc.miscSendTextMessage(accountId2, chatId, "super secret message");
+    dc.rpc.miscSendTextMessage(accountId2, "super secret message", chatId);
    // Check if answer arives at A and if it is encrypted
    await eventPromise2;

    const messageId = (
-      await dc.rpc.getMessageIds(accountId1, chatId, 0)
+      await dc.rpc.messageListGetMessageIds(accountId1, chatId, 0)
    ).reverse()[0];
-    const message2 = await dc.rpc.getMessage(accountId1, messageId);
+    const message2 = await dc.rpc.messageGetMessage(accountId1, messageId);
    expect(message2.text).equal("super secret message");
    expect(message2.showPadlock).equal(true);
  });
@@ -175,22 +179,22 @@ describe("online tests", function () {
  });
 });

-async function waitForEvent<T extends DcEvent["type"]>(
+async function waitForEvent(
  dc: DeltaChat,
-  eventType: T,
+  eventType: EventTypeName,
  accountId: number,
  timeout: number = EVENT_TIMEOUT
-): Promise<Extract<DcEvent, { type: T }>> {
+): Promise<DeltaChatEvent> {
  return new Promise((resolve, reject) => {
    const rejectTimeout = setTimeout(
-      () => reject(new Error("Timeout reached before event came in")),
+      () => reject(new Error('Timeout reached before event came in')),
      timeout
-    );
-    const callback = (contextId: number, event: DcEvent) => {
-      if (contextId == accountId) {
+    )
+    const callback = (event: DeltaChatEvent) => {
+      if (event.contextId == accountId) {
        dc.off(eventType, callback);
-        clearTimeout(rejectTimeout);
-        resolve(event as any);
+        clearTimeout(rejectTimeout)
+        resolve(event);
      }
    };
    dc.on(eventType, callback);
--- a/deltachat-jsonrpc/typescript/test/test_base.ts
+++ b/deltachat-jsonrpc/typescript/test/test_base.ts
@@ -30,8 +30,7 @@ export async function startServer(port: number = RPC_SERVER_PORT): Promise<RpcSe
    cwd: tmpDir,
    env: {
      RUST_LOG: process.env.RUST_LOG || "info",
-      DC_PORT: '' + port,
-      RUST_MIN_STACK: "8388608"
+      DC_PORT: '' + port
    },
  });
  let shouldClose = false;
--- a/examples/repl/cmdline.rs
+++ b/examples/repl/cmdline.rs
@@ -20,7 +20,6 @@ use deltachat::log::LogExt;
 use deltachat::message::{self, Message, MessageState, MsgId, Viewtype};
 use deltachat::peerstate::*;
 use deltachat::qr::*;
-use deltachat::reaction::send_reaction;
 use deltachat::receive_imf::*;
 use deltachat::sql;
 use deltachat::tools::*;
@@ -408,7 +407,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 resend <msg-id>\n\
                 markseen <msg-id>\n\
                 delmsg <msg-id>\n\
-                 react <msg-id> [<reaction>]\n\
                 ===========================Contact commands==\n\
                 listcontacts [<query>]\n\
                 listverified [<query>]\n\
@@ -554,11 +552,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
            sql::housekeeping(&context).await.ok_or_log(&context);
        }
        "listchats" | "listarchived" | "chats" => {
-            let listflags = if arg0 == "listarchived" {
-                DC_GCL_ARCHIVED_ONLY
-            } else {
-                0
-            };
+            let listflags = if arg0 == "listarchived" { 0x01 } else { 0 };
            let time_start = std::time::SystemTime::now();
            let chatlist = Chatlist::try_load(
                &context,
@@ -1127,12 +1121,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
            ids[0] = MsgId::new(arg1.parse()?);
            message::delete_msgs(&context, &ids).await?;
        }
-        "react" => {
-            ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
-            let msg_id = MsgId::new(arg1.parse()?);
-            let reaction = arg2;
-            send_reaction(&context, msg_id, reaction).await?;
-        }
        "listcontacts" | "contacts" | "listverified" => {
            let contacts = Contact::get_all(
                &context,
--- a/examples/repl/main.rs
+++ b/examples/repl/main.rs
@@ -20,7 +20,6 @@ use deltachat::context::*;
 use deltachat::oauth2::*;
 use deltachat::qr_code_generator::get_securejoin_qr_svg;
 use deltachat::securejoin::*;
-use deltachat::stock_str::StockStrings;
 use deltachat::{EventType, Events};
 use log::{error, info, warn};
 use rustyline::completion::{Completer, FilenameCompleter, Pair};
@@ -72,19 +71,6 @@ fn receive_event(event: EventType) {
                ))
            );
        }
-        EventType::ReactionsChanged {
-            chat_id,
-            msg_id,
-            contact_id,
-        } => {
-            info!(
-                "{}",
-                yellow.paint(format!(
-                    "Received REACTIONS_CHANGED(chat_id={}, msg_id={}, contact_id={})",
-                    chat_id, msg_id, contact_id
-                ))
-            );
-        }
        EventType::ContactsChanged(_) => {
            info!("{}", yellow.paint("Received CONTACTS_CHANGED()"));
        }
@@ -221,7 +207,7 @@ const CHAT_COMMANDS: [&str; 36] = [
    "accept",
    "blockchat",
 ];
-const MESSAGE_COMMANDS: [&str; 9] = [
+const MESSAGE_COMMANDS: [&str; 8] = [
    "listmsgs",
    "msginfo",
    "listfresh",
@@ -230,7 +216,6 @@ const MESSAGE_COMMANDS: [&str; 9] = [
    "markseen",
    "delmsg",
    "download",
-    "react",
 ];
 const CONTACT_COMMANDS: [&str; 9] = [
    "listcontacts",
@@ -313,7 +298,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
        println!("Error: Bad arguments, expected [db-name].");
        bail!("No db-name specified");
    }
-    let context = Context::new(Path::new(&args[1]), 0, Events::new(), StockStrings::new()).await?;
+    let context = Context::new(Path::new(&args[1]), 0, Events::new()).await?;

    let events = context.get_event_emitter();
    tokio::task::spawn(async move {
@@ -446,7 +431,7 @@ async fn handle_cmd(
                }
                println!("{}", qr);
                let output = Command::new("qrencode")
-                    .args(["-t", "ansiutf8", qr.as_str(), "-o", "-"])
+                    .args(&["-t", "ansiutf8", qr.as_str(), "-o", "-"])
                    .output()
                    .expect("failed to execute process");
                io::stdout().write_all(&output.stdout).unwrap();
--- a/examples/simple.rs
+++ b/examples/simple.rs
@@ -6,7 +6,6 @@ use deltachat::config;
 use deltachat::contact::*;
 use deltachat::context::*;
 use deltachat::message::Message;
-use deltachat::stock_str::StockStrings;
 use deltachat::{EventType, Events};

 fn cb(event: EventType) {
@@ -37,7 +36,7 @@ async fn main() {
    let dir = tempdir().unwrap();
    let dbfile = dir.path().join("db.sqlite");
    log::info!("creating database {:?}", dbfile);
-    let ctx = Context::new(&dbfile, 0, Events::new(), StockStrings::new())
+    let ctx = Context::new(&dbfile, 0, Events::new())
        .await
        .expect("Failed to create context");
    let info = ctx.get_info().await;
--- a/node/constants.js
+++ b/node/constants.js
@@ -42,7 +42,6 @@ module.exports = {
  DC_EVENT_IMEX_FILE_WRITTEN: 2052,
  DC_EVENT_IMEX_PROGRESS: 2051,
  DC_EVENT_INCOMING_MSG: 2005,
-  DC_EVENT_INCOMING_MSG_BUNCH: 2006,
  DC_EVENT_INFO: 100,
  DC_EVENT_LOCATION_CHANGED: 2035,
  DC_EVENT_MSGS_CHANGED: 2000,
@@ -51,14 +50,12 @@ module.exports = {
  DC_EVENT_MSG_FAILED: 2012,
  DC_EVENT_MSG_READ: 2015,
  DC_EVENT_NEW_BLOB_FILE: 150,
-  DC_EVENT_REACTIONS_CHANGED: 2001,
  DC_EVENT_SECUREJOIN_INVITER_PROGRESS: 2060,
  DC_EVENT_SECUREJOIN_JOINER_PROGRESS: 2061,
  DC_EVENT_SELFAVATAR_CHANGED: 2110,
  DC_EVENT_SMTP_CONNECTED: 101,
  DC_EVENT_SMTP_MESSAGE_SENT: 103,
  DC_EVENT_WARNING: 300,
-  DC_EVENT_WEBXDC_INSTANCE_DELETED: 2121,
  DC_EVENT_WEBXDC_STATUS_UPDATE: 2120,
  DC_GCL_ADD_ALLDONE_HINT: 4,
  DC_GCL_ADD_SELF: 2,
@@ -72,19 +69,8 @@ module.exports = {
  DC_IMEX_EXPORT_SELF_KEYS: 1,
  DC_IMEX_IMPORT_BACKUP: 12,
  DC_IMEX_IMPORT_SELF_KEYS: 2,
-  DC_INFO_AUTOCRYPT_SETUP_MESSAGE: 6,
-  DC_INFO_EPHEMERAL_TIMER_CHANGED: 10,
-  DC_INFO_GROUP_IMAGE_CHANGED: 3,
-  DC_INFO_GROUP_NAME_CHANGED: 2,
-  DC_INFO_LOCATIONSTREAMING_ENABLED: 8,
-  DC_INFO_LOCATION_ONLY: 9,
-  DC_INFO_MEMBER_ADDED_TO_GROUP: 4,
-  DC_INFO_MEMBER_REMOVED_FROM_GROUP: 5,
  DC_INFO_PROTECTION_DISABLED: 12,
  DC_INFO_PROTECTION_ENABLED: 11,
-  DC_INFO_SECURE_JOIN_MESSAGE: 7,
-  DC_INFO_UNKNOWN: 0,
-  DC_INFO_WEBXDC_INFO_MESSAGE: 32,
  DC_KEY_GEN_DEFAULT: 0,
  DC_KEY_GEN_ED25519: 2,
  DC_KEY_GEN_RSA2048: 1,
@@ -116,7 +102,6 @@ module.exports = {
  DC_QR_FPR_MISMATCH: 220,
  DC_QR_FPR_OK: 210,
  DC_QR_FPR_WITHOUT_ADDR: 230,
-  DC_QR_LOGIN: 520,
  DC_QR_REVIVE_VERIFYCONTACT: 510,
  DC_QR_REVIVE_VERIFYGROUP: 512,
  DC_QR_TEXT: 330,
--- a/node/events.js
+++ b/node/events.js
@@ -14,9 +14,7 @@ module.exports = {
  400: 'DC_EVENT_ERROR',
  410: 'DC_EVENT_ERROR_SELF_NOT_IN_GROUP',
  2000: 'DC_EVENT_MSGS_CHANGED',
-  2001: 'DC_EVENT_REACTIONS_CHANGED',
  2005: 'DC_EVENT_INCOMING_MSG',
-  2006: 'DC_EVENT_INCOMING_MSG_BUNCH',
  2008: 'DC_EVENT_MSGS_NOTICED',
  2010: 'DC_EVENT_MSG_DELIVERED',
  2012: 'DC_EVENT_MSG_FAILED',
@@ -32,6 +30,5 @@ module.exports = {
  2061: 'DC_EVENT_SECUREJOIN_JOINER_PROGRESS',
  2100: 'DC_EVENT_CONNECTIVITY_CHANGED',
  2110: 'DC_EVENT_SELFAVATAR_CHANGED',
-  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
-  2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED'
+  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE'
 }
--- a/node/lib/constants.ts
+++ b/node/lib/constants.ts
@@ -42,7 +42,6 @@ export enum C {
  DC_EVENT_IMEX_FILE_WRITTEN = 2052,
  DC_EVENT_IMEX_PROGRESS = 2051,
  DC_EVENT_INCOMING_MSG = 2005,
-  DC_EVENT_INCOMING_MSG_BUNCH = 2006,
  DC_EVENT_INFO = 100,
  DC_EVENT_LOCATION_CHANGED = 2035,
  DC_EVENT_MSGS_CHANGED = 2000,
@@ -51,14 +50,12 @@ export enum C {
  DC_EVENT_MSG_FAILED = 2012,
  DC_EVENT_MSG_READ = 2015,
  DC_EVENT_NEW_BLOB_FILE = 150,
-  DC_EVENT_REACTIONS_CHANGED = 2001,
  DC_EVENT_SECUREJOIN_INVITER_PROGRESS = 2060,
  DC_EVENT_SECUREJOIN_JOINER_PROGRESS = 2061,
  DC_EVENT_SELFAVATAR_CHANGED = 2110,
  DC_EVENT_SMTP_CONNECTED = 101,
  DC_EVENT_SMTP_MESSAGE_SENT = 103,
  DC_EVENT_WARNING = 300,
-  DC_EVENT_WEBXDC_INSTANCE_DELETED = 2121,
  DC_EVENT_WEBXDC_STATUS_UPDATE = 2120,
  DC_GCL_ADD_ALLDONE_HINT = 4,
  DC_GCL_ADD_SELF = 2,
@@ -72,19 +69,8 @@ export enum C {
  DC_IMEX_EXPORT_SELF_KEYS = 1,
  DC_IMEX_IMPORT_BACKUP = 12,
  DC_IMEX_IMPORT_SELF_KEYS = 2,
-  DC_INFO_AUTOCRYPT_SETUP_MESSAGE = 6,
-  DC_INFO_EPHEMERAL_TIMER_CHANGED = 10,
-  DC_INFO_GROUP_IMAGE_CHANGED = 3,
-  DC_INFO_GROUP_NAME_CHANGED = 2,
-  DC_INFO_LOCATIONSTREAMING_ENABLED = 8,
-  DC_INFO_LOCATION_ONLY = 9,
-  DC_INFO_MEMBER_ADDED_TO_GROUP = 4,
-  DC_INFO_MEMBER_REMOVED_FROM_GROUP = 5,
  DC_INFO_PROTECTION_DISABLED = 12,
  DC_INFO_PROTECTION_ENABLED = 11,
-  DC_INFO_SECURE_JOIN_MESSAGE = 7,
-  DC_INFO_UNKNOWN = 0,
-  DC_INFO_WEBXDC_INFO_MESSAGE = 32,
  DC_KEY_GEN_DEFAULT = 0,
  DC_KEY_GEN_ED25519 = 2,
  DC_KEY_GEN_RSA2048 = 1,
@@ -116,7 +102,6 @@ export enum C {
  DC_QR_FPR_MISMATCH = 220,
  DC_QR_FPR_OK = 210,
  DC_QR_FPR_WITHOUT_ADDR = 230,
-  DC_QR_LOGIN = 520,
  DC_QR_REVIVE_VERIFYCONTACT = 510,
  DC_QR_REVIVE_VERIFYGROUP = 512,
  DC_QR_TEXT = 330,
@@ -295,9 +280,7 @@ export const EventId2EventName: { [key: number]: string } = {
  400: 'DC_EVENT_ERROR',
  410: 'DC_EVENT_ERROR_SELF_NOT_IN_GROUP',
  2000: 'DC_EVENT_MSGS_CHANGED',
-  2001: 'DC_EVENT_REACTIONS_CHANGED',
  2005: 'DC_EVENT_INCOMING_MSG',
-  2006: 'DC_EVENT_INCOMING_MSG_BUNCH',
  2008: 'DC_EVENT_MSGS_NOTICED',
  2010: 'DC_EVENT_MSG_DELIVERED',
  2012: 'DC_EVENT_MSG_FAILED',
@@ -314,5 +297,4 @@ export const EventId2EventName: { [key: number]: string } = {
  2100: 'DC_EVENT_CONNECTIVITY_CHANGED',
  2110: 'DC_EVENT_SELFAVATAR_CHANGED',
  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
-  2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED',
 }
--- a/node/scripts/postLinksToDetails.js
+++ b/node/scripts/postLinksToDetails.js
@@ -12,12 +12,11 @@ const GITHUB_API_URL =

 const file_url = process.env['URL']
 const GITHUB_TOKEN = process.env['GITHUB_TOKEN']
-const context = process.env['MSG_CONTEXT']

 const STATUS_DATA = {
  state: 'success',
  description: '⏩ Click on "Details" to download →',
-  context: context || 'Download the node-bindings.tar.gz',
+  context: 'Download the node-bindings.tar.gz',
  target_url: base_url + file_url,
 }

--- a/node/test/test.js
+++ b/node/test/test.js
@@ -89,11 +89,7 @@ describe('JSON RPC', function () {
    const { dc } = DeltaChat.newTemporary()
    let promise_resolve
    const promise = new Promise((res, _rej) => {
-      promise_resolve = (response) => {
-        // ignore events
-        const answer = JSON.parse(response)
-        if (answer['method'] !== 'event') res(answer)
-      }
+      promise_resolve = res
    })
    dc.startJsonRpcHandler(promise_resolve)
    dc.jsonRpcRequest(
@@ -110,7 +106,7 @@ describe('JSON RPC', function () {
        id: 2,
        result: [1],
      },
-      await promise
+      JSON.parse(await promise)
    )
    dc.close()
  })
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
 {
  "dependencies": {
+    "@deltachat/jsonrpc-client": "file:deltachat-jsonrpc/typescript",
    "debug": "^4.1.1",
    "napi-macros": "^2.0.0",
    "node-gyp-build": "^4.1.0"
@@ -57,8 +58,8 @@
    "prebuildify": "cd node && prebuildify -t 16.13.0 --napi --strip --postinstall \"node scripts/postinstall.js --prebuild\"",
    "test": "npm run test:lint && npm run test:mocha",
    "test:lint": "npm run lint",
-    "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail --exit"
+    "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail"
  },
  "types": "node/dist/index.d.ts",
-  "version": "1.99.0"
+  "version": "1.93.0"
 }
--- a/python/src/deltachat/events.py
+++ b/python/src/deltachat/events.py
@@ -105,7 +105,7 @@ class FFIEventTracker:
            yield self.get(timeout=timeout, check_error=check_error)

    def get_matching(self, event_name_regex, check_error=True, timeout=None):
-        rex = re.compile("^(?:{})$".format(event_name_regex))
+        rex = re.compile("(?:{}).*".format(event_name_regex))
        for ev in self.iter_events(timeout=timeout, check_error=check_error):
            if rex.match(ev.name):
                return ev
--- a/python/tests/test_3_offline.py
+++ b/python/tests/test_3_offline.py
@@ -80,7 +80,7 @@ class TestOfflineAccountBasic:
        d = ac1.get_info()
        assert d["arch"]
        assert d["number_of_chats"] == "0"
-        assert d["bcc_self"] == "1"
+        assert d["bcc_self"] == "0"

    def test_is_not_configured(self, acfactory):
        ac1 = acfactory.get_unconfigured_account()
@@ -118,7 +118,7 @@ class TestOfflineAccountBasic:
    def test_has_bccself(self, acfactory):
        ac1 = acfactory.get_unconfigured_account()
        assert "bcc_self" in ac1.get_config("sys.config_keys").split()
-        assert ac1.get_config("bcc_self") == "1"
+        assert ac1.get_config("bcc_self") == "0"

    def test_selfcontact_if_unconfigured(self, acfactory):
        ac1 = acfactory.get_unconfigured_account()
--- a/python/tox.ini
+++ b/python/tox.ini
@@ -10,9 +10,6 @@ envlist =
 commands = 
    pytest -n6 --extra-info --reruns 2 --reruns-delay 5 -v -rsXx --ignored --strict-tls {posargs: tests examples}
    pip wheel . -w {toxworkdir}/wheelhouse --no-deps
-setenv =
-# Avoid stack overflow when Rust core is built without optimizations.
-    RUST_MIN_STACK=8388608
 passenv = 
    DCC_RS_DEV
    DCC_RS_TARGET
--- a/spec.md
+++ b/spec.md
@@ -450,16 +450,6 @@ This allows the receiver to show the time without knowing the file format.
    Chat-Duration: 10000


-# Reactions
-
-Messengers MAY implement [RFC 9078](https://tools.ietf.org/html/rfc9078) reactions.
-Received reaction should be interpreted as overwriting all previous reactions
-received from the same contact.
-This semantics is compatible to [XEP-0444](https://xmpp.org/extensions/xep-0444.html).
-As an extension to RFC 9078, it is allowed to send empty reaction message,
-in which case all previously sent reactions are retracted.
-
-
 # Miscellaneous

 Messengers SHOULD use the header `In-Reply-To` as usual.
--- a/src/accounts.rs
+++ b/src/accounts.rs
@@ -10,7 +10,6 @@ use uuid::Uuid;

 use crate::context::Context;
 use crate::events::{Event, EventEmitter, EventType, Events};
-use crate::stock_str::StockStrings;

 /// Account manager, that can handle multiple accounts in a single place.
 #[derive(Debug)]
@@ -21,12 +20,6 @@ pub struct Accounts {

    /// Event channel to emit account manager errors.
    events: Events,
-
-    /// Stock string translations shared by all created contexts.
-    ///
-    /// This way changing a translation for one context automatically
-    /// changes it for all other contexts.
-    pub(crate) stockstrings: StockStrings,
 }

 impl Accounts {
@@ -62,9 +55,8 @@ impl Accounts {
            .await
            .context("failed to load accounts config")?;
        let events = Events::new();
-        let stockstrings = StockStrings::new();
        let accounts = config
-            .load_accounts(&events, &stockstrings)
+            .load_accounts(&events)
            .await
            .context("failed to load accounts")?;

@@ -73,24 +65,23 @@ impl Accounts {
            config,
            accounts,
            events,
-            stockstrings,
        })
    }

    /// Get an account by its `id`:
-    pub fn get_account(&self, id: u32) -> Option<Context> {
+    pub async fn get_account(&self, id: u32) -> Option<Context> {
        self.accounts.get(&id).cloned()
    }

    /// Get the currently selected account.
-    pub fn get_selected_account(&self) -> Option<Context> {
-        let id = self.config.get_selected_account();
+    pub async fn get_selected_account(&self) -> Option<Context> {
+        let id = self.config.get_selected_account().await;
        self.accounts.get(&id).cloned()
    }

    /// Returns the currently selected account's id or None if no account is selected.
-    pub fn get_selected_account_id(&self) -> Option<u32> {
-        match self.config.get_selected_account() {
+    pub async fn get_selected_account_id(&self) -> Option<u32> {
+        match self.config.get_selected_account().await {
            0 => None,
            id => Some(id),
        }
@@ -113,7 +104,6 @@ impl Accounts {
            &account_config.dbfile(),
            account_config.id,
            self.events.clone(),
-            self.stockstrings.clone(),
        )
        .await?;
        self.accounts.insert(account_config.id, ctx);
@@ -129,7 +119,6 @@ impl Accounts {
            &account_config.dbfile(),
            account_config.id,
            self.events.clone(),
-            self.stockstrings.clone(),
        )
        .await?;
        self.accounts.insert(account_config.id, ctx);
@@ -146,7 +135,7 @@ impl Accounts {
        ctx.stop_io().await;
        drop(ctx);

-        if let Some(cfg) = self.config.get_account(id) {
+        if let Some(cfg) = self.config.get_account(id).await {
            // Spend up to 1 minute trying to remove the files.
            // Files may remain locked up to 30 seconds due to r2d2 bug:
            // https://github.com/sfackler/r2d2/issues/99
@@ -182,7 +171,7 @@ impl Accounts {
        ensure!(dbfile.exists(), "no database found: {}", dbfile.display());
        ensure!(blobdir.exists(), "no blobdir found: {}", blobdir.display());

-        let old_id = self.config.get_selected_account();
+        let old_id = self.config.get_selected_account().await;

        // create new account
        let account_config = self
@@ -215,13 +204,7 @@ impl Accounts {

        match res {
            Ok(_) => {
-                let ctx = Context::new(
-                    &new_dbfile,
-                    account_config.id,
-                    self.events.clone(),
-                    self.stockstrings.clone(),
-                )
-                .await?;
+                let ctx = Context::new(&new_dbfile, account_config.id, self.events.clone()).await?;
                self.accounts.insert(account_config.id, ctx);
                Ok(account_config.id)
            }
@@ -242,7 +225,7 @@ impl Accounts {
    }

    /// Get a list of all account ids.
-    pub fn get_all(&self) -> Vec<u32> {
+    pub async fn get_all(&self) -> Vec<u32> {
        self.accounts.keys().copied().collect()
    }

@@ -298,7 +281,7 @@ impl Accounts {
    }

    /// Returns event emitter.
-    pub fn get_event_emitter(&self) -> EventEmitter {
+    pub async fn get_event_emitter(&self) -> EventEmitter {
        self.events.get_emitter()
    }
 }
@@ -356,31 +339,17 @@ impl Config {
        Ok(Config { file, inner })
    }

-    /// Loads all accounts defined in the configuration file.
-    ///
-    /// Created contexts share the same event channel and stock string
-    /// translations.
-    pub async fn load_accounts(
-        &self,
-        events: &Events,
-        stockstrings: &StockStrings,
-    ) -> Result<BTreeMap<u32, Context>> {
+    pub async fn load_accounts(&self, events: &Events) -> Result<BTreeMap<u32, Context>> {
        let mut accounts = BTreeMap::new();
-
        for account_config in &self.inner.accounts {
-            let ctx = Context::new(
-                &account_config.dbfile(),
-                account_config.id,
-                events.clone(),
-                stockstrings.clone(),
-            )
-            .await
-            .with_context(|| {
-                format!(
-                    "failed to create context from file {:?}",
-                    account_config.dbfile()
-                )
-            })?;
+            let ctx = Context::new(&account_config.dbfile(), account_config.id, events.clone())
+                .await
+                .with_context(|| {
+                    format!(
+                        "failed to create context from file {:?}",
+                        account_config.dbfile()
+                    )
+                })?;

            accounts.insert(account_config.id, ctx);
        }
@@ -411,6 +380,7 @@ impl Config {
            .context("failed to select just added account")?;
        let cfg = self
            .get_account(id)
+            .await
            .context("failed to get just added account")?;
        Ok(cfg)
    }
@@ -432,11 +402,11 @@ impl Config {
        self.sync().await
    }

-    fn get_account(&self, id: u32) -> Option<AccountConfig> {
+    async fn get_account(&self, id: u32) -> Option<AccountConfig> {
        self.inner.accounts.iter().find(|e| e.id == id).cloned()
    }

-    pub fn get_selected_account(&self) -> u32 {
+    pub async fn get_selected_account(&self) -> u32 {
        self.inner.selected_account
    }

@@ -477,8 +447,6 @@ impl AccountConfig {
 mod tests {
    use super::*;

-    use crate::stock_str::{self, StockMessage};
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_account_new_open() {
        let dir = tempfile::tempdir().unwrap();
@@ -490,7 +458,7 @@ mod tests {
        let accounts2 = Accounts::open(p).await.unwrap();

        assert_eq!(accounts1.accounts.len(), 1);
-        assert_eq!(accounts1.config.get_selected_account(), 1);
+        assert_eq!(accounts1.config.get_selected_account().await, 1);

        assert_eq!(accounts1.dir, accounts2.dir);
        assert_eq!(accounts1.config, accounts2.config,);
@@ -504,23 +472,23 @@ mod tests {

        let mut accounts = Accounts::new(p.clone()).await.unwrap();
        assert_eq!(accounts.accounts.len(), 0);
-        assert_eq!(accounts.config.get_selected_account(), 0);
+        assert_eq!(accounts.config.get_selected_account().await, 0);

        let id = accounts.add_account().await.unwrap();
        assert_eq!(id, 1);
        assert_eq!(accounts.accounts.len(), 1);
-        assert_eq!(accounts.config.get_selected_account(), 1);
+        assert_eq!(accounts.config.get_selected_account().await, 1);

        let id = accounts.add_account().await.unwrap();
        assert_eq!(id, 2);
-        assert_eq!(accounts.config.get_selected_account(), id);
+        assert_eq!(accounts.config.get_selected_account().await, id);
        assert_eq!(accounts.accounts.len(), 2);

        accounts.select_account(1).await.unwrap();
-        assert_eq!(accounts.config.get_selected_account(), 1);
+        assert_eq!(accounts.config.get_selected_account().await, 1);

        accounts.remove_account(1).await.unwrap();
-        assert_eq!(accounts.config.get_selected_account(), 2);
+        assert_eq!(accounts.config.get_selected_account().await, 2);
        assert_eq!(accounts.accounts.len(), 1);
    }

@@ -530,17 +498,17 @@ mod tests {
        let p: PathBuf = dir.path().join("accounts");

        let mut accounts = Accounts::new(p.clone()).await?;
-        assert!(accounts.get_selected_account().is_none());
-        assert_eq!(accounts.config.get_selected_account(), 0);
+        assert!(accounts.get_selected_account().await.is_none());
+        assert_eq!(accounts.config.get_selected_account().await, 0);

        let id = accounts.add_account().await?;
-        assert!(accounts.get_selected_account().is_some());
+        assert!(accounts.get_selected_account().await.is_some());
        assert_eq!(id, 1);
        assert_eq!(accounts.accounts.len(), 1);
-        assert_eq!(accounts.config.get_selected_account(), id);
+        assert_eq!(accounts.config.get_selected_account().await, id);

        accounts.remove_account(id).await?;
-        assert!(accounts.get_selected_account().is_none());
+        assert!(accounts.get_selected_account().await.is_none());

        Ok(())
    }
@@ -552,10 +520,10 @@ mod tests {

        let mut accounts = Accounts::new(p.clone()).await.unwrap();
        assert_eq!(accounts.accounts.len(), 0);
-        assert_eq!(accounts.config.get_selected_account(), 0);
+        assert_eq!(accounts.config.get_selected_account().await, 0);

        let extern_dbfile: PathBuf = dir.path().join("other");
-        let ctx = Context::new(&extern_dbfile, 0, Events::new(), StockStrings::new())
+        let ctx = Context::new(&extern_dbfile, 0, Events::new())
            .await
            .unwrap();
        ctx.set_config(crate::config::Config::Addr, Some("me@mail.com"))
@@ -569,9 +537,9 @@ mod tests {
            .await
            .unwrap();
        assert_eq!(accounts.accounts.len(), 1);
-        assert_eq!(accounts.config.get_selected_account(), 1);
+        assert_eq!(accounts.config.get_selected_account().await, 1);

-        let ctx = accounts.get_selected_account().unwrap();
+        let ctx = accounts.get_selected_account().await.unwrap();
        assert_eq!(
            "me@mail.com",
            ctx.get_config(crate::config::Config::Addr)
@@ -594,7 +562,7 @@ mod tests {
            assert_eq!(id, expected_id);
        }

-        let ids = accounts.get_all();
+        let ids = accounts.get_all().await;
        for (i, expected_id) in (1..10).enumerate() {
            assert_eq!(ids.get(i), Some(&expected_id));
        }
@@ -609,16 +577,16 @@ mod tests {
        let (id0, id1, id2) = {
            let mut accounts = Accounts::new(p.clone()).await?;
            accounts.add_account().await?;
-            let ids = accounts.get_all();
+            let ids = accounts.get_all().await;
            assert_eq!(ids.len(), 1);

            let id0 = *ids.first().unwrap();
-            let ctx = accounts.get_account(id0).unwrap();
+            let ctx = accounts.get_account(id0).await.unwrap();
            ctx.set_config(crate::config::Config::Addr, Some("one@example.org"))
                .await?;

            let id1 = accounts.add_account().await?;
-            let ctx = accounts.get_account(id1).unwrap();
+            let ctx = accounts.get_account(id1).await.unwrap();
            ctx.set_config(crate::config::Config::Addr, Some("two@example.org"))
                .await?;

@@ -629,7 +597,7 @@ mod tests {
            }

            let id2 = accounts.add_account().await?;
-            let ctx = accounts.get_account(id2).unwrap();
+            let ctx = accounts.get_account(id2).await.unwrap();
            ctx.set_config(crate::config::Config::Addr, Some("three@example.org"))
                .await?;

@@ -643,31 +611,31 @@ mod tests {

        let (id0_reopened, id1_reopened, id2_reopened) = {
            let accounts = Accounts::new(p.clone()).await?;
-            let ctx = accounts.get_selected_account().unwrap();
+            let ctx = accounts.get_selected_account().await.unwrap();
            assert_eq!(
                ctx.get_config(crate::config::Config::Addr).await?,
                Some("two@example.org".to_string())
            );

-            let ids = accounts.get_all();
+            let ids = accounts.get_all().await;
            assert_eq!(ids.len(), 3);

            let id0 = *ids.first().unwrap();
-            let ctx = accounts.get_account(id0).unwrap();
+            let ctx = accounts.get_account(id0).await.unwrap();
            assert_eq!(
                ctx.get_config(crate::config::Config::Addr).await?,
                Some("one@example.org".to_string())
            );

            let id1 = *ids.get(1).unwrap();
-            let t = accounts.get_account(id1).unwrap();
+            let t = accounts.get_account(id1).await.unwrap();
            assert_eq!(
                t.get_config(crate::config::Config::Addr).await?,
                Some("two@example.org".to_string())
            );

            let id2 = *ids.get(2).unwrap();
-            let ctx = accounts.get_account(id2).unwrap();
+            let ctx = accounts.get_account(id2).await.unwrap();
            assert_eq!(
                ctx.get_config(crate::config::Config::Addr).await?,
                Some("three@example.org".to_string())
@@ -693,7 +661,7 @@ mod tests {
        assert_eq!(accounts.accounts.len(), 0);

        // Create event emitter.
-        let event_emitter = accounts.get_event_emitter();
+        let event_emitter = accounts.get_event_emitter().await;

        // Test that event emitter does not return `None` immediately.
        let duration = std::time::Duration::from_millis(1);
@@ -724,6 +692,7 @@ mod tests {
            .context("failed to add closed account")?;
        let account = accounts
            .get_selected_account()
+            .await
            .context("failed to get account")?;
        assert_eq!(account.id, account_id);
        let passphrase_set_success = account
@@ -738,6 +707,7 @@ mod tests {
            .context("failed to create second accounts manager")?;
        let account = accounts
            .get_selected_account()
+            .await
            .context("failed to get account")?;
        assert_eq!(account.is_open().await, false);

@@ -750,28 +720,4 @@ mod tests {

        Ok(())
    }
-
-    /// Tests that accounts share stock string translations.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_accounts_share_translations() -> Result<()> {
-        let dir = tempfile::tempdir().unwrap();
-        let p: PathBuf = dir.path().join("accounts");
-
-        let mut accounts = Accounts::new(p.clone()).await?;
-        accounts.add_account().await?;
-        accounts.add_account().await?;
-
-        let account1 = accounts.get_account(1).context("failed to get account 1")?;
-        let account2 = accounts.get_account(2).context("failed to get account 2")?;
-
-        assert_eq!(stock_str::no_messages(&account1).await, "No messages.");
-        assert_eq!(stock_str::no_messages(&account2).await, "No messages.");
-        account1
-            .set_stock_translation(StockMessage::NoMessages, "foobar".to_string())
-            .await?;
-        assert_eq!(stock_str::no_messages(&account1).await, "foobar");
-        assert_eq!(stock_str::no_messages(&account2).await, "foobar");
-
-        Ok(())
-    }
 }
--- a/src/authres.rs
+++ b/src/authres.rs
@@ -1,753 +0,0 @@
-//! Parsing and handling of the Authentication-Results header.
-//! See the comment on [`handle_authres`] for more.
-
-use std::borrow::Cow;
-use std::collections::BTreeSet;
-use std::fmt;
-
-use anyhow::Result;
-use mailparse::MailHeaderMap;
-use mailparse::ParsedMail;
-use once_cell::sync::Lazy;
-
-use crate::config::Config;
-use crate::context::Context;
-use crate::headerdef::HeaderDef;
-use crate::tools::time;
-use crate::tools::EmailAddress;
-
-/// `authres` is short for the Authentication-Results header, defined in
-/// <https://datatracker.ietf.org/doc/html/rfc8601>, which contains info
-/// about whether DKIM and SPF passed.
-///
-/// To mitigate From forgery, we remember for each sending domain whether it is known
-/// to have valid DKIM. If an email from such a domain comes with invalid DKIM,
-/// we don't allow changing the autocrypt key.
-///
-/// See <https://github.com/deltachat/deltachat-core-rust/issues/3507>.
-pub(crate) async fn handle_authres(
-    context: &Context,
-    mail: &ParsedMail<'_>,
-    from: &str,
-    message_time: i64,
-) -> Result<DkimResults> {
-    let from_domain = match EmailAddress::new(from) {
-        Ok(email) => email.domain,
-        Err(e) => {
-            warn!(context, "invalid email {:#}", e);
-            // This email is invalid, but don't return an error, we still want to
-            // add a stub to the database so that it's not downloaded again
-            return Ok(DkimResults::default());
-        }
-    };
-
-    let authres = parse_authres_headers(&mail.get_headers(), &from_domain);
-    update_authservid_candidates(context, &authres).await?;
-    compute_dkim_results(context, authres, &from_domain, message_time).await
-}
-
-#[derive(Default, Debug)]
-pub(crate) struct DkimResults {
-    /// Whether DKIM passed for this particular e-mail.
-    pub dkim_passed: bool,
-    /// Whether DKIM is known to work for e-mails coming from the sender's domain,
-    /// i.e. whether we expect DKIM to work.
-    pub dkim_should_work: bool,
-    /// Whether changing the public Autocrypt key should be allowed.
-    /// This is false if we expected DKIM to work (dkim_works=true),
-    /// but it failed now (dkim_passed=false).
-    pub allow_keychange: bool,
-}
-
-impl fmt::Display for DkimResults {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            fmt,
-            "DKIM Results: Passed={}, Works={}, Allow_Keychange={}",
-            self.dkim_passed, self.dkim_should_work, self.allow_keychange
-        )?;
-        if !self.allow_keychange {
-            write!(fmt, " KEYCHANGES NOT ALLOWED!!!!")?;
-        }
-        Ok(())
-    }
-}
-
-type AuthservId = String;
-
-#[derive(Debug, PartialEq)]
-enum DkimResult {
-    /// The header explicitly said that DKIM passed
-    Passed,
-    /// The header explicitly said that DKIM failed
-    Failed,
-    /// The header didn't say anything about DKIM; this might mean that it wasn't
-    /// checked, but it might also mean that it failed. This is because some providers
-    /// (e.g. ik.me, mail.ru, posteo.de) don't add `dkim=none` to their
-    /// Authentication-Results if there was no DKIM.
-    Nothing,
-}
-
-type ParsedAuthresHeaders = Vec<(AuthservId, DkimResult)>;
-
-fn parse_authres_headers(
-    headers: &mailparse::headers::Headers<'_>,
-    from_domain: &str,
-) -> ParsedAuthresHeaders {
-    let mut res = Vec::new();
-    for header_value in headers.get_all_values(HeaderDef::AuthenticationResults.into()) {
-        let header_value = remove_comments(&header_value);
-
-        if let Some(mut authserv_id) = header_value.split(';').next() {
-            if authserv_id.contains(char::is_whitespace) || authserv_id.is_empty() {
-                // Outlook violates the RFC by not adding an authserv-id at all, which we notice
-                // because there is whitespace in the first identifier before the ';'.
-                // Authentication-Results-parsing still works securely because they remove incoming
-                // Authentication-Results headers.
-                // We just use an arbitrary authserv-id, it will work for Outlook, and in general,
-                // with providers not implementing the RFC correctly, someone can trick us
-                // into thinking that an incoming email is DKIM-correct, anyway.
-                // The most important thing here is that we have some valid `authserv_id`.
-                authserv_id = "invalidAuthservId";
-            }
-            let dkim_passed = parse_one_authres_header(&header_value, from_domain);
-            res.push((authserv_id.to_string(), dkim_passed));
-        }
-    }
-
-    res
-}
-
-/// The headers can contain comments that look like this:
-/// ```text
-/// Authentication-Results: (this is a comment) gmx.net; (another; comment) dkim=pass;
-/// ```
-fn remove_comments(header: &str) -> Cow<'_, str> {
-    // In Pomsky, this is:
-    //     "(" Codepoint* lazy ")"
-    // See https://playground.pomsky-lang.org/?text=%22(%22%20Codepoint*%20lazy%20%22)%22
-    static RE: Lazy<regex::Regex> = Lazy::new(|| regex::Regex::new(r"\([\s\S]*?\)").unwrap());
-
-    RE.replace_all(header, " ")
-}
-
-/// Parses a single Authentication-Results header, like:
-///
-/// ```text
-/// Authentication-Results:  gmx.net; dkim=pass header.i=@slack.com
-/// ```
-fn parse_one_authres_header(header_value: &str, from_domain: &str) -> DkimResult {
-    if let Some((before_dkim_part, dkim_to_end)) = header_value.split_once("dkim=") {
-        // Check that the character right before `dkim=` is a space or a tab
-        // so that we wouldn't e.g. mistake `notdkim=pass` for `dkim=pass`
-        if before_dkim_part.ends_with(' ') || before_dkim_part.ends_with('\t') {
-            let dkim_part = dkim_to_end.split(';').next().unwrap_or_default();
-            let dkim_parts: Vec<_> = dkim_part.split_whitespace().collect();
-            if let Some(&"pass") = dkim_parts.first() {
-                // DKIM headers contain a header.d or header.i field
-                // that says which domain signed. We have to check ourselves
-                // that this is the same domain as in the From header.
-                let header_d: &str = &format!("header.d={}", &from_domain);
-                let header_i: &str = &format!("header.i=@{}", &from_domain);
-
-                if dkim_parts.contains(&header_d) || dkim_parts.contains(&header_i) {
-                    // We have found a `dkim=pass` header!
-                    return DkimResult::Passed;
-                }
-            } else {
-                // dkim=fail, dkim=none, ...
-                return DkimResult::Failed;
-            }
-        }
-    }
-
-    DkimResult::Nothing
-}
-
-/// ## About authserv-ids
-///
-/// After having checked DKIM, our email server adds an Authentication-Results header.
-///
-/// Now, an attacker could just add an Authentication-Results header that says dkim=pass
-/// in order to make us think that DKIM was correct in their From-forged email.
-///
-/// In order to prevent this, each email server adds its authserv-id to the
-/// Authentication-Results header, e.g. Testrun's authserv-id is `testrun.org`, Gmail's
-/// is `mx.google.com`. When Testrun gets a mail delivered from outside, it will then
-/// remove any Authentication-Results headers whose authserv-id is also `testrun.org`.
-///
-/// We need to somehow find out the authserv-id(s) of our email server, so that
-/// we can use the Authentication-Results with the right authserv-id.
-///
-/// ## What this function does
-///
-/// When receiving an email, this function is called and updates the candidates for
-/// our server's authserv-id, i.e. what we think our server's authserv-id is.
-///
-/// Usually, every incoming email has Authentication-Results  with our server's
-/// authserv-id, so, the intersection of the existing authserv-ids and the incoming
-/// authserv-ids for our server's authserv-id is a good guess for our server's
-/// authserv-id. When this intersection is empty, we assume that the authserv-id has
-/// changed and start over with the new authserv-ids.
-///
-/// See [`handle_authres`].
-async fn update_authservid_candidates(
-    context: &Context,
-    authres: &ParsedAuthresHeaders,
-) -> Result<()> {
-    let mut new_ids: BTreeSet<&str> = authres
-        .iter()
-        .map(|(authserv_id, _dkim_passed)| authserv_id.as_str())
-        .collect();
-    if new_ids.is_empty() {
-        // The incoming message doesn't contain any authentication results, maybe it's a
-        // self-sent or a mailer-daemon message
-        return Ok(());
-    }
-
-    let old_config = context.get_config(Config::AuthservIdCandidates).await?;
-    let old_ids = parse_authservid_candidates_config(&old_config);
-    let intersection: BTreeSet<&str> = old_ids.intersection(&new_ids).copied().collect();
-    if !intersection.is_empty() {
-        new_ids = intersection;
-    }
-    // If there were no AuthservIdCandidates previously, just start with
-    // the ones from the incoming email
-
-    if old_ids != new_ids {
-        let new_config = new_ids.into_iter().collect::<Vec<_>>().join(" ");
-        context
-            .set_config(Config::AuthservIdCandidates, Some(&new_config))
-            .await?;
-        // Updating the authservid candidates may mean that we now consider
-        // emails as "failed" which "passed" previously, so we need to
-        // reset our expectation which DKIMs work.
-        clear_dkim_works(context).await?
-    }
-    Ok(())
-}
-
-/// Use the parsed authres and the authservid candidates to compute whether DKIM passed
-/// and whether a keychange should be allowed.
-///
-/// We track in the `sending_domains` table whether we get positive Authentication-Results
-/// for mails from a contact (meaning that their provider properly authenticates against
-/// our provider).
-///
-/// Once a contact is known to come with positive Authentication-Resutls (dkim: pass),
-/// we don't accept Autocrypt key changes if they come with negative Authentication-Results.
-async fn compute_dkim_results(
-    context: &Context,
-    mut authres: ParsedAuthresHeaders,
-    from_domain: &str,
-    message_time: i64,
-) -> Result<DkimResults> {
-    let mut dkim_passed = false;
-
-    let ids_config = context.get_config(Config::AuthservIdCandidates).await?;
-    let ids = parse_authservid_candidates_config(&ids_config);
-
-    // Remove all foreign authentication results
-    authres.retain(|(authserv_id, _dkim_passed)| ids.contains(authserv_id.as_str()));
-
-    if authres.is_empty() {
-        // If the authentication results are empty, then our provider doesn't add them
-        // and an attacker could just add their own Authentication-Results, making us
-        // think that DKIM passed. So, in this case, we can as well assume that DKIM passed.
-        dkim_passed = true;
-    } else {
-        for (_authserv_id, current_dkim_passed) in authres {
-            match current_dkim_passed {
-                DkimResult::Passed => {
-                    dkim_passed = true;
-                    break;
-                }
-                DkimResult::Failed => {
-                    dkim_passed = false;
-                    break;
-                }
-                DkimResult::Nothing => {
-                    // Continue looking for an Authentication-Results header
-                }
-            }
-        }
-    }
-
-    let last_working_timestamp = dkim_works_timestamp(context, from_domain).await?;
-    let mut dkim_should_work = dkim_should_work(last_working_timestamp)?;
-    if message_time > last_working_timestamp && dkim_passed {
-        set_dkim_works_timestamp(context, from_domain, message_time).await?;
-        dkim_should_work = true;
-    }
-
-    Ok(DkimResults {
-        dkim_passed,
-        dkim_should_work,
-        allow_keychange: dkim_passed || !dkim_should_work,
-    })
-}
-
-/// Whether DKIM in emails from this domain should be considered to work.
-fn dkim_should_work(last_working_timestamp: i64) -> Result<bool> {
-    // When we get an email with valid DKIM-Authentication-Results,
-    // then we assume that DKIM works for 30 days from this time on.
-    let should_work_until = last_working_timestamp + 3600 * 24 * 30;
-
-    let dkim_ever_worked = last_working_timestamp > 0;
-
-    // We're using time() here and not the time when the message
-    // claims to have been sent (passed around as `message_time`)
-    // because otherwise an attacker could just put a time way
-    // in the future into the `Date` header and then we would
-    // assume that DKIM doesn't have to be valid anymore.
-    let dkim_should_work_now = should_work_until > time();
-    Ok(dkim_ever_worked && dkim_should_work_now)
-}
-
-async fn dkim_works_timestamp(context: &Context, from_domain: &str) -> Result<i64, anyhow::Error> {
-    let last_working_timestamp: i64 = context
-        .sql
-        .query_get_value(
-            "SELECT dkim_works FROM sending_domains WHERE domain=?",
-            paramsv![from_domain],
-        )
-        .await?
-        .unwrap_or(0);
-    Ok(last_working_timestamp)
-}
-
-async fn set_dkim_works_timestamp(
-    context: &Context,
-    from_domain: &str,
-    timestamp: i64,
-) -> Result<()> {
-    context
-        .sql
-        .execute(
-            "INSERT INTO sending_domains (domain, dkim_works) VALUES (?,?)
-                ON CONFLICT(domain) DO UPDATE SET dkim_works=excluded.dkim_works",
-            paramsv![from_domain, timestamp],
-        )
-        .await?;
-    Ok(())
-}
-
-async fn clear_dkim_works(context: &Context) -> Result<()> {
-    context
-        .sql
-        .execute("DELETE FROM sending_domains", paramsv![])
-        .await?;
-    Ok(())
-}
-
-fn parse_authservid_candidates_config(config: &Option<String>) -> BTreeSet<&str> {
-    config
-        .as_deref()
-        .map(|c| c.split_whitespace().collect())
-        .unwrap_or_default()
-}
-
-#[cfg(test)]
-mod tests {
-    #![allow(clippy::indexing_slicing)]
-    use std::time::Duration;
-
-    use tokio::fs;
-    use tokio::io::AsyncReadExt;
-
-    use super::*;
-
-    use crate::aheader::EncryptPreference;
-    use crate::e2ee;
-    use crate::mimeparser;
-    use crate::peerstate::Peerstate;
-    use crate::securejoin::get_securejoin_qr;
-    use crate::securejoin::join_securejoin;
-    use crate::test_utils;
-    use crate::test_utils::TestContext;
-    use crate::test_utils::TestContextManager;
-    use crate::tools;
-
-    #[test]
-    fn test_remove_comments() {
-        let header = "Authentication-Results: mx3.messagingengine.com;
-    dkim=pass (1024-bit rsa key sha256) header.d=riseup.net;"
-            .to_string();
-        assert_eq!(
-            remove_comments(&header),
-            "Authentication-Results: mx3.messagingengine.com;
-    dkim=pass   header.d=riseup.net;"
-        );
-
-        let header = ") aaa (".to_string();
-        assert_eq!(remove_comments(&header), ") aaa (");
-
-        let header = "((something weird) no comment".to_string();
-        assert_eq!(remove_comments(&header), "  no comment");
-
-        let header = "🎉(🎉(🎉))🎉(".to_string();
-        assert_eq!(remove_comments(&header), "🎉 )🎉(");
-
-        // Comments are allowed to include whitespace
-        let header = "(com\n\t\r\nment) no comment (comment)".to_string();
-        assert_eq!(remove_comments(&header), "  no comment  ");
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_parse_authentication_results() -> Result<()> {
-        let t = TestContext::new().await;
-        t.configure_addr("alice@gmx.net").await;
-        let bytes = b"Authentication-Results:  gmx.net; dkim=pass header.i=@slack.com
-Authentication-Results:  gmx.net; dkim=pass header.i=@amazonses.com";
-        let mail = mailparse::parse_mail(bytes)?;
-        let actual = parse_authres_headers(&mail.get_headers(), "slack.com");
-        assert_eq!(
-            actual,
-            vec![
-                ("gmx.net".to_string(), DkimResult::Passed),
-                ("gmx.net".to_string(), DkimResult::Nothing)
-            ]
-        );
-
-        let bytes = b"Authentication-Results:  gmx.net; notdkim=pass header.i=@slack.com
-Authentication-Results:  gmx.net; notdkim=pass header.i=@amazonses.com";
-        let mail = mailparse::parse_mail(bytes)?;
-        let actual = parse_authres_headers(&mail.get_headers(), "slack.com");
-        assert_eq!(
-            actual,
-            vec![
-                ("gmx.net".to_string(), DkimResult::Nothing),
-                ("gmx.net".to_string(), DkimResult::Nothing)
-            ]
-        );
-
-        let bytes = b"Authentication-Results:  gmx.net; dkim=pass header.i=@amazonses.com";
-        let mail = mailparse::parse_mail(bytes)?;
-        let actual = parse_authres_headers(&mail.get_headers(), "slack.com");
-        assert_eq!(actual, vec![("gmx.net".to_string(), DkimResult::Nothing)],);
-
-        // Weird Authentication-Results from Outlook without an authserv-id
-        let bytes = b"Authentication-Results: spf=pass (sender IP is 40.92.73.85)
-    smtp.mailfrom=hotmail.com; dkim=pass (signature was verified)
-    header.d=hotmail.com;dmarc=pass action=none
-    header.from=hotmail.com;compauth=pass reason=100";
-        let mail = mailparse::parse_mail(bytes)?;
-        let actual = parse_authres_headers(&mail.get_headers(), "hotmail.com");
-        // At this point, the most important thing to test is that there are no
-        // authserv-ids with whitespace in them.
-        assert_eq!(
-            actual,
-            vec![("invalidAuthservId".to_string(), DkimResult::Passed)]
-        );
-
-        let bytes = b"Authentication-Results:  gmx.net; dkim=none header.i=@slack.com
-Authentication-Results:  gmx.net; dkim=pass header.i=@slack.com";
-        let mail = mailparse::parse_mail(bytes)?;
-        let actual = parse_authres_headers(&mail.get_headers(), "slack.com");
-        assert_eq!(
-            actual,
-            vec![
-                ("gmx.net".to_string(), DkimResult::Failed),
-                ("gmx.net".to_string(), DkimResult::Passed)
-            ]
-        );
-
-        // ';' in comments
-        let bytes = b"Authentication-Results: mx1.riseup.net;
-	dkim=pass (1024-bit key; unprotected) header.d=yandex.ru header.i=@yandex.ru header.a=rsa-sha256 header.s=mail header.b=avNJu6sw;
-	dkim-atps=neutral";
-        let mail = mailparse::parse_mail(bytes)?;
-        let actual = parse_authres_headers(&mail.get_headers(), "yandex.ru");
-        assert_eq!(
-            actual,
-            vec![("mx1.riseup.net".to_string(), DkimResult::Passed)]
-        );
-
-        let bytes = br#"Authentication-Results: box.hispanilandia.net;
-	dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=disroot.org header.i=@disroot.org header.b="kqh3WUKq";
-	dkim-atps=neutral
-Authentication-Results: box.hispanilandia.net; dmarc=pass (p=quarantine dis=none) header.from=disroot.org
-Authentication-Results: box.hispanilandia.net; spf=pass smtp.mailfrom=adbenitez@disroot.org"#;
-        let mail = mailparse::parse_mail(bytes)?;
-        let actual = parse_authres_headers(&mail.get_headers(), "disroot.org");
-        assert_eq!(
-            actual,
-            vec![
-                ("box.hispanilandia.net".to_string(), DkimResult::Failed),
-                ("box.hispanilandia.net".to_string(), DkimResult::Nothing),
-                ("box.hispanilandia.net".to_string(), DkimResult::Nothing),
-            ]
-        );
-
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_update_authservid_candidates() -> Result<()> {
-        let t = TestContext::new_alice().await;
-
-        update_authservid_candidates_test(&t, &["mx3.messagingengine.com"]).await;
-        let candidates = t.get_config(Config::AuthservIdCandidates).await?.unwrap();
-        assert_eq!(candidates, "mx3.messagingengine.com");
-
-        // "mx4.messagingengine.com" seems to be the new authserv-id, DC should accept it
-        update_authservid_candidates_test(&t, &["mx4.messagingengine.com"]).await;
-        let candidates = t.get_config(Config::AuthservIdCandidates).await?.unwrap();
-        assert_eq!(candidates, "mx4.messagingengine.com");
-
-        // A message without any Authentication-Results headers shouldn't remove all
-        // candidates since it could be a mailer-daemon message or so
-        update_authservid_candidates_test(&t, &[]).await;
-        let candidates = t.get_config(Config::AuthservIdCandidates).await?.unwrap();
-        assert_eq!(candidates, "mx4.messagingengine.com");
-
-        update_authservid_candidates_test(&t, &["mx4.messagingengine.com", "someotherdomain.com"])
-            .await;
-        let candidates = t.get_config(Config::AuthservIdCandidates).await?.unwrap();
-        assert_eq!(candidates, "mx4.messagingengine.com");
-
-        Ok(())
-    }
-
-    /// Calls update_authservid_candidates(), meant for using in a test.
-    ///
-    /// update_authservid_candidates() only looks at the keys of its
-    /// `authentication_results` parameter. So, this function takes `incoming_ids`
-    /// and adds some AuthenticationResults to get the HashMap we need.
-    async fn update_authservid_candidates_test(context: &Context, incoming_ids: &[&str]) {
-        let v = incoming_ids
-            .iter()
-            .map(|id| (id.to_string(), DkimResult::Passed))
-            .collect();
-        update_authservid_candidates(context, &v).await.unwrap()
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_realworld_authentication_results() -> Result<()> {
-        let mut test_failed = false;
-
-        let dir = tools::read_dir("test-data/message/dkimchecks-2022-09-28/".as_ref())
-            .await
-            .unwrap();
-        let mut bytes = Vec::new();
-        for entry in dir {
-            if !entry.file_type().await.unwrap().is_dir() {
-                continue;
-            }
-            let self_addr = entry.file_name().into_string().unwrap();
-            let self_domain = EmailAddress::new(&self_addr).unwrap().domain;
-            let authres_parsing_works = [
-                "ik.me",
-                "web.de",
-                "posteo.de",
-                "gmail.com",
-                "hotmail.com",
-                "mail.ru",
-                "aol.com",
-                "yahoo.com",
-                "icloud.com",
-                "fastmail.com",
-                "mail.de",
-                "outlook.com",
-                "gmx.de",
-                "testrun.org",
-            ]
-            .contains(&self_domain.as_str());
-
-            let t = TestContext::new().await;
-            t.configure_addr(&self_addr).await;
-            if !authres_parsing_works {
-                println!("========= Receiving as {} =========", &self_addr);
-            }
-
-            // Simulate receiving all emails once, so that we have the correct authserv-ids
-            let mut dir = tools::read_dir(&entry.path()).await.unwrap();
-
-            // The ordering in which the emails are received can matter;
-            // the test _should_ pass for every ordering.
-            dir.sort_by_key(|d| d.file_name());
-            //rand::seq::SliceRandom::shuffle(&mut dir[..], &mut rand::thread_rng());
-
-            for entry in &dir {
-                let mut file = fs::File::open(entry.path()).await?;
-                bytes.clear();
-                file.read_to_end(&mut bytes).await.unwrap();
-
-                let mail = mailparse::parse_mail(&bytes)?;
-                let from = &mimeparser::get_from(&mail.headers)[0].addr;
-
-                let res = handle_authres(&t, &mail, from, time()).await?;
-                assert!(res.allow_keychange);
-            }
-
-            for entry in &dir {
-                let mut file = fs::File::open(entry.path()).await?;
-                bytes.clear();
-                file.read_to_end(&mut bytes).await.unwrap();
-
-                let mail = mailparse::parse_mail(&bytes)?;
-                let from = &mimeparser::get_from(&mail.headers)[0].addr;
-
-                let res = handle_authres(&t, &mail, from, time()).await?;
-                if !res.allow_keychange {
-                    println!(
-                        "!!!!!! FAILURE Receiving {:?}, keychange is not allowed !!!!!!",
-                        entry.path()
-                    );
-                    test_failed = true;
-                }
-
-                let from_domain = EmailAddress::new(from).unwrap().domain;
-                assert_eq!(
-                    res.dkim_should_work,
-                    dkim_should_work(dkim_works_timestamp(&t, &from_domain).await?)?
-                );
-                assert_eq!(res.dkim_passed, res.dkim_should_work);
-
-                // delta.blinzeln.de and gmx.de have invalid DKIM, so the DKIM check should fail
-                let expected_result = (from_domain != "delta.blinzeln.de") && (from_domain != "gmx.de")
-                    // These are (fictional) forged emails where the attacker added a fake
-                    // Authentication-Results before sending the email
-                    && from != "forged-authres-added@example.com"
-                    // Other forged emails
-                    && !from.starts_with("forged");
-
-                if res.dkim_passed != expected_result {
-                    if authres_parsing_works {
-                        println!(
-                            "!!!!!! FAILURE Receiving {:?}, order {:#?} wrong result: !!!!!!",
-                            entry.path(),
-                            dir.iter().map(|e| e.file_name()).collect::<Vec<_>>()
-                        );
-                        test_failed = true;
-                    }
-                    println!("From {}: {}", from_domain, res.dkim_passed);
-                }
-            }
-        }
-
-        assert!(!test_failed);
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_handle_authres() {
-        let t = TestContext::new().await;
-
-        // Even if the format is wrong and parsing fails, handle_authres() shouldn't
-        // return an Err because this would prevent the message from being added
-        // to the database and downloaded again and again
-        let bytes = b"Authentication-Results: dkim=";
-        let mail = mailparse::parse_mail(bytes).unwrap();
-        handle_authres(&t, &mail, "invalidfrom.com", time())
-            .await
-            .unwrap();
-    }
-
-    #[ignore = "Disallowing keychanges is disabled for now"]
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_handle_authres_fails() -> Result<()> {
-        let mut tcm = TestContextManager::new();
-        let alice = tcm.alice().await;
-        let bob = tcm.bob().await;
-
-        // Bob sends Alice a message, so she gets his key
-        tcm.send_recv_accept(&bob, &alice, "Hi").await;
-
-        // We don't need bob anymore, let's make sure it's not accidentally used
-        drop(bob);
-
-        // Assume Alice receives an email from bob@example.net with
-        // correct DKIM -> `set_dkim_works()` was called
-        set_dkim_works_timestamp(&alice, "example.net", time()).await?;
-        // And Alice knows her server's authserv-id
-        alice
-            .set_config(Config::AuthservIdCandidates, Some("example.org"))
-            .await?;
-
-        tcm.section("An attacker, bob2, sends a from-forged email to Alice!");
-
-        // Sleep to make sure key reset is ignored because of DKIM failure
-        // and not because reordering is suspected.
-        tokio::time::sleep(std::time::Duration::from_millis(1100)).await;
-
-        let bob2 = tcm.unconfigured().await;
-        bob2.configure_addr("bob@example.net").await;
-        e2ee::ensure_secret_key_exists(&bob2).await?;
-
-        let chat = bob2.create_chat(&alice).await;
-        let mut sent = bob2
-            .send_text(chat.id, "Please send me lots of money")
-            .await;
-
-        sent.payload
-            .insert_str(0, "Authentication-Results: example.org; dkim=fail");
-
-        let received = alice.recv_msg(&sent).await;
-
-        // Assert that the error tells the user about the problem
-        assert!(received.error.unwrap().contains("DKIM failed"));
-
-        let bob_state = Peerstate::from_addr(&alice, "bob@example.net")
-            .await?
-            .unwrap();
-
-        // Encryption preference is still mutual.
-        assert_eq!(bob_state.prefer_encrypt, EncryptPreference::Mutual);
-
-        // Also check that the keypair was not changed
-        assert_eq!(
-            bob_state.public_key.unwrap(),
-            test_utils::bob_keypair().public
-        );
-
-        // Since Alice didn't change the key, Bob can't read her message
-        let received = tcm
-            .try_send_recv(&alice, &bob2, "My credit card number is 1234")
-            .await;
-        assert!(!received.text.as_ref().unwrap().contains("1234"));
-        assert!(received.error.is_some());
-
-        tcm.section("Turns out bob2 wasn't an attacker at all, Bob just has a new phone and DKIM just stopped working.");
-        tcm.section("To fix the key problems, Bob scans Alice's QR code.");
-
-        let qr = get_securejoin_qr(&alice.ctx, None).await.unwrap();
-        join_securejoin(&bob2.ctx, &qr).await.unwrap();
-
-        loop {
-            if let Some(mut sent) = bob2.pop_sent_msg_opt(Duration::ZERO).await {
-                sent.payload
-                    .insert_str(0, "Authentication-Results: example.org; dkim=fail");
-                alice.recv_msg(&sent).await;
-            } else if let Some(sent) = alice.pop_sent_msg_opt(Duration::ZERO).await {
-                bob2.recv_msg(&sent).await;
-            } else {
-                break;
-            }
-        }
-
-        // Unfortunately, securejoin currently doesn't work with authres-checking,
-        // so these checks would fail:
-
-        // let contact_bob = alice.add_or_lookup_contact(&bob2).await;
-        // assert_eq!(
-        //     contact_bob.is_verified(&alice.ctx).await.unwrap(),
-        //     VerifiedStatus::BidirectVerified
-        // );
-
-        // let contact_alice = bob2.add_or_lookup_contact(&alice).await;
-        // assert_eq!(
-        //     contact_alice.is_verified(&bob2.ctx).await.unwrap(),
-        //     VerifiedStatus::BidirectVerified
-        // );
-
-        // // Bob can read Alice's messages again
-        // let received = tcm
-        //     .try_send_recv(&alice, &bob2, "Can you read this again?")
-        //     .await;
-        // assert_eq!(received.text.as_ref().unwrap(), "Can you read this again?");
-        // assert!(received.error.is_none());
-
-        Ok(())
-    }
-}
--- a/src/blob.rs
+++ b/src/blob.rs
@@ -326,7 +326,10 @@ impl<'a> BlobObject<'a> {

        // max_bytes is 20_000 bytes: Outlook servers don't allow headers larger than 32k.
        // 32 / 4 * 3 = 24k if you account for base64 encoding. To be safe, we reduced this to 20k.
-        if let Some(new_name) = self.recode_to_size(context, blob_abs, img_wh, Some(20_000))? {
+        if let Some(new_name) = self
+            .recode_to_size(context, blob_abs, img_wh, Some(20_000))
+            .await?
+        {
            self.name = new_name;
        }
        Ok(())
@@ -349,7 +352,8 @@ impl<'a> BlobObject<'a> {
            };

        if self
-            .recode_to_size(context, blob_abs, img_wh, None)?
+            .recode_to_size(context, blob_abs, img_wh, None)
+            .await?
            .is_some()
        {
            return Err(format_err!(
@@ -359,7 +363,7 @@ impl<'a> BlobObject<'a> {
        Ok(())
    }

-    fn recode_to_size(
+    async fn recode_to_size(
        &self,
        context: &Context,
        mut blob_abs: PathBuf,
@@ -742,6 +746,7 @@ mod tests {
        let blob = BlobObject::new_from_path(&t, &avatar_blob).await.unwrap();

        blob.recode_to_size(&t, blob.to_abs_path(), 1000, Some(3000))
+            .await
            .unwrap();
        assert!(file_size(&avatar_blob).await <= 3000);
        assert!(file_size(&avatar_blob).await > 2000);
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -1130,8 +1130,8 @@ impl Chat {
    }

    /// Returns mailing list address where messages are sent to.
-    pub fn get_mailinglist_addr(&self) -> Option<&str> {
-        self.param.get(Param::ListPost)
+    pub fn get_mailinglist_addr(&self) -> &str {
+        self.param.get(Param::ListPost).unwrap_or_default()
    }

    /// Returns profile image path for the chat.
@@ -2254,7 +2254,7 @@ pub async fn get_chat_msgs(
                let curr_day = curr_local_timestamp / 86400;
                if curr_day != last_day {
                    ret.push(ChatItem::DayMarker {
-                        timestamp: curr_day * 86400, // Convert day back to Unix timestamp
+                        timestamp: curr_day,
                    });
                    last_day = curr_day;
                }
@@ -2439,7 +2439,7 @@ pub async fn get_chat_media(
                AND hidden=0
              ORDER BY timestamp, id;",
            paramsv![
-                chat_id.is_none(),
+                if chat_id.is_none() { 1i32 } else { 0i32 },
                chat_id.unwrap_or_else(|| ChatId::new(0)),
                msg_type,
                if msg_type2 != Viewtype::Unknown {
@@ -3369,15 +3369,6 @@ pub(crate) async fn delete_and_reset_all_device_msgs(context: &Context) -> Resul
        .sql
        .execute("DELETE FROM devmsglabels;", paramsv![])
        .await?;
-
-    // Insert labels for welcome messages to avoid them being readded on reconfiguration.
-    context
-        .sql
-        .execute(
-            r#"INSERT INTO devmsglabels (label) VALUES ("core-welcome-image"), ("core-welcome")"#,
-            paramsv![],
-        )
-        .await?;
    context.set_config(Config::QuotaExceeding, None).await?;
    Ok(())
 }
@@ -3702,11 +3693,11 @@ mod tests {

        // create group and sync it to the second device
        let a1_chat_id = create_group_chat(&a1, ProtectionStatus::Unprotected, "foo").await?;
-        let sent = a1.send_text(a1_chat_id, "ho!").await;
+        a1.send_text(a1_chat_id, "ho!").await;
        let a1_msg = a1.get_last_msg().await;
        let a1_chat = Chat::load_from_db(&a1, a1_chat_id).await?;

-        let a2_msg = a2.recv_msg(&sent).await;
+        let a2_msg = a2.recv_msg(&a1.pop_sent_msg().await).await;
        let a2_chat_id = a2_msg.chat_id;
        let a2_chat = Chat::load_from_db(&a2, a2_chat_id).await?;

@@ -4563,24 +4554,26 @@ mod tests {
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_set_protection() -> Result<()> {
+    async fn test_set_protection() {
        let t = TestContext::new_alice().await;
-        t.set_config_bool(Config::BccSelf, false).await?;
-        let chat_id = create_group_chat(&t, ProtectionStatus::Unprotected, "foo").await?;
-        let chat = Chat::load_from_db(&t, chat_id).await?;
+        let chat_id = create_group_chat(&t, ProtectionStatus::Unprotected, "foo")
+            .await
+            .unwrap();
+        let chat = Chat::load_from_db(&t, chat_id).await.unwrap();
        assert!(!chat.is_protected());
        assert!(chat.is_unpromoted());

        // enable protection on unpromoted chat, the info-message is added via add_info_msg()
        chat_id
            .set_protection(&t, ProtectionStatus::Protected)
-            .await?;
+            .await
+            .unwrap();

-        let chat = Chat::load_from_db(&t, chat_id).await?;
+        let chat = Chat::load_from_db(&t, chat_id).await.unwrap();
        assert!(chat.is_protected());
        assert!(chat.is_unpromoted());

-        let msgs = get_chat_msgs(&t, chat_id, 0).await?;
+        let msgs = get_chat_msgs(&t, chat_id, 0).await.unwrap();
        assert_eq!(msgs.len(), 1);

        let msg = t.get_last_msg_in(chat_id).await;
@@ -4591,9 +4584,10 @@ mod tests {
        // disable protection again, still unpromoted
        chat_id
            .set_protection(&t, ProtectionStatus::Unprotected)
-            .await?;
+            .await
+            .unwrap();

-        let chat = Chat::load_from_db(&t, chat_id).await?;
+        let chat = Chat::load_from_db(&t, chat_id).await.unwrap();
        assert!(!chat.is_protected());
        assert!(chat.is_unpromoted());

@@ -4603,20 +4597,21 @@ mod tests {
        assert_eq!(msg.get_state(), MessageState::InNoticed);

        // send a message, this switches to promoted state
-        send_text_msg(&t, chat_id, "hi!".to_string()).await?;
+        send_text_msg(&t, chat_id, "hi!".to_string()).await.unwrap();

-        let chat = Chat::load_from_db(&t, chat_id).await?;
+        let chat = Chat::load_from_db(&t, chat_id).await.unwrap();
        assert!(!chat.is_protected());
        assert!(!chat.is_unpromoted());

-        let msgs = get_chat_msgs(&t, chat_id, 0).await?;
+        let msgs = get_chat_msgs(&t, chat_id, 0).await.unwrap();
        assert_eq!(msgs.len(), 3);

        // enable protection on promoted chat, the info-message is sent via send_msg() this time
        chat_id
            .set_protection(&t, ProtectionStatus::Protected)
-            .await?;
-        let chat = Chat::load_from_db(&t, chat_id).await?;
+            .await
+            .unwrap();
+        let chat = Chat::load_from_db(&t, chat_id).await.unwrap();
        assert!(chat.is_protected());
        assert!(!chat.is_unpromoted());

@@ -4624,8 +4619,6 @@ mod tests {
        assert!(msg.is_info());
        assert_eq!(msg.get_info_type(), SystemMessage::ChatProtectionEnabled);
        assert_eq!(msg.get_state(), MessageState::OutDelivered); // as bcc-self is disabled and there is nobody else in the chat
-
-        Ok(())
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
--- a/src/config.rs
+++ b/src/config.rs
@@ -55,7 +55,7 @@ pub enum Config {
    Selfstatus,
    Selfavatar,

-    #[strum(props(default = "1"))]
+    #[strum(props(default = "0"))]
    BccSelf,

    #[strum(props(default = "1"))]
@@ -184,12 +184,6 @@ pub enum Config {
    /// In a future versions, this switch may be removed.
    #[strum(props(default = "0"))]
    SendSyncMsgs,
-
-    /// Space-separated list of all the authserv-ids which we believe
-    /// may be the one of our email server.
-    ///
-    /// See `crate::authres::update_authservid_candidates`.
-    AuthservIdCandidates,
 }

 impl Context {
@@ -204,7 +198,7 @@ impl Context {
                let rel_path = self.sql.get_raw_config(key).await?;
                rel_path.map(|p| get_abs_path(self, &p).to_string_lossy().into_owned())
            }
-            Config::SysVersion => Some((*DC_VERSION_STR).clone()),
+            Config::SysVersion => Some((&*DC_VERSION_STR).clone()),
            Config::SysMsgsizeMaxRecommended => Some(format!("{}", RECOMMENDED_FILE_SIZE)),
            Config::SysConfigKeys => Some(get_config_keys_string()),
            _ => self.sql.get_raw_config(key).await?,
--- a/src/configure.rs
+++ b/src/configure.rs
@@ -196,7 +196,7 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
    }
    // no oauth? - just continue it's no error

-    let parsed = EmailAddress::new(&param.addr).context("Bad email-address")?;
+    let parsed: EmailAddress = param.addr.parse().context("Bad email-address")?;
    let param_domain = parsed.domain;
    let param_addr_urlencoded = utf8_percent_encode(&param.addr, NON_ALPHANUMERIC).to_string();

@@ -579,7 +579,8 @@ async fn try_imap_one_param(

    let (_s, r) = async_channel::bounded(1);

-    let mut imap = match Imap::new(param, socks5_config.clone(), addr, provider_strict_tls, r) {
+    let mut imap = match Imap::new(param, socks5_config.clone(), addr, provider_strict_tls, r).await
+    {
        Err(err) => {
            info!(context, "failure: {}", err);
            return Err(ConfigurationError {
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -167,11 +167,6 @@ pub const DC_MSG_ID_LAST_SPECIAL: u32 = 9;

 /// String that indicates that something is left out or truncated.
 pub const DC_ELLIPSIS: &str = "[...]";
-// how many lines desktop can display when fullscreen (fullscreen at zoomlevel 1x)
-// (taken from "subjective" testing what looks ok)
-pub const DC_DESIRED_TEXT_LINES: usize = 38;
-// how many chars desktop can display per line (from "subjective" testing)
-pub const DC_DESIRED_TEXT_LINE_LEN: usize = 100;

 /// Message length limit.
 ///
@@ -181,7 +176,7 @@ pub const DC_DESIRED_TEXT_LINE_LEN: usize = 100;
 ///
 /// Note that for simplicity maximum length is defined as the number of Unicode Scalar Values (Rust
 /// `char`s), not Unicode Grapheme Clusters.
-pub const DC_DESIRED_TEXT_LEN: usize = DC_DESIRED_TEXT_LINE_LEN * DC_DESIRED_TEXT_LINES;
+pub const DC_DESIRED_TEXT_LEN: usize = 5000;

 // Flags for empty server job

--- a/src/contact.rs
+++ b/src/contact.rs
@@ -1,20 +1,14 @@
 //! Contacts module

-use std::cmp::Reverse;
-use std::collections::BinaryHeap;
 use std::convert::{TryFrom, TryInto};
 use std::fmt;
 use std::path::PathBuf;
-use std::time::{SystemTime, UNIX_EPOCH};

 use anyhow::{bail, ensure, Context as _, Result};
-use async_channel::{self as channel, Receiver, Sender};
 use deltachat_derive::{FromSql, ToSql};
 use once_cell::sync::Lazy;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
-use tokio::task;
-use tokio::time::{timeout, Duration};

 use crate::aheader::EncryptPreference;
 use crate::chat::ChatId;
@@ -30,7 +24,7 @@ use crate::mimeparser::AvatarAction;
 use crate::param::{Param, Params};
 use crate::peerstate::{Peerstate, PeerstateVerifiedStatus};
 use crate::sql::{self, params_iter};
-use crate::tools::{duration_to_str, get_abs_path, improve_single_line_input, time, EmailAddress};
+use crate::tools::{get_abs_path, improve_single_line_input, time, EmailAddress};
 use crate::{chat, stock_str};

 /// Time during which a contact is considered as seen recently.
@@ -40,9 +34,7 @@ const SEEN_RECENTLY_SECONDS: i64 = 600;
 ///
 /// Some contact IDs are reserved to identify special contacts.  This
 /// type can represent both the special as well as normal contacts.
-#[derive(
-    Debug, Copy, Clone, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize,
-)]
+#[derive(Debug, Copy, Clone, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct ContactId(u32);

 impl ContactId {
@@ -514,9 +506,9 @@ impl Contact {
        let mut update_addr = false;
        let mut row_id = 0;

-        if let Some((id, row_name, row_addr, row_origin, row_authname)) = context
+        if let Ok((id, row_name, row_addr, row_origin, row_authname)) = context
            .sql
-            .query_row_optional(
+            .query_row(
                "SELECT id, name, addr, origin, authname \
            FROM contacts WHERE addr=? COLLATE NOCASE;",
                paramsv![addr.to_string()],
@@ -530,7 +522,7 @@ impl Contact {
                    Ok((row_id, row_name, row_addr, row_origin, row_authname))
                },
            )
-            .await?
+            .await
        {
            let update_name = manual && name != row_name;
            let update_authname = !manual
@@ -1191,7 +1183,7 @@ impl Contact {

 /// Returns false if addr is an invalid address, otherwise true.
 pub fn may_be_valid_addr(addr: &str) -> bool {
-    let res = EmailAddress::new(addr);
+    let res = addr.parse::<EmailAddress>();
    res.is_ok()
 }

@@ -1376,17 +1368,13 @@ pub(crate) async fn update_last_seen(
        "Can not update special contact last seen timestamp"
    );

-    if context
+    context
        .sql
        .execute(
            "UPDATE contacts SET last_seen = ?1 WHERE last_seen < ?1 AND id = ?2",
            paramsv![timestamp, contact_id],
        )
-        .await?
-        > 0
-    {
-        context.interrupt_recently_seen(contact_id, timestamp).await;
-    }
+        .await?;
    Ok(())
 }

@@ -1453,121 +1441,6 @@ fn split_address_book(book: &str) -> Vec<(&str, &str)> {
        .collect()
 }

-#[derive(Debug)]
-pub(crate) struct RecentlySeenInterrupt {
-    contact_id: ContactId,
-    timestamp: i64,
-}
-
-#[derive(Debug)]
-pub(crate) struct RecentlySeenLoop {
-    /// Task running "recently seen" loop.
-    handle: task::JoinHandle<()>,
-
-    interrupt_send: Sender<RecentlySeenInterrupt>,
-}
-
-impl RecentlySeenLoop {
-    pub(crate) fn new(context: Context) -> Self {
-        let (interrupt_send, interrupt_recv) = channel::bounded(1);
-
-        let handle = task::spawn(async move { Self::run(context, interrupt_recv).await });
-        Self {
-            handle,
-            interrupt_send,
-        }
-    }
-
-    async fn run(context: Context, interrupt: Receiver<RecentlySeenInterrupt>) {
-        type MyHeapElem = (Reverse<i64>, ContactId);
-
-        // Priority contains all recently seen sorted by the timestamp
-        // when they become not recently seen.
-        //
-        // Initialize with contacts which are currently seen, but will
-        // become unseen in the future.
-        let mut unseen_queue: BinaryHeap<MyHeapElem> = context
-            .sql
-            .query_map(
-                "SELECT id, last_seen FROM contacts
-                 WHERE last_seen > ?",
-                paramsv![time() - SEEN_RECENTLY_SECONDS],
-                |row| {
-                    let contact_id: ContactId = row.get("id")?;
-                    let last_seen: i64 = row.get("last_seen")?;
-                    Ok((Reverse(last_seen + SEEN_RECENTLY_SECONDS), contact_id))
-                },
-                |rows| {
-                    rows.collect::<std::result::Result<BinaryHeap<MyHeapElem>, _>>()
-                        .map_err(Into::into)
-                },
-            )
-            .await
-            .unwrap_or_default();
-
-        loop {
-            let now = SystemTime::now();
-
-            let (until, contact_id) =
-                if let Some((Reverse(timestamp), contact_id)) = unseen_queue.peek() {
-                    (
-                        UNIX_EPOCH
-                            + Duration::from_secs((*timestamp).try_into().unwrap_or(u64::MAX))
-                            + Duration::from_secs(1),
-                        Some(contact_id),
-                    )
-                } else {
-                    // Sleep for 24 hours.
-                    (now + Duration::from_secs(86400), None)
-                };
-
-            if let Ok(duration) = until.duration_since(now) {
-                info!(
-                    context,
-                    "Recently seen loop waiting for {} or interupt",
-                    duration_to_str(duration)
-                );
-
-                match timeout(duration, interrupt.recv()).await {
-                    Err(_) => {
-                        // Timeout, notify about contact.
-                        if let Some(contact_id) = contact_id {
-                            context.emit_event(EventType::ContactsChanged(Some(*contact_id)));
-                            unseen_queue.pop();
-                        }
-                    }
-                    Ok(Err(err)) => {
-                        warn!(
-                            context,
-                            "Error receiving an interruption in recently seen loop: {}", err
-                        );
-                    }
-                    Ok(Ok(RecentlySeenInterrupt {
-                        contact_id,
-                        timestamp,
-                    })) => {
-                        // Received an interrupt.
-                        unseen_queue.push((Reverse(timestamp + SEEN_RECENTLY_SECONDS), contact_id));
-                    }
-                }
-            }
-        }
-    }
-
-    pub(crate) fn interrupt(&self, contact_id: ContactId, timestamp: i64) {
-        self.interrupt_send
-            .try_send(RecentlySeenInterrupt {
-                contact_id,
-                timestamp,
-            })
-            .ok();
-    }
-
-    pub(crate) fn abort(self) {
-        self.handle.abort();
-    }
-}
-
 #[cfg(test)]
 mod tests {
    use super::*;
@@ -2405,7 +2278,7 @@ Hi."#;

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_was_seen_recently() -> Result<()> {
-        let mut tcm = TestContextManager::new();
+        let mut tcm = TestContextManager::new().await;
        let alice = tcm.alice().await;
        let bob = tcm.bob().await;

--- a/src/context.rs
+++ b/src/context.rs
@@ -23,159 +23,8 @@ use crate::quota::QuotaInfo;
 use crate::ratelimit::Ratelimit;
 use crate::scheduler::Scheduler;
 use crate::sql::Sql;
-use crate::stock_str::StockStrings;
 use crate::tools::{duration_to_str, time};

-/// Builder for the [`Context`].
-///
-/// Many arguments to the [`Context`] are kind of optional and only needed to handle
-/// multiple contexts, for which the [account manager](crate::accounts::Accounts) should be
-/// used.  This builder makes creating a new context simpler, especially for the
-/// standalone-context case.
-///
-/// # Examples
-///
-/// Creating a new unecrypted database:
-///
-/// ```
-/// # let rt = tokio::runtime::Runtime::new().unwrap();
-/// # rt.block_on(async move {
-/// use deltachat::context::ContextBuilder;
-///
-/// let dir = tempfile::tempdir().unwrap();
-/// let context = ContextBuilder::new(dir.path().join("db"))
-///      .open()
-///      .await
-///      .unwrap();
-/// drop(context);
-/// # });
-/// ```
-///
-/// To use an encrypted database provide a password.  If the database does not yet exist it
-/// will be created:
-///
-/// ```
-/// # let rt = tokio::runtime::Runtime::new().unwrap();
-/// # rt.block_on(async move {
-/// use deltachat::context::ContextBuilder;
-///
-/// let dir = tempfile::tempdir().unwrap();
-/// let context = ContextBuilder::new(dir.path().join("db"))
-///      .with_password("secret".into())
-///      .open()
-///      .await
-///      .unwrap();
-/// drop(context);
-/// # });
-/// ```
-#[derive(Clone, Debug)]
-pub struct ContextBuilder {
-    dbfile: PathBuf,
-    id: u32,
-    events: Events,
-    stock_strings: StockStrings,
-    password: Option<String>,
-}
-
-impl ContextBuilder {
-    /// Create the builder using the given database file.
-    ///
-    /// The *dbfile* should be in a dedicated directory and this directory must exist.  The
-    /// [`Context`] will create other files and folders in the same directory as the
-    /// database file used.
-    pub fn new(dbfile: PathBuf) -> Self {
-        ContextBuilder {
-            dbfile,
-            id: rand::random(),
-            events: Events::new(),
-            stock_strings: StockStrings::new(),
-            password: None,
-        }
-    }
-
-    /// Sets the context ID.
-    ///
-    /// This identifier is used e.g. in [`Event`]s to identify which [`Context`] an event
-    /// belongs to.  The only real limit on it is that it should not conflict with any other
-    /// [`Context`]s you currently have open.  So if you handle multiple [`Context`]s you
-    /// may want to use this.
-    ///
-    /// Note that the [account manager](crate::accounts::Accounts) is designed to handle the
-    /// common case for using multiple [`Context`] instances.
-    pub fn with_id(mut self, id: u32) -> Self {
-        self.id = id;
-        self
-    }
-
-    /// Sets the event channel for this [`Context`].
-    ///
-    /// Mostly useful when using multiple [`Context`]s, this allows creating one [`Events`]
-    /// channel and passing it to all [`Context`]s so all events are recieved on the same
-    /// channel.
-    ///
-    /// Note that the [account manager](crate::accounts::Accounts) is designed to handle the
-    /// common case for using multiple [`Context`] instances.
-    pub fn with_events(mut self, events: Events) -> Self {
-        self.events = events;
-        self
-    }
-
-    /// Sets the [`StockStrings`] map to use for this [`Context`].
-    ///
-    /// This is useful in order to share the same translation strings in all [`Context`]s.
-    /// The mapping may be empty when set, it will be populated by
-    /// [`Context::set_stock-translation`] or [`Accounts::set_stock_translation`] calls.
-    ///
-    /// Note that the [account manager](crate::accounts::Accounts) is designed to handle the
-    /// common case for using multiple [`Context`] instances.
-    ///
-    /// [`Accounts::set_stock_translation`]: crate::accounts::Accounts::set_stock_translation
-    pub fn with_stock_strings(mut self, stock_strings: StockStrings) -> Self {
-        self.stock_strings = stock_strings;
-        self
-    }
-
-    /// Sets the password to unlock the database.
-    ///
-    /// If an encrypted database is used it must be opened with a password.  Setting a
-    /// password on a new database will enable encryption.
-    pub fn with_password(mut self, password: String) -> Self {
-        self.password = Some(password);
-        self
-    }
-
-    /// Opens the [`Context`].
-    pub async fn open(self) -> Result<Context, ContextError> {
-        let context =
-            Context::new_closed(&self.dbfile, self.id, self.events, self.stock_strings).await?;
-        let password = self.password.unwrap_or_default();
-        match context.open(password).await? {
-            true => Ok(context),
-            false => Err(ContextError::DatabaseEncrypted),
-        }
-    }
-}
-
-#[non_exhaustive]
-#[derive(Debug, thiserror::Error)]
-pub enum ContextError {
-    #[error("database could not be decrypted, incorrect or missing password")]
-    DatabaseEncrypted,
-    #[error("failed to open context")]
-    Other(#[from] anyhow::Error),
-}
-
-/// The context for a single DeltaChat account.
-///
-/// This contains all the state for a single DeltaChat account, including background tasks
-/// running in Tokio to operate the account.  The [`Context`] can be cheaply cloned.
-///
-/// Each context, and thus each account, must be associated with an directory where all the
-/// state is kept.  This state is also preserved between restarts.
-///
-/// To use multiple accounts it is best to look at the [accounts
-/// manager][crate::accounts::Accounts] which handles storing multiple accounts in a single
-/// directory structure and handles loading them all concurrently.
 #[derive(Clone, Debug)]
 pub struct Context {
    pub(crate) inner: Arc<InnerContext>,
@@ -202,7 +51,7 @@ pub struct InnerContext {
    pub(crate) oauth2_mutex: Mutex<()>,
    /// Mutex to prevent a race condition when a "your pw is wrong" warning is sent, resulting in multiple messeges being sent.
    pub(crate) wrong_pw_warning_mutex: Mutex<()>,
-    pub(crate) translated_stockstrings: StockStrings,
+    pub(crate) translated_stockstrings: RwLock<HashMap<usize, String>>,
    pub(crate) events: Events,

    pub(crate) scheduler: RwLock<Option<Scheduler>>,
@@ -270,13 +119,8 @@ pub fn get_info() -> BTreeMap<&'static str, String> {

 impl Context {
    /// Creates new context and opens the database.
-    pub async fn new(
-        dbfile: &Path,
-        id: u32,
-        events: Events,
-        stock_strings: StockStrings,
-    ) -> Result<Context> {
-        let context = Self::new_closed(dbfile, id, events, stock_strings).await?;
+    pub async fn new(dbfile: &Path, id: u32, events: Events) -> Result<Context> {
+        let context = Self::new_closed(dbfile, id, events).await?;

        // Open the database if is not encrypted.
        if context.check_passphrase("".to_string()).await? {
@@ -286,12 +130,7 @@ impl Context {
    }

    /// Creates new context without opening the database.
-    pub async fn new_closed(
-        dbfile: &Path,
-        id: u32,
-        events: Events,
-        stockstrings: StockStrings,
-    ) -> Result<Context> {
+    pub async fn new_closed(dbfile: &Path, id: u32, events: Events) -> Result<Context> {
        let mut blob_fname = OsString::new();
        blob_fname.push(dbfile.file_name().unwrap_or_default());
        blob_fname.push("-blobs");
@@ -299,7 +138,7 @@ impl Context {
        if !blobdir.exists() {
            tokio::fs::create_dir_all(&blobdir).await?;
        }
-        let context = Context::with_blobdir(dbfile.into(), blobdir, id, events, stockstrings)?;
+        let context = Context::with_blobdir(dbfile.into(), blobdir, id, events).await?;
        Ok(context)
    }

@@ -330,12 +169,11 @@ impl Context {
        self.sql.check_passphrase(passphrase).await
    }

-    pub(crate) fn with_blobdir(
+    pub(crate) async fn with_blobdir(
        dbfile: PathBuf,
        blobdir: PathBuf,
        id: u32,
        events: Events,
-        stockstrings: StockStrings,
    ) -> Result<Context> {
        ensure!(
            blobdir.is_dir(),
@@ -352,7 +190,7 @@ impl Context {
            generating_key_mutex: Mutex::new(()),
            oauth2_mutex: Mutex::new(()),
            wrong_pw_warning_mutex: Mutex::new(()),
-            translated_stockstrings: stockstrings,
+            translated_stockstrings: RwLock::new(HashMap::new()),
            events,
            scheduler: RwLock::new(None),
            ratelimit: RwLock::new(Ratelimit::new(Duration::new(60, 0), 6.0)), // Allow to send 6 messages immediately, no more than once every 10 seconds.
@@ -508,7 +346,6 @@ impl Context {
        }
    }

-    #[allow(unused)]
    pub(crate) async fn shall_stop_ongoing(&self) -> bool {
        match &*self.running_state.read().await {
            RunningState::Running { .. } => false,
@@ -694,12 +531,6 @@ impl Context {
                .await?
                .to_string(),
        );
-        res.insert(
-            "authserv_id_candidates",
-            self.get_config(Config::AuthservIdCandidates)
-                .await?
-                .unwrap_or_default(),
-        );

        let elapsed = self.creation_time.elapsed();
        res.insert("uptime", duration_to_str(elapsed.unwrap_or_default()));
@@ -806,7 +637,7 @@ impl Context {
                        ON m.chat_id=c.id
                 WHERE m.chat_id>9
                   AND m.hidden=0
-                   AND c.blocked!=1
+                   AND c.blocked=0
                   AND ct.blocked=0
                   AND m.txt LIKE ?
                 ORDER BY m.id DESC LIMIT 1000",
@@ -859,8 +690,6 @@ mod tests {
    use crate::chat::{
        get_chat_contacts, get_chat_msgs, send_msg, set_muted, Chat, ChatId, MuteDuration,
    };
-    use crate::chatlist::Chatlist;
-    use crate::constants::Chattype;
    use crate::contact::ContactId;
    use crate::message::{Message, Viewtype};
    use crate::receive_imf::receive_imf;
@@ -876,7 +705,7 @@ mod tests {
        let tmp = tempfile::tempdir()?;
        let dbfile = tmp.path().join("db.sqlite");
        tokio::fs::write(&dbfile, b"123").await?;
-        let res = Context::new(&dbfile, 1, Events::new(), StockStrings::new()).await?;
+        let res = Context::new(&dbfile, 1, Events::new()).await?;

        // Broken database is indistinguishable from encrypted one.
        assert_eq!(res.is_open().await, false);
@@ -1022,9 +851,7 @@ mod tests {
    async fn test_blobdir_exists() {
        let tmp = tempfile::tempdir().unwrap();
        let dbfile = tmp.path().join("db.sqlite");
-        Context::new(&dbfile, 1, Events::new(), StockStrings::new())
-            .await
-            .unwrap();
+        Context::new(&dbfile, 1, Events::new()).await.unwrap();
        let blobdir = tmp.path().join("db.sqlite-blobs");
        assert!(blobdir.is_dir());
    }
@@ -1035,7 +862,7 @@ mod tests {
        let dbfile = tmp.path().join("db.sqlite");
        let blobdir = tmp.path().join("db.sqlite-blobs");
        tokio::fs::write(&blobdir, b"123").await.unwrap();
-        let res = Context::new(&dbfile, 1, Events::new(), StockStrings::new()).await;
+        let res = Context::new(&dbfile, 1, Events::new()).await;
        assert!(res.is_err());
    }

@@ -1045,9 +872,7 @@ mod tests {
        let subdir = tmp.path().join("subdir");
        let dbfile = subdir.join("db.sqlite");
        let dbfile2 = dbfile.clone();
-        Context::new(&dbfile, 1, Events::new(), StockStrings::new())
-            .await
-            .unwrap();
+        Context::new(&dbfile, 1, Events::new()).await.unwrap();
        assert!(subdir.is_dir());
        assert!(dbfile2.is_file());
    }
@@ -1057,7 +882,7 @@ mod tests {
        let tmp = tempfile::tempdir().unwrap();
        let dbfile = tmp.path().join("db.sqlite");
        let blobdir = PathBuf::new();
-        let res = Context::with_blobdir(dbfile, blobdir, 1, Events::new(), StockStrings::new());
+        let res = Context::with_blobdir(dbfile, blobdir, 1, Events::new()).await;
        assert!(res.is_err());
    }

@@ -1066,7 +891,7 @@ mod tests {
        let tmp = tempfile::tempdir().unwrap();
        let dbfile = tmp.path().join("db.sqlite");
        let blobdir = tmp.path().join("blobs");
-        let res = Context::with_blobdir(dbfile, blobdir, 1, Events::new(), StockStrings::new());
+        let res = Context::with_blobdir(dbfile, blobdir, 1, Events::new()).await;
        assert!(res.is_err());
    }

@@ -1196,59 +1021,6 @@ mod tests {
        Ok(())
    }

-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_search_unaccepted_requests() -> Result<()> {
-        let t = TestContext::new_alice().await;
-        receive_imf(
-            &t,
-            b"From: BobBar <bob@example.org>\n\
-                 To: alice@example.org\n\
-                 Subject: foo\n\
-                 Message-ID: <msg1234@example.org>\n\
-                 Chat-Version: 1.0\n\
-                 Date: Tue, 25 Oct 2022 13:37:00 +0000\n\
-                 \n\
-                 hello bob, foobar test!\n",
-            false,
-        )
-        .await?;
-        let chat_id = t.get_last_msg().await.get_chat_id();
-        let chat = Chat::load_from_db(&t, chat_id).await?;
-        assert_eq!(chat.get_type(), Chattype::Single);
-        assert!(chat.is_contact_request());
-
-        assert_eq!(Chatlist::try_load(&t, 0, None, None).await?.len(), 1);
-        assert_eq!(
-            Chatlist::try_load(&t, 0, Some("BobBar"), None).await?.len(),
-            1
-        );
-        assert_eq!(t.search_msgs(None, "foobar").await?.len(), 1);
-        assert_eq!(t.search_msgs(Some(chat_id), "foobar").await?.len(), 1);
-
-        chat_id.block(&t).await?;
-
-        assert_eq!(Chatlist::try_load(&t, 0, None, None).await?.len(), 0);
-        assert_eq!(
-            Chatlist::try_load(&t, 0, Some("BobBar"), None).await?.len(),
-            0
-        );
-        assert_eq!(t.search_msgs(None, "foobar").await?.len(), 0);
-        assert_eq!(t.search_msgs(Some(chat_id), "foobar").await?.len(), 0);
-
-        let contact_ids = get_chat_contacts(&t, chat_id).await?;
-        Contact::unblock(&t, *contact_ids.first().unwrap()).await?;
-
-        assert_eq!(Chatlist::try_load(&t, 0, None, None).await?.len(), 1);
-        assert_eq!(
-            Chatlist::try_load(&t, 0, Some("BobBar"), None).await?.len(),
-            1
-        );
-        assert_eq!(t.search_msgs(None, "foobar").await?.len(), 1);
-        assert_eq!(t.search_msgs(Some(chat_id), "foobar").await?.len(), 1);
-
-        Ok(())
-    }
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_limit_search_msgs() -> Result<()> {
        let alice = TestContext::new_alice().await;
@@ -1288,7 +1060,7 @@ mod tests {
        let dbfile = dir.path().join("db.sqlite");

        let id = 1;
-        let context = Context::new_closed(&dbfile, id, Events::new(), StockStrings::new())
+        let context = Context::new_closed(&dbfile, id, Events::new())
            .await
            .context("failed to create context")?;
        assert_eq!(context.open("foo".to_string()).await?, true);
@@ -1296,7 +1068,7 @@ mod tests {
        drop(context);

        let id = 2;
-        let context = Context::new(&dbfile, id, Events::new(), StockStrings::new())
+        let context = Context::new(&dbfile, id, Events::new())
            .await
            .context("failed to create context")?;
        assert_eq!(context.is_open().await, false);
--- a/src/decrypt.rs
+++ b/src/decrypt.rs
@@ -4,13 +4,12 @@ use std::collections::HashSet;

 use anyhow::{Context as _, Result};
 use mailparse::ParsedMail;
-use mailparse::SingleInfo;

 use crate::aheader::Aheader;
-use crate::authres;
-use crate::authres::handle_authres;
 use crate::contact::addr_cmp;
 use crate::context::Context;
+use crate::headerdef::HeaderDef;
+use crate::headerdef::HeaderDefMap;
 use crate::key::{DcKey, Fingerprint, SignedPublicKey, SignedSecretKey};
 use crate::keyring::Keyring;
 use crate::log::LogExt;
@@ -56,44 +55,35 @@ pub async fn try_decrypt(
    .await
 }

-pub async fn prepare_decryption(
+pub async fn create_decryption_info(
    context: &Context,
    mail: &ParsedMail<'_>,
-    from: &[SingleInfo],
    message_time: i64,
 ) -> Result<DecryptionInfo> {
-    let from = if let Some(f) = from.first() {
-        &f.addr
-    } else {
-        return Ok(DecryptionInfo::default());
-    };
+    let from = mail
+        .headers
+        .get_header(HeaderDef::From_)
+        .and_then(|from_addr| mailparse::addrparse_header(from_addr).ok())
+        .and_then(|from| from.extract_single_info())
+        .map(|from| from.addr)
+        .unwrap_or_default();

-    let autocrypt_header = Aheader::from_headers(from, &mail.headers)
+    let autocrypt_header = Aheader::from_headers(&from, &mail.headers)
        .ok_or_log_msg(context, "Failed to parse Autocrypt header")
        .flatten();

-    let dkim_results = handle_authres(context, mail, from, message_time).await?;
-
-    let peerstate = get_autocrypt_peerstate(
-        context,
-        from,
-        autocrypt_header.as_ref(),
-        message_time,
-        // Disallowing keychanges is disabled for now:
-        true, // dkim_results.allow_keychange,
-    )
-    .await?;
+    let peerstate =
+        get_autocrypt_peerstate(context, &from, autocrypt_header.as_ref(), message_time).await?;

    Ok(DecryptionInfo {
-        from: from.to_string(),
+        from,
        autocrypt_header,
        peerstate,
        message_time,
-        dkim_results,
    })
 }

-#[derive(Default, Debug)]
+#[derive(Debug)]
 pub struct DecryptionInfo {
    /// The From address. This is the address from the unnencrypted, outer
    /// From header.
@@ -106,7 +96,6 @@ pub struct DecryptionInfo {
    /// means out-of-order message arrival, We don't modify the
    /// peerstate in this case.
    pub message_time: i64,
-    pub(crate) dkim_results: authres::DkimResults,
 }

 /// Returns a reference to the encrypted payload of a ["Mixed
@@ -274,16 +263,12 @@ fn keyring_from_peerstate(peerstate: &Option<Peerstate>) -> Keyring<SignedPublic
 /// If we already know this fingerprint from another contact's peerstate, return that
 /// peerstate in order to make AEAP work, but don't save it into the db yet.
 ///
-/// The param `allow_change` is used to prevent the autocrypt key from being changed
-/// if we suspect that the message may be forged and have a spoofed sender identity.
-///
 /// Returns updated peerstate.
 pub(crate) async fn get_autocrypt_peerstate(
    context: &Context,
    from: &str,
    autocrypt_header: Option<&Aheader>,
    message_time: i64,
-    allow_change: bool,
 ) -> Result<Option<Peerstate>> {
    let mut peerstate;

@@ -304,15 +289,8 @@ 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(header, message_time);
-                    peerstate.save_to_db(&context.sql, false).await?;
-                } else {
-                    info!(
-                        context,
-                        "Refusing to update existing peerstate of {}", &peerstate.addr
-                    );
-                }
+                peerstate.apply_header(header, message_time);
+                peerstate.save_to_db(&context.sql, false).await?;
            }
            // If `peerstate.addr` and `from` differ, this means that
            // someone is using the same key but a different addr, probably
--- a/src/download.rs
+++ b/src/download.rs
@@ -11,7 +11,7 @@ use crate::imap::{Imap, ImapActionResult};
 use crate::job::{self, Action, Job, Status};
 use crate::message::{Message, MsgId, Viewtype};
 use crate::mimeparser::{MimeMessage, Part};
-use crate::param::Params;
+use crate::param::{Param, Params};
 use crate::tools::time;
 use crate::{job_try, stock_str, EventType};
 use std::cmp::max;
@@ -69,6 +69,42 @@ impl Context {
            Ok(Some(max(MIN_DOWNLOAD_LIMIT, download_limit as u32)))
        }
    }
+
+    // Merges the two messages to `placeholder_msg_id`;
+    // `full_msg_id` is no longer used afterwards.
+    pub(crate) async fn merge_messages(
+        &self,
+        full_msg_id: MsgId,
+        placeholder_msg_id: MsgId,
+    ) -> Result<()> {
+        let placeholder = Message::load_from_db(self, placeholder_msg_id).await?;
+        self.sql
+            .transaction(move |transaction| {
+                transaction
+                    .execute("DELETE FROM msgs WHERE id=?;", paramsv![placeholder_msg_id])?;
+                transaction.execute(
+                    "UPDATE msgs SET id=? WHERE id=?",
+                    paramsv![placeholder_msg_id, full_msg_id],
+                )?;
+                Ok(())
+            })
+            .await?;
+        let mut full = Message::load_from_db(self, placeholder_msg_id).await?;
+
+        for key in [
+            Param::WebxdcSummary,
+            Param::WebxdcSummaryTimestamp,
+            Param::WebxdcDocument,
+            Param::WebxdcDocumentTimestamp,
+        ] {
+            if let Some(value) = placeholder.param.get(key) {
+                full.param.set(key, value);
+            }
+        }
+        full.update_param(self).await?;
+
+        Ok(())
+    }
 }

 impl MsgId {
--- a/src/ephemeral.rs
+++ b/src/ephemeral.rs
@@ -36,21 +36,15 @@
 //!
 //! ## How messages are deleted
 //!
-//! When Delta Chat deletes the message locally, it moves the message
-//! to the trash chat and removes actual message contents. Messages in
-//! the trash chat are called "tombstones" and track the Message-ID to
-//! prevent accidental redownloading of the message from the server,
-//! e.g. in case of UID validity change.
-//!
-//! Vice versa, when Delta Chat deletes the message from the server,
-//! it removes IMAP folder and UID row from the `imap` table, but
-//! keeps the message in the `msgs` table.
-//!
-//! Delta Chat eventually removes tombstones from the `msgs` table,
-//! leaving no trace of the message, when it thinks there are no more
-//! copies of the message stored on the server, i.e. when there is no
-//! corresponding `imap` table entry. This is done in the
-//! `prune_tombstones()` procedure during housekeeping.
+//! When the message is deleted locally, its contents is removed and
+//! it is moved to the trash chat. This database entry is then used to
+//! track the Message-ID and corresponding IMAP folder and UID until
+//! the message is deleted from the server. Vice versa, when device
+//! deletes the message from the server, it removes IMAP folder and
+//! UID information, but keeps the message contents. When database
+//! entry is both moved to trash chat and does not contain UID
+//! information, it is deleted from the database, leaving no trace of
+//! the message.
 //!
 //! ## When messages are deleted
 //!
@@ -332,35 +326,35 @@ pub(crate) async fn start_ephemeral_timers_msgids(
    Ok(())
 }

-/// Selects messages which are expired according to
+/// Deletes messages which are expired according to
 /// `delete_device_after` setting or `ephemeral_timestamp` column.
 ///
-/// For each message a row ID, chat id and viewtype is returned.
-async fn select_expired_messages(
-    context: &Context,
-    now: i64,
-) -> Result<Vec<(MsgId, ChatId, Viewtype)>> {
-    let mut rows = context
+/// Returns true if any message is deleted, so caller can emit
+/// MsgsChanged event. If nothing has been deleted, returns
+/// false. This function does not emit the MsgsChanged event itself,
+/// because it is also called when chatlist is reloaded, and emitting
+/// MsgsChanged there will cause infinite reload loop.
+pub(crate) async fn delete_expired_messages(context: &Context, now: i64) -> Result<()> {
+    let mut updated = context
        .sql
-        .query_map(
+        .execute(
+            // If you change which information is removed here, also change MsgId::trash() and
+            // which information receive_imf::add_parts() still adds to the db if the chat_id is TRASH
            r#"
-SELECT id, chat_id, type
-FROM msgs
+UPDATE msgs
+SET 
+  chat_id=?, txt='', subject='', txt_raw='', 
+  mime_headers='', from_id=0, to_id=0, param=''
 WHERE
  ephemeral_timestamp != 0
  AND ephemeral_timestamp <= ?
  AND chat_id != ?
 "#,
-            paramsv![now, DC_CHAT_ID_TRASH],
-            |row| {
-                let id: MsgId = row.get("id")?;
-                let chat_id: ChatId = row.get("chat_id")?;
-                let viewtype: Viewtype = row.get("type")?;
-                Ok((id, chat_id, viewtype))
-            },
-            |rows| rows.collect::<Result<Vec<_>, _>>().map_err(Into::into),
+            paramsv![DC_CHAT_ID_TRASH, now, DC_CHAT_ID_TRASH],
        )
-        .await?;
+        .await
+        .context("update failed")?
+        > 0;

    if let Some(delete_device_after) = context.get_config_delete_device_after().await? {
        let self_chat_id = ChatId::lookup_by_contact(context, ContactId::SELF)
@@ -372,81 +366,36 @@ WHERE

        let threshold_timestamp = now.saturating_sub(delete_device_after);

-        let rows_expired = context
+        // Delete expired messages
+        //
+        // Only update the rows that have to be updated, to avoid emitting
+        // unnecessary "chat modified" events.
+        let rows_modified = context
            .sql
-            .query_map(
-                r#"
-SELECT id, chat_id, type
-FROM msgs
-WHERE
-  timestamp < ?
-  AND chat_id > ?
-  AND chat_id != ?
-  AND chat_id != ?
-"#,
+            .execute(
+                "UPDATE msgs \
+             SET chat_id = ?, txt = '', subject='', txt_raw='', \
+                 mime_headers='', from_id=0, to_id=0, param='' \
+             WHERE timestamp < ? \
+             AND chat_id > ? \
+             AND chat_id != ? \
+             AND chat_id != ?",
                paramsv![
+                    DC_CHAT_ID_TRASH,
                    threshold_timestamp,
                    DC_CHAT_ID_LAST_SPECIAL,
                    self_chat_id,
                    device_chat_id
                ],
-                |row| {
-                    let id: MsgId = row.get("id")?;
-                    let chat_id: ChatId = row.get("chat_id")?;
-                    let viewtype: Viewtype = row.get("type")?;
-                    Ok((id, chat_id, viewtype))
-                },
-                |rows| rows.collect::<Result<Vec<_>, _>>().map_err(Into::into),
-            )
-            .await?;
-
-        rows.extend(rows_expired);
-    }
-
-    Ok(rows)
-}
-
-/// Deletes messages which are expired according to
-/// `delete_device_after` setting or `ephemeral_timestamp` column.
-///
-/// Emits relevant `MsgsChanged` and `WebxdcInstanceDeleted` events
-/// if messages are deleted.
-pub(crate) async fn delete_expired_messages(context: &Context, now: i64) -> Result<()> {
-    let rows = select_expired_messages(context, now).await?;
-
-    if !rows.is_empty() {
-        context
-            .sql
-            .execute(
-                // If you change which information is removed here, also change MsgId::trash() and
-                // which information receive_imf::add_parts() still adds to the db if the chat_id is TRASH
-                &format!(
-                    r#"
-UPDATE msgs
-SET
-  chat_id=?, txt='', subject='', txt_raw='',
-  mime_headers='', from_id=0, to_id=0, param=''
-WHERE id IN ({})
-"#,
-                    sql::repeat_vars(rows.len())
-                ),
-                rusqlite::params_from_iter(
-                    std::iter::once(&DC_CHAT_ID_TRASH as &dyn crate::ToSql).chain(
-                        rows.iter()
-                            .map(|(msg_id, _chat_id, _viewtype)| msg_id as &dyn crate::ToSql),
-                    ),
-                ),
            )
            .await
-            .context("update failed")?;
+            .context("deleted update failed")?;

-        for (msg_id, chat_id, viewtype) in rows {
-            context.emit_msgs_changed(chat_id, msg_id);
+        updated |= rows_modified > 0;
+    }

-            if viewtype == Viewtype::Webxdc {
-                context.emit_event(EventType::WebxdcInstanceDeleted { msg_id });
-            }
-        }
+    if updated {
+        context.emit_msgs_changed_without_ids();
    }

    Ok(())
@@ -1001,19 +950,6 @@ mod tests {

        assert!(next_expiration < deleted_at);
        delete_expired_messages(t, deleted_at).await?;
-        t.evtracker
-            .get_matching(|evt| {
-                if let EventType::MsgsChanged {
-                    msg_id: event_msg_id,
-                    ..
-                } = evt
-                {
-                    *event_msg_id == msg_id
-                } else {
-                    false
-                }
-            })
-            .await;

        let loaded = Message::load_from_db(t, msg_id).await?;
        assert_eq!(loaded.text.unwrap(), "");
--- a/src/events.rs
+++ b/src/events.rs
@@ -173,13 +173,6 @@ pub enum EventType {
        msg_id: MsgId,
    },

-    /// Reactions for the message changed.
-    ReactionsChanged {
-        chat_id: ChatId,
-        msg_id: MsgId,
-        contact_id: ContactId,
-    },
-
    /// There is a fresh message. Typically, the user will show an notification
    /// when receiving this message.
    ///
@@ -189,10 +182,6 @@ pub enum EventType {
        msg_id: MsgId,
    },

-    IncomingMsgBunch {
-        msg_ids: Vec<MsgId>,
-    },
-
    /// Messages were seen or noticed.
    /// chat id is always set.
    MsgsNoticed(ChatId),
@@ -318,4 +307,12 @@ pub enum EventType {
    WebxdcInstanceDeleted {
        msg_id: MsgId,
    },
+
+    WebxdcBusyUpdating {
+        msg_id: MsgId,
+    },
+
+    WebxdcUpToDate {
+        msg_id: MsgId,
+    },
 }
--- a/src/headerdef.rs
+++ b/src/headerdef.rs
@@ -63,11 +63,6 @@ pub enum HeaderDef {
    Sender,
    EphemeralTimer,
    Received,
-
-    /// A header that includes the results of the DKIM, SPF and DMARC checks.
-    /// See <https://datatracker.ietf.org/doc/html/rfc8601>
-    AuthenticationResults,
-
    _TestHeader,
 }

--- a/src/html.rs
+++ b/src/html.rs
@@ -94,11 +94,11 @@ impl HtmlMsgParser {

        let parsedmail = mailparse::parse_mail(rawmime)?;

-        parser.collect_texts_recursive(&parsedmail).await?;
+        parser.collect_texts_recursive(context, &parsedmail).await?;

        if parser.html.is_empty() {
            if let Some(plain) = &parser.plain {
-                parser.html = plain.to_html();
+                parser.html = plain.to_html().await;
            }
        } else {
            parser.cid_to_data_recursive(context, &parsedmail).await?;
@@ -117,6 +117,7 @@ impl HtmlMsgParser {
    /// therefore we use the first one.
    fn collect_texts_recursive<'a>(
        &'a mut self,
+        context: &'a Context,
        mail: &'a mailparse::ParsedMail<'a>,
    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a + Send>> {
        // Boxed future to deal with recursion
@@ -124,7 +125,7 @@ impl HtmlMsgParser {
            match get_mime_multipart_type(&mail.ctype) {
                MimeMultipartType::Multiple => {
                    for cur_data in mail.subparts.iter() {
-                        self.collect_texts_recursive(cur_data).await?
+                        self.collect_texts_recursive(context, cur_data).await?
                    }
                    Ok(())
                }
@@ -134,7 +135,7 @@ impl HtmlMsgParser {
                        return Ok(());
                    }
                    let mail = mailparse::parse_mail(&raw).context("failed to parse mail")?;
-                    self.collect_texts_recursive(&mail).await
+                    self.collect_texts_recursive(context, &mail).await
                }
                MimeMultipartType::Single => {
                    let mimetype = mail.ctype.mimetype.parse::<Mime>()?;
@@ -206,7 +207,7 @@ impl HtmlMsgParser {
                                        Ok(re) => {
                                            self.html = re
                                                .replace_all(
-                                                    &self.html,
+                                                    &*self.html,
                                                    format!("${{1}}{}${{3}}", replacement).as_str(),
                                                )
                                                .as_ref()
--- a/src/imap.rs
+++ b/src/imap.rs
@@ -237,7 +237,7 @@ impl Imap {
    /// Creates new disconnected IMAP client using the specific login parameters.
    ///
    /// `addr` is used to renew token if OAuth2 authentication is used.
-    pub fn new(
+    pub async fn new(
        lp: &ServerLoginParam,
        socks5_config: Option<Socks5Config>,
        addr: &str,
@@ -303,7 +303,8 @@ impl Imap {
                    provider.strict_tls
                }),
            idle_interrupt,
-        )?;
+        )
+        .await?;
        Ok(imap)
    }

@@ -902,12 +903,6 @@ impl Imap {

        info!(context, "{} mails read from \"{}\".", read_cnt, folder);

-        let msg_ids = received_msgs
-            .iter()
-            .flat_map(|m| m.msg_ids.clone())
-            .collect();
-        context.emit_event(EventType::IncomingMsgBunch { msg_ids });
-
        chat::mark_old_messages_as_noticed(context, received_msgs).await?;

        Ok(read_cnt > 0)
@@ -2163,8 +2158,8 @@ pub(crate) async fn set_uid_next(context: &Context, folder: &str, uid_next: u32)
        .sql
        .execute(
            "INSERT INTO imap_sync (folder, uid_next) VALUES (?,?)
-                ON CONFLICT(folder) DO UPDATE SET uid_next=excluded.uid_next",
-            paramsv![folder, uid_next],
+                ON CONFLICT(folder) DO UPDATE SET uid_next=? WHERE folder=?;",
+            paramsv![folder, uid_next, uid_next, folder],
        )
        .await?;
    Ok(())
@@ -2195,8 +2190,8 @@ pub(crate) async fn set_uidvalidity(
        .sql
        .execute(
            "INSERT INTO imap_sync (folder, uidvalidity) VALUES (?,?)
-                ON CONFLICT(folder) DO UPDATE SET uidvalidity=excluded.uidvalidity",
-            paramsv![folder, uidvalidity],
+                ON CONFLICT(folder) DO UPDATE SET uidvalidity=? WHERE folder=?;",
+            paramsv![folder, uidvalidity, uidvalidity, folder],
        )
        .await?;
    Ok(())
@@ -2218,8 +2213,8 @@ pub(crate) async fn set_modseq(context: &Context, folder: &str, modseq: u64) ->
        .sql
        .execute(
            "INSERT INTO imap_sync (folder, modseq) VALUES (?,?)
-                ON CONFLICT(folder) DO UPDATE SET modseq=excluded.modseq",
-            paramsv![folder, modseq],
+                ON CONFLICT(folder) DO UPDATE SET modseq=? WHERE folder=?;",
+            paramsv![folder, modseq, modseq, folder],
        )
        .await?;
    Ok(())
--- a/src/imex.rs
+++ b/src/imex.rs
@@ -6,7 +6,7 @@ use std::path::{Path, PathBuf};

 use ::pgp::types::KeyTrait;
 use anyhow::{bail, ensure, format_err, Context as _, Result};
-use futures::StreamExt;
+use futures::{StreamExt, TryStreamExt};
 use futures_lite::FutureExt;
 use rand::{thread_rng, Rng};
 use tokio::fs::{self, File};
@@ -17,6 +17,7 @@ use crate::chat::{self, delete_and_reset_all_device_msgs, ChatId};
 use crate::config::Config;
 use crate::contact::ContactId;
 use crate::context::Context;
+use crate::e2ee;
 use crate::events::EventType;
 use crate::key::{self, DcKey, DcSecretKey, SignedPublicKey, SignedSecretKey};
 use crate::log::LogExt;
@@ -30,7 +31,6 @@ use crate::tools::{
    create_folder, delete_file, get_filesuffix_lc, open_file_std, read_file, time, write_file,
    EmailAddress,
 };
-use crate::{e2ee, tools};

 // Name of the database file in the backup.
 const DBFILE_BACKUP_NAME: &str = "dc_database_backup.sqlite";
@@ -134,9 +134,19 @@ pub async fn has_backup(_context: &Context, dir_name: &Path) -> Result<String> {
 }

 /// Initiates key transfer via Autocrypt Setup Message.
-///
-/// Returns setup code.
 pub async fn initiate_key_transfer(context: &Context) -> Result<String> {
+    use futures::future::FutureExt;
+
+    let cancel = context.alloc_ongoing().await?;
+    let res = do_initiate_key_transfer(context)
+        .race(cancel.recv().map(|_| Err(format_err!("canceled"))))
+        .await;
+
+    context.free_ongoing().await;
+    res
+}
+
+async fn do_initiate_key_transfer(context: &Context) -> Result<String> {
    let setup_code = create_setup_code(context);
    /* this may require a keypair to be created. this may take a second ... */
    let setup_file_content = render_setup_file(context, &setup_code).await?;
@@ -161,7 +171,17 @@ pub async fn initiate_key_transfer(context: &Context) -> Result<String> {
    msg.force_plaintext();
    msg.param.set_int(Param::SkipAutocrypt, 1);

-    chat::send_msg(context, chat_id, &mut msg).await?;
+    let msg_id = chat::send_msg(context, chat_id, &mut msg).await?;
+    info!(context, "Wait for setup message being sent ...",);
+    while !context.shall_stop_ongoing().await {
+        tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+        if let Ok(msg) = Message::load_from_db(context, msg_id).await {
+            if msg.is_sent() {
+                info!(context, "... setup message sent.",);
+                break;
+            }
+        }
+    }
    // no maybe_add_bcc_self_device_msg() here.
    // the ui shows the dialog with the setup code on this device,
    // it would be too much noise to have two things popping up at the same time.
@@ -576,7 +596,10 @@ async fn export_backup_inner(
        .append_path_with_name(temp_db_path, DBFILE_BACKUP_NAME)
        .await?;

-    let read_dir = tools::read_dir(context.get_blobdir()).await?;
+    let read_dir: Vec<_> =
+        tokio_stream::wrappers::ReadDirStream::new(fs::read_dir(context.get_blobdir()).await?)
+            .try_collect()
+            .await?;
    let count = read_dir.len();
    let mut written_files = 0;

@@ -957,10 +980,16 @@ mod tests {
    async fn test_key_transfer() -> Result<()> {
        let alice = TestContext::new_alice().await;

-        let setup_code = initiate_key_transfer(&alice).await?;
+        let alice_clone = alice.clone();
+        let key_transfer_task = tokio::task::spawn(async move {
+            let ctx = alice_clone;
+            initiate_key_transfer(&ctx).await
+        });

-        // Get Autocrypt Setup Message.
+        // Wait for the message to be added to the queue.
+        tokio::time::sleep(std::time::Duration::from_secs(1)).await;
        let sent = alice.pop_sent_msg().await;
+        let setup_code = key_transfer_task.await??;

        // Alice sets up a second device.
        let alice2 = TestContext::new().await;
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -18,11 +18,7 @@
    clippy::mixed_read_write_in_expression,
    clippy::bool_assert_comparison,
    clippy::manual_split_once,
-    clippy::format_push_string,
-    clippy::bool_to_int_with_if,
-    // This lint can be re-enabled once we don't target
-    // Rust 1.56 anymore:
-    clippy::collapsible_str_replace
+    clippy::format_push_string
 )]

 #[macro_use]
@@ -97,7 +93,6 @@ mod update_helper;
 pub mod webxdc;
 #[macro_use]
 mod dehtml;
-mod authres;
 mod color;
 pub mod html;
 pub mod plaintext;
@@ -108,7 +103,6 @@ pub mod receive_imf;
 pub mod tools;

 pub mod accounts;
-pub mod reaction;

 /// if set imap/incoming and smtp/outgoing MIME messages will be printed
 pub const DCC_MIME_DEBUG: &str = "DCC_MIME_DEBUG";
--- a/src/login_param.rs
+++ b/src/login_param.rs
@@ -15,7 +15,7 @@ use crate::constants::{DC_LP_AUTH_FLAGS, DC_LP_AUTH_NORMAL, DC_LP_AUTH_OAUTH2};
 use crate::provider::{get_provider_by_id, Provider};
 use crate::{context::Context, provider::Socket};

-#[derive(Copy, Clone, Debug, Display, FromPrimitive, ToPrimitive, PartialEq, Eq)]
+#[derive(Copy, Clone, Debug, Display, FromPrimitive, PartialEq, Eq)]
 #[repr(u32)]
 #[strum(serialize_all = "snake_case")]
 pub enum CertificateChecks {
--- a/src/message.rs
+++ b/src/message.rs
@@ -22,7 +22,6 @@ use crate::imap::markseen_on_imap_table;
 use crate::mimeparser::{parse_message_id, DeliveryReport, SystemMessage};
 use crate::param::{Param, Params};
 use crate::pgp::split_armored_data;
-use crate::reaction::get_msg_reactions;
 use crate::scheduler::InterruptInfo;
 use crate::sql;
 use crate::stock_str;
@@ -726,7 +725,7 @@ impl Message {
        self.text = text;
    }

-    pub fn set_file(&mut self, file: impl ToString, filemime: Option<&str>) {
+    pub fn set_file(&mut self, file: impl AsRef<str>, filemime: Option<&str>) {
        self.param.set(Param::File, file);
        if let Some(filemime) = filemime {
            self.param.set(Param::MimeType, filemime);
@@ -752,11 +751,6 @@ impl Message {
        self.param.set_int(Param::Duration, duration);
    }

-    /// Marks the message as reaction.
-    pub(crate) fn set_reaction(&mut self) {
-        self.param.set_int(Param::Reaction, 1);
-    }
-
    pub async fn latefiling_mediasize(
        &mut self,
        context: &Context,
@@ -1088,11 +1082,6 @@ pub async fn get_msg_info(context: &Context, msg_id: MsgId) -> Result<String> {

    ret += "\n";

-    let reactions = get_msg_reactions(context, msg_id).await?;
-    if !reactions.is_empty() {
-        ret += &format!("Reactions: {}\n", reactions);
-    }
-
    if let Some(error) = msg.error.as_ref() {
        ret += &format!("Error: {}", error);
    }
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -183,10 +183,7 @@ impl<'a> MimeFactory<'a> {
                )
                .await?;

-            if !msg.is_system_message()
-                && msg.param.get_int(Param::Reaction).unwrap_or_default() == 0
-                && context.get_config_bool(Config::MdnsEnabled).await?
-            {
+            if !msg.is_system_message() && context.get_config_bool(Config::MdnsEnabled).await? {
                req_mdn = true;
            }
        }
@@ -1125,11 +1122,6 @@ impl<'a> MimeFactory<'a> {
                "text/plain; charset=utf-8; format=flowed; delsp=no".to_string(),
            ))
            .body(message_text);
-
-        if self.msg.param.get_int(Param::Reaction).unwrap_or_default() != 0 {
-            main_part = main_part.header(("Content-Disposition", "reaction"));
-        }
-
        let mut parts = Vec::new();

        // add HTML-part, this is needed only if a HTML-message from a non-delta-client is forwarded;
@@ -1185,17 +1177,17 @@ impl<'a> MimeFactory<'a> {
        if command == SystemMessage::MultiDeviceSync && self.is_e2ee_guaranteed() {
            let json = self.msg.param.get(Param::Arg).unwrap_or_default();
            let ids = self.msg.param.get(Param::Arg2).unwrap_or_default();
-            parts.push(context.build_sync_part(json.to_string()));
+            parts.push(context.build_sync_part(json.to_string()).await);
            self.sync_ids_to_delete = Some(ids.to_string());
        } else if command == SystemMessage::WebxdcStatusUpdate {
            let json = self.msg.param.get(Param::Arg).unwrap_or_default();
-            parts.push(context.build_status_update_part(json));
+            parts.push(context.build_status_update_part(json).await);
        } else if self.msg.viewtype == Viewtype::Webxdc {
            if let Some(json) = context
                .render_webxdc_status_update_object(self.msg.id, None)
                .await?
            {
-                parts.push(context.build_status_update_part(&json));
+                parts.push(context.build_status_update_part(&json).await);
            }
        }

@@ -1311,7 +1303,7 @@ impl<'a> MimeFactory<'a> {
 /// This line length limit is an
 /// [RFC5322 requirement](https://tools.ietf.org/html/rfc5322#section-2.1.1).
 fn wrapped_base64_encode(buf: &[u8]) -> String {
-    let base64 = base64::encode(buf);
+    let base64 = base64::encode(&buf);
    let mut chars = base64.chars();
    std::iter::repeat_with(|| chars.by_ref().take(78).collect::<String>())
        .take_while(|s| !s.is_empty())
--- a/src/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -12,10 +12,10 @@ use once_cell::sync::Lazy;

 use crate::aheader::Aheader;
 use crate::blob::BlobObject;
-use crate::constants::{DC_DESIRED_TEXT_LINES, DC_DESIRED_TEXT_LINE_LEN};
+use crate::constants::{DC_DESIRED_TEXT_LEN, DC_ELLIPSIS};
 use crate::contact::{addr_cmp, addr_normalize, ContactId};
 use crate::context::Context;
-use crate::decrypt::{prepare_decryption, try_decrypt};
+use crate::decrypt::{create_decryption_info, try_decrypt};
 use crate::dehtml::dehtml;
 use crate::events::EventType;
 use crate::format_flowed::unformat_flowed;
@@ -28,7 +28,7 @@ use crate::peerstate::Peerstate;
 use crate::simplify::{simplify, SimplifiedText};
 use crate::stock_str;
 use crate::sync::SyncItems;
-use crate::tools::{get_filemeta, parse_receive_headers, truncate_by_lines};
+use crate::tools::{get_filemeta, parse_receive_headers, truncate};

 /// A parsed MIME message.
 ///
@@ -178,7 +178,7 @@ impl MimeMessage {
            .get_header_value(HeaderDef::Date)
            .and_then(|v| mailparse::dateparse(&v).ok())
            .unwrap_or_default();
-        let mut hop_info = parse_receive_headers(&mail.get_headers());
+        let hop_info = parse_receive_headers(&mail.get_headers());

        let mut headers = Default::default();
        let mut recipients = Default::default();
@@ -220,9 +220,7 @@ impl MimeMessage {
        let mut mail_raw = Vec::new();
        let mut gossiped_addr = Default::default();
        let mut from_is_signed = false;
-        let mut decryption_info = prepare_decryption(context, &mail, &from, message_time).await?;
-        hop_info += "\n\n";
-        hop_info += &decryption_info.dkim_results.to_string();
+        let mut decryption_info = create_decryption_info(context, &mail, message_time).await?;

        // `signatures` is non-empty exactly if the message was encrypted and correctly signed.
        let (mail, signatures, warn_empty_signature) =
@@ -298,8 +296,6 @@ impl MimeMessage {
                    if let Some(peerstate) = &mut decryption_info.peerstate {
                        if message_time > peerstate.last_seen_autocrypt
                            && mail.ctype.mimetype != "multipart/report"
-                        // Disallowing keychanges is disabled for now:
-                        // && decryption_info.dkim_results.allow_keychange
                        {
                            peerstate.degrade_encryption(message_time);
                            peerstate.save_to_db(&context.sql, false).await?;
@@ -373,12 +369,6 @@ impl MimeMessage {
        parser.heuristically_parse_ndn(context).await;
        parser.parse_headers(context).await?;

-        // Disallowing keychanges is disabled for now
-        // if !decryption_info.dkim_results.allow_keychange {
-        //     for part in parser.parts.iter_mut() {
-        //         part.error = Some("Seems like DKIM failed, this either is an attack or (more likely) a bug in Authentication-Results checking. Please tell us about this at https://support.delta.chat.".to_string());
-        //     }
-        // }
        if warn_empty_signature && parser.signatures.is_empty() {
            for part in parser.parts.iter_mut() {
                part.error = Some("No valid signature".to_string());
@@ -402,10 +392,15 @@ impl MimeMessage {
    /// Parses system messages.
    fn parse_system_message_headers(&mut self, context: &Context) {
        if self.get_header(HeaderDef::AutocryptSetupMessage).is_some() {
-            self.parts.retain(|part| {
-                part.mimetype.is_none()
-                    || part.mimetype.as_ref().unwrap().as_ref() == MIME_AC_SETUP_FILE
-            });
+            self.parts = self
+                .parts
+                .iter()
+                .filter(|part| {
+                    part.mimetype.is_none()
+                        || part.mimetype.as_ref().unwrap().as_ref() == MIME_AC_SETUP_FILE
+                })
+                .cloned()
+                .collect();

            if self.parts.len() == 1 {
                self.is_system_message = SystemMessage::AutocryptSetupMessage;
@@ -561,10 +556,7 @@ impl MimeMessage {
            }

            if prepend_subject && !subject.is_empty() {
-                let part_with_text = self
-                    .parts
-                    .iter_mut()
-                    .find(|part| !part.msg.is_empty() && !part.is_reaction);
+                let part_with_text = self.parts.iter_mut().find(|part| !part.msg.is_empty());
                if let Some(mut part) = part_with_text {
                    part.msg = format!("{} – {}", subject, part.msg);
                }
@@ -926,7 +918,6 @@ impl MimeMessage {
        Ok(any_part_added)
    }

-    /// Returns true if any part was added, false otherwise.
    async fn add_single_part_if_known(
        &mut self,
        context: &Context,
@@ -960,30 +951,6 @@ impl MimeMessage {
                        warn!(context, "Missing attachment");
                        return Ok(false);
                    }
-                    mime::TEXT
-                        if mail.get_content_disposition().disposition
-                            == DispositionType::Extension("reaction".to_string()) =>
-                    {
-                        // Reaction.
-                        let decoded_data = match mail.get_body() {
-                            Ok(decoded_data) => decoded_data,
-                            Err(err) => {
-                                warn!(context, "Invalid body parsed {:?}", err);
-                                // Note that it's not always an error - might be no data
-                                return Ok(false);
-                            }
-                        };
-
-                        let part = Part {
-                            typ: Viewtype::Text,
-                            mimetype: Some(mime_type),
-                            msg: decoded_data,
-                            is_reaction: true,
-                            ..Default::default()
-                        };
-                        self.do_add_single_part(part);
-                        return Ok(true);
-                    }
                    mime::TEXT | mime::HTML => {
                        let decoded_data = match mail.get_body() {
                            Ok(decoded_data) => decoded_data,
@@ -1045,15 +1012,14 @@ impl MimeMessage {
                            (simplified_txt, top_quote)
                        };

-                        // Truncate text if it has too many lines
-                        let (simplified_txt, was_truncated) = truncate_by_lines(
-                            simplified_txt,
-                            DC_DESIRED_TEXT_LINES,
-                            DC_DESIRED_TEXT_LINE_LEN,
-                        );
-                        if was_truncated {
-                            self.is_mime_modified = was_truncated;
-                        }
+                        let simplified_txt = if simplified_txt.chars().count()
+                            > DC_DESIRED_TEXT_LEN + DC_ELLIPSIS.len()
+                        {
+                            self.is_mime_modified = true;
+                            truncate(&*simplified_txt, DC_DESIRED_TEXT_LEN).to_string()
+                        } else {
+                            simplified_txt
+                        };

                        if !simplified_txt.is_empty() || simplified_quote.is_some() {
                            let mut part = Part {
@@ -1682,9 +1648,6 @@ pub struct Part {
    /// note that multipart/related may contain further multipart nestings
    /// and all of them needs to be marked with `is_related`.
    pub(crate) is_related: bool,
-
-    /// Part is an RFC 9078 reaction.
-    pub(crate) is_reaction: bool,
 }

 /// return mimetype and viewtype for a parsed mail
@@ -1854,7 +1817,7 @@ mod tests {
    use crate::{
        chatlist::Chatlist,
        config::Config,
-        constants::{Blocked, DC_DESIRED_TEXT_LEN, DC_ELLIPSIS},
+        constants::Blocked,
        message::{Message, MessageState, MessengerMessage},
        receive_imf::receive_imf,
        test_utils::TestContext,
@@ -3368,40 +3331,7 @@ Message.

        assert_eq!(mime_message.parts[0].org_filename, Some(".eml".to_string()));

-        Ok(())
-    }
-
-    /// Tests parsing of MIME message containing RFC 9078 reaction.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_parse_reaction() -> Result<()> {
-        let alice = TestContext::new_alice().await;
-
-        let mime_message = MimeMessage::from_bytes(
-            &alice,
-            "To: alice@example.org\n\
-From: bob@example.net\n\
-Date: Today, 29 February 2021 00:00:10 -800\n\
-Message-ID: 56789@example.net\n\
-In-Reply-To: 12345@example.org\n\
-Subject: Meeting\n\
-Mime-Version: 1.0 (1.0)\n\
-Content-Type: text/plain; charset=utf-8\n\
-Content-Disposition: reaction\n\
-\n\
-\u{1F44D}"
-                .as_bytes(),
-        )
-        .await?;
-
-        assert_eq!(mime_message.parts.len(), 1);
-        assert_eq!(mime_message.parts[0].is_reaction, true);
-        assert_eq!(
-            mime_message
-                .get_header(HeaderDef::InReplyTo)
-                .and_then(|msgid| parse_message_id(msgid).ok())
-                .unwrap(),
-            "12345@example.org"
-        );
+        dbg!(mime_message);

        Ok(())
    }
--- a/src/param.rs
+++ b/src/param.rs
@@ -59,9 +59,6 @@ pub enum Param {
    /// For Messages
    WantsMdn = b'r',

-    /// For Messages: the message is a reaction.
-    Reaction = b'x',
-
    /// For Messages: a message with Auto-Submitted header ("bot").
    Bot = b'b',

@@ -266,8 +263,8 @@ impl Params {
    }

    /// Set the given key to the passed in value.
-    pub fn set(&mut self, key: Param, value: impl ToString) -> &mut Self {
-        self.inner.insert(key, value.to_string());
+    pub fn set(&mut self, key: Param, value: impl AsRef<str>) -> &mut Self {
+        self.inner.insert(key, value.as_ref().to_string());
        self
    }

--- a/src/peerstate.rs
+++ b/src/peerstate.rs
@@ -196,36 +196,35 @@ impl Peerstate {
                //   gossip_key_fingerprint, verified_key, verified_key_fingerprint

                let res = Peerstate {
-                    addr: row.get("addr")?,
-                    last_seen: row.get("last_seen")?,
-                    last_seen_autocrypt: row.get("last_seen_autocrypt")?,
-                    prefer_encrypt: EncryptPreference::from_i32(row.get("prefer_encrypted")?)
-                        .unwrap_or_default(),
+                    addr: row.get(0)?,
+                    last_seen: row.get(1)?,
+                    last_seen_autocrypt: row.get(2)?,
+                    prefer_encrypt: EncryptPreference::from_i32(row.get(3)?).unwrap_or_default(),
                    public_key: row
-                        .get("public_key")
+                        .get(4)
                        .ok()
                        .and_then(|blob: Vec<u8>| SignedPublicKey::from_slice(&blob).ok()),
                    public_key_fingerprint: row
-                        .get::<_, Option<String>>("public_key_fingerprint")?
+                        .get::<_, Option<String>>(7)?
                        .map(|s| s.parse::<Fingerprint>())
                        .transpose()
                        .unwrap_or_default(),
                    gossip_key: row
-                        .get("gossip_key")
+                        .get(6)
                        .ok()
                        .and_then(|blob: Vec<u8>| SignedPublicKey::from_slice(&blob).ok()),
                    gossip_key_fingerprint: row
-                        .get::<_, Option<String>>("gossip_key_fingerprint")?
+                        .get::<_, Option<String>>(8)?
                        .map(|s| s.parse::<Fingerprint>())
                        .transpose()
                        .unwrap_or_default(),
-                    gossip_timestamp: row.get("gossip_timestamp")?,
+                    gossip_timestamp: row.get(5)?,
                    verified_key: row
-                        .get("verified_key")
+                        .get(9)
                        .ok()
                        .and_then(|blob: Vec<u8>| SignedPublicKey::from_slice(&blob).ok()),
                    verified_key_fingerprint: row
-                        .get::<_, Option<String>>("verified_key_fingerprint")?
+                        .get::<_, Option<String>>(10)?
                        .map(|s| s.parse::<Fingerprint>())
                        .transpose()
                        .unwrap_or_default(),
--- a/src/plaintext.rs
+++ b/src/plaintext.rs
@@ -21,7 +21,7 @@ pub struct PlainText {
 impl PlainText {
    /// Convert plain text to HTML.
    /// The function handles quotes, links, fixed and floating text paragraphs.
-    pub fn to_html(&self) -> String {
+    pub async fn to_html(&self) -> String {
        static LINKIFY_MAIL_RE: Lazy<regex::Regex> =
            Lazy::new(|| regex::Regex::new(r#"\b([\w.\-+]+@[\w.\-]+)\b"#).unwrap());

@@ -44,12 +44,12 @@ impl PlainText {
            let line = line.to_string().replace('\r', "");

            let mut line = LINKIFY_MAIL_RE
-                .replace_all(&line, "\rLTa href=\rQUOTmailto:$1\rQUOT\rGT$1\rLT/a\rGT")
+                .replace_all(&*line, "\rLTa href=\rQUOTmailto:$1\rQUOT\rGT$1\rLT/a\rGT")
                .as_ref()
                .to_string();

            line = LINKIFY_URL_RE
-                .replace_all(&line, "\rLTa href=\rQUOT$1\rQUOT\rGT$1\rLT/a\rGT")
+                .replace_all(&*line, "\rLTa href=\rQUOT$1\rQUOT\rGT$1\rLT/a\rGT")
                .as_ref()
                .to_string();

@@ -111,7 +111,8 @@ http://link-at-start-of-line.org
            flowed: false,
            delsp: false,
        }
-        .to_html();
+        .to_html()
+        .await;
        assert_eq!(
            html,
            r##"<!DOCTYPE html>
@@ -133,7 +134,8 @@ line with <a href="https://link-mid-of-line.org">https://link-mid-of-line.org</a
            flowed: false,
            delsp: false,
        }
-        .to_html();
+        .to_html()
+        .await;
        assert_eq!(
            html,
            r#"<!DOCTYPE html>
@@ -151,7 +153,8 @@ line with &lt;<a href="http://encapsulated.link/?foo=_bar">http://encapsulated.l
            flowed: false,
            delsp: false,
        }
-        .to_html();
+        .to_html()
+        .await;
        assert_eq!(
            html,
            r#"<!DOCTYPE html>
@@ -169,7 +172,8 @@ line with nohttp://no.link here<br/>
            flowed: false,
            delsp: false,
        }
-        .to_html();
+        .to_html()
+        .await;
        assert_eq!(
            html,
            r#"<!DOCTYPE html>
@@ -187,7 +191,8 @@ just an address: <a href="mailto:foo@bar.org">foo@bar.org</a> <a href="mailto:an
            flowed: true,
            delsp: false,
        }
-        .to_html();
+        .to_html()
+        .await;
        assert_eq!(
            html,
            r#"<!DOCTYPE html>
@@ -208,7 +213,8 @@ line still line<br/>
            flowed: true,
            delsp: true,
        }
-        .to_html();
+        .to_html()
+        .await;
        assert_eq!(
            html,
            r#"<!DOCTYPE html>
@@ -229,7 +235,8 @@ linestill line<br/>
            flowed: false,
            delsp: false,
        }
-        .to_html();
+        .to_html()
+        .await;
        assert_eq!(
            html,
            r#"<!DOCTYPE html>
--- a/src/qr.rs
+++ b/src/qr.rs
@@ -1,8 +1,5 @@
 //! # QR code module.

-mod dclogin_scheme;
-pub use dclogin_scheme::LoginOptions;
-
 use anyhow::{anyhow, bail, ensure, Context as _, Error, Result};
 use once_cell::sync::Lazy;
 use percent_encoding::percent_decode_str;
@@ -20,11 +17,8 @@ use crate::peerstate::Peerstate;
 use crate::tools::time;
 use crate::{token, EventType};

-use self::dclogin_scheme::configure_from_login_qr;
-
 const OPENPGP4FPR_SCHEME: &str = "OPENPGP4FPR:"; // yes: uppercase
 const DCACCOUNT_SCHEME: &str = "DCACCOUNT:";
-pub(super) const DCLOGIN_SCHEME: &str = "DCLOGIN:";
 const DCWEBRTC_SCHEME: &str = "DCWEBRTC:";
 const MAILTO_SCHEME: &str = "mailto:";
 const MATMSG_SCHEME: &str = "MATMSG:";
@@ -103,10 +97,6 @@ pub enum Qr {
        invitenumber: String,
        authcode: String,
    },
-    Login {
-        address: String,
-        options: LoginOptions,
-    },
 }

 fn starts_with_ignore_case(string: &str, pattern: &str) -> bool {
@@ -125,8 +115,6 @@ pub async fn check_qr(context: &Context, qr: &str) -> Result<Qr> {
            .context("failed to decode OPENPGP4FPR QR code")?
    } else if starts_with_ignore_case(qr, DCACCOUNT_SCHEME) {
        decode_account(qr)?
-    } else if starts_with_ignore_case(qr, DCLOGIN_SCHEME) {
-        dclogin_scheme::decode_login(qr)?
    } else if starts_with_ignore_case(qr, DCWEBRTC_SCHEME) {
        decode_webrtc_instance(context, qr)?
    } else if qr.starts_with(MAILTO_SCHEME) {
@@ -230,7 +218,7 @@ async fn decode_openpgp(context: &Context, qr: &str) -> Result<Qr> {
                .await
                .with_context(|| format!("can't check if address {:?} is our address", addr))?
            {
-                if token::exists(context, token::Namespace::InviteNumber, &invitenumber).await {
+                if token::exists(context, token::Namespace::InviteNumber, &*invitenumber).await {
                    Ok(Qr::WithdrawVerifyGroup {
                        grpname,
                        grpid,
@@ -260,7 +248,7 @@ async fn decode_openpgp(context: &Context, qr: &str) -> Result<Qr> {
                })
            }
        } else if context.is_self_addr(addr).await? {
-            if token::exists(context, token::Namespace::InviteNumber, &invitenumber).await {
+            if token::exists(context, token::Namespace::InviteNumber, &*invitenumber).await {
                Ok(Qr::WithdrawVerifyContact {
                    contact_id,
                    fingerprint,
@@ -474,9 +462,6 @@ pub async fn set_config_from_qr(context: &Context, qr: &str) -> Result<()> {
            context.sync_qr_code_tokens(chat_id).await?;
            context.send_sync_msg().await?;
        }
-        Qr::Login { address, options } => {
-            configure_from_login_qr(context, &address, options).await?
-        }
        _ => bail!("qr code {:?} does not contain config", qr),
    }

@@ -1039,103 +1024,6 @@ mod tests {
        Ok(())
    }

-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_decode_and_apply_dclogin() -> Result<()> {
-        let ctx = TestContext::new().await;
-
-        let result = check_qr(&ctx.ctx, "dclogin:usename+extension@host?p=1234&v=1").await?;
-        if let Qr::Login { address, options } = result {
-            assert_eq!(address, "usename+extension@host".to_owned());
-
-            if let LoginOptions::V1 { mail_pw, .. } = options {
-                assert_eq!(mail_pw, "1234".to_owned());
-            } else {
-                bail!("wrong type")
-            }
-        } else {
-            bail!("wrong type")
-        }
-
-        assert!(ctx.ctx.get_config(Config::Addr).await?.is_none());
-        assert!(ctx.ctx.get_config(Config::MailPw).await?.is_none());
-
-        set_config_from_qr(&ctx.ctx, "dclogin:username+extension@host?p=1234&v=1").await?;
-        assert_eq!(
-            ctx.ctx.get_config(Config::Addr).await?,
-            Some("username+extension@host".to_owned())
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::MailPw).await?,
-            Some("1234".to_owned())
-        );
-
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_decode_and_apply_dclogin_advanced_options() -> Result<()> {
-        let ctx = TestContext::new().await;
-        set_config_from_qr(&ctx.ctx, "dclogin:username+extension@host?p=1234&spw=4321&sh=send.host&sp=7273&su=SendUser&ih=host.tld&ip=4343&iu=user&ipw=password&is=ssl&ic=1&sc=3&ss=plain&v=1").await?;
-        assert_eq!(
-            ctx.ctx.get_config(Config::Addr).await?,
-            Some("username+extension@host".to_owned())
-        );
-
-        // `p=1234` is ignored, because `ipw=password` is set
-
-        assert_eq!(
-            ctx.ctx.get_config(Config::MailServer).await?,
-            Some("host.tld".to_owned())
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::MailPort).await?,
-            Some("4343".to_owned())
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::MailUser).await?,
-            Some("user".to_owned())
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::MailPw).await?,
-            Some("password".to_owned())
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::MailSecurity).await?,
-            Some("1".to_owned()) // ssl
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::ImapCertificateChecks).await?,
-            Some("1".to_owned())
-        );
-
-        assert_eq!(
-            ctx.ctx.get_config(Config::SendPw).await?,
-            Some("4321".to_owned())
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::SendServer).await?,
-            Some("send.host".to_owned())
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::SendPort).await?,
-            Some("7273".to_owned())
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::SendUser).await?,
-            Some("SendUser".to_owned())
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::SmtpCertificateChecks).await?,
-            Some("3".to_owned())
-        );
-        assert_eq!(
-            ctx.ctx.get_config(Config::SendSecurity).await?,
-            Some("3".to_owned()) // plain
-        );
-
-        Ok(())
-    }
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_decode_account() -> Result<()> {
        let ctx = TestContext::new().await;
--- a/src/qr/dclogin_scheme.rs
+++ b/src/qr/dclogin_scheme.rs
@@ -1,388 +0,0 @@
-use std::collections::HashMap;
-
-use crate::config::Config;
-use crate::context::Context;
-use crate::provider::Socket;
-use crate::{contact, login_param::CertificateChecks};
-use anyhow::{bail, Context as _, Result};
-use num_traits::cast::ToPrimitive;
-
-use super::{Qr, DCLOGIN_SCHEME};
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum LoginOptions {
-    UnsuportedVersion(u32),
-    V1 {
-        mail_pw: String,
-        imap_host: Option<String>,
-        imap_port: Option<u16>,
-        imap_username: Option<String>,
-        imap_password: Option<String>,
-        imap_security: Option<Socket>,
-        imap_certificate_checks: Option<CertificateChecks>,
-        smtp_host: Option<String>,
-        smtp_port: Option<u16>,
-        smtp_username: Option<String>,
-        smtp_password: Option<String>,
-        smtp_security: Option<Socket>,
-        smtp_certificate_checks: Option<CertificateChecks>,
-    },
-}
-
-/// scheme: `dclogin://user@host/?p=password&v=1[&options]`
-/// read more about the scheme at <https://github.com/deltachat/interface/blob/master/uri-schemes.md#DCLOGIN>
-pub(super) fn decode_login(qr: &str) -> Result<Qr> {
-    let url = url::Url::parse(qr).with_context(|| format!("Malformed url: {:?}", qr))?;
-
-    let url_without_scheme = qr
-        .get(DCLOGIN_SCHEME.len()..)
-        .context("invalid DCLOGIN payload E1")?;
-    let payload = url_without_scheme
-        .strip_prefix("//")
-        .unwrap_or(url_without_scheme);
-
-    let addr = payload
-        .split(|c| c == '?' || c == '/')
-        .next()
-        .context("invalid DCLOGIN payload E3")?;
-
-    if url.scheme().eq_ignore_ascii_case("dclogin") {
-        let options = url.query_pairs();
-        if options.count() == 0 {
-            bail!("invalid DCLOGIN payload E4")
-        }
-        // load options into hashmap
-        let parameter_map: HashMap<String, String> = options
-            .map(|(key, value)| (key.into_owned(), value.into_owned()))
-            .collect();
-
-        // check if username is there
-        if !contact::may_be_valid_addr(addr) {
-            bail!("invalid DCLOGIN payload: invalid username E5");
-        }
-
-        // apply to result struct
-        let options: LoginOptions = match parameter_map.get("v").map(|i| i.parse::<u32>()) {
-            Some(Ok(1)) => LoginOptions::V1 {
-                mail_pw: parameter_map
-                    .get("p")
-                    .map(|s| s.to_owned())
-                    .context("password missing")?,
-                imap_host: parameter_map.get("ih").map(|s| s.to_owned()),
-                imap_port: parse_port(parameter_map.get("ip"))
-                    .context("could not parse imap port")?,
-                imap_username: parameter_map.get("iu").map(|s| s.to_owned()),
-                imap_password: parameter_map.get("ipw").map(|s| s.to_owned()),
-                imap_security: parse_socket_security(parameter_map.get("is"))?,
-                imap_certificate_checks: parse_certificate_checks(parameter_map.get("ic"))?,
-                smtp_host: parameter_map.get("sh").map(|s| s.to_owned()),
-                smtp_port: parse_port(parameter_map.get("sp"))
-                    .context("could not parse smtp port")?,
-                smtp_username: parameter_map.get("su").map(|s| s.to_owned()),
-                smtp_password: parameter_map.get("spw").map(|s| s.to_owned()),
-                smtp_security: parse_socket_security(parameter_map.get("ss"))?,
-                smtp_certificate_checks: parse_certificate_checks(parameter_map.get("sc"))?,
-            },
-            Some(Ok(v)) => LoginOptions::UnsuportedVersion(v),
-            Some(Err(_)) => bail!("version could not be parsed as number E6"),
-            None => bail!("invalid DCLOGIN payload: version missing E7"),
-        };
-
-        Ok(Qr::Login {
-            address: addr.to_owned(),
-            options,
-        })
-    } else {
-        bail!("Bad scheme for account URL: {:?}.", payload);
-    }
-}
-
-fn parse_port(port: Option<&String>) -> core::result::Result<Option<u16>, std::num::ParseIntError> {
-    match port {
-        Some(p) => Ok(Some(p.parse::<u16>()?)),
-        None => Ok(None),
-    }
-}
-
-fn parse_socket_security(security: Option<&String>) -> Result<Option<Socket>> {
-    Ok(match security.map(|s| s.as_str()) {
-        Some("ssl") => Some(Socket::Ssl),
-        Some("starttls") => Some(Socket::Starttls),
-        Some("default") => Some(Socket::Automatic),
-        Some("plain") => Some(Socket::Plain),
-        Some(other) => bail!("Unknown security level: {}", other),
-        None => None,
-    })
-}
-
-fn parse_certificate_checks(
-    certificate_checks: Option<&String>,
-) -> Result<Option<CertificateChecks>> {
-    Ok(match certificate_checks.map(|s| s.as_str()) {
-        Some("0") => Some(CertificateChecks::Automatic),
-        Some("1") => Some(CertificateChecks::Strict),
-        Some("3") => Some(CertificateChecks::AcceptInvalidCertificates),
-        Some(other) => bail!("Unknown certificatecheck level: {}", other),
-        None => None,
-    })
-}
-
-pub(crate) async fn configure_from_login_qr(
-    context: &Context,
-    address: &str,
-    options: LoginOptions,
-) -> Result<()> {
-    context.set_config(Config::Addr, Some(address)).await?;
-
-    match options {
-        LoginOptions::V1 {
-            mail_pw,
-            imap_host,
-            imap_port,
-            imap_username,
-            imap_password,
-            imap_security,
-            imap_certificate_checks,
-            smtp_host,
-            smtp_port,
-            smtp_username,
-            smtp_password,
-            smtp_security,
-            smtp_certificate_checks,
-        } => {
-            context.set_config(Config::MailPw, Some(&mail_pw)).await?;
-            if let Some(value) = imap_host {
-                context.set_config(Config::MailServer, Some(&value)).await?;
-            }
-            if let Some(value) = imap_port {
-                context
-                    .set_config(Config::MailPort, Some(&value.to_string()))
-                    .await?;
-            }
-            if let Some(value) = imap_username {
-                context.set_config(Config::MailUser, Some(&value)).await?;
-            }
-            if let Some(value) = imap_password {
-                context.set_config(Config::MailPw, Some(&value)).await?;
-            }
-            if let Some(value) = imap_security {
-                let code = value
-                    .to_u8()
-                    .context("could not convert imap security value to number")?;
-                context
-                    .set_config(Config::MailSecurity, Some(&code.to_string()))
-                    .await?;
-            }
-            if let Some(value) = imap_certificate_checks {
-                let code = value
-                    .to_u32()
-                    .context("could not convert imap certificate checks value to number")?;
-                context
-                    .set_config(Config::ImapCertificateChecks, Some(&code.to_string()))
-                    .await?;
-            }
-            if let Some(value) = smtp_host {
-                context.set_config(Config::SendServer, Some(&value)).await?;
-            }
-            if let Some(value) = smtp_port {
-                context
-                    .set_config(Config::SendPort, Some(&value.to_string()))
-                    .await?;
-            }
-            if let Some(value) = smtp_username {
-                context.set_config(Config::SendUser, Some(&value)).await?;
-            }
-            if let Some(value) = smtp_password {
-                context.set_config(Config::SendPw, Some(&value)).await?;
-            }
-            if let Some(value) = smtp_security {
-                let code = value
-                    .to_u8()
-                    .context("could not convert smtp security value to number")?;
-                context
-                    .set_config(Config::SendSecurity, Some(&code.to_string()))
-                    .await?;
-            }
-            if let Some(value) = smtp_certificate_checks {
-                let code = value
-                    .to_u32()
-                    .context("could not convert smtp certificate checks value to number")?;
-                context
-                    .set_config(Config::SmtpCertificateChecks, Some(&code.to_string()))
-                    .await?;
-            }
-            Ok(())
-        }
-        _ => bail!(
-            "DeltaChat does not understand this QR Code yet, please update the app and try again."
-        ),
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::{decode_login, LoginOptions};
-    use crate::{login_param::CertificateChecks, provider::Socket, qr::Qr};
-    use anyhow::{self, bail};
-
-    macro_rules! login_options_just_pw {
-        ($pw: expr) => {
-            LoginOptions::V1 {
-                mail_pw: $pw,
-                imap_host: None,
-                imap_port: None,
-                imap_username: None,
-                imap_password: None,
-                imap_security: None,
-                imap_certificate_checks: None,
-                smtp_host: None,
-                smtp_port: None,
-                smtp_username: None,
-                smtp_password: None,
-                smtp_security: None,
-                smtp_certificate_checks: None,
-            }
-        };
-    }
-
-    #[test]
-    fn minimal_no_options() -> anyhow::Result<()> {
-        let result = decode_login("dclogin://email@host.tld?p=123&v=1")?;
-        if let Qr::Login { address, options } = result {
-            assert_eq!(address, "email@host.tld".to_owned());
-            assert_eq!(options, login_options_just_pw!("123".to_owned()));
-        } else {
-            bail!("wrong type")
-        }
-        let result = decode_login("dclogin://email@host.tld/?p=123456&v=1")?;
-        if let Qr::Login { address, options } = result {
-            assert_eq!(address, "email@host.tld".to_owned());
-            assert_eq!(options, login_options_just_pw!("123456".to_owned()));
-        } else {
-            bail!("wrong type")
-        }
-        let result = decode_login("dclogin://email@host.tld/ignored/path?p=123456&v=1")?;
-        if let Qr::Login { address, options } = result {
-            assert_eq!(address, "email@host.tld".to_owned());
-            assert_eq!(options, login_options_just_pw!("123456".to_owned()));
-        } else {
-            bail!("wrong type")
-        }
-        Ok(())
-    }
-    #[test]
-    fn minimal_no_options_no_double_slash() -> anyhow::Result<()> {
-        let result = decode_login("dclogin:email@host.tld?p=123&v=1")?;
-        if let Qr::Login { address, options } = result {
-            assert_eq!(address, "email@host.tld".to_owned());
-            assert_eq!(options, login_options_just_pw!("123".to_owned()));
-        } else {
-            bail!("wrong type")
-        }
-        let result = decode_login("dclogin:email@host.tld/?p=123456&v=1")?;
-        if let Qr::Login { address, options } = result {
-            assert_eq!(address, "email@host.tld".to_owned());
-            assert_eq!(options, login_options_just_pw!("123456".to_owned()));
-        } else {
-            bail!("wrong type")
-        }
-        let result = decode_login("dclogin:email@host.tld/ignored/path?p=123456&v=1")?;
-        if let Qr::Login { address, options } = result {
-            assert_eq!(address, "email@host.tld".to_owned());
-            assert_eq!(options, login_options_just_pw!("123456".to_owned()));
-        } else {
-            bail!("wrong type")
-        }
-        Ok(())
-    }
-
-    #[test]
-    fn no_version_set() {
-        assert!(decode_login("dclogin:email@host.tld?p=123").is_err());
-    }
-
-    #[test]
-    fn invalid_version_set() {
-        assert!(decode_login("dclogin:email@host.tld?p=123&v=").is_err());
-        assert!(decode_login("dclogin:email@host.tld?p=123&v=%40").is_err());
-        assert!(decode_login("dclogin:email@host.tld?p=123&v=-20").is_err());
-        assert!(decode_login("dclogin:email@host.tld?p=123&v=hi").is_err());
-    }
-
-    #[test]
-    fn version_too_new() -> anyhow::Result<()> {
-        let result = decode_login("dclogin:email@host.tld/?p=123456&v=2")?;
-        if let Qr::Login { options, .. } = result {
-            assert_eq!(options, LoginOptions::UnsuportedVersion(2));
-        } else {
-            bail!("wrong type");
-        }
-        let result = decode_login("dclogin:email@host.tld/?p=123456&v=5")?;
-        if let Qr::Login { options, .. } = result {
-            assert_eq!(options, LoginOptions::UnsuportedVersion(5));
-        } else {
-            bail!("wrong type");
-        }
-        Ok(())
-    }
-
-    #[test]
-    fn all_advanced_options() -> anyhow::Result<()> {
-        let result = decode_login(
-            "dclogin:email@host.tld?p=secret&v=1&ih=imap.host.tld&ip=4000&iu=max&ipw=87654&is=ssl&ic=1&sh=mail.host.tld&sp=3000&su=max@host.tld&spw=3242HS&ss=plain&sc=3",
-        )?;
-        if let Qr::Login { address, options } = result {
-            assert_eq!(address, "email@host.tld".to_owned());
-            assert_eq!(
-                options,
-                LoginOptions::V1 {
-                    mail_pw: "secret".to_owned(),
-                    imap_host: Some("imap.host.tld".to_owned()),
-                    imap_port: Some(4000),
-                    imap_username: Some("max".to_owned()),
-                    imap_password: Some("87654".to_owned()),
-                    imap_security: Some(Socket::Ssl),
-                    imap_certificate_checks: Some(CertificateChecks::Strict),
-                    smtp_host: Some("mail.host.tld".to_owned()),
-                    smtp_port: Some(3000),
-                    smtp_username: Some("max@host.tld".to_owned()),
-                    smtp_password: Some("3242HS".to_owned()),
-                    smtp_security: Some(Socket::Plain),
-                    smtp_certificate_checks: Some(CertificateChecks::AcceptInvalidCertificates),
-                }
-            );
-        } else {
-            bail!("wrong type")
-        }
-        Ok(())
-    }
-
-    #[test]
-    fn uri_encoded_password() -> anyhow::Result<()> {
-        let result = decode_login(
-            "dclogin:email@host.tld?p=%7BDaehFl%3B%22as%40%21fhdodn5%24234%22%7B%7Dfg&v=1",
-        )?;
-        if let Qr::Login { address, options } = result {
-            assert_eq!(address, "email@host.tld".to_owned());
-            assert_eq!(
-                options,
-                login_options_just_pw!("{DaehFl;\"as@!fhdodn5$234\"{}fg".to_owned())
-            );
-        } else {
-            bail!("wrong type")
-        }
-        Ok(())
-    }
-
-    #[test]
-    fn email_with_plus_extension() -> anyhow::Result<()> {
-        let result = decode_login("dclogin:usename+extension@host?p=1234&v=1")?;
-        if let Qr::Login { address, options } = result {
-            assert_eq!(address, "usename+extension@host".to_owned());
-            assert_eq!(options, login_options_just_pw!("1234".to_owned()));
-        } else {
-            bail!("wrong type")
-        }
-        Ok(())
-    }
-}
--- a/src/reaction.rs
+++ b/src/reaction.rs
@@ -1,551 +0,0 @@
-//! # Reactions.
-//!
-//! Reactions are short messages consisting of emojis sent in reply to
-//! messages. Unlike normal messages which are added to the end of the chat,
-//! reactions are supposed to be displayed near the original messages.
-//!
-//! RFC 9078 specifies how reactions are transmitted in MIME messages.
-//!
-//! Reaction update semantics is not well-defined in RFC 9078, so
-//! Delta Chat uses the same semantics as in
-//! [XEP-0444](https://xmpp.org/extensions/xep-0444.html) section
-//! "3.2 Updating reactions to a message". Received reactions override
-//! all previously received reactions from the same user and it is
-//! possible to remove all reactions by sending an empty string as a reaction,
-//! even though RFC 9078 requires at least one emoji to be sent.
-
-use std::collections::BTreeMap;
-use std::fmt;
-
-use anyhow::Result;
-
-use crate::chat::{send_msg, ChatId};
-use crate::contact::ContactId;
-use crate::context::Context;
-use crate::events::EventType;
-use crate::message::{rfc724_mid_exists, Message, MsgId, Viewtype};
-
-/// A single reaction consisting of multiple emoji sequences.
-///
-/// It is guaranteed to have all emojis sorted and deduplicated inside.
-#[derive(Debug, Default, Clone)]
-pub struct Reaction {
-    /// Canonical represntation of reaction as a string of space-separated emojis.
-    reaction: String,
-}
-
-// We implement From<&str> instead of std::str::FromStr, because
-// FromStr requires error type and reaction parsing never returns an
-// error.
-impl From<&str> for Reaction {
-    /// Parses a string containing a reaction.
-    ///
-    /// Reaction string is separated by spaces or tabs (`WSP` in ABNF),
-    /// but this function accepts any ASCII whitespace, so even a CRLF at
-    /// the end of string is acceptable.
-    ///
-    /// Any short enough string is accepted as a reaction to avoid the
-    /// complexity of validating emoji sequences as required by RFC
-    /// 9078. On the sender side UI is responsible to provide only
-    /// valid emoji sequences via reaction picker. On the receiver
-    /// side, abuse of the possibility to use arbitrary strings as
-    /// reactions is not different from other kinds of spam attacks
-    /// such as sending large numbers of large messages, and should be
-    /// dealt with the same way, e.g. by blocking the user.
-    fn from(reaction: &str) -> Self {
-        let mut emojis: Vec<&str> = reaction
-            .split_ascii_whitespace()
-            .filter(|&emoji| emoji.len() < 30)
-            .collect();
-        emojis.sort_unstable();
-        emojis.dedup();
-        let reaction = emojis.join(" ");
-        Self { reaction }
-    }
-}
-
-impl Reaction {
-    /// Returns true if reaction contains no emojis.
-    pub fn is_empty(&self) -> bool {
-        self.reaction.is_empty()
-    }
-
-    /// Returns a vector of emojis composing a reaction.
-    pub fn emojis(&self) -> Vec<&str> {
-        self.reaction.split(' ').collect()
-    }
-
-    /// Returns space-separated string of emojis
-    pub fn as_str(&self) -> &str {
-        &self.reaction
-    }
-
-    /// Appends emojis from another reaction to this reaction.
-    pub fn add(&self, other: Self) -> Self {
-        let mut emojis: Vec<&str> = self.emojis();
-        emojis.append(&mut other.emojis());
-        emojis.sort_unstable();
-        emojis.dedup();
-        let reaction = emojis.join(" ");
-        Self { reaction }
-    }
-}
-
-/// Structure representing all reactions to a particular message.
-#[derive(Debug)]
-pub struct Reactions {
-    /// Map from a contact to its reaction to message.
-    reactions: BTreeMap<ContactId, Reaction>,
-}
-
-impl Reactions {
-    /// Returns vector of contacts that reacted to the message.
-    pub fn contacts(&self) -> Vec<ContactId> {
-        self.reactions.keys().copied().collect()
-    }
-
-    /// Returns reaction of a given contact to message.
-    ///
-    /// If contact did not react to message or removed the reaction,
-    /// this method returns an empty reaction.
-    pub fn get(&self, contact_id: ContactId) -> Reaction {
-        self.reactions.get(&contact_id).cloned().unwrap_or_default()
-    }
-
-    /// Returns true if the message has no reactions.
-    pub fn is_empty(&self) -> bool {
-        self.reactions.is_empty()
-    }
-}
-
-impl fmt::Display for Reactions {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let mut emoji_frequencies: BTreeMap<String, usize> = BTreeMap::new();
-        for reaction in self.reactions.values() {
-            for emoji in reaction.emojis() {
-                emoji_frequencies
-                    .entry(emoji.to_string())
-                    .and_modify(|x| *x += 1)
-                    .or_insert(1);
-            }
-        }
-        let mut first = true;
-        for (emoji, frequency) in emoji_frequencies {
-            if !first {
-                write!(f, " ")?;
-            }
-            first = false;
-            write!(f, "{}{}", emoji, frequency)?;
-        }
-        Ok(())
-    }
-}
-
-async fn set_msg_id_reaction(
-    context: &Context,
-    msg_id: MsgId,
-    chat_id: ChatId,
-    contact_id: ContactId,
-    reaction: Reaction,
-) -> Result<()> {
-    if reaction.is_empty() {
-        // Simply remove the record instead of setting it to empty string.
-        context
-            .sql
-            .execute(
-                "DELETE FROM reactions
-                 WHERE msg_id = ?1
-                 AND contact_id = ?2",
-                paramsv![msg_id, contact_id],
-            )
-            .await?;
-    } else {
-        context
-            .sql
-            .execute(
-                "INSERT INTO reactions (msg_id, contact_id, reaction)
-                 VALUES (?1, ?2, ?3)
-                 ON CONFLICT(msg_id, contact_id)
-                 DO UPDATE SET reaction=excluded.reaction",
-                paramsv![msg_id, contact_id, reaction.as_str()],
-            )
-            .await?;
-    }
-
-    context.emit_event(EventType::ReactionsChanged {
-        chat_id,
-        msg_id,
-        contact_id,
-    });
-    Ok(())
-}
-
-/// Sends a reaction to message `msg_id`, overriding previously sent reactions.
-///
-/// `reaction` is a string consisting of space-separated emoji. Use
-/// empty string to retract a reaction.
-pub async fn send_reaction(context: &Context, msg_id: MsgId, reaction: &str) -> Result<MsgId> {
-    let msg = Message::load_from_db(context, msg_id).await?;
-    let chat_id = msg.chat_id;
-
-    let reaction: Reaction = reaction.into();
-    let mut reaction_msg = Message::new(Viewtype::Text);
-    reaction_msg.text = Some(reaction.as_str().to_string());
-    reaction_msg.set_reaction();
-    reaction_msg.in_reply_to = Some(msg.rfc724_mid);
-    reaction_msg.hidden = true;
-
-    // Send messsage first.
-    let reaction_msg_id = send_msg(context, chat_id, &mut reaction_msg).await?;
-
-    // Only set reaction if we successfully sent the message.
-    set_msg_id_reaction(context, msg_id, msg.chat_id, ContactId::SELF, reaction).await?;
-    Ok(reaction_msg_id)
-}
-
-/// Adds given reaction to message `msg_id` and sends an update.
-///
-/// This can be used to implement advanced clients that allow reacting
-/// with multiple emojis. For a simple messenger UI, you probably want
-/// to use [`send_reaction()`] instead so reacting with a new emoji
-/// removes previous emoji at the same time.
-pub async fn add_reaction(context: &Context, msg_id: MsgId, reaction: &str) -> Result<MsgId> {
-    let self_reaction = get_self_reaction(context, msg_id).await?;
-    let reaction = self_reaction.add(Reaction::from(reaction));
-    send_reaction(context, msg_id, reaction.as_str()).await
-}
-
-/// Updates reaction of `contact_id` on the message with `in_reply_to`
-/// Message-ID. If no such message is found in the database, reaction
-/// is ignored.
-///
-/// `reaction` is a space-separated string of emojis. It can be empty
-/// if contact wants to remove all reactions.
-pub(crate) async fn set_msg_reaction(
-    context: &Context,
-    in_reply_to: &str,
-    chat_id: ChatId,
-    contact_id: ContactId,
-    reaction: Reaction,
-) -> 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, reaction).await
-    } else {
-        info!(
-            context,
-            "Can't assign reaction to unknown message with Message-ID {}", in_reply_to
-        );
-        Ok(())
-    }
-}
-
-/// Get our own reaction for a given message.
-async fn get_self_reaction(context: &Context, msg_id: MsgId) -> Result<Reaction> {
-    let reaction_str: Option<String> = context
-        .sql
-        .query_get_value(
-            "SELECT reaction
-             FROM reactions
-             WHERE msg_id=? AND contact_id=?",
-            paramsv![msg_id, ContactId::SELF],
-        )
-        .await?;
-    Ok(reaction_str
-        .as_deref()
-        .map(Reaction::from)
-        .unwrap_or_default())
-}
-
-/// Returns a structure containing all reactions to the message.
-pub async fn get_msg_reactions(context: &Context, msg_id: MsgId) -> Result<Reactions> {
-    let reactions = context
-        .sql
-        .query_map(
-            "SELECT contact_id, reaction FROM reactions WHERE msg_id=?",
-            paramsv![msg_id],
-            |row| {
-                let contact_id: ContactId = row.get(0)?;
-                let reaction: String = row.get(1)?;
-                Ok((contact_id, reaction))
-            },
-            |rows| {
-                let mut reactions = Vec::new();
-                for row in rows {
-                    let (contact_id, reaction) = row?;
-                    reactions.push((contact_id, Reaction::from(reaction.as_str())));
-                }
-                Ok(reactions)
-            },
-        )
-        .await?
-        .into_iter()
-        .collect();
-    Ok(Reactions { reactions })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::chat::get_chat_msgs;
-
-    use crate::config::Config;
-    use crate::constants::DC_CHAT_ID_TRASH;
-    use crate::contact::{Contact, Origin};
-    use crate::download::DownloadState;
-    use crate::message::MessageState;
-    use crate::receive_imf::{receive_imf, receive_imf_inner};
-    use crate::test_utils::TestContext;
-
-    #[test]
-    fn test_parse_reaction() {
-        // Check that basic set of emojis from RFC 9078 is supported.
-        assert_eq!(Reaction::from("👍").emojis(), vec!["👍"]);
-        assert_eq!(Reaction::from("👎").emojis(), vec!["👎"]);
-        assert_eq!(Reaction::from("😀").emojis(), vec!["😀"]);
-        assert_eq!(Reaction::from("☹").emojis(), vec!["☹"]);
-        assert_eq!(Reaction::from("😢").emojis(), vec!["😢"]);
-
-        // Empty string can be used to remove all reactions.
-        assert!(Reaction::from("").is_empty());
-
-        // Short strings can be used as emojis, could be used to add
-        // support for custom emojis via emoji shortcodes.
-        assert_eq!(Reaction::from(":deltacat:").emojis(), vec![":deltacat:"]);
-
-        // Check that long strings are not valid emojis.
-        assert!(
-            Reaction::from(":foobarbazquuxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:").is_empty()
-        );
-
-        // Multiple reactions separated by spaces or tabs are supported.
-        assert_eq!(Reaction::from("👍 ❤").emojis(), vec!["❤", "👍"]);
-        assert_eq!(Reaction::from("👍\t❤").emojis(), vec!["❤", "👍"]);
-
-        // Invalid emojis are removed, but valid emojis are retained.
-        assert_eq!(
-            Reaction::from("👍\t:foo: ❤").emojis(),
-            vec![":foo:", "❤", "👍"]
-        );
-        assert_eq!(Reaction::from("👍\t:foo: ❤").as_str(), ":foo: ❤ 👍");
-
-        // Duplicates are removed.
-        assert_eq!(Reaction::from("👍 👍").emojis(), vec!["👍"]);
-    }
-
-    #[test]
-    fn test_add_reaction() {
-        let reaction1 = Reaction::from("👍 😀");
-        let reaction2 = Reaction::from("❤");
-        let reaction_sum = reaction1.add(reaction2);
-
-        assert_eq!(reaction_sum.emojis(), vec!["❤", "👍", "😀"]);
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_receive_reaction() -> Result<()> {
-        let alice = TestContext::new_alice().await;
-        alice.set_config(Config::ShowEmails, Some("2")).await?;
-
-        // Alice receives BCC-self copy of a message sent to Bob.
-        receive_imf(
-            &alice,
-            "To: bob@example.net\n\
-From: alice@example.org\n\
-Date: Today, 29 February 2021 00:00:00 -800\n\
-Message-ID: 12345@example.org\n\
-Subject: Meeting\n\
-\n\
-Can we chat at 1pm pacific, today?"
-                .as_bytes(),
-            false,
-        )
-        .await?;
-        let msg = alice.get_last_msg().await;
-        assert_eq!(msg.state, MessageState::OutDelivered);
-        let reactions = get_msg_reactions(&alice, msg.id).await?;
-        let contacts = reactions.contacts();
-        assert_eq!(contacts.len(), 0);
-
-        let bob_id = Contact::add_or_lookup(&alice, "", "bob@example.net", Origin::ManuallyCreated)
-            .await?
-            .0;
-        let bob_reaction = reactions.get(bob_id);
-        assert!(bob_reaction.is_empty()); // Bob has not reacted to message yet.
-
-        // Alice receives reaction to her message from Bob.
-        receive_imf(
-            &alice,
-            "To: alice@example.org\n\
-From: bob@example.net\n\
-Date: Today, 29 February 2021 00:00:10 -800\n\
-Message-ID: 56789@example.net\n\
-In-Reply-To: 12345@example.org\n\
-Subject: Meeting\n\
-Mime-Version: 1.0 (1.0)\n\
-Content-Type: text/plain; charset=utf-8\n\
-Content-Disposition: reaction\n\
-\n\
-\u{1F44D}"
-                .as_bytes(),
-            false,
-        )
-        .await?;
-
-        let reactions = get_msg_reactions(&alice, msg.id).await?;
-        assert_eq!(reactions.to_string(), "👍1");
-
-        let contacts = reactions.contacts();
-        assert_eq!(contacts.len(), 1);
-
-        assert_eq!(contacts.get(0), Some(&bob_id));
-        let bob_reaction = reactions.get(bob_id);
-        assert_eq!(bob_reaction.is_empty(), false);
-        assert_eq!(bob_reaction.emojis(), vec!["👍"]);
-        assert_eq!(bob_reaction.as_str(), "👍");
-
-        Ok(())
-    }
-
-    async fn expect_reactions_changed_event(
-        t: &TestContext,
-        expected_chat_id: ChatId,
-        expected_msg_id: MsgId,
-        expected_contact_id: ContactId,
-    ) -> Result<()> {
-        let event = t
-            .evtracker
-            .get_matching(|evt| matches!(evt, EventType::ReactionsChanged { .. }))
-            .await;
-        match event {
-            EventType::ReactionsChanged {
-                chat_id,
-                msg_id,
-                contact_id,
-            } => {
-                assert_eq!(chat_id, expected_chat_id);
-                assert_eq!(msg_id, expected_msg_id);
-                assert_eq!(contact_id, expected_contact_id);
-            }
-            _ => unreachable!(),
-        }
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_send_reaction() -> Result<()> {
-        let alice = TestContext::new_alice().await;
-        let bob = TestContext::new_bob().await;
-
-        let chat_alice = alice.create_chat(&bob).await;
-        let alice_msg = alice.send_text(chat_alice.id, "Hi!").await;
-        let bob_msg = bob.recv_msg(&alice_msg).await;
-        assert_eq!(get_chat_msgs(&alice, chat_alice.id, 0).await?.len(), 1);
-        assert_eq!(get_chat_msgs(&bob, bob_msg.chat_id, 0).await?.len(), 1);
-
-        let alice_msg2 = alice.send_text(chat_alice.id, "Hi again!").await;
-        bob.recv_msg(&alice_msg2).await;
-        assert_eq!(get_chat_msgs(&alice, chat_alice.id, 0).await?.len(), 2);
-        assert_eq!(get_chat_msgs(&bob, bob_msg.chat_id, 0).await?.len(), 2);
-
-        bob_msg.chat_id.accept(&bob).await?;
-
-        send_reaction(&bob, bob_msg.id, "👍").await.unwrap();
-        expect_reactions_changed_event(&bob, bob_msg.chat_id, bob_msg.id, ContactId::SELF).await?;
-        assert_eq!(get_chat_msgs(&bob, bob_msg.chat_id, 0).await?.len(), 2);
-
-        let bob_reaction_msg = bob.pop_sent_msg().await;
-        let alice_reaction_msg = alice.recv_msg_opt(&bob_reaction_msg).await.unwrap();
-        assert_eq!(alice_reaction_msg.chat_id, DC_CHAT_ID_TRASH);
-        assert_eq!(get_chat_msgs(&alice, chat_alice.id, 0).await?.len(), 2);
-
-        let reactions = get_msg_reactions(&alice, alice_msg.sender_msg_id).await?;
-        assert_eq!(reactions.to_string(), "👍1");
-        let contacts = reactions.contacts();
-        assert_eq!(contacts.len(), 1);
-        let bob_id = contacts.get(0).unwrap();
-        let bob_reaction = reactions.get(*bob_id);
-        assert_eq!(bob_reaction.is_empty(), false);
-        assert_eq!(bob_reaction.emojis(), vec!["👍"]);
-        assert_eq!(bob_reaction.as_str(), "👍");
-        expect_reactions_changed_event(&alice, chat_alice.id, alice_msg.sender_msg_id, *bob_id)
-            .await?;
-
-        // Alice reacts to own message.
-        send_reaction(&alice, alice_msg.sender_msg_id, "👍 😀")
-            .await
-            .unwrap();
-        let reactions = get_msg_reactions(&alice, alice_msg.sender_msg_id).await?;
-        assert_eq!(reactions.to_string(), "👍2 😀1");
-
-        Ok(())
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_partial_download_and_reaction() -> Result<()> {
-        let alice = TestContext::new_alice().await;
-        let bob = TestContext::new_bob().await;
-
-        alice
-            .create_chat_with_contact("Bob", "bob@example.net")
-            .await;
-
-        let msg_header = "From: Bob <bob@example.net>\n\
-                    To: Alice <alice@example.org>\n\
-                    Chat-Version: 1.0\n\
-                    Subject: subject\n\
-                    Message-ID: <first@example.org>\n\
-                    Date: Sun, 14 Nov 2021 00:10:00 +0000\
-                    Content-Type: text/plain";
-        let msg_full = format!("{}\n\n100k text...", msg_header);
-
-        // Alice downloads message from Bob partially.
-        let alice_received_message = receive_imf_inner(
-            &alice,
-            "first@example.org",
-            msg_header.as_bytes(),
-            false,
-            Some(100000),
-            false,
-        )
-        .await?
-        .unwrap();
-        let alice_msg_id = *alice_received_message.msg_ids.get(0).unwrap();
-
-        // Bob downloads own message on the other device.
-        let bob_received_message = receive_imf(&bob, msg_full.as_bytes(), false)
-            .await?
-            .unwrap();
-        let bob_msg_id = *bob_received_message.msg_ids.get(0).unwrap();
-
-        // Bob reacts to own message.
-        send_reaction(&bob, bob_msg_id, "👍").await.unwrap();
-        let bob_reaction_msg = bob.pop_sent_msg().await;
-
-        // Alice receives a reaction.
-        alice.recv_msg_opt(&bob_reaction_msg).await.unwrap();
-
-        let reactions = get_msg_reactions(&alice, alice_msg_id).await?;
-        assert_eq!(reactions.to_string(), "👍1");
-        let msg = Message::load_from_db(&alice, alice_msg_id).await?;
-        assert_eq!(msg.download_state(), DownloadState::Available);
-
-        // Alice downloads full message.
-        receive_imf_inner(
-            &alice,
-            "first@example.org",
-            msg_full.as_bytes(),
-            false,
-            None,
-            false,
-        )
-        .await?;
-
-        // Check that reaction is still on the message after full download.
-        let msg = Message::load_from_db(&alice, alice_msg_id).await?;
-        assert_eq!(msg.download_state(), DownloadState::Done);
-        let reactions = get_msg_reactions(&alice, alice_msg_id).await?;
-        assert_eq!(reactions.to_string(), "👍1");
-
-        Ok(())
-    }
-}
--- a/src/receive_imf.rs
+++ b/src/receive_imf.rs
@@ -33,7 +33,6 @@ use crate::mimeparser::{
 };
 use crate::param::{Param, Params};
 use crate::peerstate::{Peerstate, PeerstateKeyType, PeerstateVerifiedStatus};
-use crate::reaction::{set_msg_reaction, Reaction};
 use crate::securejoin::{self, handle_securejoin_handshake, observe_securejoin_on_other_device};
 use crate::sql;
 use crate::stock_str;
@@ -173,13 +172,10 @@ pub(crate) async fn receive_imf_inner(
    .await?;

    let rcvd_timestamp = smeared_time(context).await;
-
-    // Sender timestamp is allowed to be a bit in the future due to
-    // unsynchronized clocks, but not too much.
    let sent_timestamp = mime_parser
        .get_header(HeaderDef::Date)
        .and_then(|value| mailparse::dateparse(value).ok())
-        .map_or(rcvd_timestamp, |value| min(value, rcvd_timestamp + 60));
+        .map_or(rcvd_timestamp, |value| min(value, rcvd_timestamp));

    // Add parts
    let received_msg = add_parts(
@@ -408,7 +404,7 @@ async fn add_parts(
    from_id: ContactId,
    seen: bool,
    is_partial_download: Option<u32>,
-    mut replace_msg_id: Option<MsgId>,
+    replace_msg_id: Option<MsgId>,
    fetching_existing_messages: bool,
    prevent_rename: bool,
 ) -> Result<ReceivedMsg> {
@@ -434,9 +430,8 @@ async fn add_parts(
    };
    // incoming non-chat messages may be discarded

-    let is_location_kml = mime_parser.location_kml.is_some();
+    let location_kml_is = mime_parser.location_kml.is_some();
    let is_mdn = !mime_parser.mdn_reports.is_empty();
-    let is_reaction = mime_parser.parts.iter().any(|part| part.is_reaction);
    let show_emails =
        ShowEmails::from_i32(context.get_config_int(Config::ShowEmails).await?).unwrap_or_default();

@@ -455,7 +450,7 @@ async fn add_parts(
            ShowEmails::All => allow_creation = !is_mdn,
        }
    } else {
-        allow_creation = !is_mdn && !is_reaction;
+        allow_creation = !is_mdn;
    }

    // check if the message introduces a new chat:
@@ -694,8 +689,7 @@ async fn add_parts(
        state = if seen
            || fetching_existing_messages
            || is_mdn
-            || is_reaction
-            || is_location_kml
+            || location_kml_is
            || securejoin_seen
            || chat_id_blocked == Blocked::Yes
        {
@@ -847,15 +841,14 @@ async fn add_parts(
        }
    }

-    let orig_chat_id = chat_id;
-    let chat_id = if is_mdn || is_reaction {
+    if is_mdn {
+        chat_id = Some(DC_CHAT_ID_TRASH);
+    }
+
+    let chat_id = chat_id.unwrap_or_else(|| {
+        info!(context, "No chat id for message (TRASH)");
        DC_CHAT_ID_TRASH
-    } else {
-        chat_id.unwrap_or_else(|| {
-            info!(context, "No chat id for message (TRASH)");
-            DC_CHAT_ID_TRASH
-        })
-    };
+    });

    // Extract ephemeral timer from the message or use the existing timer if the message is not fully downloaded.
    let mut ephemeral_timer = if is_partial_download.is_some() {
@@ -1060,41 +1053,11 @@ async fn add_parts(
    let conn = context.sql.get_conn().await?;

    for part in &mime_parser.parts {
-        if part.is_reaction {
-            set_msg_reaction(
-                context,
-                &mime_in_reply_to,
-                orig_chat_id.unwrap_or_default(),
-                from_id,
-                Reaction::from(part.msg.as_str()),
-            )
-            .await?;
-        }
-
-        let mut param = part.param.clone();
-        if is_system_message != SystemMessage::Unknown {
-            param.set_int(Param::Cmd, is_system_message as i32);
-        }
-        if let Some(replace_msg_id) = replace_msg_id {
-            let placeholder = Message::load_from_db(context, replace_msg_id).await?;
-            for key in [
-                Param::WebxdcSummary,
-                Param::WebxdcSummaryTimestamp,
-                Param::WebxdcDocument,
-                Param::WebxdcDocumentTimestamp,
-            ] {
-                if let Some(value) = placeholder.param.get(key) {
-                    param.set(key, value);
-                }
-            }
-        }
-
        let mut txt_raw = "".to_string();
        let mut stmt = conn.prepare_cached(
            r#"
 INSERT INTO msgs
  (
-    id,
    rfc724_mid, chat_id,
    from_id, to_id, timestamp, timestamp_sent, 
    timestamp_rcvd, type, state, msgrmsg, 
@@ -1104,22 +1067,13 @@ INSERT INTO msgs
    ephemeral_timestamp, download_state, hop_info
  )
  VALUES (
-    ?,
    ?, ?, ?, ?,
    ?, ?, ?, ?,
    ?, ?, ?, ?,
    ?, ?, ?, ?,
    ?, ?, ?, ?,
    ?, ?, ?, ?
-  )
-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=excluded.timestamp, timestamp_sent=excluded.timestamp_sent,
-    timestamp_rcvd=excluded.timestamp_rcvd, type=excluded.type, state=excluded.state, msgrmsg=excluded.msgrmsg,
-    txt=excluded.txt, subject=excluded.subject, txt_raw=excluded.txt_raw, param=excluded.param,
-    bytes=excluded.bytes, mime_headers=excluded.mime_headers, mime_in_reply_to=excluded.mime_in_reply_to,
-    mime_references=excluded.mime_references, mime_modified=excluded.mime_modified, error=excluded.error, ephemeral_timer=excluded.ephemeral_timer,
-    ephemeral_timestamp=excluded.ephemeral_timestamp, download_state=excluded.download_state, hop_info=excluded.hop_info
+  );
 "#,
        )?;

@@ -1141,6 +1095,11 @@ SET rfc724_mid=excluded.rfc724_mid, chat_id=excluded.chat_id,
            txt_raw = format!("{}\n\n{}", subject, msg_raw);
        }

+        let mut param = part.param.clone();
+        if is_system_message != SystemMessage::Unknown {
+            param.set_int(Param::Cmd, is_system_message as i32);
+        }
+
        let ephemeral_timestamp = if in_fresh {
            0
        } else {
@@ -1154,10 +1113,9 @@ SET rfc724_mid=excluded.rfc724_mid, chat_id=excluded.chat_id,

        // If you change which information is skipped if the message is trashed,
        // also change `MsgId::trash()` and `delete_expired_messages()`
-        let trash = chat_id.is_trash() || (is_location_kml && msg.is_empty());
+        let trash = chat_id.is_trash() || (location_kml_is && msg.is_empty());

        stmt.execute(paramsv![
-            replace_msg_id,
            rfc724_mid,
            if trash { DC_CHAT_ID_TRASH } else { chat_id },
            if trash { ContactId::UNDEFINED } else { from_id },
@@ -1196,10 +1154,6 @@ SET rfc724_mid=excluded.rfc724_mid, chat_id=excluded.chat_id,
            },
            mime_parser.hop_info
        ])?;
-
-        // We only replace placeholder with a first part,
-        // afterwards insert additional parts.
-        replace_msg_id = None;
        let row_id = conn.last_insert_rowid();

        drop(stmt);
@@ -1208,8 +1162,14 @@ SET rfc724_mid=excluded.rfc724_mid, chat_id=excluded.chat_id,
    drop(conn);

    if let Some(replace_msg_id) = replace_msg_id {
-        // "Replace" placeholder with a message that has no parts.
-        replace_msg_id.delete_from_db(context).await?;
+        if let Some(created_msg_id) = created_db_entries.pop() {
+            context
+                .merge_messages(created_msg_id, replace_msg_id)
+                .await?;
+            created_db_entries.push(replace_msg_id);
+        } else {
+            replace_msg_id.delete_from_db(context).await?;
+        }
    }

    chat_id.unarchive_if_not_muted(context).await?;
@@ -1904,7 +1864,7 @@ async fn apply_mailinglist_changes(
            Contact::add_or_lookup(context, "", list_post, Origin::Hidden).await?;
        let mut contact = Contact::load_from_db(context, contact_id).await?;
        if contact.param.get(Param::ListId) != Some(listid) {
-            contact.param.set(Param::ListId, listid);
+            contact.param.set(Param::ListId, &listid);
            contact.update_param(context).await?;
        }

@@ -1912,7 +1872,7 @@ async fn apply_mailinglist_changes(
            if list_post != old_list_post {
                // Apparently the mailing list is using a different List-Post header in each message.
                // Make the mailing list read-only because we would't know which message the user wants to reply to.
-                chat.param.remove(Param::ListPost);
+                chat.param.set(Param::ListPost, "");
                chat.update_param(context).await?;
            }
        } else {
@@ -2989,7 +2949,7 @@ mod tests {
        assert!(chat.can_send(&t.ctx).await?);
        assert_eq!(
            chat.get_mailinglist_addr(),
-            Some("reply+elernshsetushoyseshetihseusaferuhsedtisneu@reply.github.com")
+            "reply+elernshsetushoyseshetihseusaferuhsedtisneu@reply.github.com"
        );
        assert_eq!(chat.name, "deltachat/deltachat-core-rust");
        assert_eq!(chat::get_chat_contacts(&t.ctx, chat_id).await?.len(), 1);
@@ -2998,7 +2958,7 @@ mod tests {

        let chat = chat::Chat::load_from_db(&t.ctx, chat_id).await?;
        assert!(!chat.can_send(&t.ctx).await?);
-        assert_eq!(chat.get_mailinglist_addr(), None);
+        assert_eq!(chat.get_mailinglist_addr(), "");

        let chats = Chatlist::try_load(&t.ctx, 0, None, None).await?;
        assert_eq!(chats.len(), 1);
@@ -3057,7 +3017,7 @@ mod tests {
        let chat = Chat::load_from_db(&t.ctx, chat_id).await.unwrap();
        assert_eq!(chat.name, "delta-dev");
        assert!(chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), Some("delta@codespeak.net"));
+        assert_eq!(chat.get_mailinglist_addr(), "delta@codespeak.net");

        let msg = get_chat_msg(&t, chat_id, 0, 1).await;
        let contact1 = Contact::load_from_db(&t.ctx, msg.from_id).await.unwrap();
@@ -3149,7 +3109,6 @@ Hello mailinglist!\r\n"
            .unwrap();

        receive_imf(&t.ctx, DC_MAILINGLIST, false).await.unwrap();
-        t.evtracker.wait_next_incoming_message().await;
        let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
        assert_eq!(chats.len(), 1);
        let chat_id = chats.get_chat_id(0).unwrap();
@@ -3162,6 +3121,7 @@ Hello mailinglist!\r\n"
        let chats = Chatlist::try_load(&t.ctx, 0, None, None).await.unwrap();
        assert_eq!(chats.len(), 0); // Test that the message disappeared

+        t.evtracker.consume_events().await;
        receive_imf(&t.ctx, DC_MAILINGLIST2, false).await.unwrap();

        // Check that no notification is displayed for blocked mailing list message.
@@ -3320,7 +3280,7 @@ Hello mailinglist!\r\n"
        assert_eq!(chat.name, "ola");
        assert_eq!(chat::get_chat_msgs(&t, chat.id, 0).await.unwrap().len(), 1);
        assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), None);
+        assert_eq!(chat.get_mailinglist_addr(), "");

        // receive another message with no sender name but the same address,
        // make sure this lands in the same chat
@@ -3373,7 +3333,7 @@ Hello mailinglist!\r\n"
        );
        assert_eq!(chat.name, "Atlas Obscura");
        assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), None);
+        assert_eq!(chat.get_mailinglist_addr(), "");

        Ok(())
    }
@@ -3402,7 +3362,7 @@ Hello mailinglist!\r\n"
        assert_eq!(chat.grpid, "1234ABCD-123LMNO.mailing.dhl.de");
        assert_eq!(chat.name, "DHL Paket");
        assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), None);
+        assert_eq!(chat.get_mailinglist_addr(), "");

        Ok(())
    }
@@ -3431,7 +3391,7 @@ Hello mailinglist!\r\n"
        assert_eq!(chat.grpid, "dpdde.mxmail.service.dpd.de");
        assert_eq!(chat.name, "DPD");
        assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), None);
+        assert_eq!(chat.get_mailinglist_addr(), "");

        Ok(())
    }
@@ -3452,7 +3412,7 @@ Hello mailinglist!\r\n"
        assert_eq!(chat.grpid, "96540.xt.local");
        assert_eq!(chat.name, "Microsoft Store");
        assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), None);
+        assert_eq!(chat.get_mailinglist_addr(), "");

        receive_imf(
            &t,
@@ -3465,7 +3425,7 @@ Hello mailinglist!\r\n"
        assert_eq!(chat.grpid, "121231234.xt.local");
        assert_eq!(chat.name, "DER SPIEGEL Kundenservice");
        assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), None);
+        assert_eq!(chat.get_mailinglist_addr(), "");

        Ok(())
    }
@@ -3488,7 +3448,7 @@ Hello mailinglist!\r\n"
        assert_eq!(chat.grpid, "51231231231231231231231232869f58.xing.com");
        assert_eq!(chat.name, "xing.com");
        assert!(!chat.can_send(&t).await?);
-        assert_eq!(chat.get_mailinglist_addr(), None);
+        assert_eq!(chat.get_mailinglist_addr(), "");

        Ok(())
    }
@@ -4666,7 +4626,7 @@ Reply to all"#,
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_chat_assignment_adhoc() -> Result<()> {
        let alice = TestContext::new_alice().await;
-        let bob = TestContext::new_bob().await;
+        let bob = TestContext::new_alice().await;
        alice.set_config(Config::ShowEmails, Some("2")).await?;
        bob.set_config(Config::ShowEmails, Some("2")).await?;

@@ -4989,7 +4949,7 @@ Reply from different address

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_long_filenames() -> Result<()> {
-        let mut tcm = TestContextManager::new();
+        let mut tcm = TestContextManager::new().await;
        let alice = tcm.alice().await;
        let bob = tcm.bob().await;

@@ -5041,7 +5001,7 @@ Reply from different address
    /// Tests that contact request is accepted automatically on outgoing message.
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_accept_outgoing() -> Result<()> {
-        let mut tcm = TestContextManager::new();
+        let mut tcm = TestContextManager::new().await;
        let alice1 = tcm.alice().await;
        let alice2 = tcm.alice().await;
        let bob1 = tcm.bob().await;
@@ -5086,7 +5046,7 @@ Reply from different address

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_outgoing_private_reply_multidevice() -> Result<()> {
-        let mut tcm = TestContextManager::new();
+        let mut tcm = TestContextManager::new().await;
        let alice1 = tcm.alice().await;
        let alice2 = tcm.alice().await;
        let bob = tcm.bob().await;
@@ -5174,7 +5134,7 @@ Reply from different address

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_no_private_reply_to_blocked_account() -> Result<()> {
-        let mut tcm = TestContextManager::new();
+        let mut tcm = TestContextManager::new().await;
        let alice = tcm.alice().await;
        let bob = tcm.bob().await;

--- a/src/scheduler.rs
+++ b/src/scheduler.rs
@@ -1,11 +1,10 @@
 use anyhow::{bail, Context as _, Result};
 use async_channel::{self as channel, Receiver, Sender};
-use futures::try_join;
+use futures::{join, try_join};
 use futures_lite::FutureExt;
 use tokio::task;

 use crate::config::Config;
-use crate::contact::{ContactId, RecentlySeenLoop};
 use crate::context::Context;
 use crate::ephemeral::{self, delete_expired_imap_messages};
 use crate::imap::Imap;
@@ -36,8 +35,6 @@ pub(crate) struct Scheduler {
    ephemeral_interrupt_send: Sender<()>,
    location_handle: task::JoinHandle<()>,
    location_interrupt_send: Sender<()>,
-
-    recently_seen_loop: RecentlySeenLoop,
 }

 impl Context {
@@ -45,7 +42,7 @@ impl Context {
    pub async fn maybe_network(&self) {
        let lock = self.scheduler.read().await;
        if let Some(scheduler) = &*lock {
-            scheduler.maybe_network();
+            scheduler.maybe_network().await;
        }
        connectivity::idle_interrupted(lock).await;
    }
@@ -54,38 +51,32 @@ impl Context {
    pub async fn maybe_network_lost(&self) {
        let lock = self.scheduler.read().await;
        if let Some(scheduler) = &*lock {
-            scheduler.maybe_network_lost();
+            scheduler.maybe_network_lost().await;
        }
        connectivity::maybe_network_lost(self, lock).await;
    }

    pub(crate) async fn interrupt_inbox(&self, info: InterruptInfo) {
        if let Some(scheduler) = &*self.scheduler.read().await {
-            scheduler.interrupt_inbox(info);
+            scheduler.interrupt_inbox(info).await;
        }
    }

    pub(crate) async fn interrupt_smtp(&self, info: InterruptInfo) {
        if let Some(scheduler) = &*self.scheduler.read().await {
-            scheduler.interrupt_smtp(info);
+            scheduler.interrupt_smtp(info).await;
        }
    }

    pub(crate) async fn interrupt_ephemeral_task(&self) {
        if let Some(scheduler) = &*self.scheduler.read().await {
-            scheduler.interrupt_ephemeral_task();
+            scheduler.interrupt_ephemeral_task().await;
        }
    }

    pub(crate) async fn interrupt_location(&self) {
        if let Some(scheduler) = &*self.scheduler.read().await {
-            scheduler.interrupt_location();
-        }
-    }
-
-    pub(crate) async fn interrupt_recently_seen(&self, contact_id: ContactId, timestamp: i64) {
-        if let Some(scheduler) = &*self.scheduler.read().await {
-            scheduler.interrupt_recently_seen(contact_id, timestamp);
+            scheduler.interrupt_location().await;
        }
    }
 }
@@ -341,7 +332,7 @@ async fn smtp_loop(ctx: Context, started: Sender<()>, smtp_handlers: SmtpConnect
                if !duration_until_can_send.is_zero() {
                    info!(
                        ctx,
-                        "smtp got rate limited, waiting for {} until can send again",
+                        "smtp got rate limited, delaying next try by {}",
                        duration_to_str(duration_until_can_send)
                    );
                    tokio::time::timeout(duration_until_can_send, async {
@@ -481,8 +472,6 @@ impl Scheduler {
            })
        };

-        let recently_seen_loop = RecentlySeenLoop::new(ctx.clone());
-
        let res = Self {
            inbox,
            mvbox,
@@ -496,7 +485,6 @@ impl Scheduler {
            ephemeral_interrupt_send,
            location_handle,
            location_interrupt_send,
-            recently_seen_loop,
        };

        // wait for all loops to be started
@@ -513,48 +501,48 @@ impl Scheduler {
        Ok(res)
    }

-    fn maybe_network(&self) {
-        self.interrupt_inbox(InterruptInfo::new(true));
-        self.interrupt_mvbox(InterruptInfo::new(true));
-        self.interrupt_sentbox(InterruptInfo::new(true));
-        self.interrupt_smtp(InterruptInfo::new(true));
+    async fn maybe_network(&self) {
+        join!(
+            self.interrupt_inbox(InterruptInfo::new(true)),
+            self.interrupt_mvbox(InterruptInfo::new(true)),
+            self.interrupt_sentbox(InterruptInfo::new(true)),
+            self.interrupt_smtp(InterruptInfo::new(true))
+        );
    }

-    fn maybe_network_lost(&self) {
-        self.interrupt_inbox(InterruptInfo::new(false));
-        self.interrupt_mvbox(InterruptInfo::new(false));
-        self.interrupt_sentbox(InterruptInfo::new(false));
-        self.interrupt_smtp(InterruptInfo::new(false));
+    async fn maybe_network_lost(&self) {
+        join!(
+            self.interrupt_inbox(InterruptInfo::new(false)),
+            self.interrupt_mvbox(InterruptInfo::new(false)),
+            self.interrupt_sentbox(InterruptInfo::new(false)),
+            self.interrupt_smtp(InterruptInfo::new(false))
+        );
    }

-    fn interrupt_inbox(&self, info: InterruptInfo) {
-        self.inbox.interrupt(info);
+    async fn interrupt_inbox(&self, info: InterruptInfo) {
+        self.inbox.interrupt(info).await;
    }

-    fn interrupt_mvbox(&self, info: InterruptInfo) {
-        self.mvbox.interrupt(info);
+    async fn interrupt_mvbox(&self, info: InterruptInfo) {
+        self.mvbox.interrupt(info).await;
    }

-    fn interrupt_sentbox(&self, info: InterruptInfo) {
-        self.sentbox.interrupt(info);
+    async fn interrupt_sentbox(&self, info: InterruptInfo) {
+        self.sentbox.interrupt(info).await;
    }

-    fn interrupt_smtp(&self, info: InterruptInfo) {
-        self.smtp.interrupt(info);
+    async fn interrupt_smtp(&self, info: InterruptInfo) {
+        self.smtp.interrupt(info).await;
    }

-    fn interrupt_ephemeral_task(&self) {
+    async fn interrupt_ephemeral_task(&self) {
        self.ephemeral_interrupt_send.try_send(()).ok();
    }

-    fn interrupt_location(&self) {
+    async fn interrupt_location(&self) {
        self.location_interrupt_send.try_send(()).ok();
    }

-    fn interrupt_recently_seen(&self, contact_id: ContactId, timestamp: i64) {
-        self.recently_seen_loop.interrupt(contact_id, timestamp);
-    }
-
    /// Halt the scheduler.
    ///
    /// It consumes the scheduler and never fails to stop it. In the worst case, long-running tasks
@@ -590,7 +578,6 @@ impl Scheduler {
            .ok_or_log(context);
        self.ephemeral_handle.abort();
        self.location_handle.abort();
-        self.recently_seen_loop.abort();
    }
 }

@@ -616,7 +603,7 @@ impl ConnectionState {
        Ok(())
    }

-    fn interrupt(&self, info: InterruptInfo) {
+    async fn interrupt(&self, info: InterruptInfo) {
        // Use try_send to avoid blocking on interrupts.
        self.idle_interrupt_sender.try_send(info).ok();
    }
@@ -650,8 +637,8 @@ impl SmtpConnectionState {
    }

    /// Interrupt any form of idle.
-    fn interrupt(&self, info: InterruptInfo) {
-        self.state.interrupt(info);
+    async fn interrupt(&self, info: InterruptInfo) {
+        self.state.interrupt(info).await;
    }

    /// Shutdown this connection completely.
@@ -695,8 +682,8 @@ impl ImapConnectionState {
    }

    /// Interrupt any form of idle.
-    fn interrupt(&self, info: InterruptInfo) {
-        self.state.interrupt(info);
+    async fn interrupt(&self, info: InterruptInfo) {
+        self.state.interrupt(info).await;
    }

    /// Shutdown this connection completely.
--- a/src/scheduler/connectivity.rs
+++ b/src/scheduler/connectivity.rs
@@ -405,7 +405,7 @@ impl Context {
                    ret += " <b>";
                    ret += &*escaper::encode_minimal(&foldername);
                    ret += ":</b> ";
-                    ret += &*escaper::encode_minimal(&detailed.to_string_imap(self).await);
+                    ret += &*escaper::encode_minimal(&*detailed.to_string_imap(self).await);
                    ret += "</li>";

                    folder_added = true;
--- a/src/securejoin.rs
+++ b/src/securejoin.rs
@@ -693,11 +693,10 @@ mod tests {
    use crate::peerstate::Peerstate;
    use crate::receive_imf::receive_imf;
    use crate::test_utils::{TestContext, TestContextManager};
-    use crate::tools::EmailAddress;

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_setup_contact() {
-        let mut tcm = TestContextManager::new();
+        let mut tcm = TestContextManager::new().await;
        let alice = tcm.alice().await;
        let bob = tcm.bob().await;
        assert_eq!(
@@ -723,10 +722,7 @@ mod tests {
        );

        let sent = bob.pop_sent_msg().await;
-        assert_eq!(
-            sent.recipient(),
-            EmailAddress::new("alice@example.org").unwrap()
-        );
+        assert_eq!(sent.recipient(), "alice@example.org".parse().unwrap());
        let msg = alice.parse_msg(&sent).await;
        assert!(!msg.was_encrypted());
        assert_eq!(msg.get_header(HeaderDef::SecureJoin).unwrap(), "vc-request");
@@ -914,7 +910,7 @@ mod tests {

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_setup_contact_bob_knows_alice() -> Result<()> {
-        let mut tcm = TestContextManager::new();
+        let mut tcm = TestContextManager::new().await;
        let alice = tcm.alice().await;
        let bob = tcm.bob().await;

@@ -1039,7 +1035,7 @@ mod tests {

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_setup_contact_concurrent_calls() -> Result<()> {
-        let mut tcm = TestContextManager::new();
+        let mut tcm = TestContextManager::new().await;
        let alice = tcm.alice().await;
        let bob = tcm.bob().await;

@@ -1070,7 +1066,7 @@ mod tests {

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_secure_join() -> Result<()> {
-        let mut tcm = TestContextManager::new();
+        let mut tcm = TestContextManager::new().await;
        let alice = tcm.alice().await;
        let bob = tcm.bob().await;

@@ -1091,10 +1087,7 @@ mod tests {
        assert_eq!(Chatlist::try_load(&bob, 0, None, None).await?.len(), 1);

        let sent = bob.pop_sent_msg().await;
-        assert_eq!(
-            sent.recipient(),
-            EmailAddress::new("alice@example.org").unwrap()
-        );
+        assert_eq!(sent.recipient(), "alice@example.org".parse().unwrap());
        let msg = alice.parse_msg(&sent).await;
        assert!(!msg.was_encrypted());
        assert_eq!(msg.get_header(HeaderDef::SecureJoin).unwrap(), "vg-request");
--- a/src/smtp.rs
+++ b/src/smtp.rs
@@ -22,6 +22,7 @@ use crate::mimefactory::MimeFactory;
 use crate::oauth2::get_oauth2_access_token;
 use crate::provider::Socket;
 use crate::sql;
+use crate::webxdc::get_busy_webxdc_instances;
 use crate::{context::Context, scheduler::connectivity::ConnectivityStore};

 /// SMTP write and read timeout in seconds.
@@ -64,7 +65,7 @@ impl Smtp {

    /// Return true if smtp was connected but is not known to
    /// have been successfully used the last 60 seconds
-    pub fn has_maybe_stale_connection(&self) -> bool {
+    pub async fn has_maybe_stale_connection(&self) -> bool {
        if let Some(last_success) = self.last_success {
            SystemTime::now()
                .duration_since(last_success)
@@ -77,7 +78,7 @@ impl Smtp {
    }

    /// Check whether we are connected.
-    pub fn is_connected(&self) -> bool {
+    pub async fn is_connected(&self) -> bool {
        self.transport
            .as_ref()
            .map(|t| t.is_connected())
@@ -86,12 +87,12 @@ impl Smtp {

    /// Connect using configured parameters.
    pub async fn connect_configured(&mut self, context: &Context) -> Result<()> {
-        if self.has_maybe_stale_connection() {
+        if self.has_maybe_stale_connection().await {
            info!(context, "Closing stale connection");
            self.disconnect().await;
        }

-        if self.is_connected() {
+        if self.is_connected().await {
            return Ok(());
        }

@@ -117,7 +118,7 @@ impl Smtp {
        addr: &str,
        provider_strict_tls: bool,
    ) -> Result<()> {
-        if self.is_connected() {
+        if self.is_connected().await {
            warn!(context, "SMTP already connected.");
            return Ok(());
        }
@@ -499,7 +500,15 @@ async fn send_mdns(context: &Context, connection: &mut Smtp) -> Result<()> {
 pub(crate) async fn send_smtp_messages(context: &Context, connection: &mut Smtp) -> Result<()> {
    let ratelimited = if context.ratelimit.read().await.can_send() {
        // add status updates and sync messages to end of sending queue
+
+        let update_needed = get_busy_webxdc_instances(&context.sql).await?;
        context.flush_status_updates().await?;
+        let update_needed_after_sending = get_busy_webxdc_instances(&context.sql).await?;
+
+        for msg_id in update_needed.difference(&update_needed_after_sending) {
+            context.emit_event(EventType::WebxdcUpToDate { msg_id: *msg_id })
+        }
+
        context.send_sync_msg().await?;
        false
    } else {
--- a/src/sql.rs
+++ b/src/sql.rs
@@ -7,6 +7,7 @@ use std::path::PathBuf;
 use std::time::Duration;

 use anyhow::{bail, Context as _, Result};
+use rusqlite::types::FromSql;
 use rusqlite::{config::DbConfig, Connection, OpenFlags};
 use tokio::sync::RwLock;

@@ -363,6 +364,25 @@ impl Sql {
        })
    }

+    /// Returns unique values of a `column` in `table`
+    pub async fn distinct<T: FromSql + Default>(
+        &self,
+        table: &str,
+        column: &str,
+    ) -> Result<Vec<T>> {
+        let conn = self.get_conn().await?;
+        let rows: Result<Vec<T>> = tokio::task::block_in_place(move || {
+            let mut stmt = conn.prepare(&format!("SELECT DISTINCT {column} FROM {table}"))?;
+            let rows = stmt
+                .query([])?
+                .mapped(|r| r.get(0))
+                .map(|a| a.unwrap_or_default())
+                .collect();
+            Ok(rows)
+        });
+        rows
+    }
+
    /// Prepares and executes the statement and maps a function over the resulting rows.
    /// Then executes the second function over the returned iterator and returns the
    /// result of that function.
@@ -396,7 +416,7 @@ impl Sql {
    }

    /// Used for executing `SELECT COUNT` statements only. Returns the resulting count.
-    pub async fn count(&self, query: &str, params: impl rusqlite::Params) -> Result<usize> {
+    pub async fn count(&self, query: &str, params: impl rusqlite::Params) -> anyhow::Result<usize> {
        let count: isize = self.query_row(query, params, |row| row.get(0)).await?;
        Ok(usize::try_from(count)?)
    }
@@ -429,10 +449,10 @@ impl Sql {
    ///
    /// If the function returns an error, the transaction will be rolled back. If it does not return an
    /// error, the transaction will be committed.
-    pub async fn transaction<G, H>(&self, callback: G) -> Result<H>
+    pub async fn transaction<G, H>(&self, callback: G) -> anyhow::Result<H>
    where
        H: Send + 'static,
-        G: Send + 'static + FnOnce(&mut rusqlite::Transaction<'_>) -> Result<H>,
+        G: Send + 'static + FnOnce(&mut rusqlite::Transaction<'_>) -> anyhow::Result<H>,
    {
        let mut conn = self.get_conn().await?;
        tokio::task::block_in_place(move || {
@@ -453,7 +473,7 @@ impl Sql {
    }

    /// Query the database if the requested table already exists.
-    pub async fn table_exists(&self, name: &str) -> Result<bool> {
+    pub async fn table_exists(&self, name: &str) -> anyhow::Result<bool> {
        let conn = self.get_conn().await?;
        tokio::task::block_in_place(move || {
            let mut exists = false;
@@ -468,7 +488,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> {
+    pub async fn col_exists(&self, table_name: &str, col_name: &str) -> anyhow::Result<bool> {
        let conn = self.get_conn().await?;
        tokio::task::block_in_place(move || {
            let mut exists = false;
@@ -492,7 +512,7 @@ impl Sql {
        sql: &str,
        params: impl rusqlite::Params,
        f: F,
-    ) -> Result<Option<T>>
+    ) -> anyhow::Result<Option<T>>
    where
        F: FnOnce(&rusqlite::Row) -> rusqlite::Result<T>,
    {
@@ -516,7 +536,7 @@ impl Sql {
        &self,
        query: &str,
        params: impl rusqlite::Params,
-    ) -> Result<Option<T>>
+    ) -> anyhow::Result<Option<T>>
    where
        T: rusqlite::types::FromSql,
    {
--- a/src/sql/migrations.rs
+++ b/src/sql/migrations.rs
@@ -24,6 +24,7 @@ pub async fn run(context: &Context, sql: &Sql) -> Result<(bool, bool, bool, bool
        .await
        .context("failed to check if config table exists")?
    {
+        info!(context, "First time init: creating tables",);
        sql.transaction(move |transaction| {
            transaction.execute_batch(TABLES)?;

@@ -34,8 +35,7 @@ pub async fn run(context: &Context, sql: &Sql) -> Result<(bool, bool, bool, bool
            )?;
            Ok(())
        })
-        .await
-        .context("Creating tables failed")?;
+        .await?;

        let mut lock = context.sql.config_cache.write().await;
        lock.insert(
@@ -57,6 +57,7 @@ pub async fn run(context: &Context, sql: &Sql) -> Result<(bool, bool, bool, bool
    let mut recode_avatar = false;

    if dbversion < 1 {
+        info!(context, "[migration] v1");
        sql.execute_migration(
            r#"
 CREATE TABLE leftgrps ( id INTEGER PRIMARY KEY, grpid TEXT DEFAULT '');
@@ -66,6 +67,7 @@ CREATE INDEX leftgrps_index1 ON leftgrps (grpid);"#,
        .await?;
    }
    if dbversion < 2 {
+        info!(context, "[migration] v2");
        sql.execute_migration(
            "ALTER TABLE contacts ADD COLUMN authname TEXT DEFAULT '';",
            2,
@@ -73,6 +75,7 @@ CREATE INDEX leftgrps_index1 ON leftgrps (grpid);"#,
        .await?;
    }
    if dbversion < 7 {
+        info!(context, "[migration] v7");
        sql.execute_migration(
            "CREATE TABLE keypairs (\
                 id INTEGER PRIMARY KEY, \
@@ -86,6 +89,7 @@ CREATE INDEX leftgrps_index1 ON leftgrps (grpid);"#,
        .await?;
    }
    if dbversion < 10 {
+        info!(context, "[migration] v10");
        sql.execute_migration(
            "CREATE TABLE acpeerstates (\
                 id INTEGER PRIMARY KEY, \
@@ -100,6 +104,7 @@ CREATE INDEX leftgrps_index1 ON leftgrps (grpid);"#,
        .await?;
    }
    if dbversion < 12 {
+        info!(context, "[migration] v12");
        sql.execute_migration(
            r#"
 CREATE TABLE msgs_mdns ( msg_id INTEGER,  contact_id INTEGER);
@@ -109,6 +114,7 @@ CREATE INDEX msgs_mdns_index1 ON msgs_mdns (msg_id);"#,
        .await?;
    }
    if dbversion < 17 {
+        info!(context, "[migration] v17");
        sql.execute_migration(
            r#"
 ALTER TABLE chats ADD COLUMN archived INTEGER DEFAULT 0;
@@ -122,6 +128,7 @@ CREATE INDEX msgs_index5 ON msgs (starred);"#,
        .await?;
    }
    if dbversion < 18 {
+        info!(context, "[migration] v18");
        sql.execute_migration(
            r#"
 ALTER TABLE acpeerstates ADD COLUMN gossip_timestamp INTEGER DEFAULT 0;
@@ -131,6 +138,7 @@ ALTER TABLE acpeerstates ADD COLUMN gossip_key;"#,
        .await?;
    }
    if dbversion < 27 {
+        info!(context, "[migration] v27");
        // chat.id=1 and chat.id=2 are the old deaddrops,
        // the current ones are defined by chats.blocked=2
        sql.execute_migration(
@@ -144,6 +152,7 @@ ALTER TABLE msgs ADD COLUMN timestamp_rcvd INTEGER DEFAULT 0;"#,
        .await?;
    }
    if dbversion < 34 {
+        info!(context, "[migration] v34");
        sql.execute_migration(
            r#"
 ALTER TABLE msgs ADD COLUMN hidden INTEGER DEFAULT 0;
@@ -158,6 +167,7 @@ CREATE INDEX acpeerstates_index4 ON acpeerstates (gossip_key_fingerprint);"#,
        recalc_fingerprints = true;
    }
    if dbversion < 39 {
+        info!(context, "[migration] v39");
        sql.execute_migration(
            r#"
 CREATE TABLE tokens ( 
@@ -175,14 +185,17 @@ CREATE INDEX acpeerstates_index5 ON acpeerstates (verified_key_fingerprint);"#,
        .await?;
    }
    if dbversion < 40 {
+        info!(context, "[migration] v40");
        sql.execute_migration("ALTER TABLE jobs ADD COLUMN thread INTEGER DEFAULT 0;", 40)
            .await?;
    }
    if dbversion < 44 {
+        info!(context, "[migration] v44");
        sql.execute_migration("ALTER TABLE msgs ADD COLUMN mime_headers TEXT;", 44)
            .await?;
    }
    if dbversion < 46 {
+        info!(context, "[migration] v46");
        sql.execute_migration(
            r#"
 ALTER TABLE msgs ADD COLUMN mime_in_reply_to TEXT;
@@ -192,10 +205,12 @@ ALTER TABLE msgs ADD COLUMN mime_references TEXT;"#,
        .await?;
    }
    if dbversion < 47 {
+        info!(context, "[migration] v47");
        sql.execute_migration("ALTER TABLE jobs ADD COLUMN tries INTEGER DEFAULT 0;", 47)
            .await?;
    }
    if dbversion < 48 {
+        info!(context, "[migration] v48");
        // NOTE: move_state is not used anymore
        sql.execute_migration(
            "ALTER TABLE msgs ADD COLUMN move_state INTEGER DEFAULT 1;",
@@ -204,6 +219,7 @@ ALTER TABLE msgs ADD COLUMN mime_references TEXT;"#,
        .await?;
    }
    if dbversion < 49 {
+        info!(context, "[migration] v49");
        sql.execute_migration(
            "ALTER TABLE chats ADD COLUMN gossiped_timestamp INTEGER DEFAULT 0;",
            49,
@@ -211,6 +227,7 @@ ALTER TABLE msgs ADD COLUMN mime_references TEXT;"#,
        .await?;
    }
    if dbversion < 50 {
+        info!(context, "[migration] v50");
        // installations <= 0.100.1 used DC_SHOW_EMAILS_ALL implicitly;
        // keep this default and use DC_SHOW_EMAILS_NO
        // only for new installations
@@ -221,6 +238,7 @@ ALTER TABLE msgs ADD COLUMN mime_references TEXT;"#,
        sql.set_db_version(50).await?;
    }
    if dbversion < 53 {
+        info!(context, "[migration] v53");
        // the messages containing _only_ locations
        // are also added to the database as _hidden_.
        sql.execute_migration(
@@ -245,6 +263,7 @@ CREATE INDEX chats_index3 ON chats (locations_send_until);"#,
        .await?;
    }
    if dbversion < 54 {
+        info!(context, "[migration] v54");
        sql.execute_migration(
            r#"
 ALTER TABLE msgs ADD COLUMN location_id INTEGER DEFAULT 0;
@@ -254,6 +273,7 @@ CREATE INDEX msgs_index6 ON msgs (location_id);"#,
        .await?;
    }
    if dbversion < 55 {
+        info!(context, "[migration] v55");
        sql.execute_migration(
            "ALTER TABLE locations ADD COLUMN independent INTEGER DEFAULT 0;",
            55,
@@ -261,6 +281,7 @@ CREATE INDEX msgs_index6 ON msgs (location_id);"#,
        .await?;
    }
    if dbversion < 59 {
+        info!(context, "[migration] v59");
        // records in the devmsglabels are kept when the message is deleted.
        // so, msg_id may or may not exist.
        sql.execute_migration(
@@ -274,6 +295,7 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);"#, 59)
    }

    if dbversion < 60 {
+        info!(context, "[migration] v60");
        sql.execute_migration(
            "ALTER TABLE chats ADD COLUMN created_timestamp INTEGER DEFAULT 0;",
            60,
@@ -281,6 +303,7 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);"#, 59)
        .await?;
    }
    if dbversion < 61 {
+        info!(context, "[migration] v61");
        sql.execute_migration(
            "ALTER TABLE contacts ADD COLUMN selfavatar_sent INTEGER DEFAULT 0;",
            61,
@@ -289,6 +312,7 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);"#, 59)
        update_icons = true;
    }
    if dbversion < 62 {
+        info!(context, "[migration] v62");
        sql.execute_migration(
            "ALTER TABLE chats ADD COLUMN muted_until INTEGER DEFAULT 0;",
            62,
@@ -296,14 +320,17 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);"#, 59)
        .await?;
    }
    if dbversion < 63 {
+        info!(context, "[migration] v63");
        sql.execute_migration("UPDATE chats SET grpid='' WHERE type=100", 63)
            .await?;
    }
    if dbversion < 64 {
+        info!(context, "[migration] v64");
        sql.execute_migration("ALTER TABLE msgs ADD COLUMN error TEXT DEFAULT '';", 64)
            .await?;
    }
    if dbversion < 65 {
+        info!(context, "[migration] v65");
        sql.execute_migration(
            r#"
 ALTER TABLE chats ADD COLUMN ephemeral_timer INTEGER;
@@ -314,10 +341,12 @@ ALTER TABLE msgs ADD COLUMN ephemeral_timestamp INTEGER DEFAULT 0;"#,
        .await?;
    }
    if dbversion < 66 {
+        info!(context, "[migration] v66");
        update_icons = true;
        sql.set_db_version(66).await?;
    }
    if dbversion < 67 {
+        info!(context, "[migration] v67");
        for prefix in &["", "configured_"] {
            if let Some(server_flags) = sql
                .get_raw_config_int(format!("{}server_flags", prefix))
@@ -344,6 +373,7 @@ ALTER TABLE msgs ADD COLUMN ephemeral_timestamp INTEGER DEFAULT 0;"#,
        sql.set_db_version(67).await?;
    }
    if dbversion < 68 {
+        info!(context, "[migration] v68");
        // the index is used to speed up get_fresh_msg_cnt() (see comment there for more details) and marknoticed_chat()
        sql.execute_migration(
            "CREATE INDEX IF NOT EXISTS msgs_index7 ON msgs (state, hidden, chat_id);",
@@ -352,6 +382,7 @@ ALTER TABLE msgs ADD COLUMN ephemeral_timestamp INTEGER DEFAULT 0;"#,
        .await?;
    }
    if dbversion < 69 {
+        info!(context, "[migration] v69");
        sql.execute_migration(
            r#"
 ALTER TABLE chats ADD COLUMN protected INTEGER DEFAULT 0;
@@ -363,8 +394,9 @@ UPDATE chats SET protected=1, type=120 WHERE type=130;"#,
    }

    if dbversion < 71 {
+        info!(context, "[migration] v71");
        if let Ok(addr) = context.get_primary_self_addr().await {
-            if let Ok(domain) = EmailAddress::new(&addr).map(|email| email.domain) {
+            if let Ok(domain) = addr.parse::<EmailAddress>().map(|email| email.domain) {
                context
                    .set_config(
                        Config::ConfiguredProvider,
@@ -378,16 +410,20 @@ UPDATE chats SET protected=1, type=120 WHERE type=130;"#,

        sql.set_db_version(71).await?;
    }
-    if dbversion < 72 && !sql.col_exists("msgs", "mime_modified").await? {
-        sql.execute_migration(
-            r#"
-    ALTER TABLE msgs ADD COLUMN mime_modified INTEGER DEFAULT 0;"#,
-            72,
-        )
-        .await?;
+    if dbversion < 72 {
+        info!(context, "[migration] v72");
+        if !sql.col_exists("msgs", "mime_modified").await? {
+            sql.execute_migration(
+                r#"
+ALTER TABLE msgs ADD COLUMN mime_modified INTEGER DEFAULT 0;"#,
+                72,
+            )
+            .await?;
+        }
    }
    if dbversion < 73 {
        use Config::*;
+        info!(context, "[migration] v73");
        sql.execute(
            r#"
 CREATE TABLE imap_sync (folder TEXT PRIMARY KEY, uidvalidity INTEGER DEFAULT 0, uid_next INTEGER DEFAULT 0);"#,
@@ -423,10 +459,12 @@ paramsv![]
        sql.set_db_version(73).await?;
    }
    if dbversion < 74 {
+        info!(context, "[migration] v74");
        sql.execute_migration("UPDATE contacts SET name='' WHERE name=authname", 74)
            .await?;
    }
    if dbversion < 75 {
+        info!(context, "[migration] v75");
        sql.execute_migration(
            "ALTER TABLE contacts ADD COLUMN status TEXT DEFAULT '';",
            75,
@@ -434,20 +472,24 @@ paramsv![]
        .await?;
    }
    if dbversion < 76 {
+        info!(context, "[migration] v76");
        sql.execute_migration("ALTER TABLE msgs ADD COLUMN subject TEXT DEFAULT '';", 76)
            .await?;
    }
    if dbversion < 77 {
+        info!(context, "[migration] v77");
        recode_avatar = true;
        sql.set_db_version(77).await?;
    }
    if dbversion < 78 {
        // move requests to "Archived Chats",
        // this way, the app looks familiar after the contact request upgrade.
+        info!(context, "[migration] v78");
        sql.execute_migration("UPDATE chats SET archived=1 WHERE blocked=2;", 78)
            .await?;
    }
    if dbversion < 79 {
+        info!(context, "[migration] v79");
        sql.execute_migration(
            r#"
        ALTER TABLE msgs ADD COLUMN download_state INTEGER DEFAULT 0;
@@ -457,6 +499,7 @@ paramsv![]
        .await?;
    }
    if dbversion < 80 {
+        info!(context, "[migration] v80");
        sql.execute_migration(
            r#"CREATE TABLE multi_device_sync (
 id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -466,10 +509,12 @@ item TEXT DEFAULT '');"#,
        .await?;
    }
    if dbversion < 81 {
+        info!(context, "[migration] v81");
        sql.execute_migration("ALTER TABLE msgs ADD COLUMN hop_info TEXT;", 81)
            .await?;
    }
    if dbversion < 82 {
+        info!(context, "[migration] v82");
        sql.execute_migration(
            r#"CREATE TABLE imap (
 id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -502,6 +547,7 @@ DO UPDATE SET rfc724_mid=excluded.rfc724_mid,
        .await?;
    }
    if dbversion < 83 {
+        info!(context, "[migration] v83");
        sql.execute_migration(
            "ALTER TABLE imap_sync
             ADD COLUMN modseq -- Highest modification sequence
@@ -511,6 +557,7 @@ DO UPDATE SET rfc724_mid=excluded.rfc724_mid,
        .await?;
    }
    if dbversion < 84 {
+        info!(context, "[migration] v84");
        sql.execute_migration(
            r#"CREATE TABLE msgs_status_updates (
 id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -523,6 +570,7 @@ CREATE INDEX msgs_status_updates_index1 ON msgs_status_updates (msg_id);"#,
        .await?;
    }
    if dbversion < 85 {
+        info!(context, "[migration] v85");
        sql.execute_migration(
            r#"CREATE TABLE smtp (
 id INTEGER PRIMARY KEY,
@@ -539,6 +587,7 @@ CREATE INDEX smtp_messageid ON imap(rfc724_mid);
        .await?;
    }
    if dbversion < 86 {
+        info!(context, "[migration] v86");
        sql.execute_migration(
            r#"CREATE TABLE bobstate (
                   id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -551,6 +600,7 @@ CREATE INDEX smtp_messageid ON imap(rfc724_mid);
        .await?;
    }
    if dbversion < 87 {
+        info!(context, "[migration] v87");
        // the index is used to speed up delete_expired_messages()
        sql.execute_migration(
            "CREATE INDEX IF NOT EXISTS msgs_index8 ON msgs (ephemeral_timestamp);",
@@ -559,10 +609,12 @@ CREATE INDEX smtp_messageid ON imap(rfc724_mid);
        .await?;
    }
    if dbversion < 88 {
+        info!(context, "[migration] v88");
        sql.execute_migration("DROP TABLE IF EXISTS backup_blobs;", 88)
            .await?;
    }
    if dbversion < 89 {
+        info!(context, "[migration] v89");
        sql.execute_migration(
            r#"CREATE TABLE imap_markseen (
              id INTEGER,
@@ -573,6 +625,7 @@ CREATE INDEX smtp_messageid ON imap(rfc724_mid);
        .await?;
    }
    if dbversion < 90 {
+        info!(context, "[migration] v90");
        sql.execute_migration(
            r#"CREATE TABLE smtp_mdns (
              msg_id INTEGER NOT NULL, -- id of the message in msgs table which requested MDN
@@ -585,6 +638,7 @@ CREATE INDEX smtp_messageid ON imap(rfc724_mid);
        .await?;
    }
    if dbversion < 91 {
+        info!(context, "[migration] v91");
        sql.execute_migration(
            r#"CREATE TABLE smtp_status_updates (
              msg_id INTEGER NOT NULL UNIQUE, -- msg_id of the webxdc instance with pending updates
@@ -596,42 +650,6 @@ CREATE INDEX smtp_messageid ON imap(rfc724_mid);
        )
        .await?;
    }
-    if dbversion < 92 {
-        sql.execute_migration(
-            r#"CREATE TABLE reactions (
-              msg_id INTEGER NOT NULL, -- id of the message reacted to
-              contact_id INTEGER NOT NULL, -- id of the contact reacting to the message
-              reaction TEXT DEFAULT '' NOT NULL, -- a sequence of emojis separated by spaces
-              PRIMARY KEY(msg_id, contact_id),
-              FOREIGN KEY(msg_id) REFERENCES msgs(id) ON DELETE CASCADE -- delete reactions when message is deleted
-              FOREIGN KEY(contact_id) REFERENCES contacts(id) ON DELETE CASCADE -- delete reactions when contact is deleted
-            )"#,
-            92
-        ).await?;
-    }
-    if dbversion < 93 {
-        sql.execute_migration(
-            "CREATE TABLE sending_domains(domain TEXT PRIMARY KEY, dkim_works INTEGER DEFAULT 0);",
-            93,
-        )
-        .await?;
-    }
-
-    let new_version = sql
-        .get_raw_config_int(VERSION_CFG)
-        .await?
-        .unwrap_or_default();
-    if new_version != dbversion || !exists_before_update {
-        let created_db = if exists_before_update {
-            ""
-        } else {
-            "Created new database; "
-        };
-        info!(
-            context,
-            "{}[migration] v{}-v{}", created_db, dbversion, new_version
-        );
-    }

    Ok((
        recalc_fingerprints,
--- a/src/stock_str.rs
+++ b/src/stock_str.rs
@@ -1,14 +1,9 @@
 //! Module to work with translatable stock strings.

-use std::collections::HashMap;
-use std::sync::Arc;
-
-use anyhow::{bail, Result};
+use anyhow::{bail, Error};
 use strum::EnumProperty as EnumPropertyTrait;
 use strum_macros::EnumProperty;
-use tokio::sync::RwLock;

-use crate::accounts::Accounts;
 use crate::blob::BlobObject;
 use crate::chat::{self, Chat, ChatId, ProtectionStatus};
 use crate::config::Config;
@@ -19,12 +14,6 @@ use crate::param::Param;
 use crate::tools::timestamp_to_str;
 use humansize::{file_size_opts, FileSize};

-#[derive(Debug, Clone)]
-pub struct StockStrings {
-    /// Map from stock string ID to the translation.
-    translated_stockstrings: Arc<RwLock<HashMap<usize, String>>>,
-}
-
 /// Stock strings
 ///
 /// These identify the string to return in [Context.stock_str].  The
@@ -413,54 +402,15 @@ impl StockMessage {
    }
 }

-impl Default for StockStrings {
-    fn default() -> Self {
-        StockStrings::new()
-    }
-}
-
-impl StockStrings {
-    pub fn new() -> Self {
-        Self {
-            translated_stockstrings: Arc::new(RwLock::new(Default::default())),
-        }
-    }
-
-    async fn translated(&self, id: StockMessage) -> String {
-        self.translated_stockstrings
-            .read()
-            .await
-            .get(&(id as usize))
-            .map(AsRef::as_ref)
-            .unwrap_or_else(|| id.fallback())
-            .to_string()
-    }
-
-    async fn set_stock_translation(&self, id: StockMessage, stockstring: String) -> Result<()> {
-        if stockstring.contains("%1") && !id.fallback().contains("%1") {
-            bail!(
-                "translation {} contains invalid %1 placeholder, default is {}",
-                stockstring,
-                id.fallback()
-            );
-        }
-        if stockstring.contains("%2") && !id.fallback().contains("%2") {
-            bail!(
-                "translation {} contains invalid %2 placeholder, default is {}",
-                stockstring,
-                id.fallback()
-            );
-        }
-        self.translated_stockstrings
-            .write()
-            .await
-            .insert(id as usize, stockstring);
-        Ok(())
-    }
-}
-
 async fn translated(context: &Context, id: StockMessage) -> String {
-    context.translated_stockstrings.translated(id).await
+    context
+        .translated_stockstrings
+        .read()
+        .await
+        .get(&(id as usize))
+        .map(AsRef::as_ref)
+        .unwrap_or_else(|| id.fallback())
+        .to_string()
 }

 /// Helper trait only meant to be implemented for [`String`].
@@ -1255,10 +1205,29 @@ pub(crate) async fn aeap_explanation_and_link(
 impl Context {
    /// Set the stock string for the [StockMessage].
    ///
-    pub async fn set_stock_translation(&self, id: StockMessage, stockstring: String) -> Result<()> {
+    pub async fn set_stock_translation(
+        &self,
+        id: StockMessage,
+        stockstring: String,
+    ) -> Result<(), Error> {
+        if stockstring.contains("%1") && !id.fallback().contains("%1") {
+            bail!(
+                "translation {} contains invalid %1 placeholder, default is {}",
+                stockstring,
+                id.fallback()
+            );
+        }
+        if stockstring.contains("%2") && !id.fallback().contains("%2") {
+            bail!(
+                "translation {} contains invalid %2 placeholder, default is {}",
+                stockstring,
+                id.fallback()
+            );
+        }
        self.translated_stockstrings
-            .set_stock_translation(id, stockstring)
-            .await?;
+            .write()
+            .await
+            .insert(id as usize, stockstring);
        Ok(())
    }

@@ -1274,7 +1243,7 @@ impl Context {
        }
    }

-    pub(crate) async fn update_device_chats(&self) -> Result<()> {
+    pub(crate) async fn update_device_chats(&self) -> Result<(), Error> {
        if self.get_config_bool(Config::Bot).await? {
            return Ok(());
        }
@@ -1303,22 +1272,10 @@ impl Context {
    }
 }

-impl Accounts {
-    /// Set the stock string for the [StockMessage].
-    ///
-    pub async fn set_stock_translation(&self, id: StockMessage, stockstring: String) -> Result<()> {
-        self.stockstrings
-            .set_stock_translation(id, stockstring)
-            .await?;
-        Ok(())
-    }
-}
-
 #[cfg(test)]
 mod tests {
    use num_traits::ToPrimitive;

-    use crate::chat::delete_and_reset_all_device_msgs;
    use crate::chat::Chat;
    use crate::chatlist::Chatlist;
    use crate::test_utils::TestContext;
@@ -1429,7 +1386,7 @@ mod tests {
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_quota_exceeding_stock_str() -> Result<()> {
+    async fn test_quota_exceeding_stock_str() -> anyhow::Result<()> {
        let t = TestContext::new().await;
        let str = quota_exceeding(&t, 81).await;
        assert!(str.contains("81% "));
@@ -1439,7 +1396,7 @@ mod tests {
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_partial_download_msg_body() -> Result<()> {
+    async fn test_partial_download_msg_body() -> anyhow::Result<()> {
        let t = TestContext::new().await;
        let str = partial_download_msg_body(&t, 1024 * 1024).await;
        assert_eq!(str, "1 MiB message");
@@ -1484,17 +1441,7 @@ mod tests {
        assert_eq!(chats.len(), 0);

        // a subsequent call to update_device_chats() must not re-add manally deleted messages or chats
-        t.update_device_chats().await.unwrap();
-        let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap();
-        assert_eq!(chats.len(), 0);
-
-        // Reset all device messages. This normally happens due to account export and import.
-        // Check that update_device_chats() does not add welcome message for imported account.
-        delete_and_reset_all_device_msgs(&t).await.unwrap();
-        let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap();
-        assert_eq!(chats.len(), 0);
-
-        t.update_device_chats().await.unwrap();
+        t.update_device_chats().await.ok();
        let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap();
        assert_eq!(chats.len(), 0);
    }
--- a/src/sync.rs
+++ b/src/sync.rs
@@ -185,7 +185,7 @@ impl Context {
        }
    }

-    pub(crate) fn build_sync_part(&self, json: String) -> PartBuilder {
+    pub(crate) async fn build_sync_part(&self, json: String) -> PartBuilder {
        PartBuilder::new()
            .content_type(&"application/json".parse::<mime::Mime>().unwrap())
            .header((
--- a/src/test_utils.rs
+++ b/src/test_utils.rs
@@ -29,7 +29,6 @@ use crate::key::{self, DcKey, KeyPair, KeyPairUse};
 use crate::message::{update_msg_state, Message, MessageState, MsgId, Viewtype};
 use crate::mimeparser::MimeMessage;
 use crate::receive_imf::receive_imf;
-use crate::stock_str::StockStrings;
 use crate::tools::EmailAddress;

 #[allow(non_upper_case_globals)]
@@ -45,7 +44,7 @@ pub struct TestContextManager {
 }

 impl TestContextManager {
-    pub fn new() -> Self {
+    pub async fn new() -> Self {
        let (log_tx, _log_sink) = LogSink::create();
        Self { log_tx, _log_sink }
    }
@@ -74,14 +73,6 @@ impl TestContextManager {
            .await
    }

-    /// Creates a new unconfigured test account.
-    pub async fn unconfigured(&mut self) -> TestContext {
-        TestContext::builder()
-            .with_log_sink(self.log_tx.clone())
-            .build()
-            .await
-    }
-
    /// Writes info events to the log that mark a section, e.g.:
    ///
    /// ========== `msg` goes here ==========
@@ -97,23 +88,19 @@ impl TestContextManager {
    /// - Let the other TestContext receive it and accept the chat
    /// - Assert that the message arrived
    pub async fn send_recv_accept(&self, from: &TestContext, to: &TestContext, msg: &str) {
-        let received_msg = self.try_send_recv(from, to, msg).await;
-        assert_eq!(received_msg.text.as_ref().unwrap(), msg);
-        received_msg.chat_id.accept(to).await.unwrap();
-    }
-
-    /// - Let one TestContext send a message
-    /// - Let the other TestContext receive it
-    pub async fn try_send_recv(&self, from: &TestContext, to: &TestContext, msg: &str) -> Message {
        self.section(&format!(
            "{} sends a message '{}' to {}",
            from.name(),
            msg,
            to.name()
        ));
+
        let chat = from.create_chat(to).await;
        let sent = from.send_text(chat.id, msg).await;
-        to.recv_msg(&sent).await
+
+        let received_msg = to.recv_msg(&sent).await;
+        received_msg.chat_id.accept(to).await.unwrap();
+        assert_eq!(received_msg.text.unwrap(), msg);
    }

    pub async fn change_addr(&self, test_context: &TestContext, new_addr: &str) {
@@ -290,7 +277,7 @@ impl TestContext {
            let mut context_names = CONTEXT_NAMES.write().unwrap();
            context_names.insert(id, name);
        }
-        let ctx = Context::new(&dbfile, id, Events::new(), StockStrings::new())
+        let ctx = Context::new(&dbfile, id, Events::new())
            .await
            .expect("failed to create context");

@@ -381,12 +368,6 @@ impl TestContext {
    ///
    /// Panics if there is no message or on any error.
    pub async fn pop_sent_msg(&self) -> SentMessage {
-        self.pop_sent_msg_opt(Duration::from_secs(3))
-            .await
-            .expect("no sent message found in jobs table")
-    }
-
-    pub async fn pop_sent_msg_opt(&self, timeout: Duration) -> Option<SentMessage> {
        let start = Instant::now();
        let (rowid, msg_id, payload, recipients) = loop {
            let row = self
@@ -411,25 +392,25 @@ impl TestContext {
            if let Some(row) = row {
                break row;
            }
-            if start.elapsed() < timeout {
+            if start.elapsed() < Duration::from_secs(3) {
                tokio::time::sleep(Duration::from_millis(100)).await;
            } else {
-                return None;
+                panic!("no sent message found in jobs table");
            }
        };
        self.ctx
            .sql
-            .execute("DELETE FROM smtp WHERE id=?;", paramsv![rowid])
+            .execute("DELETE FROM jobs WHERE id=?;", paramsv![rowid])
            .await
            .expect("failed to remove job");
        update_msg_state(&self.ctx, msg_id, MessageState::OutDelivered)
            .await
            .expect("failed to update message state");
-        Some(SentMessage {
+        SentMessage {
            payload,
            sender_msg_id: msg_id,
            recipients,
-        })
+        }
    }

    /// Parses a message.
@@ -743,7 +724,7 @@ impl Drop for LogSink {
 /// passed through a SMTP-IMAP pipeline.
 #[derive(Debug, Clone)]
 pub struct SentMessage {
-    pub payload: String,
+    payload: String,
    recipients: String,
    pub sender_msg_id: MsgId,
 }
@@ -758,7 +739,7 @@ impl SentMessage {
            .split(' ')
            .next()
            .expect("no recipient found");
-        EmailAddress::new(rcpt).expect("failed to parse email address")
+        rcpt.parse().expect("failed to parse email address")
    }

    /// The raw message payload.
@@ -876,10 +857,9 @@ impl EventTracker {
        .await
    }

-    /// Wait for the next IncomingMsg event.
-    pub async fn wait_next_incoming_message(&self) {
-        self.get_matching(|evt| matches!(evt, EventType::IncomingMsg { .. }))
-            .await;
+    /// Consumes all pending events.
+    pub async fn consume_events(&self) {
+        while self.try_recv().is_ok() {}
    }
 }

@@ -1059,7 +1039,7 @@ mod tests {

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_with_both() {
-        let mut tcm = TestContextManager::new();
+        let mut tcm = TestContextManager::new().await;
        let alice = tcm.alice().await;
        let bob = tcm.bob().await;

--- a/src/tests/aeap.rs
+++ b/src/tests/aeap.rs
@@ -18,7 +18,7 @@ use crate::test_utils::TestContextManager;

 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_change_primary_self_addr() -> Result<()> {
-    let mut tcm = TestContextManager::new();
+    let mut tcm = TestContextManager::new().await;
    let alice = tcm.alice().await;
    let bob = tcm.bob().await;

@@ -130,7 +130,7 @@ async fn check_aeap_transition(
    // the case where Bob already had contact with Alice's new address
    const ALICE_NEW_ADDR: &str = "fiona@example.net";

-    let mut tcm = TestContextManager::new();
+    let mut tcm = TestContextManager::new().await;
    let alice = tcm.alice().await;
    let bob = tcm.bob().await;

@@ -362,7 +362,7 @@ async fn get_last_info_msg(t: &TestContext, chat_id: ChatId) -> Option<Message>
 /// to make Bob think that there was a transition to Fiona's address.
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_aeap_replay_attack() -> Result<()> {
-    let mut tcm = TestContextManager::new();
+    let mut tcm = TestContextManager::new().await;
    let alice = tcm.alice().await;
    let bob = tcm.bob().await;

--- a/src/tools.rs
+++ b/src/tools.rs
@@ -7,12 +7,12 @@ use std::fmt;
 use std::io::Cursor;
 use std::path::{Path, PathBuf};
 use std::str::from_utf8;
-
+use std::str::FromStr;
 use std::time::{Duration, SystemTime};

 use anyhow::{bail, Error, Result};
 use chrono::{Local, TimeZone};
-use futures::{StreamExt, TryStreamExt};
+use futures::StreamExt;
 use mailparse::dateparse;
 use mailparse::headers::Headers;
 use mailparse::MailHeaderMap;
@@ -49,65 +49,6 @@ pub(crate) fn truncate(buf: &str, approx_chars: usize) -> Cow<str> {
    }
 }

-/// Shortens a string to a specified line count and adds "[...]" to the
-/// end of the shortened string.
-///
-/// returns tuple with the String and a boolean whether is was truncated
-pub(crate) fn truncate_by_lines(
-    buf: String,
-    max_lines: usize,
-    max_line_len: usize,
-) -> (String, bool) {
-    let mut lines = 0;
-    let mut line_chars = 0;
-    let mut break_point: Option<usize> = None;
-
-    for (index, char) in buf.char_indices() {
-        if char == '\n' {
-            line_chars = 0;
-            lines += 1;
-        } else {
-            line_chars += 1;
-            if line_chars > max_line_len {
-                line_chars = 1;
-                lines += 1;
-            }
-        }
-        if lines == max_lines {
-            break_point = Some(index);
-            break;
-        }
-    }
-
-    if let Some(end_pos) = break_point {
-        // Text has too many lines and needs to be truncated.
-        let text = {
-            if let Some(buffer) = buf.get(..end_pos) {
-                if let Some(index) = buffer.rfind(|c| c == ' ' || c == '\n') {
-                    buf.get(..=index)
-                } else {
-                    buf.get(..end_pos)
-                }
-            } else {
-                None
-            }
-        };
-
-        if let Some(truncated_text) = text {
-            (format!("{}{}", truncated_text, DC_ELLIPSIS), true)
-        } else {
-            // In case of indexing/slicing error, we return an error
-            // message as a preview and add HTML version. This should
-            // never happen.
-            let error_text = "[Truncation of the message failed, this is a bug in the Delta Chat core. Please report it.\nYou can still open the full text to view the original message.]";
-            (error_text.to_string(), true)
-        }
-    } else {
-        // text is unchanged
-        (buf, false)
-    }
-}
-
 /* ******************************************************************************
 * date/time tools
 ******************************************************************************/
@@ -272,7 +213,7 @@ pub(crate) fn create_id() -> String {
    rng.fill(&mut arr[..]);

    // Take 11 base64 characters containing 66 random bits.
-    base64::encode_config(arr, base64::URL_SAFE)
+    base64::encode_config(&arr, base64::URL_SAFE)
        .chars()
        .take(11)
        .collect()
@@ -495,13 +436,6 @@ pub fn open_file_std<P: AsRef<std::path::Path>>(
    }
 }

-pub async fn read_dir(path: &Path) -> Result<Vec<fs::DirEntry>> {
-    let res = tokio_stream::wrappers::ReadDirStream::new(fs::read_dir(path).await?)
-        .try_collect()
-        .await?;
-    Ok(res)
-}
-
 pub(crate) fn time() -> i64 {
    SystemTime::now()
        .duration_since(SystemTime::UNIX_EPOCH)
@@ -531,15 +465,23 @@ pub struct EmailAddress {
    pub domain: String,
 }

+impl EmailAddress {
+    pub fn new(input: &str) -> Result<Self> {
+        input.parse::<EmailAddress>()
+    }
+}
+
 impl fmt::Display for EmailAddress {
    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
        write!(f, "{}@{}", self.local, self.domain)
    }
 }

-impl EmailAddress {
+impl FromStr for EmailAddress {
+    type Err = Error;
+
    /// Performs a dead-simple parse of an email address.
-    pub fn new(input: &str) -> Result<EmailAddress> {
+    fn from_str(input: &str) -> Result<EmailAddress> {
        if input.is_empty() {
            bail!("empty string is not valid");
        }
@@ -722,9 +664,7 @@ hi
 Message-ID: 2dfdbde7@example.org

 Hop: From: localhost; By: hq5.merlinux.eu; Date: Sat, 14 Sep 2019 17:00:22 +0000
-Hop: From: hq5.merlinux.eu; By: hq5.merlinux.eu; Date: Sat, 14 Sep 2019 17:00:25 +0000
-
-DKIM Results: Passed=true, Works=true, Allow_Keychange=true";
+Hop: From: hq5.merlinux.eu; By: hq5.merlinux.eu; Date: Sat, 14 Sep 2019 17:00:25 +0000";
        check_parse_receive_headers_integration(raw, expected).await;

        let raw = include_bytes!("../test-data/message/encrypted_with_received_headers.eml");
@@ -741,9 +681,7 @@ Message-ID: Mr.adQpEwndXLH.LPDdlFVJ7wG@example.net

 Hop: From: [127.0.0.1]; By: mail.example.org; Date: Mon, 27 Dec 2021 11:21:21 +0000
 Hop: From: mout.example.org; By: hq5.example.org; Date: Mon, 27 Dec 2021 11:21:22 +0000
-Hop: From: hq5.example.org; By: hq5.example.org; Date: Mon, 27 Dec 2021 11:21:22 +0000
-
-DKIM Results: Passed=true, Works=true, Allow_Keychange=true";
+Hop: From: hq5.example.org; By: hq5.example.org; Date: Mon, 27 Dec 2021 11:21:22 +0000";
        check_parse_receive_headers_integration(raw, expected).await;
    }

@@ -806,79 +744,6 @@ DKIM Results: Passed=true, Works=true, Allow_Keychange=true";
        );
    }

-    mod truncate_by_lines {
-        use super::*;
-
-        #[test]
-        fn test_just_text() {
-            let s = "this is a little test string".to_string();
-            assert_eq!(
-                truncate_by_lines(s, 4, 6),
-                ("this is a little test [...]".to_string(), true)
-            );
-        }
-
-        #[test]
-        fn test_with_linebreaks() {
-            let s = "this\n is\n a little test string".to_string();
-            assert_eq!(
-                truncate_by_lines(s, 4, 6),
-                ("this\n is\n a little [...]".to_string(), true)
-            );
-        }
-
-        #[test]
-        fn test_only_linebreaks() {
-            let s = "\n\n\n\n\n\n\n".to_string();
-            assert_eq!(
-                truncate_by_lines(s, 4, 5),
-                ("\n\n\n[...]".to_string(), true)
-            );
-        }
-
-        #[test]
-        fn limit_hits_end() {
-            let s = "hello\n world !".to_string();
-            assert_eq!(
-                truncate_by_lines(s, 2, 8),
-                ("hello\n world !".to_string(), false)
-            );
-        }
-
-        #[test]
-        fn test_edge() {
-            assert_eq!(
-                truncate_by_lines("".to_string(), 2, 4),
-                ("".to_string(), false)
-            );
-
-            assert_eq!(
-                truncate_by_lines("\n  hello \n world".to_string(), 2, 4),
-                ("\n  [...]".to_string(), true)
-            );
-            assert_eq!(
-                truncate_by_lines("𐠈0Aᝮa𫝀®!ꫛa¡0A𐢧00𐹠®A  丽ⷐએ".to_string(), 1, 2),
-                ("𐠈0[...]".to_string(), true)
-            );
-            assert_eq!(
-                truncate_by_lines("𐠈0Aᝮa𫝀®!ꫛa¡0A𐢧00𐹠®A  丽ⷐએ".to_string(), 1, 0),
-                ("[...]".to_string(), true)
-            );
-
-            // 9 characters, so no truncation
-            assert_eq!(
-                truncate_by_lines("𑒀ὐ￠🜀\u{1e01b}A a🟠".to_string(), 1, 12),
-                ("𑒀ὐ￠🜀\u{1e01b}A a🟠".to_string(), false),
-            );
-
-            // 12 characters, truncation
-            assert_eq!(
-                truncate_by_lines("𑒀ὐ￠🜀\u{1e01b}A a🟠bcd".to_string(), 1, 7),
-                ("𑒀ὐ￠🜀\u{1e01b}A [...]".to_string(), true),
-            );
-        }
-    }
-
    #[test]
    fn test_create_id() {
        let buf = create_id();
@@ -948,36 +813,36 @@ DKIM Results: Passed=true, Works=true, Allow_Keychange=true";

    #[test]
    fn test_emailaddress_parse() {
-        assert_eq!(EmailAddress::new("").is_ok(), false);
+        assert_eq!("".parse::<EmailAddress>().is_ok(), false);
        assert_eq!(
-            EmailAddress::new("user@domain.tld").unwrap(),
+            "user@domain.tld".parse::<EmailAddress>().unwrap(),
            EmailAddress {
                local: "user".into(),
                domain: "domain.tld".into(),
            }
        );
        assert_eq!(
-            EmailAddress::new("user@localhost").unwrap(),
+            "user@localhost".parse::<EmailAddress>().unwrap(),
            EmailAddress {
                local: "user".into(),
                domain: "localhost".into()
            }
        );
-        assert_eq!(EmailAddress::new("uuu").is_ok(), false);
-        assert_eq!(EmailAddress::new("dd.tt").is_ok(), false);
-        assert!(EmailAddress::new("tt.dd@uu").is_ok());
-        assert!(EmailAddress::new("u@d").is_ok());
-        assert!(EmailAddress::new("u@d.").is_ok());
-        assert!(EmailAddress::new("u@d.t").is_ok());
+        assert_eq!("uuu".parse::<EmailAddress>().is_ok(), false);
+        assert_eq!("dd.tt".parse::<EmailAddress>().is_ok(), false);
+        assert!("tt.dd@uu".parse::<EmailAddress>().is_ok());
+        assert!("u@d".parse::<EmailAddress>().is_ok());
+        assert!("u@d.".parse::<EmailAddress>().is_ok());
+        assert!("u@d.t".parse::<EmailAddress>().is_ok());
        assert_eq!(
-            EmailAddress::new("u@d.tt").unwrap(),
+            "u@d.tt".parse::<EmailAddress>().unwrap(),
            EmailAddress {
                local: "u".into(),
                domain: "d.tt".into(),
            }
        );
-        assert!(EmailAddress::new("u@tt").is_ok());
-        assert_eq!(EmailAddress::new("@d.tt").is_ok(), false);
+        assert!("u@tt".parse::<EmailAddress>().is_ok());
+        assert_eq!("@d.tt".parse::<EmailAddress>().is_ok(), false);
    }

    use crate::chatlist::Chatlist;
--- a/src/webxdc.rs
+++ b/src/webxdc.rs
@@ -1,5 +1,6 @@
 //! # Handle webxdc messages.

+use std::collections::HashSet;
 use std::convert::TryFrom;
 use std::path::Path;

@@ -20,6 +21,7 @@ use crate::mimeparser::SystemMessage;
 use crate::param::Param;
 use crate::param::Params;
 use crate::scheduler::InterruptInfo;
+use crate::sql::Sql;
 use crate::tools::{create_smeared_timestamp, get_abs_path};
 use crate::{chat, EventType};

@@ -377,6 +379,10 @@ impl Context {
            )
            .await?;

+        self.emit_event(EventType::WebxdcBusyUpdating {
+            msg_id: instance.id,
+        });
+
        if send_now {
            self.sql.insert(
                "INSERT INTO smtp_status_updates (msg_id, first_serial, last_serial, descr) VALUES(?, ?, ?, ?)
@@ -390,7 +396,6 @@ impl Context {
    }

    /// Pops one record of queued webxdc status updates.
-    /// This function exists to make the sqlite statement testable.
    async fn pop_smtp_status_update(
        &self,
    ) -> Result<Option<(MsgId, StatusUpdateSerial, StatusUpdateSerial, String)>> {
@@ -414,12 +419,15 @@ impl Context {
    }

    /// Attempts to send queued webxdc status updates.
-    pub(crate) async fn flush_status_updates(&self) -> Result<()> {
+    ///
+    /// Returns true if there are more status updates to send, but rate limiter does not
+    /// allow to send them. Returns false if there are no more status updates to send.
+    pub(crate) async fn flush_status_updates(&self) -> Result<bool> {
        loop {
            let (instance_id, first_serial, last_serial, descr) =
                match self.pop_smtp_status_update().await? {
                    Some(res) => res,
-                    None => return Ok(()),
+                    None => return Ok(false),
                };

            if let Some(json) = self
@@ -445,7 +453,7 @@ impl Context {
        }
    }

-    pub(crate) fn build_status_update_part(&self, json: &str) -> PartBuilder {
+    pub(crate) async fn build_status_update_part(&self, json: &str) -> PartBuilder {
        PartBuilder::new()
            .content_type(&"application/json".parse::<mime::Mime>().unwrap())
            .header((
@@ -496,7 +504,7 @@ impl Context {
        for update_item in updates.updates {
            self.create_status_update_record(
                &mut instance,
-                &serde_json::to_string(&update_item)?,
+                &*serde_json::to_string(&update_item)?,
                timestamp,
                can_info_msg,
                from_id,
@@ -545,7 +553,7 @@ impl Context {
                        let (update_item_str, serial) = row;
                        let update_item = StatusUpdateItemAndSerial
                        {
-                            item: serde_json::from_str(&update_item_str)?,
+                            item: serde_json::from_str(&*update_item_str)?,
                            serial,
                            max_serial,
                        };
@@ -553,7 +561,7 @@ impl Context {
                        if !json.is_empty() {
                            json.push_str(",\n");
                        }
-                        json.push_str(&serde_json::to_string(&update_item)?);
+                        json.push_str(&*serde_json::to_string(&update_item)?);
                    }
                    Ok(json)
                },
@@ -741,6 +749,15 @@ impl Message {
    }
 }

+/// Returns a hashset of all webxdc instaces which still have updates to send
+pub(crate) async fn get_busy_webxdc_instances(sql: &Sql) -> Result<HashSet<MsgId>> {
+    Ok(sql
+        .distinct("smtp_status_updates", "msg_id")
+        .await?
+        .into_iter()
+        .collect())
+}
+
 #[cfg(test)]
 mod tests {
    use crate::chat::{
@@ -948,7 +965,6 @@ mod tests {
    async fn test_resend_webxdc_instance_and_info() -> Result<()> {
        // Alice uses webxdc in a group
        let alice = TestContext::new_alice().await;
-        alice.set_config_bool(Config::BccSelf, false).await?;
        let alice_grp = create_group_chat(&alice, ProtectionStatus::Unprotected, "grp").await?;
        let alice_instance = send_webxdc_instance(&alice, alice_grp).await?;
        assert_eq!(alice_grp.get_msg_cnt(&alice).await?, 1);
@@ -1825,7 +1841,7 @@ sth_for_the = "future""#

        let instance = t.get_last_msg().await;
        let html = instance.get_webxdc_blob(&t, "index.html").await?;
-        assert!(String::from_utf8_lossy(&html).contains("requires a newer Delta Chat version"));
+        assert!(String::from_utf8_lossy(&*html).contains("requires a newer Delta Chat version"));

        Ok(())
    }
--- a/standards.md
+++ b/standards.md
@@ -8,7 +8,6 @@ Transport                        | IMAP v4 ([RFC 3501](https://tools.ietf.org/ht
 Proxy                            | SOCKS5 ([RFC 1928](https://tools.ietf.org/html/rfc1928))
 Embedded media                   | MIME Document Series ([RFC 2045](https://tools.ietf.org/html/rfc2045), [RFC 2046](https://tools.ietf.org/html/rfc2046)), Content-Disposition Header ([RFC 2183](https://tools.ietf.org/html/rfc2183)), Multipart/Related ([RFC 2387](https://tools.ietf.org/html/rfc2387))
 Text and Quote encoding          | Fixed, Flowed ([RFC 3676](https://tools.ietf.org/html/rfc3676))
-Reactions                        | Reaction: Indicating Summary Reaction to a Message [RFC 9078](https://datatracker.ietf.org/doc/rfc9078/)
 Filename encoding                | Encoded Words ([RFC 2047](https://tools.ietf.org/html/rfc2047)), Encoded Word Extensions ([RFC 2231](https://tools.ietf.org/html/rfc2231))
 Identify server folders          | IMAP LIST Extension ([RFC 6154](https://tools.ietf.org/html/rfc6154))
 Push                             | IMAP IDLE ([RFC 2177](https://tools.ietf.org/html/rfc2177))
--- a/test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@buzon.uy
+++ b/test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@buzon.uy
@@ -1,6 +0,0 @@
-Authentication-Results: atlas106.aol.mail.ne1.yahoo.com;
- dkim=pass header.i=@buzon.uy header.s=2019;
- spf=pass smtp.mailfrom=buzon.uy;
- dmarc=pass(p=REJECT) header.from=buzon.uy;
-From: <alice@buzon.uy>
-To: <alice@aol.com>
--- a/test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@delta.blinzeln.de
+++ b/test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@delta.blinzeln.de
@@ -1,6 +0,0 @@
-Authentication-Results: atlas206.aol.mail.ne1.yahoo.com;
- dkim=unknown;
- spf=none smtp.mailfrom=delta.blinzeln.de;
- dmarc=unknown header.from=delta.blinzeln.de;
-From: <alice@delta.blinzeln.de>
-To: <alice@aol.com>
--- a/test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@disroot.org
+++ b/test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@disroot.org
@@ -1,6 +0,0 @@
-Authentication-Results: atlas210.aol.mail.bf1.yahoo.com;
- dkim=pass header.i=@disroot.org header.s=mail;
- spf=pass smtp.mailfrom=disroot.org;
- dmarc=pass(p=QUARANTINE) header.from=disroot.org;
-From: <alice@disroot.org>
-To: <alice@aol.com>
--- a/test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@fastmail.com
+++ b/test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@fastmail.com
@@ -1,7 +0,0 @@
-Authentication-Results: atlas105.aol.mail.ne1.yahoo.com;
- dkim=pass header.i=@fastmail.com header.s=fm2;
- dkim=pass header.i=@messagingengine.com header.s=fm2;
- spf=pass smtp.mailfrom=fastmail.com;
- dmarc=pass(p=NONE,sp=NONE) header.from=fastmail.com;
-From: <alice@fastmail.com>
-To: <alice@aol.com>
--- a/test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@gmail.com
+++ b/test-data/message/dkimchecks-2022-09-28/alice@aol.com/alice@gmail.com
@@ -1,6 +0,0 @@
-Authentication-Results: atlas-baseline-production.v2-mail-prod1-gq1.omega.yahoo.com;
- dkim=pass header.i=@gmail.com header.s=20210112;
- spf=pass smtp.mailfrom=gmail.com;
- dmarc=pass(p=NONE,sp=QUARANTINE) header.from=gmail.com;
-From: <alice@gmail.com>
-To: <alice@aol.com>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sebastian Klähn	f9b3a3e5a9	Merge branch 'webxdc_delete_event' into webxdc_update_notifications	2022-09-11 21:05:36 +02:00
Sebastian Klähn	85f74eb5e1	merge master	2022-09-11 21:04:52 +02:00
Sebastian Klähn	5a79815a13	method to get busy webxdcs	2022-09-11 20:41:45 +02:00
Sebastian Klähn	6877f16b63	introduce two new events	2022-09-11 19:42:45 +02:00
Sebastian Klähn	70979c55fa	typo + only send for webxdcs	2022-09-11 09:39:56 +02:00
Sebastian Klähn	2e2fa95298	fix jsonrpc	2022-09-10 19:46:54 +02:00
Sebastian Klähn	f506b6882c	fix id + typo	2022-09-10 19:38:28 +02:00
Sebastian Klähn	fb564aedb2	changelog entry + deltachat.h entry	2022-09-10 19:35:45 +02:00
Sebastian Klähn	3271d509cc	delete comment	2022-09-10 19:29:12 +02:00
Sebastian Klähn	24d9345ea0	add delete event for webxdc	2022-09-10 19:27:20 +02:00