Make cffi docs suitable for C devs

This is an early start.
imap: simplify UPSERT queries on imap_sync
2026-07-05 15:04:56 +03:00 · 2022-10-17 21:40:43 +02:00 · 2022-10-16 16:34:13 +00:00 · 2022-10-16 15:08:55 +02:00 · 2022-10-16 14:53:06 +02:00 · 2022-10-16 11:30:01 +00:00
74 changed files with 4760 additions and 1135 deletions
--- a/.github/workflows/jsonrpc-client-npm-package.yml
+++ b/.github/workflows/jsonrpc-client-npm-package.yml
@@ -0,0 +1,83 @@
+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/node-tests.yml
+++ b/.github/workflows/node-tests.yml
@@ -52,6 +52,7 @@ jobs:
          npm install --verbose

      - name: Test
+        timeout-minutes: 10
        if: runner.os != 'Windows'
        run: |
          cd node
@@ -59,6 +60,7 @@ 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,6 +2,92 @@

 ## Unreleased

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

@@ -11,7 +97,8 @@
  and `dc_event_emitter_unref()` should be used instead of
  `dc_accounts_event_emitter_unref`.
 - add `dc_contact_was_seen_recently()` #3560
- jsonrpc: add functions: #3586, #3587
+- 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()`
  - `getChatSecurejoinQrCodeSvg()`
@@ -20,17 +107,37 @@
  - `addContactToChat()`
  - `deleteMessages()`
  - `getMessageInfo()`
+  - `getBasicChatInfo()`
+  - `marknoticedChat()`
+  - `getFirstUnreadMessageOfChat()`
+  - `markseenMsgs()`
+  - `forwardMessages()`
+  - `removeDraft()`
+  - `getDraft()`
+  - `miscSendMsg()`
+  - `miscSetDraft()`
+  - `maybeNetwork()`
+  - `getConnectivity()`
+  - `getContactEncryptionInfo()`
+  - `getConnectivityHtml()`
 - jsonrpc: add `is_broadcast` property to `ChatListItemFetchResult` #3584
 - jsonrpc: add `was_seen_recently` property to `ChatListItemFetchResult`, `FullChat` and `Contact` #3584
 - jsonrpc: add `webxdc_info` property to `Message` #3588
+- python: move `get_dc_event_name()` from `deltachat` to `deltachat.events` #3564
+- jsonrpc: add `webxdc_info`, `parent_id` and `download_state` property to `Message` #3588, #3590
+- jsonrpc: add `BasicChat` object as a leaner alternative to `FullChat` #3590
+- 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 #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
+- `DC_EVENT_WEBXDC_INSTANCE_DELETED` is emitted when a message containing a webxdc gets deleted #3592

 ### 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.63"
+version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26fa4d7e3f2eebadf743988fc8aec9fa9a9e82611acafd77c1462ed6262440a"
+checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"

 [[package]]
 name = "ascii_utils"
@@ -236,9 +236,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

 [[package]]
 name = "axum"
-version = "0.5.15"
+version = "0.5.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de18bc5f2e9df8f52da03856bf40e29b747de5a84e43aefff90e3dc4a21529b"
+checksum = "c9e3356844c4d6a6d6467b8da2cffb4a2820be256f50a3a386c9d152bab31043"
 dependencies = [
 "async-trait",
 "axum-core",
@@ -270,9 +270,9 @@ dependencies = [

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

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

 [[package]]
 name = "deltachat"
-version = "1.93.0"
+version = "1.97.0"
 dependencies = [
 "ansi_term",
 "anyhow",
@@ -946,13 +948,13 @@ dependencies = [
 "serde",
 "serde_json",
 "sha-1 0.10.0",
- "sha2 0.10.3",
+ "sha2 0.10.6",
 "smallvec",
 "strum",
 "strum_macros",
 "tagger",
 "tempfile",
- "textwrap 0.15.0",
+ "textwrap 0.15.1",
 "thiserror",
 "tokio",
 "tokio-stream",
@@ -965,13 +967,13 @@ dependencies = [

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

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

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

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

 [[package]]
 name = "env_logger"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
+checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272"
 dependencies = [
 "atty",
 "humantime 2.1.0",
@@ -1827,9 +1830,9 @@ dependencies = [

 [[package]]
 name = "image"
-version = "0.24.3"
+version = "0.24.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e30ca2ecf7666107ff827a8e481de6a132a9b687ed3bb20bb1c144a36c00964"
+checksum = "bd8e4fb07cf672b1642304e731ef8a6a4c7891d67bb4fd4f5ce58cd6ed86803c"
 dependencies = [
 "bytemuck",
 "byteorder",
@@ -1979,9 +1982,9 @@ dependencies = [

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

 [[package]]
 name = "libm"
@@ -2285,9 +2288,9 @@ dependencies = [

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

 [[package]]
 name = "oorandom"
@@ -2623,9 +2626,9 @@ dependencies = [

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

 [[package]]
 name = "reqwest"
-version = "0.11.11"
+version = "0.11.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92"
+checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc"
 dependencies = [
 "base64 0.13.0",
 "bytes",
@@ -2894,10 +2897,10 @@ dependencies = [
 "hyper-tls",
 "ipnet",
 "js-sys",
- "lazy_static",
 "log",
 "mime",
 "native-tls",
+ "once_cell",
 "percent-encoding",
 "pin-project-lite",
 "serde",
@@ -2941,7 +2944,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4cf22754c49613d2b3b119f0e5d46e34a2c628a937e3024b8762de4e7d8c710b"
 dependencies = [
 "byteorder",
- "digest 0.10.3",
+ "digest 0.10.5",
 "num-bigint-dig",
 "num-integer",
 "num-iter",
@@ -3105,9 +3108,9 @@ dependencies = [

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

 [[package]]
 name = "serde_derive"
-version = "1.0.144"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
+checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3177,7 +3180,7 @@ checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
 dependencies = [
 "cfg-if",
 "cpufeatures",
- "digest 0.10.3",
+ "digest 0.10.5",
 ]

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

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

 [[package]]
@@ -3341,9 +3344,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"

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

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

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

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

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

 [[package]]
 name = "tokio-stream"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9"
+checksum = "f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af"
 dependencies = [
 "futures-core",
 "pin-project-lite",
@@ -3817,13 +3819,12 @@ checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"

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

--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.93.0"
+version = "1.97.0"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
 license = "MPL-2.0"
@@ -36,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.3", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+image = { version = "0.24.4", 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"
@@ -46,7 +46,7 @@ native-tls = "0.2"
 num_cpus = "1.13"
 num-derive = "0.3"
 num-traits = "0.2"
-once_cell = "1.13.1"
+once_cell = "1.15.0"
 percent-encoding = "2.0"
 pgp = { version = "0.8", default-features = false }
 pretty_env_logger = { version = "0.4", optional = true }
@@ -74,11 +74,11 @@ fast-socks5 = "0.8"
 humansize = "1"
 qrcodegen = "1.7.0"
 tagger = "4.3.3"
-textwrap = "0.15.0"
+textwrap = "0.15.1"
 async-channel = "1.6.1"
 futures-lite = "1.12.0"
-tokio-stream = { version = "0.1.9", features = ["fs"] }
-reqwest = { version = "0.11.11", features = ["json"] }
+tokio-stream = { version = "0.1.10", features = ["fs"] }
+reqwest = { version = "0.11.12", features = ["json"] }
 async_zip = { git = "https://github.com/dignifiedquire/rs-async-zip", branch = "main", default-features = false, features = ["deflate"] }

 [dev-dependencies]
--- a/benches/contacts.rs
+++ b/benches/contacts.rs
@@ -1,6 +1,7 @@
 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;

@@ -8,7 +9,9 @@ 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()).await.unwrap();
+    let context = Context::new(&dbfile, id, Events::new(), StockStrings::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,11 +5,14 @@ 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()).await.unwrap();
+    let context = Context::new(dbfile, id, Events::new(), StockStrings::new())
+        .await
+        .unwrap();

    for c in chats.iter().take(10) {
        black_box(chat::get_chat_msgs(&context, *c, 0).await.ok());
@@ -23,7 +26,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())
+            let context = Context::new(Path::new(&path), 100, Events::new(), StockStrings::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,6 +4,7 @@ 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) {
@@ -16,7 +17,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())
+            Context::new(Path::new(&path), 100, Events::new(), StockStrings::new())
                .await
                .unwrap()
        });
--- a/benches/receive_emails.rs
+++ b/benches/receive_emails.rs
@@ -6,6 +6,7 @@ use deltachat::{
    context::Context,
    imex::{imex, ImexMode},
    receive_imf::receive_imf,
+    stock_str::StockStrings,
    Events,
 };
 use tempfile::tempdir;
@@ -41,7 +42,9 @@ 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()).await.unwrap();
+    let context = Context::new(&dbfile, id, Events::new(), StockStrings::new())
+        .await
+        .unwrap();

    let backup: PathBuf = std::env::current_dir()
        .unwrap()
--- a/benches/search_msgs.rs
+++ b/benches/search_msgs.rs
@@ -1,11 +1,12 @@
 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())
+    let context = Context::new(dbfile.as_ref(), id, Events::new(), StockStrings::new())
        .await
        .unwrap();

--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.93.0"
+version = "1.97.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.13.1"
+once_cell = "1.15.0"

 [features]
 default = ["vendored"]
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -468,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 or DC_QR_WEBRTC_INSTANCE.
+ * QR code is DC_QR_ACCOUNT, DC_QR_LOGIN 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
+ * e.g. `addr` and `mail_pw` for DC_QR_ACCOUNT and DC_QR_LOGIN
 * or `webrtc_instance` for DC_QR_WEBRTC_INSTANCE.
 *
 * @memberof dc_context_t
@@ -2174,11 +2174,10 @@ 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 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 function creates the setup message and adds it to outgoing message queue.
+ * The message is sent asynchronously.
 *
- * After everything succeeded, the required setup code is returned in the following format:
+ * The required setup code is returned in the following format:
 *
 * ~~~
 * 1234-1234-1234-1234-1234-1234-1234-1234-1234
@@ -2244,8 +2243,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(),
- * dc_initiate_key_transfer() or dc_imex(). As there is always at most only
+ * Typical ongoing processes are started by dc_configure()
+ * 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
@@ -2271,6 +2270,7 @@ 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.
@@ -2343,6 +2343,10 @@ 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.
@@ -5731,24 +5735,10 @@ 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
-
 /**
 * @}
 */
@@ -5980,28 +5970,38 @@ void dc_event_unref(dc_event_t* event);
 /// Used in status messages for group name changes.
 /// - %1$s will be replaced by the old group name
 /// - %2$s will be replaced by the new group name
+///
+/// @deprecated 2022-09-10
 #define DC_STR_MSGGRPNAME                 15

 /// "Group image changed."
 ///
 /// Used in status messages for group images changes.
+///
+/// @deprecated 2022-09-10
 #define DC_STR_MSGGRPIMGCHANGED           16

 /// "Member %1$s added."
 ///
 /// Used in status messages for added members.
 /// - %1$s will be replaced by the name of the added member
+///
+/// @deprecated 2022-09-10
 #define DC_STR_MSGADDMEMBER               17

 /// "Member %1$s removed."
 ///
 /// Used in status messages for removed members.
 /// - %1$s will be replaced by the name of the removed member
+///
+/// @deprecated 2022-09-10
 #define DC_STR_MSGDELMEMBER               18

 /// "Group left."
 ///
 /// Used in status messages.
+///
+/// @deprecated 2022-09-10
 #define DC_STR_MSGGROUPLEFT               19

 /// "GIF"
@@ -6048,9 +6048,7 @@ void dc_event_unref(dc_event_t* event);
 /// - %1$s will be replaced by the subject of the displayed message
 #define DC_STR_READRCPT_MAILBODY          32

-/// "Group image deleted."
-///
-/// Used in status messages for deleted group images.
+/// @deprecated Deprecated, this string is no longer needed.
 #define DC_STR_MSGGRPIMGDELETED           33

 /// "End-to-end encryption preferred."
@@ -6103,6 +6101,8 @@ void dc_event_unref(dc_event_t* event);
 /// - %1$s will be replaced by an action
 ///   as #DC_STR_MSGADDMEMBER or #DC_STR_MSGGRPIMGCHANGED (full-stop removed, if any)
 /// - %2$s will be replaced by the name of the user taking that action
+///
+/// @deprecated 2022-09-10
 #define DC_STR_MSGACTIONBYUSER            62

 /// "%1$s by me"
@@ -6110,6 +6110,8 @@ void dc_event_unref(dc_event_t* event);
 /// Used to concretize actions.
 /// - %1$s will be replaced by an action
 ///   as #DC_STR_MSGADDMEMBER or #DC_STR_MSGGRPIMGCHANGED (full-stop removed, if any)
+///
+/// @deprecated 2022-09-10
 #define DC_STR_MSGACTIONBYME              63

 /// "Location streaming enabled."
@@ -6173,6 +6175,8 @@ void dc_event_unref(dc_event_t* event);
 /// "Message deletion timer is disabled."
 ///
 /// Used in status messages.
+///
+/// @deprecated 2022-09-10
 #define DC_STR_EPHEMERAL_DISABLED         75

 /// "Message deletion timer is set to %1$s s."
@@ -6180,26 +6184,36 @@ void dc_event_unref(dc_event_t* event);
 /// Used in status messages when the other constants
 /// (#DC_STR_EPHEMERAL_MINUTE, #DC_STR_EPHEMERAL_HOUR and so on) do not match the timer.
 /// - %1$s will be replaced by the number of seconds the timer is set to
+///
+/// @deprecated 2022-09-10
 #define DC_STR_EPHEMERAL_SECONDS          76

 /// "Message deletion timer is set to 1 minute."
 ///
 /// Used in status messages.
+///
+/// @deperecated 2022-09-10
 #define DC_STR_EPHEMERAL_MINUTE           77

 /// "Message deletion timer is set to 1 hour."
 ///
 /// Used in status messages.
+///
+/// @deprecated 2022-09-10
 #define DC_STR_EPHEMERAL_HOUR             78

 /// "Message deletion timer is set to 1 day."
 ///
 /// Used in status messages.
+///
+/// @deprecated 2022-09-10
 #define DC_STR_EPHEMERAL_DAY              79

 /// "Message deletion timer is set to 1 week."
 ///
 /// Used in status messages.
+///
+/// @deprecated 2022-09-10
 #define DC_STR_EPHEMERAL_WEEK             80

 /// @deprecated Deprecated 2021-01-30, DC_STR_EPHEMERAL_WEEKS is used instead.
@@ -6240,12 +6254,11 @@ void dc_event_unref(dc_event_t* event);

 /// "Chat protection enabled."
 ///
-/// Used in status messages.
+
+/// @deprecated Deprecated, replaced by DC_STR_MSG_YOU_ENABLED_PROTECTION and DC_STR_MSG_PROTECTION_ENABLED_BY.
 #define DC_STR_PROTECTION_ENABLED         88

-/// "Chat protection disabled."
-///
-/// Used in status messages.
+/// @deprecated Deprecated, replaced by DC_STR_MSG_YOU_DISABLED_PROTECTION and DC_STR_MSG_PROTECTION_DISABLED_BY.
 #define DC_STR_PROTECTION_DISABLED        89

 /// "Reply"
@@ -6267,29 +6280,37 @@ void dc_event_unref(dc_event_t* event);
 /// "Message deletion timer is set to %1$s minutes."
 ///
 /// Used in status messages.
-//
-/// `%1$s` will be replaced by the number of minutes (alwasy >1) the timer is set to.
+///
+/// `%1$s` will be replaced by the number of minutes (always >1) the timer is set to.
+///
+/// @deprecated Replaced by DC_STR_MSG_YOU_EPHEMERAL_TIMER_MINUTES and DC_STR_MSG_EPHEMERAL_TIMER_MINUTES_BY.
 #define DC_STR_EPHEMERAL_MINUTES          93

 /// "Message deletion timer is set to %1$s hours."
 ///
 /// Used in status messages.
-//
+///
 /// `%1$s` will be replaced by the number of hours (always >1) the timer is set to.
+///
+/// @deprecated Replaced by DC_STR_MSG_YOU_EPHEMERAL_TIMER_HOURS and DC_STR_MSG_EPHEMERAL_TIMER_HOURS_BY.
 #define DC_STR_EPHEMERAL_HOURS            94

 /// "Message deletion timer is set to %1$s days."
 ///
 /// Used in status messages.
-//
+///
 /// `%1$s` will be replaced by the number of days (always >1) the timer is set to.
+///
+/// @deprecated Replaced by DC_STR_MSG_YOU_EPHEMERAL_TIMER_DAYS and DC_STR_MSG_EPHEMERAL_TIMER_DAYS_BY.
 #define DC_STR_EPHEMERAL_DAYS             95

 /// "Message deletion timer is set to %1$s weeks."
 ///
 /// Used in status messages.
-//
+///
 /// `%1$s` will be replaced by the number of weeks (always >1) the timer is set to.
+///
+/// @deprecated Replaced by DC_STR_MSG_YOU_EPHEMERAL_TIMER_WEEKS and DC_STR_MSG_EPHEMERAL_TIMER_WEEKS_BY.
 #define DC_STR_EPHEMERAL_WEEKS            96

 /// "Forwarded"
@@ -6446,7 +6467,7 @@ void dc_event_unref(dc_event_t* event);
 /// Used as status in the connectivity view.
 #define DC_STR_NOT_CONNECTED              121

-/// %1$s changed their address from %2$s to %3$s"
+/// "%1$s changed their address from %2$s to %3$s"
 ///
 /// Used as an info message to chats with contacts that changed their address.
 #define DC_STR_AEAP_ADDR_CHANGED          122
@@ -6464,6 +6485,246 @@ void dc_event_unref(dc_event_t* event);
 /// Used in a device message that explains AEAP.
 #define DC_STR_AEAP_EXPLANATION_AND_LINK  123

+/// "You changed group name from \"%1$s\" to \"%2$s\"."
+///
+/// `%1$s` will be replaced by the old group name.
+/// `%2$s` will be replaced by the new group name.
+#define DC_STR_GROUP_NAME_CHANGED_BY_YOU 124
+
+/// "Group name changed from \"%1$s\" to \"%2$s\" by %3$s."
+///
+/// `%1$s` will be replaced by the old group name.
+/// `%2$s` will be replaced by the new group name.
+/// `%3$s` will be replaced by name and address of the contact who did the action.
+#define DC_STR_GROUP_NAME_CHANGED_BY_OTHER 125
+
+/// "You changed the group image."
+#define DC_STR_GROUP_IMAGE_CHANGED_BY_YOU 126
+
+/// "Group image changed by %1$s."
+///
+/// `%1$s` will be replaced by name and address of the contact who did the action.
+#define DC_STR_GROUP_IMAGE_CHANGED_BY_OTHER 127
+
+/// "You added member %1$s."
+///
+/// Used in status messages.
+#define DC_STR_ADD_MEMBER_BY_YOU 128
+
+/// "Member %1$s added by %2$s."
+///
+/// `%1$s` will be replaced by name and address of the contact added to the group.
+/// `%2$s` will be replaced by name and address of the contact who did the action.
+///
+/// Used in status messages.
+#define DC_STR_ADD_MEMBER_BY_OTHER 129
+
+/// "You removed member %1$s."
+///
+/// `%1$s` will be replaced by name and address of the contact removed from the group.
+///
+/// Used in status messages.
+#define DC_STR_REMOVE_MEMBER_BY_YOU 130
+
+/// "Member %1$s removed by %2$s."
+///
+/// `%1$s` will be replaced by name and address of the contact removed from the group.
+/// `%2$s` will be replaced by name and address of the contact who did the action.
+///
+/// Used in status messages.
+#define DC_STR_REMOVE_MEMBER_BY_OTHER 131
+
+/// "You left the group."
+///
+/// Used in status messages.
+#define DC_STR_GROUP_LEFT_BY_YOU 132
+
+/// "Group left by %1$s."
+///
+/// `%1$s` will be replaced by name and address of the contact.
+///
+/// Used in status messages.
+#define DC_STR_GROUP_LEFT_BY_OTHER 133
+
+/// "You deleted the group image."
+///
+/// Used in status messages.
+#define DC_STR_GROUP_IMAGE_DELETED_BY_YOU 134
+
+/// "Group image deleted by %1$s."
+///
+/// `%1$s` will be replaced by name and address of the contact.
+///
+/// Used in status messages.
+#define DC_STR_GROUP_IMAGE_DELETED_BY_OTHER 135
+
+/// "You enabled location streaming."
+///
+/// Used in status messages.
+#define DC_STR_LOCATION_ENABLED_BY_YOU 136
+
+/// "Location streaming enabled by %1$s."
+///
+/// `%1$s` will be replaced by name and address of the contact.
+///
+/// Used in status messages.
+#define DC_STR_LOCATION_ENABLED_BY_OTHER 137
+
+/// "You disabled message deletion timer."
+///
+/// Used in status messages.
+#define DC_STR_EPHEMERAL_TIMER_DISABLED_BY_YOU 138
+
+/// "Message deletion timer is disabled by %1$s."
+///
+/// `%1$s` will be replaced by name and address of the contact.
+///
+/// Used in status messages.
+#define DC_STR_EPHEMERAL_TIMER_DISABLED_BY_OTHER 139
+
+/// "You set message deletion timer to %1$s s."
+///
+/// `%1$s` will be replaced by the number of seconds (always >1) the timer is set to.
+///
+/// Used in status messages.
+#define DC_STR_EPHEMERAL_TIMER_SECONDS_BY_YOU 140
+
+/// "Message deletion timer is set to %1$s s by %2$s."
+///
+/// `%1$s` will be replaced by the number of seconds (always >1) the timer is set to.
+/// `%2$s` will be replaced by name and address of the contact.
+///
+/// Used in status messages.
+#define DC_STR_EPHEMERAL_TIMER_SECONDS_BY_OTHER 141
+
+/// "You set message deletion timer to 1 minute."
+///
+/// Used in status messages.
+#define DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_YOU 142
+
+/// "Message deletion timer is set to 1 minute by %1$s."
+///
+/// `%1$s` will be replaced by name and address of the contact.
+///
+/// Used in status messages.
+#define DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_OTHER 143
+
+/// "You set message deletion timer to 1 hour."
+///
+/// Used in status messages.
+#define DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_YOU 144
+
+/// "Message deletion timer is set to 1 hour by %1$s."
+///
+/// `%1$s` will be replaced by name and address of the contact.
+///
+/// Used in status messages.
+#define DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_OTHER 145
+
+/// "You set message deletion timer to 1 day."
+///
+/// Used in status messages.
+#define DC_STR_EPHEMERAL_TIMER_1_DAY_BY_YOU 146
+
+/// "Message deletion timer is set to 1 day by %1$s."
+///
+/// `%1$s` will be replaced by name and address of the contact.
+///
+/// Used in status messages.
+#define DC_STR_EPHEMERAL_TIMER_1_DAY_BY_OTHER 147
+
+/// "You set message deletion timer to 1 week."
+///
+/// Used in status messages.
+#define DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_YOU 148
+
+/// "Message deletion timer is set to 1 week by %1$s."
+///
+/// `%1$s` will be replaced by name and address of the contact.
+///
+/// Used in status messages.
+#define DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_OTHER 149
+
+/// "You set message deletion timer to %1$s minutes."
+///
+/// Used in status messages.
+///
+/// `%1$s` will be replaced by the number of minutes (always >1) the timer is set to.
+#define DC_STR_EPHEMERAL_TIMER_MINUTES_BY_YOU 150
+
+/// "Message deletion timer is set to %1$s minutes by %2$s."
+///
+/// Used in status messages.
+///
+/// `%1$s` will be replaced by the number of minutes (always >1) the timer is set to.
+/// `%2$s` will be replaced by name and address of the contact.
+#define DC_STR_EPHEMERAL_TIMER_MINUTES_BY_OTHER 151
+
+/// "You set message deletion timer to %1$s hours."
+///
+/// Used in status messages.
+///
+/// `%1$s` will be replaced by the number of hours (always >1) the timer is set to.
+#define DC_STR_EPHEMERAL_TIMER_HOURS_BY_YOU 152
+
+/// "Message deletion timer is set to %1$s hours by %2$s."
+///
+/// Used in status messages.
+///
+/// `%1$s` will be replaced by the number of hours (always >1) the timer is set to.
+/// `%2$s` will be replaced by name and address of the contact.
+#define DC_STR_EPHEMERAL_TIMER_HOURS_BY_OTHER 153
+
+/// "You set message deletion timer to %1$s days."
+///
+/// Used in status messages.
+///
+/// `%1$s` will be replaced by the number of days (always >1) the timer is set to.
+#define DC_STR_EPHEMERAL_TIMER_DAYS_BY_YOU 154
+
+/// "Message deletion timer is set to %1$s days by %2$s."
+///
+/// Used in status messages.
+///
+/// `%1$s` will be replaced by the number of days (always >1) the timer is set to.
+/// `%2$s` will be replaced by name and address of the contact.
+#define DC_STR_EPHEMERAL_TIMER_DAYS_BY_OTHER 155
+
+/// "You set message deletion timer to %1$s weeks."
+///
+/// Used in status messages.
+///
+/// `%1$s` will be replaced by the number of weeks (always >1) the timer is set to.
+#define DC_STR_EPHEMERAL_TIMER_WEEKS_BY_YOU 156
+
+/// "Message deletion timer is set to %1$s weeks by %2$s."
+///
+/// Used in status messages.
+///
+/// `%1$s` will be replaced by the number of weeks (always >1) the timer is set to.
+/// `%2$s` will be replaced by name and address of the contact.
+#define DC_STR_EPHEMERAL_TIMER_WEEKS_BY_OTHER 157
+
+/// "You enabled chat protection."
+///
+/// Used in status messages.
+#define DC_STR_PROTECTION_ENABLED_BY_YOU 158
+
+/// "Chat protection enabled by %1$s."
+///
+/// `%1$s` will be replaced by name and address of the contact.
+///
+/// Used in status messages.
+#define DC_STR_PROTECTION_ENABLED_BY_OTHER 159
+
+/// "You disabled chat protection."
+#define DC_STR_PROTECTION_DISABLED_BY_YOU 160
+
+/// "Chat protection disabled by %1$s."
+///
+/// `%1$s` will be replaced by name and address of the contact.
+#define DC_STR_PROTECTION_DISABLED_BY_OTHER 161
+
 /**
 * @}
 */
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -38,6 +38,7 @@ use deltachat::ephemeral::Timer as EphemeralTimer;
 use deltachat::key::DcKey;
 use deltachat::message::MsgId;
 use deltachat::stock_str::StockMessage;
+use deltachat::stock_str::StockStrings;
 use deltachat::webxdc::StatusUpdateSerial;
 use deltachat::*;
 use deltachat::{accounts::Accounts, log::LogExt};
@@ -98,7 +99,12 @@ 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()))
+        block_on(Context::new(
+            as_path(dbfile),
+            id,
+            Events::new(),
+            StockStrings::new(),
+        ))
    } else {
        eprintln!("blobdir can not be defined explicitly anymore");
        return ptr::null_mut();
@@ -122,7 +128,12 @@ 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())) {
+    match block_on(Context::new_closed(
+        as_path(dbfile),
+        id,
+        Events::new(),
+        StockStrings::new(),
+    )) {
        Ok(context) => Box::into_raw(Box::new(context)),
        Err(err) => {
            eprintln!("failed to create context: {:#}", err);
@@ -169,7 +180,7 @@ pub unsafe extern "C" fn dc_context_unref(context: *mut dc_context_t) {
        eprintln!("ignoring careless call to dc_context_unref()");
        return;
    }
-    Box::from_raw(context);
+    drop(Box::from_raw(context));
 }

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

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

 #[no_mangle]
@@ -505,8 +516,6 @@ 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,
    }
 }

@@ -554,8 +563,6 @@ 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,
    }
 }

@@ -588,8 +595,6 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
        | EventType::MsgsNoticed(_)
        | EventType::ConnectivityChanged
        | EventType::WebxdcInstanceDeleted { .. }
-        | EventType::WebxdcBusyUpdating { .. }
-        | EventType::WebxdcUpToDate { .. }
        | EventType::SelfavatarChanged => 0,
        EventType::ChatModified(_) => 0,
        EventType::MsgsChanged { msg_id, .. }
@@ -647,8 +652,6 @@ 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 {
@@ -695,7 +698,7 @@ pub unsafe extern "C" fn dc_event_emitter_unref(emitter: *mut dc_event_emitter_t
        return;
    }

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

 #[no_mangle]
@@ -2434,7 +2437,7 @@ pub unsafe extern "C" fn dc_array_unref(a: *mut dc_array::dc_array_t) {
        return;
    }

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

 #[no_mangle]
@@ -2602,6 +2605,7 @@ pub unsafe fn dc_array_is_independent(
 /// because the FFI API has a refernce from the message to the
 /// context, but the Rust API does not, so the FFI layer needs to glue
 /// these together.
+#[doc(hidden)]
 pub struct ChatlistWrapper {
    context: *const dc_context_t,
    list: chatlist::Chatlist,
@@ -2615,7 +2619,7 @@ pub unsafe extern "C" fn dc_chatlist_unref(chatlist: *mut dc_chatlist_t) {
        eprintln!("ignoring careless call to dc_chatlist_unref()");
        return;
    }
-    Box::from_raw(chatlist);
+    drop(Box::from_raw(chatlist));
 }

 #[no_mangle]
@@ -2746,6 +2750,7 @@ pub unsafe extern "C" fn dc_chatlist_get_context(
 /// because the FFI API has a refernce from the message to the
 /// context, but the Rust API does not, so the FFI layer needs to glue
 /// these together.
+#[doc(hidden)]
 pub struct ChatWrapper {
    context: *const dc_context_t,
    chat: chat::Chat,
@@ -2760,7 +2765,7 @@ pub unsafe extern "C" fn dc_chat_unref(chat: *mut dc_chat_t) {
        return;
    }

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

 #[no_mangle]
@@ -2998,6 +3003,7 @@ pub unsafe extern "C" fn dc_chat_get_info_json(
 /// because the FFI API has a refernce from the message to the
 /// context, but the Rust API does not, so the FFI layer needs to glue
 /// these together.
+#[doc(hidden)]
 pub struct MessageWrapper {
    context: *const dc_context_t,
    message: message::Message,
@@ -3030,7 +3036,7 @@ pub unsafe extern "C" fn dc_msg_unref(msg: *mut dc_msg_t) {
        return;
    }

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

 #[no_mangle]
@@ -3739,6 +3745,7 @@ pub unsafe extern "C" fn dc_msg_force_plaintext(msg: *mut dc_msg_t) {
 /// because the FFI API has a refernce from the message to the
 /// context, but the Rust API does not, so the FFI layer needs to glue
 /// these together.
+#[doc(hidden)]
 pub struct ContactWrapper {
    context: *const dc_context_t,
    contact: contact::Contact,
@@ -3752,7 +3759,7 @@ pub unsafe extern "C" fn dc_contact_unref(contact: *mut dc_contact_t) {
        eprintln!("ignoring careless call to dc_contact_unref()");
        return;
    }
-    Box::from_raw(contact);
+    drop(Box::from_raw(contact));
 }

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

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

 #[no_mangle]
@@ -4139,6 +4146,7 @@ pub unsafe extern "C" fn dc_provider_unref(provider: *mut dc_provider_t) {

 /// Reader-writer lock wrapper for accounts manager to guarantee thread safety when using
 /// `dc_accounts_t` in multiple threads at once.
+#[doc(hidden)]
 pub struct AccountsWrapper {
    inner: Arc<RwLock<Accounts>>,
 }
@@ -4158,9 +4166,58 @@ impl AccountsWrapper {
    }
 }

-/// Struct representing a list of deltachat accounts.
+/// This class provides functionality that can be used to manage several [`dc_context_t`]
+/// objects running at the same time.
+///
+/// The account manager takes a directory where all context-databases are created in.
+///
+/// You can add, remove, import account to the account manager, all context-databases are
+/// persisted and stay available once the account manager is created again for the same
+/// directory.
+///
+/// All accounts may receive messages at the same time (e.g. by #DC_EVENT_INCOMING_MSG), and
+/// all accounts may be accessed by their own dc_context_t object.
+///
+/// To make this possible, some dc_context_t functions must not be called when using the
+/// account manager:
+///
+/// - use [`dc_accounts_add_account()`] and [`dc_accounts_get_account()`] instead of
+///   [`dc_context_new()`].
+/// - use [`dc_accounts_add_closed_account()`] instead of [`dc_context_new_closed()`]
+/// - use [`dc_accounts_start_io()`] and [`dc_accounts_stop_io()`] instead of
+///   [`dc_start_io()`] and [`dc_stop_io()`]
+/// - use dc_accounts_maybe_network() instead of dc_maybe_network()
+/// - use dc_accounts_get_event_emitter() instead of dc_get_event_emitter()
+///
+/// Additionally, there are functions to list, import and migrate accounts
+/// and to handle a "selected" account, see below.
+///
 pub type dc_accounts_t = AccountsWrapper;

+/// Create a new [account manager](dc_accounts_t).
+///
+/// Member of: [`dc_accounts_t`]
+///
+/// The account manager takes an directory
+/// where all context-databases are placed in.
+/// To add a context to the account manager,
+/// use [`dc_accounts_add_account()`] or [`dc_accounts_migrate_account()`].
+/// All account information are persisted.
+/// To remove a context from the account manager,
+/// use [`dc_accounts_remove_account()`].
+///
+/// # Params
+///
+/// *os_name*: deprecated and unused.
+///
+/// *dir*: The directory to create the context-databases in.  If the directory does not
+/// exist, dc_accounts_new() will try to create it.
+///
+/// # Returns
+///
+/// An [account manager object](dc_accounts_t).  The object must be passed to the other
+/// account manager functions and must be freed using [`dc_accounts_unref()`] after usage.
+/// On errors, NULL is returned.
 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_new(
    _os_name: *const libc::c_char,
@@ -4208,7 +4265,8 @@ pub unsafe extern "C" fn dc_accounts_get_account(
    }

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

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

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

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

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

    Box::into_raw(Box::new(emitter))
 }
@@ -4447,11 +4506,13 @@ 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]
@@ -4467,9 +4528,36 @@ 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 instance = dc_jsonrpc_instance_t { receiver, handle };
+        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,
+        };

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

    #[no_mangle]
--- a/deltachat-ffi/src/lot.rs
+++ b/deltachat-ffi/src/lot.rs
@@ -58,6 +58,7 @@ 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),
        }
@@ -108,6 +109,7 @@ impl Lot {
                Qr::WithdrawVerifyGroup { .. } => LotState::QrWithdrawVerifyGroup,
                Qr::ReviveVerifyContact { .. } => LotState::QrReviveVerifyContact,
                Qr::ReviveVerifyGroup { .. } => LotState::QrReviveVerifyGroup,
+                Qr::Login { .. } => LotState::QrLogin,
            },
            Self::Error(_err) => LotState::QrError,
        }
@@ -131,6 +133,7 @@ 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(),
        }
@@ -195,6 +198,9 @@ 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.93.0"
+version = "1.97.0"
 description = "DeltaChat JSON-RPC API"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
@@ -24,14 +24,15 @@ 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.19.2" }
+tokio = { version = "1.21.2" }

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

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


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

 pub fn event_to_json_rpc_notification(event: Event) -> Value {
-    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();
+    let id: JSONRPCEventType = event.typ.into();
    json!({
-        "id": id,
+        "event": id,
        "contextId": event.id,
-        "field1": field1,
-        "field2": field2
    })
 }

 #[derive(Serialize, TypeDef)]
-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,
+#[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,
+    },
+
+    /// 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,
+    },
+
+    /// 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.
    ConnectivityChanged,
+
    SelfavatarChanged,
-    WebxdcStatusUpdate,
-    WebxdcInstanceDeleted,
-    WebxdcBusyUpdating,
-    WebxdcUpToDate,
+
+    #[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,
+    },
 }

-impl From<EventType> for EventTypeName {
+impl From<EventType> for JSONRPCEventType {
    fn from(event: EventType) -> Self {
-        use EventTypeName::*;
+        use JSONRPCEventType::*;
        match event {
-            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::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::IncomingMsg { chat_id, msg_id } => IncomingMsg {
+                chat_id: chat_id.to_u32(),
+                msg_id: msg_id.to_u32(),
+            },
+            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::ConnectivityChanged => ConnectivityChanged,
            EventType::SelfavatarChanged => SelfavatarChanged,
-            EventType::WebxdcStatusUpdate { .. } => WebxdcStatusUpdate,
-            EventType::WebxdcInstanceDeleted { .. } => WebxdcInstanceDeleted,
-            EventType::WebxdcBusyUpdating { .. } => WebxdcBusyUpdating,
-            EventType::WebxdcUpToDate { .. } => WebxdcUpToDate,
+            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(),
+            },
        }
    }
 }
@@ -159,7 +364,8 @@ fn generate_events_ts_types_definition() {
            root_namespace: None,
            ..typescript_type_def::DefinitionFileOptions::default()
        };
-        typescript_type_def::write_definition_file::<_, EventTypeName>(&mut buf, options).unwrap();
+        typescript_type_def::write_definition_file::<_, JSONRPCEventType>(&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
--- a/deltachat-jsonrpc/src/api/types/chat.rs
+++ b/deltachat-jsonrpc/src/api/types/chat.rs
@@ -1,11 +1,13 @@
-use anyhow::{anyhow, Result};
-use deltachat::chat::get_chat_contacts;
+use std::time::{Duration, SystemTime};
+
+use anyhow::{anyhow, bail, Result};
+use deltachat::chat::{self, get_chat_contacts, ChatVisibility};
 use deltachat::chat::{Chat, ChatId};
 use deltachat::constants::Chattype;
 use deltachat::contact::{Contact, ContactId};
 use deltachat::context::Context;
 use num_traits::cast::ToPrimitive;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use typescript_type_def::TypeDef;

 use super::color_int_to_hex_string;
@@ -35,6 +37,7 @@ 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: String,
 }

 impl FullChat {
@@ -78,12 +81,14 @@ impl FullChat {
            false
        };

+        let mailing_list_address = chat.get_mailinglist_addr().to_string();
+
        Ok(FullChat {
            id: chat_id,
            name: chat.name.clone(),
            is_protected: chat.is_protected(),
            profile_image, //BLOBS ?
-            archived: chat.get_visibility() == deltachat::chat::ChatVisibility::Archived,
+            archived: chat.get_visibility() == chat::ChatVisibility::Archived,
            chat_type: chat
                .get_type()
                .to_u32()
@@ -101,6 +106,108 @@ impl FullChat {
            ephemeral_timer,
            can_send,
            was_seen_recently,
+            mailing_list_address,
        })
    }
 }
+
+/// cheaper version of fullchat, omits:
+/// - contacts
+/// - contact_ids
+/// - fresh_message_counter
+/// - ephemeral_timer
+/// - self_in_group
+/// - was_seen_recently
+/// - can_send
+///
+/// used when you only need the basic metadata of a chat like type, name, profile picture
+#[derive(Serialize, TypeDef)]
+#[serde(rename_all = "camelCase")]
+pub struct BasicChat {
+    id: u32,
+    name: String,
+    is_protected: bool,
+    profile_image: Option<String>, //BLOBS ?
+    archived: bool,
+    chat_type: u32,
+    is_unpromoted: bool,
+    is_self_talk: bool,
+    color: String,
+    is_contact_request: bool,
+    is_device_chat: bool,
+    is_muted: bool,
+}
+
+impl BasicChat {
+    pub async fn try_from_dc_chat_id(context: &Context, chat_id: u32) -> Result<Self> {
+        let rust_chat_id = ChatId::new(chat_id);
+        let chat = Chat::load_from_db(context, rust_chat_id).await?;
+
+        let profile_image = match chat.get_profile_image(context).await? {
+            Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
+            None => None,
+        };
+        let color = color_int_to_hex_string(chat.get_color(context).await?);
+
+        Ok(BasicChat {
+            id: chat_id,
+            name: chat.name.clone(),
+            is_protected: chat.is_protected(),
+            profile_image, //BLOBS ?
+            archived: chat.get_visibility() == chat::ChatVisibility::Archived,
+            chat_type: chat
+                .get_type()
+                .to_u32()
+                .ok_or_else(|| anyhow!("unknown chat type id"))?, // TODO get rid of this unwrap?
+            is_unpromoted: chat.is_unpromoted(),
+            is_self_talk: chat.is_self_talk(),
+            color,
+            is_contact_request: chat.is_contact_request(),
+            is_device_chat: chat.is_device_talk(),
+            is_muted: chat.is_muted(),
+        })
+    }
+}
+
+#[derive(Clone, Serialize, Deserialize, TypeDef)]
+pub enum MuteDuration {
+    NotMuted,
+    Forever,
+    Until(i64),
+}
+
+impl MuteDuration {
+    pub fn try_into_core_type(self) -> Result<chat::MuteDuration> {
+        match self {
+            MuteDuration::NotMuted => Ok(chat::MuteDuration::NotMuted),
+            MuteDuration::Forever => Ok(chat::MuteDuration::Forever),
+            MuteDuration::Until(n) => {
+                if n <= 0 {
+                    bail!("failed to read mute duration")
+                }
+
+                Ok(SystemTime::now()
+                    .checked_add(Duration::from_secs(n as u64))
+                    .map_or(chat::MuteDuration::Forever, chat::MuteDuration::Until))
+            }
+        }
+    }
+}
+
+#[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/contact.rs
+++ b/deltachat-jsonrpc/src/api/types/contact.rs
@@ -20,6 +20,8 @@ pub struct ContactObject {
    name_and_addr: String,
    is_blocked: bool,
    is_verified: bool,
+    /// the contact's last seen timestamp
+    last_seen: i64,
    was_seen_recently: bool,
 }

@@ -46,6 +48,7 @@ impl ContactObject {
            name_and_addr: contact.get_name_n_addr(),
            is_blocked: contact.is_blocked(),
            is_verified,
+            last_seen: contact.last_seen(),
            was_seen_recently: contact.was_seen_recently(),
        })
    }
--- a/deltachat-jsonrpc/src/api/types/location.rs
+++ b/deltachat-jsonrpc/src/api/types/location.rs
@@ -0,0 +1,47 @@
+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,6 +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;
@@ -9,6 +13,7 @@ use serde::Deserialize;
 use serde::Serialize;
 use typescript_type_def::TypeDef;

+use super::color_int_to_hex_string;
 use super::contact::ContactObject;
 use super::webxdc::WebxdcMessageInfo;

@@ -18,8 +23,9 @@ pub struct MessageObject {
    id: u32,
    chat_id: u32,
    from_id: u32,
-    quoted_text: Option<String>,
-    quoted_message_id: Option<u32>,
+    quote: Option<MessageQuote>,
+    parent_id: Option<u32>,
+
    text: Option<String>,
    has_location: bool,
    has_html: bool,
@@ -56,17 +62,37 @@ pub struct MessageObject {
    file_name: Option<String>,

    webxdc_info: Option<WebxdcMessageInfo>,
+
+    download_state: DownloadState,
+}
+
+#[derive(Serialize, TypeDef)]
+#[serde(tag = "kind")]
+enum MessageQuote {
+    JustText {
+        text: String,
+    },
+    #[serde(rename_all = "camelCase")]
+    WithMessage {
+        text: String,
+        message_id: u32,
+        author_display_name: String,
+        author_display_color: String,
+        override_sender_name: Option<String>,
+        image: Option<String>,
+        is_forwarded: bool,
+        view_type: MessageViewtype,
+    },
 }

 impl MessageObject {
    pub async fn from_message_id(context: &Context, message_id: u32) -> Result<Self> {
        let msg_id = MsgId::new(message_id);
-        let message = Message::load_from_db(context, msg_id).await?;
+        Self::from_msg_id(context, msg_id).await
+    }

-        let quoted_message_id = message
-            .quoted_message(context)
-            .await?
-            .map(|m| m.get_id().to_u32());
+    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
+        let message = Message::load_from_db(context, msg_id).await?;

        let sender_contact = Contact::load_from_db(context, message.get_from_id()).await?;
        let sender = ContactObject::try_from_dc_contact(context, sender_contact).await?;
@@ -79,12 +105,46 @@ impl MessageObject {
            None
        };

+        let parent_id = message.parent(context).await?.map(|m| m.get_id().to_u32());
+
+        let download_state = message.download_state().into();
+
+        let quote = if let Some(quoted_text) = message.quoted_text() {
+            match message.quoted_message(context).await? {
+                Some(quote) => {
+                    let quote_author = Contact::load_from_db(context, quote.get_from_id()).await?;
+                    Some(MessageQuote::WithMessage {
+                        text: quoted_text,
+                        message_id: quote.get_id().to_u32(),
+                        author_display_name: quote_author.get_display_name().to_owned(),
+                        author_display_color: color_int_to_hex_string(quote_author.get_color()),
+                        override_sender_name: quote.get_override_sender_name(),
+                        image: if quote.get_viewtype() == Viewtype::Image
+                            || quote.get_viewtype() == Viewtype::Gif
+                        {
+                            match quote.get_file(context) {
+                                Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
+                                None => None,
+                            }
+                        } else {
+                            None
+                        },
+                        is_forwarded: quote.is_forwarded(),
+                        view_type: quote.get_viewtype().into(),
+                    })
+                }
+                None => Some(MessageQuote::JustText { text: quoted_text }),
+            }
+        } else {
+            None
+        };
+
        Ok(MessageObject {
-            id: message_id,
+            id: msg_id.to_u32(),
            chat_id: message.get_chat_id().to_u32(),
            from_id: message.get_from_id().to_u32(),
-            quoted_text: message.quoted_text(),
-            quoted_message_id,
+            quote,
+            parent_id,
            text: message.get_text(),
            has_location: message.has_location(),
            has_html: message.has_html(),
@@ -131,6 +191,8 @@ impl MessageObject {
            file_bytes,
            file_name: message.get_filename(),
            webxdc_info,
+
+            download_state,
        })
    }
 }
@@ -210,3 +272,145 @@ impl From<MessageViewtype> for Viewtype {
        }
    }
 }
+
+#[derive(Serialize, TypeDef)]
+pub enum DownloadState {
+    Done,
+    Available,
+    Failure,
+    InProgress,
+}
+
+impl From<download::DownloadState> for DownloadState {
+    fn from(state: download::DownloadState) -> Self {
+        match state {
+            download::DownloadState::Done => DownloadState::Done,
+            download::DownloadState::Available => DownloadState::Available,
+            download::DownloadState::Failure => DownloadState::Failure,
+            download::DownloadState::InProgress => DownloadState::InProgress,
+        }
+    }
+}
+
+#[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
@@ -6,6 +6,7 @@ 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 webxdc;
@@ -94,6 +95,9 @@ pub enum QrObject {
        invitenumber: String,
        authcode: String,
    },
+    Login {
+        address: String,
+    },
 }

 impl From<Qr> for QrObject {
@@ -224,6 +228,7 @@ impl From<Qr> for QrObject {
                    authcode,
                }
            }
+            Qr::Login { address, .. } => QrObject::Login { address },
        }
    }
 }
--- 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().await;
+        let events = api.accounts.read().await.get_event_emitter();
        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 { DeltaChat, DeltaChatEvent } from "../deltachat.js";
+import { DcEvent, DeltaChat } 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", event => {
-    onIncomingEvent(event)
-  })
+  client.on("ALL", (accountId, event) => {
+    onIncomingEvent(accountId, 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");
@@ -73,7 +73,7 @@ async function run() {
        chatId
      );
      write($main, `<h3>${chat.name}</h3>`);
-      const messageIds = await client.rpc.messageListGetMessageIds(
+      const messageIds = await client.rpc.getMessageIds(
        selectedAccount,
        chatId,
        0
@@ -88,14 +88,15 @@ async function run() {
    }
  }

-  function onIncomingEvent(event: DeltaChatEvent) {
+  function onIncomingEvent(accountId: number, event: DcEvent) {
    write(
      $side,
      `
        <p class="message">
-          [<strong>${event.id}</strong> on account ${event.contextId}]<br>
-          <em>f1:</em> ${JSON.stringify(event.field1)}<br>
-          <em>f2:</em> ${JSON.stringify(event.field2)}
+          [<strong>${event.type}</strong> on account ${accountId}]<br>
+          <em>f1:</em> ${JSON.stringify(
+            Object.assign({}, event, { type: undefined })
+          )}
        </p>`
    );
  }
--- a/deltachat-jsonrpc/typescript/generated/client.ts
+++ b/deltachat-jsonrpc/typescript/generated/client.ts
@@ -66,6 +66,26 @@ 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.
   */
@@ -73,6 +93,13 @@ 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.
   *
@@ -135,6 +162,11 @@ 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.
@@ -150,6 +182,16 @@ 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
@@ -179,6 +221,16 @@ 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>;
@@ -204,6 +256,14 @@ export class RawClient {
    return (this._transport.request('chatlist_get_full_chat_by_id', [accountId, chatId] as RPC.Params)) as Promise<T.FullChat>;
  }

+  /**
+   * get basic info about a chat,
+   * use chatlist_get_full_chat_by_id() instead if you need more information
+   */
+  public getBasicChatInfo(accountId: T.U32, chatId: T.U32): Promise<T.BasicChat> {
+    return (this._transport.request('get_basic_chat_info', [accountId, chatId] as RPC.Params)) as Promise<T.BasicChat>;
+  }
+

  public acceptChat(accountId: T.U32, chatId: T.U32): Promise<null> {
    return (this._transport.request('accept_chat', [accountId, chatId] as RPC.Params)) as Promise<null>;
@@ -232,8 +292,7 @@ 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 dc_remove_contact_from_chat() with
-   * chat_id=DC_CONTACT_ID_SELF)
+   * To leave a chat explicitly, use leave_group()
   */
  public deleteChat(accountId: T.U32, chatId: T.U32): Promise<null> {
    return (this._transport.request('delete_chat', [accountId, chatId] as RPC.Params)) as Promise<null>;
@@ -257,7 +316,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 dc_join_securejoin()
+   * an out-of-band-verification can be joined using `secure_join()`
   *
   * chat_id: If set to a group-chat-id,
   *     the Verified-Group-Invite protocol is offered in the QR code;
@@ -265,11 +324,40 @@ export class RawClient {
   *     If not set, the Setup-Contact protocol is offered in the QR code.
   *     See https://countermitm.readthedocs.io/en/latest/new.html
   *     for details about both protocols.
+   *
+   * return format: `[code, svg]`
   */
  public getChatSecurejoinQrCodeSvg(accountId: T.U32, chatId: (T.U32|null)): Promise<[string,string]> {
    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>;
@@ -301,14 +389,207 @@ 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>;
  }

+  /**
+   *  Mark all messages in a chat as _noticed_.
+   *  _Noticed_ messages are no longer _fresh_ and do not count as being unseen
+   *  but are still waiting for being marked as "seen" using markseen_msgs()
+   *  (IMAP/MDNs is not done for noticed messages).
+   *
+   *  Calling this function usually results in the event #DC_EVENT_MSGS_NOTICED.
+   *  See also markseen_msgs().
+   */
+  public marknoticedChat(accountId: T.U32, chatId: T.U32): Promise<null> {
+    return (this._transport.request('marknoticed_chat', [accountId, chatId] as RPC.Params)) as Promise<null>;
+  }

-  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 getFirstUnreadMessageOfChat(accountId: T.U32, chatId: T.U32): Promise<(T.U32|null)> {
+    return (this._transport.request('get_first_unread_message_of_chat', [accountId, chatId] as RPC.Params)) as Promise<(T.U32|null)>;
+  }
+
+  /**
+   * Set mute duration of a chat.
+   *
+   * The UI can then call is_chat_muted() when receiving a new message
+   * to decide whether it should trigger an notification.
+   *
+   * Muted chats should not sound or vibrate
+   * and should not show a visual notification in the system area.
+   * Moreover, muted chats should be excluded from global badge counter
+   * (get_fresh_msgs() skips muted chats therefore)
+   * and the in-app, per-chat badge counter should use a less obtrusive color.
+   *
+   * Sends out #DC_EVENT_CHAT_MODIFIED.
+   */
+  public setChatMuteDuration(accountId: T.U32, chatId: T.U32, duration: T.MuteDuration): Promise<null> {
+    return (this._transport.request('set_chat_mute_duration', [accountId, chatId, duration] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Check whether the chat is currently muted (can be changed by set_chat_mute_duration()).
+   *
+   * This is available as a standalone function outside of fullchat, because it might be only needed for notification
+   */
+  public isChatMuted(accountId: T.U32, chatId: T.U32): Promise<boolean> {
+    return (this._transport.request('is_chat_muted', [accountId, chatId] as RPC.Params)) as Promise<boolean>;
+  }
+
+  /**
+   * Mark messages as presented to the user.
+   * Typically, UIs call this function on scrolling through the message list,
+   * when the messages are presented at least for a little moment.
+   * The concrete action depends on the type of the chat and on the users settings
+   * (dc_msgs_presented() may be a better name therefore, but well. :)
+   *
+   * - For normal chats, the IMAP state is updated, MDN is sent
+   *   (if set_config()-options `mdns_enabled` is set)
+   *   and the internal state is changed to @ref DC_STATE_IN_SEEN to reflect these actions.
+   *
+   * - For contact requests, no IMAP or MDNs is done
+   *   and the internal state is not changed therefore.
+   *   See also marknoticed_chat().
+   *
+   * Moreover, timer is started for incoming ephemeral messages.
+   * This also happens for contact requests chats.
+   *
+   * One #DC_EVENT_MSGS_NOTICED event is emitted per modified chat.
+   */
+  public markseenMsgs(accountId: T.U32, msgIds: (T.U32)[]): Promise<null> {
+    return (this._transport.request('markseen_msgs', [accountId, msgIds] as RPC.Params)) as Promise<null>;
+  }
+
+
+  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 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)[]>;
  }


@@ -317,10 +598,22 @@ export class RawClient {
  }


+  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 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>>;
  }

+  /**
+   * Fetch info desktop needs for creating a notification for a message
+   */
+  public messageGetNotificationInfo(accountId: T.U32, messageId: T.U32): Promise<T.MessageNotificationInfo> {
+    return (this._transport.request('message_get_notification_info', [accountId, messageId] as RPC.Params)) as Promise<T.MessageNotificationInfo>;
+  }
+
  /**
   * Delete messages. The messages are deleted on the current device and
   * on the IMAP server.
@@ -340,6 +633,46 @@ 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.
   */
@@ -396,6 +729,36 @@ export class RawClient {
    return (this._transport.request('contacts_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>;
+  }
+
+  /**
+   * 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.
+   */
+  public getContactEncryptionInfo(accountId: T.U32, contactId: T.U32): Promise<string> {
+    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.
@@ -411,6 +774,76 @@ export class RawClient {
    return (this._transport.request('chat_get_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 chatGetNeighboringMedia(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('chat_get_neighboring_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>;
+  }
+
+  /**
+   * Indicate that the network likely has come back.
+   * or just that the network conditions might have changed
+   */
+  public maybeNetwork(): Promise<null> {
+    return (this._transport.request('maybe_network', [] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Get the current connectivity, i.e. whether the device is connected to the IMAP server.
+   * One of:
+   * - DC_CONNECTIVITY_NOT_CONNECTED (1000-1999): Show e.g. the string "Not connected" or a red dot
+   * - DC_CONNECTIVITY_CONNECTING (2000-2999): Show e.g. the string "Connecting…" or a yellow dot
+   * - DC_CONNECTIVITY_WORKING (3000-3999): Show e.g. the string "Getting new messages" or a spinning wheel
+   * - DC_CONNECTIVITY_CONNECTED (>=4000): Show e.g. the string "Connected" or a green dot
+   *
+   * We don't use exact values but ranges here so that we can split up
+   * states into multiple states in the future.
+   *
+   * Meant as a rough overview that can be shown
+   * e.g. in the title of the main screen.
+   *
+   * If the connectivity changes, a #DC_EVENT_CONNECTIVITY_CHANGED will be emitted.
+   */
+  public getConnectivity(accountId: T.U32): Promise<T.U32> {
+    return (this._transport.request('get_connectivity', [accountId] as RPC.Params)) as Promise<T.U32>;
+  }
+
+  /**
+   * Get an overview of the current connectivity, and possibly more statistics.
+   * Meant to give the user more insight about the current status than
+   * the basic connectivity info returned by get_connectivity(); show this
+   * e.g., if the user taps on said basic connectivity info.
+   *
+   * If this page changes, a #DC_EVENT_CONNECTIVITY_CHANGED will be emitted.
+   *
+   * This comes as an HTML from the core so that we can easily improve it
+   * and the improvement instantly reaches all UIs.
+   */
+  public getConnectivityHtml(accountId: T.U32): Promise<string> {
+    return (this._transport.request('get_connectivity_html', [accountId] as RPC.Params)) as Promise<string>;
+  }
+
+
+  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>;
@@ -428,6 +861,53 @@ export class RawClient {
    return (this._transport.request('message_get_webxdc_info', [accountId, instanceMsgId] as RPC.Params)) as Promise<T.WebxdcMessageInfo>;
  }

+  /**
+   * Forward messages to another chat.
+   *
+   * All types of messages can be forwarded,
+   * however, they will be flagged as such (dc_msg_is_forwarded() is set).
+   *
+   * Original sender, info-state and webxdc updates are not forwarded on purpose.
+   */
+  public forwardMessages(accountId: T.U32, messageIds: (T.U32)[], chatId: T.U32): Promise<null> {
+    return (this._transport.request('forward_messages', [accountId, messageIds, chatId] as RPC.Params)) as Promise<null>;
+  }
+
+
+  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>;
+  }
+
+
+  public removeDraft(accountId: T.U32, chatId: T.U32): Promise<null> {
+    return (this._transport.request('remove_draft', [accountId, chatId] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   *  Get draft for a chat, if any.
+   */
+  public getDraft(accountId: T.U32, chatId: T.U32): Promise<(T.Message|null)> {
+    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
   */
@@ -436,4 +916,14 @@ export class RawClient {
  }


+  public miscSendMsg(accountId: T.U32, chatId: T.U32, text: (string|null), file: (string|null), location: ([T.F64,T.F64]|null), quotedMessageId: (T.U32|null)): Promise<[T.U32,T.Message]> {
+    return (this._transport.request('misc_send_msg', [accountId, chatId, text, file, location, quotedMessageId] as RPC.Params)) as Promise<[T.U32,T.Message]>;
+  }
+
+
+  public miscSetDraft(accountId: T.U32, chatId: T.U32, text: (string|null), file: (string|null), quotedMessageId: (T.U32|null)): Promise<null> {
+    return (this._transport.request('misc_set_draft', [accountId, chatId, text, file, quotedMessageId] as RPC.Params)) as Promise<null>;
+  }
+
+
 }
--- a/deltachat-jsonrpc/typescript/generated/events.ts
+++ b/deltachat-jsonrpc/typescript/generated/events.ts
@@ -1,3 +1,202 @@
 // AUTO-GENERATED by typescript-type-def

-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");
+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;})|({
+/**
+ * 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;})|({
+/**
+ * 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;}));
--- a/deltachat-jsonrpc/typescript/generated/types.ts
+++ b/deltachat-jsonrpc/typescript/generated/types.ts
@@ -2,11 +2,12 @@

 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;}));
+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 Usize=number;
-export type ChatListEntry=[U32,U32];
 export type I64=number;
+export type ChatListEntry=[U32,U32];
 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
@@ -16,8 +17,51 @@ export type ChatListItemFetchResult=(({"type":"ChatListItem";}&{"id":U32;"name":
 * contact id if this is a dm chat (for view profile entry in context menu)
 */
 "dmChatContact":(U32|null);"wasSeenRecently":boolean;})|{"type":"ArchiveLink";}|({"type":"Error";}&{"id":U32;"error":string;}));
-export type Contact={"address":string;"color":string;"authName":string;"status":string;"displayName":string;"id":U32;"name":string;"profileImage":(string|null);"nameAndAddr":string;"isBlocked":boolean;"isVerified":boolean;"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;};
+export type Contact={"address":string;"color":string;"authName":string;"status":string;"displayName":string;"id":U32;"name":string;"profileImage":(string|null);"nameAndAddr":string;"isBlocked":boolean;"isVerified":boolean;
+/**
+ * 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;};
+
+/**
+ * cheaper version of fullchat, omits:
+ * - contacts
+ * - contact_ids
+ * - fresh_message_counter
+ * - ephemeral_timer
+ * - self_in_group
+ * - was_seen_recently
+ * - can_send
+ * 
+ * used when you only need the basic metadata of a chat like type, name, profile picture
+ */
+export type BasicChat=
+/**
+ * cheaper version of fullchat, omits:
+ * - contacts
+ * - contact_ids
+ * - fresh_message_counter
+ * - ephemeral_timer
+ * - self_in_group
+ * - was_seen_recently
+ * - can_send
+ * 
+ * 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 Viewtype=("Unknown"|
 /**
 * Text message.
@@ -63,8 +107,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 I32=number;
-export type U64=number;
 export type WebxdcMessageInfo={
 /**
 * The name of the app.
@@ -102,5 +146,18 @@ export type WebxdcMessageInfo={
 * True if full internet access should be granted to the app.
 */
 "internetAccess":boolean;};
-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];
+export type DownloadState=("Done"|"Available"|"Failure"|"InProgress");
+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;"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;};
+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,null,U32,U32,(Message|null),U32,U32,U32,U32,string,U32,Record<string,(string)[]>,U32,string,U32,U32,U32,U32,(string|null),(string|null),([F64,F64]|null),(U32|null),[U32,Message],U32,U32,(string|null),(string|null),(U32|null),null];
--- a/deltachat-jsonrpc/typescript/package.json
+++ b/deltachat-jsonrpc/typescript/package.json
@@ -26,7 +26,7 @@
  },
  "license": "MPL-2.0",
  "main": "dist/deltachat.js",
-  "name": "deltachat-jsonrpc-client",
+  "name": "@deltachat/jsonrpc-client",
  "scripts": {
    "build": "run-s generate-bindings build:tsc build:bundle",
    "build:bundle": "esbuild --format=esm --bundle dist/deltachat.js --outfile=dist/deltachat.bundle.js",
@@ -47,5 +47,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "1.93.0"
+  "version": "1.97.0"
 }
--- a/deltachat-jsonrpc/typescript/src/client.ts
+++ b/deltachat-jsonrpc/typescript/src/client.ts
@@ -1,40 +1,57 @@
 import * as T from "../generated/types.js";
 import * as RPC from "../generated/jsonrpc.js";
 import { RawClient } from "../generated/client.js";
-import { EventTypeName } from "../generated/events.js";
+import { Event } from "../generated/events.js";
 import { WebsocketTransport, BaseTransport, Request } from "yerpc";
 import { TinyEmitter } from "tiny-emitter";

-export type DeltaChatEvent = {
-  id: EventTypeName;
+type DCWireEvent<T extends Event> = {
+  event: T;
  contextId: number;
-  field1: any;
-  field2: any;
 };
-export type Events = Record<
-  EventTypeName | "ALL",
-  (event: DeltaChatEvent) => void
->;
+// 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 class BaseDeltaChat<
  Transport extends BaseTransport<any>
 > extends TinyEmitter<Events> {
  rpc: RawClient;
  account?: T.Account;
-  private contextEmitters: TinyEmitter<Events>[] = [];
+  private contextEmitters: TinyEmitter<ContextEvents>[] = [];
  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 DeltaChatEvent;
-        this.emit(event.id, event);
-        this.emit("ALL", 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);

        if (this.contextEmitters[event.contextId]) {
-          this.contextEmitters[event.contextId].emit(event.id, event);
-          this.contextEmitters[event.contextId].emit("ALL", event);
+          this.contextEmitters[event.contextId].emit(
+            event.event.type,
+            event.event as any
+          );
+          this.contextEmitters[event.contextId].emit("ALL", event.event);
        }
      }
    });
@@ -70,7 +87,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/test/online.ts
+++ b/deltachat-jsonrpc/typescript/test/online.ts
@@ -1,12 +1,8 @@
 import { assert, expect } from "chai";
-import { DeltaChat, DeltaChatEvent, EventTypeName } from "../deltachat.js";
-import {
-  RpcServerHandle,
-  createTempUser,
-  startServer,
-} from "./test_base.js";
+import { DeltaChat, DcEvent } 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;
@@ -16,7 +12,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(
@@ -31,10 +27,10 @@ describe("online tests", function () {
      this.skip();
    }
    serverHandle = await startServer();
-    dc = new DeltaChat(serverHandle.url)
+    dc = new DeltaChat(serverHandle.url);

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

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

@@ -89,16 +85,19 @@ describe("online tests", function () {
      account2.email,
      null
    );
-    const chatId = await dc.rpc.contactsCreateChatByContactId(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, "Hello", chatId);
-    const { field1: chatIdOnAccountB } = await eventPromise;
+    const { chatId: chatIdOnAccountB } = await eventPromise;
    await dc.rpc.acceptChat(accountId2, chatIdOnAccountB);
-    const messageList = await dc.rpc.messageListGetMessageIds(
+    const messageList = await dc.rpc.getMessageIds(
      accountId2,
      chatIdOnAccountB,
      0
@@ -121,7 +120,10 @@ describe("online tests", function () {
      account2.email,
      null
    );
-    const chatId = await dc.rpc.contactsCreateChatByContactId(accountId1, contactId);
+    const chatId = await dc.rpc.contactsCreateChatByContactId(
+      accountId1,
+      contactId
+    );
    const eventPromise = Promise.race([
      waitForEvent(dc, "MsgsChanged", accountId2),
      waitForEvent(dc, "IncomingMsg", accountId2),
@@ -131,10 +133,10 @@ describe("online tests", function () {
    console.log("wait for message from A");

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

    await dc.rpc.acceptChat(accountId2, chatIdOnAccountB);
-    const messageList = await dc.rpc.messageListGetMessageIds(
+    const messageList = await dc.rpc.getMessageIds(
      accountId2,
      chatIdOnAccountB,
      0
@@ -154,7 +156,7 @@ describe("online tests", function () {
    await eventPromise2;

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

-async function waitForEvent(
+async function waitForEvent<T extends DcEvent["type"]>(
  dc: DeltaChat,
-  eventType: EventTypeName,
+  eventType: T,
  accountId: number,
  timeout: number = EVENT_TIMEOUT
-): Promise<DeltaChatEvent> {
+): Promise<Extract<DcEvent, { type: T }>> {
  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 = (event: DeltaChatEvent) => {
-      if (event.contextId == accountId) {
+    );
+    const callback = (contextId: number, event: DcEvent) => {
+      if (contextId == accountId) {
        dc.off(eventType, callback);
-        clearTimeout(rejectTimeout)
-        resolve(event);
+        clearTimeout(rejectTimeout);
+        resolve(event as any);
      }
    };
    dc.on(eventType, callback);
--- a/examples/repl/main.rs
+++ b/examples/repl/main.rs
@@ -20,6 +20,7 @@ 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};
@@ -298,7 +299,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()).await?;
+    let context = Context::new(Path::new(&args[1]), 0, Events::new(), StockStrings::new()).await?;

    let events = context.get_event_emitter();
    tokio::task::spawn(async move {
--- a/examples/simple.rs
+++ b/examples/simple.rs
@@ -6,6 +6,7 @@ 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) {
@@ -36,7 +37,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())
+    let ctx = Context::new(&dbfile, 0, Events::new(), StockStrings::new())
        .await
        .expect("Failed to create context");
    let info = ctx.get_info().await;
--- a/node/constants.js
+++ b/node/constants.js
@@ -56,6 +56,7 @@ module.exports = {
  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,
@@ -102,6 +103,7 @@ 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,
@@ -128,6 +130,10 @@ module.exports = {
  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,
@@ -158,6 +164,26 @@ module.exports = {
  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,
@@ -167,10 +193,20 @@ module.exports = {
  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,
@@ -190,10 +226,16 @@ module.exports = {
  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,
--- a/node/events.js
+++ b/node/events.js
@@ -30,5 +30,6 @@ module.exports = {
  2061: 'DC_EVENT_SECUREJOIN_JOINER_PROGRESS',
  2100: 'DC_EVENT_CONNECTIVITY_CHANGED',
  2110: 'DC_EVENT_SELFAVATAR_CHANGED',
-  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE'
+  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
+  2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED'
 }
--- a/node/lib/constants.ts
+++ b/node/lib/constants.ts
@@ -56,6 +56,7 @@ export enum C {
  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,
@@ -102,6 +103,7 @@ 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,
@@ -128,6 +130,10 @@ export enum C {
  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,
@@ -158,6 +164,26 @@ export enum C {
  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,
@@ -167,10 +193,20 @@ export enum C {
  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,
@@ -190,10 +226,16 @@ export enum C {
  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,
@@ -257,4 +299,5 @@ 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,11 +12,12 @@ 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: 'Download the node-bindings.tar.gz',
+  context: context || 'Download the node-bindings.tar.gz',
  target_url: base_url + file_url,
 }

--- a/node/test/test.js
+++ b/node/test/test.js
@@ -89,7 +89,11 @@ describe('JSON RPC', function () {
    const { dc } = DeltaChat.newTemporary()
    let promise_resolve
    const promise = new Promise((res, _rej) => {
-      promise_resolve = res
+      promise_resolve = (response) => {
+        // ignore events
+        const answer = JSON.parse(response)
+        if (answer['method'] !== 'event') res(answer)
+      }
    })
    dc.startJsonRpcHandler(promise_resolve)
    dc.jsonRpcRequest(
@@ -106,7 +110,7 @@ describe('JSON RPC', function () {
        id: 2,
        result: [1],
      },
-      JSON.parse(await promise)
+      await promise
    )
    dc.close()
  })
--- a/package.json
+++ b/package.json
@@ -1,6 +1,5 @@
 {
  "dependencies": {
-    "@deltachat/jsonrpc-client": "file:deltachat-jsonrpc/typescript",
    "debug": "^4.1.1",
    "napi-macros": "^2.0.0",
    "node-gyp-build": "^4.1.0"
@@ -58,8 +57,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"
+    "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail --exit"
  },
  "types": "node/dist/index.d.ts",
-  "version": "1.93.0"
+  "version": "1.97.0"
 }
--- a/python/src/deltachat/init.py
+++ b/python/src/deltachat/init.py
@@ -2,7 +2,7 @@ import sys

 from pkg_resources import DistributionNotFound, get_distribution

-from . import capi, const, events, hookspec  # noqa
+from . import capi, events, hookspec  # noqa
 from .account import Account, get_core_info  # noqa
 from .capi import ffi  # noqa
 from .chat import Chat  # noqa
@@ -17,14 +17,6 @@ except DistributionNotFound:
    __version__ = "0.0.0.dev0-unknown"


-def get_dc_event_name(integer, _DC_EVENTNAME_MAP={}):
-    if not _DC_EVENTNAME_MAP:
-        for name in dir(const):
-            if name.startswith("DC_EVENT_"):
-                _DC_EVENTNAME_MAP[getattr(const, name)] = name
-    return _DC_EVENTNAME_MAP[integer]
-
-
 def register_global_plugin(plugin):
    """Register a global plugin which implements one or more
    of the :class:`deltachat.hookspec.Global` hooks.
--- a/python/src/deltachat/events.py
+++ b/python/src/deltachat/events.py
@@ -8,14 +8,21 @@ import traceback
 from contextlib import contextmanager
 from queue import Empty, Queue

-import deltachat
-
+from . import const
 from .capi import ffi, lib
 from .cutil import from_optional_dc_charpointer
 from .hookspec import account_hookimpl
 from .message import map_system_message


+def get_dc_event_name(integer, _DC_EVENTNAME_MAP={}):
+    if not _DC_EVENTNAME_MAP:
+        for name in dir(const):
+            if name.startswith("DC_EVENT_"):
+                _DC_EVENTNAME_MAP[getattr(const, name)] = name
+    return _DC_EVENTNAME_MAP[integer]
+
+
 class FFIEvent:
    def __init__(self, name: str, data1, data2):
        self.name = name
@@ -239,7 +246,7 @@ class EventThread(threading.Thread):
            data1 = lib.dc_event_get_data1_int(event)
            # the following code relates to the deltachat/_build.py's helper
            # function which provides us signature info of an event call
-            evt_name = deltachat.get_dc_event_name(evt)
+            evt_name = get_dc_event_name(evt)
            if lib.dc_event_has_string_data(evt):
                data2 = from_optional_dc_charpointer(lib.dc_event_get_data2_str(event))
            else:
--- a/python/src/deltachat/message.py
+++ b/python/src/deltachat/message.py
@@ -507,6 +507,8 @@ def parse_system_add_remove(text):

    returns a (action, affected, actor) triple"""

+    # You removed member a@b.
+    # You added member a@b.
    # Member Me (x@y) removed by a@b.
    # Member x@y added by a@b
    # Member With space (tmp1@x.org) removed by tmp2@x.org.
@@ -518,6 +520,10 @@ def parse_system_add_remove(text):
    if m:
        affected, action, actor = m.groups()
        return action, extract_addr(affected), extract_addr(actor)
+    m = re.match(r"you (removed|added) member (.+)", text)
+    if m:
+        action, affected = m.groups()
+        return action, extract_addr(affected), "me"
    if text.startswith("group left by "):
        addr = extract_addr(text[13:])
        if addr:
--- 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"] == "0"
+        assert d["bcc_self"] == "1"

    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") == "0"
+        assert ac1.get_config("bcc_self") == "1"

    def test_selfcontact_if_unconfigured(self, acfactory):
        ac1 = acfactory.get_unconfigured_account()
@@ -301,7 +301,7 @@ class TestOfflineChat:
        assert d["draft"] == "" if chat.get_draft() is None else chat.get_draft()

    def test_group_chat_creation_with_translation(self, ac1):
-        ac1.set_stock_translation(const.DC_STR_MSGGRPNAME, "abc %1$s xyz %2$s")
+        ac1.set_stock_translation(const.DC_STR_GROUP_NAME_CHANGED_BY_YOU, "abc %1$s xyz %2$s")
        ac1._evtracker.consume_events()
        with pytest.raises(ValueError):
            ac1.set_stock_translation(const.DC_STR_FILE, "xyz %1$s")
@@ -317,7 +317,7 @@ class TestOfflineChat:
        chat.send_text("Now we have a group for homework")
        assert chat.is_promoted()
        chat.set_name("Homework")
-        assert chat.get_messages()[-1].text == "abc homework xyz Homework by me."
+        assert chat.get_messages()[-1].text == "abc homework xyz Homework"

    @pytest.mark.parametrize("verified", [True, False])
    def test_group_chat_qr(self, acfactory, ac1, verified):
--- a/src/accounts.rs
+++ b/src/accounts.rs
@@ -10,6 +10,7 @@ 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)]
@@ -20,6 +21,12 @@ 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 {
@@ -55,8 +62,9 @@ impl Accounts {
            .await
            .context("failed to load accounts config")?;
        let events = Events::new();
+        let stockstrings = StockStrings::new();
        let accounts = config
-            .load_accounts(&events)
+            .load_accounts(&events, &stockstrings)
            .await
            .context("failed to load accounts")?;

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

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

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

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

-        if let Some(cfg) = self.config.get_account(id).await {
+        if let Some(cfg) = self.config.get_account(id) {
            // 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
@@ -171,7 +182,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().await;
+        let old_id = self.config.get_selected_account();

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

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

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

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

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

-    pub async fn load_accounts(&self, events: &Events) -> Result<BTreeMap<u32, Context>> {
+    /// 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>> {
        let mut accounts = BTreeMap::new();
+
        for account_config in &self.inner.accounts {
-            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()
-                    )
-                })?;
+            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()
+                )
+            })?;

            accounts.insert(account_config.id, ctx);
        }
@@ -380,7 +411,6 @@ 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)
    }
@@ -402,11 +432,11 @@ impl Config {
        self.sync().await
    }

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

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

@@ -447,6 +477,8 @@ 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();
@@ -458,7 +490,7 @@ mod tests {
        let accounts2 = Accounts::open(p).await.unwrap();

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

        assert_eq!(accounts1.dir, accounts2.dir);
        assert_eq!(accounts1.config, accounts2.config,);
@@ -472,23 +504,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().await, 0);
+        assert_eq!(accounts.config.get_selected_account(), 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().await, 1);
+        assert_eq!(accounts.config.get_selected_account(), 1);

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

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

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

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

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

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

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

        Ok(())
    }
@@ -520,10 +552,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().await, 0);
+        assert_eq!(accounts.config.get_selected_account(), 0);

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

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

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

            let id0 = *ids.first().unwrap();
-            let ctx = accounts.get_account(id0).await.unwrap();
+            let ctx = accounts.get_account(id0).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).await.unwrap();
+            let ctx = accounts.get_account(id1).unwrap();
            ctx.set_config(crate::config::Config::Addr, Some("two@example.org"))
                .await?;

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

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

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

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

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

            let id0 = *ids.first().unwrap();
-            let ctx = accounts.get_account(id0).await.unwrap();
+            let ctx = accounts.get_account(id0).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).await.unwrap();
+            let t = accounts.get_account(id1).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).await.unwrap();
+            let ctx = accounts.get_account(id2).unwrap();
            assert_eq!(
                ctx.get_config(crate::config::Config::Addr).await?,
                Some("three@example.org".to_string())
@@ -661,7 +693,7 @@ mod tests {
        assert_eq!(accounts.accounts.len(), 0);

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

        // Test that event emitter does not return `None` immediately.
        let duration = std::time::Duration::from_millis(1);
@@ -692,7 +724,6 @@ 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
@@ -707,7 +738,6 @@ 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);

@@ -720,4 +750,28 @@ 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/blob.rs
+++ b/src/blob.rs
@@ -326,10 +326,7 @@ 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))
-            .await?
-        {
+        if let Some(new_name) = self.recode_to_size(context, blob_abs, img_wh, Some(20_000))? {
            self.name = new_name;
        }
        Ok(())
@@ -352,8 +349,7 @@ impl<'a> BlobObject<'a> {
            };

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

-    async fn recode_to_size(
+    fn recode_to_size(
        &self,
        context: &Context,
        mut blob_abs: PathBuf,
@@ -746,7 +742,6 @@ 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
@@ -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,
+                        timestamp: curr_day * 86400, // Convert day back to Unix timestamp
                    });
                    last_day = curr_day;
                }
@@ -3369,6 +3369,15 @@ 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(())
 }
@@ -4554,26 +4563,24 @@ mod tests {
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_set_protection() {
+    async fn test_set_protection() -> Result<()> {
        let t = TestContext::new_alice().await;
-        let chat_id = create_group_chat(&t, ProtectionStatus::Unprotected, "foo")
-            .await
-            .unwrap();
-        let chat = Chat::load_from_db(&t, chat_id).await.unwrap();
+        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?;
        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
-            .unwrap();
+            .await?;

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

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

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

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

@@ -4597,21 +4603,20 @@ 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.unwrap();
+        send_text_msg(&t, chat_id, "hi!".to_string()).await?;

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

-        let msgs = get_chat_msgs(&t, chat_id, 0).await.unwrap();
+        let msgs = get_chat_msgs(&t, chat_id, 0).await?;
        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
-            .unwrap();
-        let chat = Chat::load_from_db(&t, chat_id).await.unwrap();
+            .await?;
+        let chat = Chat::load_from_db(&t, chat_id).await?;
        assert!(chat.is_protected());
        assert!(!chat.is_unpromoted());

@@ -4619,6 +4624,8 @@ 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 = "0"))]
+    #[strum(props(default = "1"))]
    BccSelf,

    #[strum(props(default = "1"))]
@@ -198,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 = param.addr.parse().context("Bad email-address")?;
+    let parsed = EmailAddress::new(&param.addr).context("Bad email-address")?;
    let param_domain = parsed.domain;
    let param_addr_urlencoded = utf8_percent_encode(&param.addr, NON_ALPHANUMERIC).to_string();

@@ -579,8 +579,7 @@ 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).await
-    {
+    let mut imap = match Imap::new(param, socks5_config.clone(), addr, provider_strict_tls, r) {
        Err(err) => {
            info!(context, "failure: {}", err);
            return Err(ConfigurationError {
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -167,6 +167,11 @@ 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.
 ///
@@ -176,7 +181,7 @@ pub const DC_ELLIPSIS: &str = "[...]";
 ///
 /// 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 = 5000;
+pub const DC_DESIRED_TEXT_LEN: usize = DC_DESIRED_TEXT_LINE_LEN * DC_DESIRED_TEXT_LINES;

 // Flags for empty server job

--- a/src/contact.rs
+++ b/src/contact.rs
@@ -506,9 +506,9 @@ impl Contact {
        let mut update_addr = false;
        let mut row_id = 0;

-        if let Ok((id, row_name, row_addr, row_origin, row_authname)) = context
+        if let Some((id, row_name, row_addr, row_origin, row_authname)) = context
            .sql
-            .query_row(
+            .query_row_optional(
                "SELECT id, name, addr, origin, authname \
            FROM contacts WHERE addr=? COLLATE NOCASE;",
                paramsv![addr.to_string()],
@@ -522,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
@@ -896,11 +896,8 @@ impl Contact {
                    EncryptPreference::Reset => stock_str::encr_none(context).await,
                };

-                ret += &format!(
-                    "{}.\n{}:",
-                    stock_message,
-                    stock_str::finger_prints(context).await
-                );
+                let finger_prints = stock_str::finger_prints(context).await;
+                ret += &format!("{}.\n{}:", stock_message, finger_prints);

                let fingerprint_self = SignedPublicKey::load_self(context)
                    .await?
@@ -1186,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 = addr.parse::<EmailAddress>();
+    let res = EmailAddress::new(addr);
    res.is_ok()
 }

@@ -2281,7 +2278,7 @@ Hi."#;

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

--- a/src/context.rs
+++ b/src/context.rs
@@ -23,6 +23,7 @@ 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};

 #[derive(Clone, Debug)]
@@ -51,7 +52,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: RwLock<HashMap<usize, String>>,
+    pub(crate) translated_stockstrings: StockStrings,
    pub(crate) events: Events,

    pub(crate) scheduler: RwLock<Option<Scheduler>>,
@@ -119,8 +120,13 @@ 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) -> Result<Context> {
-        let context = Self::new_closed(dbfile, id, events).await?;
+    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?;

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

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

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

-    pub(crate) async fn with_blobdir(
+    pub(crate) fn with_blobdir(
        dbfile: PathBuf,
        blobdir: PathBuf,
        id: u32,
        events: Events,
+        stockstrings: StockStrings,
    ) -> Result<Context> {
        ensure!(
            blobdir.is_dir(),
@@ -190,7 +202,7 @@ impl Context {
            generating_key_mutex: Mutex::new(()),
            oauth2_mutex: Mutex::new(()),
            wrong_pw_warning_mutex: Mutex::new(()),
-            translated_stockstrings: RwLock::new(HashMap::new()),
+            translated_stockstrings: stockstrings,
            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.
@@ -346,6 +358,7 @@ impl Context {
        }
    }

+    #[allow(unused)]
    pub(crate) async fn shall_stop_ongoing(&self) -> bool {
        match &*self.running_state.read().await {
            RunningState::Running { .. } => false,
@@ -705,7 +718,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()).await?;
+        let res = Context::new(&dbfile, 1, Events::new(), StockStrings::new()).await?;

        // Broken database is indistinguishable from encrypted one.
        assert_eq!(res.is_open().await, false);
@@ -851,7 +864,9 @@ 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()).await.unwrap();
+        Context::new(&dbfile, 1, Events::new(), StockStrings::new())
+            .await
+            .unwrap();
        let blobdir = tmp.path().join("db.sqlite-blobs");
        assert!(blobdir.is_dir());
    }
@@ -862,7 +877,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()).await;
+        let res = Context::new(&dbfile, 1, Events::new(), StockStrings::new()).await;
        assert!(res.is_err());
    }

@@ -872,7 +887,9 @@ mod tests {
        let subdir = tmp.path().join("subdir");
        let dbfile = subdir.join("db.sqlite");
        let dbfile2 = dbfile.clone();
-        Context::new(&dbfile, 1, Events::new()).await.unwrap();
+        Context::new(&dbfile, 1, Events::new(), StockStrings::new())
+            .await
+            .unwrap();
        assert!(subdir.is_dir());
        assert!(dbfile2.is_file());
    }
@@ -882,7 +899,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()).await;
+        let res = Context::with_blobdir(dbfile, blobdir, 1, Events::new(), StockStrings::new());
        assert!(res.is_err());
    }

@@ -891,7 +908,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()).await;
+        let res = Context::with_blobdir(dbfile, blobdir, 1, Events::new(), StockStrings::new());
        assert!(res.is_err());
    }

@@ -1060,7 +1077,7 @@ mod tests {
        let dbfile = dir.path().join("db.sqlite");

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

        let id = 2;
-        let context = Context::new(&dbfile, id, Events::new())
+        let context = Context::new(&dbfile, id, Events::new(), StockStrings::new())
            .await
            .context("failed to create context")?;
        assert_eq!(context.is_open().await, false);
--- a/src/ephemeral.rs
+++ b/src/ephemeral.rs
@@ -36,15 +36,21 @@
 //!
 //! ## How messages are deleted
 //!
-//! 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 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 messages are deleted
 //!
@@ -326,35 +332,35 @@ pub(crate) async fn start_ephemeral_timers_msgids(
    Ok(())
 }

-/// Deletes messages which are expired according to
+/// Selects messages which are expired according to
 /// `delete_device_after` setting or `ephemeral_timestamp` column.
 ///
-/// 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
+/// 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
        .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
+        .query_map(
            r#"
-UPDATE msgs
-SET 
-  chat_id=?, txt='', subject='', txt_raw='', 
-  mime_headers='', from_id=0, to_id=0, param=''
+SELECT id, chat_id, type
+FROM msgs
 WHERE
  ephemeral_timestamp != 0
  AND ephemeral_timestamp <= ?
  AND chat_id != ?
 "#,
-            paramsv![DC_CHAT_ID_TRASH, now, DC_CHAT_ID_TRASH],
+            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),
        )
-        .await
-        .context("update failed")?
-        > 0;
+        .await?;

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

        let threshold_timestamp = now.saturating_sub(delete_device_after);

-        // Delete expired messages
-        //
-        // Only update the rows that have to be updated, to avoid emitting
-        // unnecessary "chat modified" events.
-        let rows_modified = context
+        let rows_expired = context
            .sql
-            .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 != ?",
+            .query_map(
+                r#"
+SELECT id, chat_id, type
+FROM msgs
+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
-            .context("deleted update failed")?;
+            .await?;

-        updated |= rows_modified > 0;
+        rows.extend(rows_expired);
    }

-    if updated {
-        context.emit_msgs_changed_without_ids();
+    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")?;
+
+        for (msg_id, chat_id, viewtype) in rows {
+            context.emit_msgs_changed(chat_id, msg_id);
+
+            if viewtype == Viewtype::Webxdc {
+                context.emit_event(EventType::WebxdcInstanceDeleted { msg_id });
+            }
+        }
    }

    Ok(())
@@ -587,7 +638,7 @@ mod tests {

        assert_eq!(
            stock_ephemeral_timer_changed(&context, Timer::Disabled, ContactId::SELF).await,
-            "Message deletion timer is disabled by me."
+            "You disabled message deletion timer."
        );

        assert_eq!(
@@ -597,7 +648,7 @@ mod tests {
                ContactId::SELF
            )
            .await,
-            "Message deletion timer is set to 1 s by me."
+            "You set message deletion timer to 1 s."
        );
        assert_eq!(
            stock_ephemeral_timer_changed(
@@ -606,7 +657,7 @@ mod tests {
                ContactId::SELF
            )
            .await,
-            "Message deletion timer is set to 30 s by me."
+            "You set message deletion timer to 30 s."
        );
        assert_eq!(
            stock_ephemeral_timer_changed(
@@ -615,7 +666,7 @@ mod tests {
                ContactId::SELF
            )
            .await,
-            "Message deletion timer is set to 1 minute by me."
+            "You set message deletion timer to 1 minute."
        );
        assert_eq!(
            stock_ephemeral_timer_changed(
@@ -624,7 +675,7 @@ mod tests {
                ContactId::SELF
            )
            .await,
-            "Message deletion timer is set to 1.5 minutes by me."
+            "You set message deletion timer to 1.5 minutes."
        );
        assert_eq!(
            stock_ephemeral_timer_changed(
@@ -633,7 +684,7 @@ mod tests {
                ContactId::SELF
            )
            .await,
-            "Message deletion timer is set to 30 minutes by me."
+            "You set message deletion timer to 30 minutes."
        );
        assert_eq!(
            stock_ephemeral_timer_changed(
@@ -642,7 +693,7 @@ mod tests {
                ContactId::SELF
            )
            .await,
-            "Message deletion timer is set to 1 hour by me."
+            "You set message deletion timer to 1 hour."
        );
        assert_eq!(
            stock_ephemeral_timer_changed(
@@ -651,7 +702,7 @@ mod tests {
                ContactId::SELF
            )
            .await,
-            "Message deletion timer is set to 1.5 hours by me."
+            "You set message deletion timer to 1.5 hours."
        );
        assert_eq!(
            stock_ephemeral_timer_changed(
@@ -662,7 +713,7 @@ mod tests {
                ContactId::SELF
            )
            .await,
-            "Message deletion timer is set to 2 hours by me."
+            "You set message deletion timer to 2 hours."
        );
        assert_eq!(
            stock_ephemeral_timer_changed(
@@ -673,7 +724,7 @@ mod tests {
                ContactId::SELF
            )
            .await,
-            "Message deletion timer is set to 1 day by me."
+            "You set message deletion timer to 1 day."
        );
        assert_eq!(
            stock_ephemeral_timer_changed(
@@ -684,7 +735,7 @@ mod tests {
                ContactId::SELF
            )
            .await,
-            "Message deletion timer is set to 2 days by me."
+            "You set message deletion timer to 2 days."
        );
        assert_eq!(
            stock_ephemeral_timer_changed(
@@ -695,7 +746,7 @@ mod tests {
                ContactId::SELF
            )
            .await,
-            "Message deletion timer is set to 1 week by me."
+            "You set message deletion timer to 1 week."
        );
        assert_eq!(
            stock_ephemeral_timer_changed(
@@ -706,7 +757,7 @@ mod tests {
                ContactId::SELF
            )
            .await,
-            "Message deletion timer is set to 4 weeks by me."
+            "You set message deletion timer to 4 weeks."
        );
    }

@@ -950,6 +1001,19 @@ 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
@@ -307,12 +307,4 @@ pub enum EventType {
    WebxdcInstanceDeleted {
        msg_id: MsgId,
    },
-
-    WebxdcBusyUpdating {
-        msg_id: MsgId,
-    },
-
-    WebxdcUpToDate {
-        msg_id: MsgId,
-    },
 }
--- a/src/html.rs
+++ b/src/html.rs
@@ -98,7 +98,7 @@ impl HtmlMsgParser {

        if parser.html.is_empty() {
            if let Some(plain) = &parser.plain {
-                parser.html = plain.to_html().await;
+                parser.html = plain.to_html();
            }
        } else {
            parser.cid_to_data_recursive(context, &parsedmail).await?;
--- 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 async fn new(
+    pub fn new(
        lp: &ServerLoginParam,
        socks5_config: Option<Socks5Config>,
        addr: &str,
@@ -303,8 +303,7 @@ impl Imap {
                    provider.strict_tls
                }),
            idle_interrupt,
-        )
-        .await?;
+        )?;
        Ok(imap)
    }

@@ -2158,8 +2157,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=? WHERE folder=?;",
-            paramsv![folder, uid_next, uid_next, folder],
+                ON CONFLICT(folder) DO UPDATE SET uid_next=excluded.uid_next",
+            paramsv![folder, uid_next],
        )
        .await?;
    Ok(())
@@ -2190,8 +2189,8 @@ pub(crate) async fn set_uidvalidity(
        .sql
        .execute(
            "INSERT INTO imap_sync (folder, uidvalidity) VALUES (?,?)
-                ON CONFLICT(folder) DO UPDATE SET uidvalidity=? WHERE folder=?;",
-            paramsv![folder, uidvalidity, uidvalidity, folder],
+                ON CONFLICT(folder) DO UPDATE SET uidvalidity=excluded.uidvalidity",
+            paramsv![folder, uidvalidity],
        )
        .await?;
    Ok(())
@@ -2213,8 +2212,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=? WHERE folder=?;",
-            paramsv![folder, modseq, modseq, folder],
+                ON CONFLICT(folder) DO UPDATE SET modseq=excluded.modseq",
+            paramsv![folder, modseq],
        )
        .await?;
    Ok(())
--- a/src/imex.rs
+++ b/src/imex.rs
@@ -134,19 +134,9 @@ 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?;
@@ -171,17 +161,7 @@ async fn do_initiate_key_transfer(context: &Context) -> Result<String> {
    msg.force_plaintext();
    msg.param.set_int(Param::SkipAutocrypt, 1);

-    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;
-            }
-        }
-    }
+    chat::send_msg(context, chat_id, &mut msg).await?;
    // 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.
@@ -980,16 +960,10 @@ mod tests {
    async fn test_key_transfer() -> Result<()> {
        let alice = TestContext::new_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
-        });
+        let setup_code = initiate_key_transfer(&alice).await?;

-        // Wait for the message to be added to the queue.
-        tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+        // Get Autocrypt Setup Message.
        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/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, PartialEq, Eq)]
+#[derive(Copy, Clone, Debug, Display, FromPrimitive, ToPrimitive, PartialEq, Eq)]
 #[repr(u32)]
 #[strum(serialize_all = "snake_case")]
 pub enum CertificateChecks {
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -1177,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()).await);
+            parts.push(context.build_sync_part(json.to_string()));
            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).await);
+            parts.push(context.build_status_update_part(json));
        } 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).await);
+                parts.push(context.build_status_update_part(&json));
            }
        }

--- a/src/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -12,7 +12,7 @@ use once_cell::sync::Lazy;

 use crate::aheader::Aheader;
 use crate::blob::BlobObject;
-use crate::constants::{DC_DESIRED_TEXT_LEN, DC_ELLIPSIS};
+use crate::constants::{DC_DESIRED_TEXT_LINES, DC_DESIRED_TEXT_LINE_LEN};
 use crate::contact::{addr_cmp, addr_normalize, ContactId};
 use crate::context::Context;
 use crate::decrypt::{create_decryption_info, try_decrypt};
@@ -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};
+use crate::tools::{get_filemeta, parse_receive_headers, truncate_by_lines};

 /// A parsed MIME message.
 ///
@@ -392,15 +392,10 @@ impl MimeMessage {
    /// Parses system messages.
    fn parse_system_message_headers(&mut self, context: &Context) {
        if self.get_header(HeaderDef::AutocryptSetupMessage).is_some() {
-            self.parts = self
-                .parts
-                .iter()
-                .filter(|part| {
-                    part.mimetype.is_none()
-                        || part.mimetype.as_ref().unwrap().as_ref() == MIME_AC_SETUP_FILE
-                })
-                .cloned()
-                .collect();
+            self.parts.retain(|part| {
+                part.mimetype.is_none()
+                    || part.mimetype.as_ref().unwrap().as_ref() == MIME_AC_SETUP_FILE
+            });

            if self.parts.len() == 1 {
                self.is_system_message = SystemMessage::AutocryptSetupMessage;
@@ -1012,14 +1007,15 @@ impl MimeMessage {
                            (simplified_txt, top_quote)
                        };

-                        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
-                        };
+                        // 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;
+                        }

                        if !simplified_txt.is_empty() || simplified_quote.is_some() {
                            let mut part = Part {
@@ -1817,7 +1813,7 @@ mod tests {
    use crate::{
        chatlist::Chatlist,
        config::Config,
-        constants::Blocked,
+        constants::{Blocked, DC_DESIRED_TEXT_LEN, DC_ELLIPSIS},
        message::{Message, MessageState, MessengerMessage},
        receive_imf::receive_imf,
        test_utils::TestContext,
@@ -3331,8 +3327,6 @@ Message.

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

-        dbg!(mime_message);
-
        Ok(())
    }
 }
--- 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 async fn to_html(&self) -> String {
+    pub fn to_html(&self) -> String {
        static LINKIFY_MAIL_RE: Lazy<regex::Regex> =
            Lazy::new(|| regex::Regex::new(r#"\b([\w.\-+]+@[\w.\-]+)\b"#).unwrap());

@@ -111,8 +111,7 @@ http://link-at-start-of-line.org
            flowed: false,
            delsp: false,
        }
-        .to_html()
-        .await;
+        .to_html();
        assert_eq!(
            html,
            r##"<!DOCTYPE html>
@@ -134,8 +133,7 @@ line with <a href="https://link-mid-of-line.org">https://link-mid-of-line.org</a
            flowed: false,
            delsp: false,
        }
-        .to_html()
-        .await;
+        .to_html();
        assert_eq!(
            html,
            r#"<!DOCTYPE html>
@@ -153,8 +151,7 @@ line with &lt;<a href="http://encapsulated.link/?foo=_bar">http://encapsulated.l
            flowed: false,
            delsp: false,
        }
-        .to_html()
-        .await;
+        .to_html();
        assert_eq!(
            html,
            r#"<!DOCTYPE html>
@@ -172,8 +169,7 @@ line with nohttp://no.link here<br/>
            flowed: false,
            delsp: false,
        }
-        .to_html()
-        .await;
+        .to_html();
        assert_eq!(
            html,
            r#"<!DOCTYPE html>
@@ -191,8 +187,7 @@ just an address: <a href="mailto:foo@bar.org">foo@bar.org</a> <a href="mailto:an
            flowed: true,
            delsp: false,
        }
-        .to_html()
-        .await;
+        .to_html();
        assert_eq!(
            html,
            r#"<!DOCTYPE html>
@@ -213,8 +208,7 @@ line still line<br/>
            flowed: true,
            delsp: true,
        }
-        .to_html()
-        .await;
+        .to_html();
        assert_eq!(
            html,
            r#"<!DOCTYPE html>
@@ -235,8 +229,7 @@ linestill line<br/>
            flowed: false,
            delsp: false,
        }
-        .to_html()
-        .await;
+        .to_html();
        assert_eq!(
            html,
            r#"<!DOCTYPE html>
--- a/src/qr.rs
+++ b/src/qr.rs
@@ -1,5 +1,8 @@
 //! # 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;
@@ -17,8 +20,11 @@ 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:";
@@ -97,6 +103,10 @@ pub enum Qr {
        invitenumber: String,
        authcode: String,
    },
+    Login {
+        address: String,
+        options: LoginOptions,
+    },
 }

 fn starts_with_ignore_case(string: &str, pattern: &str) -> bool {
@@ -115,6 +125,8 @@ 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) {
@@ -462,6 +474,9 @@ 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),
    }

@@ -1024,6 +1039,103 @@ 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
@@ -0,0 +1,388 @@
+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/receive_imf.rs
+++ b/src/receive_imf.rs
@@ -3121,7 +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;
+        t.evtracker.consume_events();
        receive_imf(&t.ctx, DC_MAILINGLIST2, false).await.unwrap();

        // Check that no notification is displayed for blocked mailing list message.
@@ -4626,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_alice().await;
+        let bob = TestContext::new_bob().await;
        alice.set_config(Config::ShowEmails, Some("2")).await?;
        bob.set_config(Config::ShowEmails, Some("2")).await?;

@@ -4949,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().await;
+        let mut tcm = TestContextManager::new();
        let alice = tcm.alice().await;
        let bob = tcm.bob().await;

@@ -5001,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().await;
+        let mut tcm = TestContextManager::new();
        let alice1 = tcm.alice().await;
        let alice2 = tcm.alice().await;
        let bob1 = tcm.bob().await;
@@ -5046,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().await;
+        let mut tcm = TestContextManager::new();
        let alice1 = tcm.alice().await;
        let alice2 = tcm.alice().await;
        let bob = tcm.bob().await;
@@ -5134,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().await;
+        let mut tcm = TestContextManager::new();
        let alice = tcm.alice().await;
        let bob = tcm.bob().await;

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

@@ -42,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().await;
+            scheduler.maybe_network();
        }
        connectivity::idle_interrupted(lock).await;
    }
@@ -51,32 +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().await;
+            scheduler.maybe_network_lost();
        }
        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).await;
+            scheduler.interrupt_inbox(info);
        }
    }

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

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

    pub(crate) async fn interrupt_location(&self) {
        if let Some(scheduler) = &*self.scheduler.read().await {
-            scheduler.interrupt_location().await;
+            scheduler.interrupt_location();
        }
    }
 }
@@ -332,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, delaying next try by {}",
+                        "smtp got rate limited, waiting for {} until can send again",
                        duration_to_str(duration_until_can_send)
                    );
                    tokio::time::timeout(duration_until_can_send, async {
@@ -501,45 +501,41 @@ impl Scheduler {
        Ok(res)
    }

-    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(&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_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 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 interrupt_inbox(&self, info: InterruptInfo) {
-        self.inbox.interrupt(info).await;
+    fn interrupt_inbox(&self, info: InterruptInfo) {
+        self.inbox.interrupt(info);
    }

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

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

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

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

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

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

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

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

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

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

    /// Shutdown this connection completely.
--- a/src/scheduler/connectivity.rs
+++ b/src/scheduler/connectivity.rs
@@ -390,7 +390,8 @@ impl Context {
        // =============================================================================================

        let watched_folders = get_watched_folder_configs(self).await?;
-        ret += &format!("<h3>{}</h3><ul>", stock_str::incoming_messages(self).await);
+        let incoming_messages = stock_str::incoming_messages(self).await;
+        ret += &format!("<h3>{}</h3><ul>", incoming_messages);
        for (folder, state) in &folders_states {
            let mut folder_added = false;

@@ -432,10 +433,8 @@ impl Context {
        //                                Your last message was sent successfully
        // =============================================================================================

-        ret += &format!(
-            "<h3>{}</h3><ul><li>",
-            stock_str::outgoing_messages(self).await
-        );
+        let outgoing_messages = stock_str::outgoing_messages(self).await;
+        ret += &format!("<h3>{}</h3><ul><li>", outgoing_messages);
        let detailed = smtp.get_detailed().await;
        ret += &*detailed.to_icon();
        ret += " ";
@@ -450,10 +449,8 @@ impl Context {
        // =============================================================================================

        let domain = tools::EmailAddress::new(&self.get_primary_self_addr().await?)?.domain;
-        ret += &format!(
-            "<h3>{}</h3><ul>",
-            stock_str::storage_on_domain(self, domain).await
-        );
+        let storage_on_domain = stock_str::storage_on_domain(self, domain).await;
+        ret += &format!("<h3>{}</h3><ul>", storage_on_domain);
        let quota = self.quota.read().await;
        if let Some(quota) = &*quota {
            match &quota.recent {
@@ -473,30 +470,23 @@ impl Context {
                                info!(self, "connectivity: root name hidden: \"{}\"", root_name);
                            }

+                            let messages = stock_str::messages(self).await;
+                            let part_of_total_used = stock_str::part_of_total_used(
+                                self,
+                                resource.usage.to_string(),
+                                resource.limit.to_string(),
+                            )
+                            .await;
                            ret += &match &resource.name {
                                Atom(resource_name) => {
                                    format!(
                                        "<b>{}:</b> {}",
                                        &*escaper::encode_minimal(resource_name),
-                                        stock_str::part_of_total_used(
-                                            self,
-                                            resource.usage.to_string(),
-                                            resource.limit.to_string()
-                                        )
-                                        .await,
+                                        part_of_total_used
                                    )
                                }
                                Message => {
-                                    format!(
-                                        "<b>{}:</b> {}",
-                                        stock_str::messages(self).await,
-                                        stock_str::part_of_total_used(
-                                            self,
-                                            resource.usage.to_string(),
-                                            resource.limit.to_string()
-                                        )
-                                        .await,
-                                    )
+                                    format!("<b>{}:</b> {}", part_of_total_used, messages)
                                }
                                Storage => {
                                    // do not use a special title needed for "Storage":
@@ -538,7 +528,8 @@ impl Context {
                self.schedule_quota_update().await?;
            }
        } else {
-            ret += &format!("<li>{}</li>", stock_str::not_connected(self).await);
+            let not_connected = stock_str::not_connected(self).await;
+            ret += &format!("<li>{}</li>", not_connected);
            self.schedule_quota_update().await?;
        }
        ret += "</ul>";
--- a/src/securejoin.rs
+++ b/src/securejoin.rs
@@ -693,10 +693,11 @@ 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().await;
+        let mut tcm = TestContextManager::new();
        let alice = tcm.alice().await;
        let bob = tcm.bob().await;
        assert_eq!(
@@ -722,7 +723,10 @@ mod tests {
        );

        let sent = bob.pop_sent_msg().await;
-        assert_eq!(sent.recipient(), "alice@example.org".parse().unwrap());
+        assert_eq!(
+            sent.recipient(),
+            EmailAddress::new("alice@example.org").unwrap()
+        );
        let msg = alice.parse_msg(&sent).await;
        assert!(!msg.was_encrypted());
        assert_eq!(msg.get_header(HeaderDef::SecureJoin).unwrap(), "vc-request");
@@ -910,7 +914,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().await;
+        let mut tcm = TestContextManager::new();
        let alice = tcm.alice().await;
        let bob = tcm.bob().await;

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

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

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

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

@@ -1087,7 +1091,10 @@ 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(), "alice@example.org".parse().unwrap());
+        assert_eq!(
+            sent.recipient(),
+            EmailAddress::new("alice@example.org").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,7 +22,6 @@ 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.
@@ -65,7 +64,7 @@ impl Smtp {

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

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

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

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

@@ -118,7 +117,7 @@ impl Smtp {
        addr: &str,
        provider_strict_tls: bool,
    ) -> Result<()> {
-        if self.is_connected().await {
+        if self.is_connected() {
            warn!(context, "SMTP already connected.");
            return Ok(());
        }
@@ -500,15 +499,7 @@ 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,7 +7,6 @@ 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;

@@ -364,25 +363,6 @@ 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.
--- a/src/sql/migrations.rs
+++ b/src/sql/migrations.rs
@@ -24,7 +24,6 @@ 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)?;

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

        let mut lock = context.sql.config_cache.write().await;
        lock.insert(
@@ -57,7 +57,6 @@ 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 '');
@@ -67,7 +66,6 @@ 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,
@@ -75,7 +73,6 @@ 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, \
@@ -89,7 +86,6 @@ 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, \
@@ -104,7 +100,6 @@ 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);
@@ -114,7 +109,6 @@ 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;
@@ -128,7 +122,6 @@ 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;
@@ -138,7 +131,6 @@ 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(
@@ -152,7 +144,6 @@ 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;
@@ -167,7 +158,6 @@ 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 ( 
@@ -185,17 +175,14 @@ 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;
@@ -205,12 +192,10 @@ 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;",
@@ -219,7 +204,6 @@ 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,
@@ -227,7 +211,6 @@ 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
@@ -238,7 +221,6 @@ 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(
@@ -263,7 +245,6 @@ 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;
@@ -273,7 +254,6 @@ 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,
@@ -281,7 +261,6 @@ 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(
@@ -295,7 +274,6 @@ 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,
@@ -303,7 +281,6 @@ 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,
@@ -312,7 +289,6 @@ 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,
@@ -320,17 +296,14 @@ 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;
@@ -341,12 +314,10 @@ 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))
@@ -373,7 +344,6 @@ 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);",
@@ -382,7 +352,6 @@ 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;
@@ -394,9 +363,8 @@ 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) = addr.parse::<EmailAddress>().map(|email| email.domain) {
+            if let Ok(domain) = EmailAddress::new(&addr).map(|email| email.domain) {
                context
                    .set_config(
                        Config::ConfiguredProvider,
@@ -410,20 +378,16 @@ UPDATE chats SET protected=1, type=120 WHERE type=130;"#,

        sql.set_db_version(71).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 < 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 < 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);"#,
@@ -459,12 +423,10 @@ 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,
@@ -472,24 +434,20 @@ 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;
@@ -499,7 +457,6 @@ paramsv![]
        .await?;
    }
    if dbversion < 80 {
-        info!(context, "[migration] v80");
        sql.execute_migration(
            r#"CREATE TABLE multi_device_sync (
 id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -509,12 +466,10 @@ 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,
@@ -547,7 +502,6 @@ 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
@@ -557,7 +511,6 @@ 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,
@@ -570,7 +523,6 @@ 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,
@@ -587,7 +539,6 @@ 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,
@@ -600,7 +551,6 @@ 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);",
@@ -609,12 +559,10 @@ 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,
@@ -625,7 +573,6 @@ 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
@@ -638,7 +585,6 @@ 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
@@ -651,6 +597,22 @@ CREATE INDEX smtp_messageid ON imap(rfc724_mid);
        .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,
        update_icons,
--- a/src/stock_str.rs
+++ b/src/stock_str.rs
@@ -1,12 +1,14 @@
 //! Module to work with translatable stock strings.

-use std::future::Future;
-use std::pin::Pin;
+use std::collections::HashMap;
+use std::sync::Arc;

-use anyhow::{bail, Error};
+use anyhow::{bail, Result};
 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;
@@ -17,6 +19,12 @@ 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
@@ -52,21 +60,6 @@ pub enum StockMessage {
    #[strum(props(fallback = "File"))]
    File = 12,

-    #[strum(props(fallback = "Group name changed from \"%1$s\" to \"%2$s\"."))]
-    MsgGrpName = 15,
-
-    #[strum(props(fallback = "Group image changed."))]
-    MsgGrpImgChanged = 16,
-
-    #[strum(props(fallback = "Member %1$s added."))]
-    MsgAddMember = 17,
-
-    #[strum(props(fallback = "Member %1$s removed."))]
-    MsgDelMember = 18,
-
-    #[strum(props(fallback = "Group left."))]
-    MsgGroupLeft = 19,
-
    #[strum(props(fallback = "GIF"))]
    Gif = 23,

@@ -91,9 +84,6 @@ pub enum StockMessage {
    #[strum(props(fallback = "This is a return receipt for the message \"%1$s\"."))]
    ReadRcptMailBody = 32,

-    #[strum(props(fallback = "Group image deleted."))]
-    MsgGrpImgDeleted = 33,
-
    #[strum(props(fallback = "End-to-end encryption preferred"))]
    E2ePreferred = 34,

@@ -122,12 +112,6 @@ pub enum StockMessage {
    ))]
    CannotLogin = 60,

-    #[strum(props(fallback = "%1$s by %2$s."))]
-    MsgActionByUser = 62,
-
-    #[strum(props(fallback = "%1$s by me."))]
-    MsgActionByMe = 63,
-
    #[strum(props(fallback = "Location streaming enabled."))]
    MsgLocationEnabled = 64,

@@ -172,26 +156,6 @@ pub enum StockMessage {
    #[strum(props(fallback = "Failed to send message to %1$s."))]
    FailedSendingTo = 74,

-    #[strum(props(fallback = "Message deletion timer is disabled."))]
-    MsgEphemeralTimerDisabled = 75,
-
-    // A fallback message for unknown timer values.
-    // "s" stands for "second" SI unit here.
-    #[strum(props(fallback = "Message deletion timer is set to %1$s s."))]
-    MsgEphemeralTimerEnabled = 76,
-
-    #[strum(props(fallback = "Message deletion timer is set to 1 minute."))]
-    MsgEphemeralTimerMinute = 77,
-
-    #[strum(props(fallback = "Message deletion timer is set to 1 hour."))]
-    MsgEphemeralTimerHour = 78,
-
-    #[strum(props(fallback = "Message deletion timer is set to 1 day."))]
-    MsgEphemeralTimerDay = 79,
-
-    #[strum(props(fallback = "Message deletion timer is set to 1 week."))]
-    MsgEphemeralTimerWeek = 80,
-
    #[strum(props(fallback = "Video chat invitation"))]
    VideochatInvitation = 82,

@@ -218,12 +182,6 @@ pub enum StockMessage {
    ))]
    ErrorNoNetwork = 87,

-    #[strum(props(fallback = "Chat protection enabled."))]
-    ProtectionEnabled = 88,
-
-    #[strum(props(fallback = "Chat protection disabled."))]
-    ProtectionDisabled = 89,
-
    // used in summaries, a noun, not a verb (not: "to reply")
    #[strum(props(fallback = "Reply"))]
    ReplyNoun = 90,
@@ -239,18 +197,6 @@ pub enum StockMessage {
    ))]
    DeleteServerTurnedOff = 92,

-    #[strum(props(fallback = "Message deletion timer is set to %1$s minutes."))]
-    MsgEphemeralTimerMinutes = 93,
-
-    #[strum(props(fallback = "Message deletion timer is set to %1$s hours."))]
-    MsgEphemeralTimerHours = 94,
-
-    #[strum(props(fallback = "Message deletion timer is set to %1$s days."))]
-    MsgEphemeralTimerDays = 95,
-
-    #[strum(props(fallback = "Message deletion timer is set to %1$s weeks."))]
-    MsgEphemeralTimerWeeks = 96,
-
    #[strum(props(fallback = "Forwarded"))]
    Forwarded = 97,

@@ -340,6 +286,122 @@ pub enum StockMessage {
        fallback = "You changed your email address from %1$s to %2$s.\n\nIf you now send a message to a verified group, contacts there will automatically replace the old with your new address.\n\nIt's highly advised to set up your old email provider to forward all emails to your new email address. Otherwise you might miss messages of contacts who did not get your new address yet."
    ))]
    AeapExplanationAndLink = 123,
+
+    #[strum(props(fallback = "You changed group name from \"%1$s\" to \"%2$s\"."))]
+    MsgYouChangedGrpName = 124,
+
+    #[strum(props(fallback = "Group name changed from \"%1$s\" to \"%2$s\" by %3$s."))]
+    MsgGrpNameChangedBy = 125,
+
+    #[strum(props(fallback = "You changed the group image."))]
+    MsgYouChangedGrpImg = 126,
+
+    #[strum(props(fallback = "Group image changed by %1$s."))]
+    MsgGrpImgChangedBy = 127,
+
+    #[strum(props(fallback = "You added member %1$s."))]
+    MsgYouAddMember = 128,
+
+    #[strum(props(fallback = "Member %1$s added by %2$s."))]
+    MsgAddMemberBy = 129,
+
+    #[strum(props(fallback = "You removed member %1$s."))]
+    MsgYouDelMember = 130,
+
+    #[strum(props(fallback = "Member %1$s removed by %2$s."))]
+    MsgDelMemberBy = 131,
+
+    #[strum(props(fallback = "You left the group."))]
+    MsgYouLeftGroup = 132,
+
+    #[strum(props(fallback = "Group left by %1$s."))]
+    MsgGroupLeftBy = 133,
+
+    #[strum(props(fallback = "You deleted the group image."))]
+    MsgYouDeletedGrpImg = 134,
+
+    #[strum(props(fallback = "Group image deleted by %1$s."))]
+    MsgGrpImgDeletedBy = 135,
+
+    #[strum(props(fallback = "You enabled location streaming."))]
+    MsgYouEnabledLocation = 136,
+
+    #[strum(props(fallback = "Location streaming enabled by %1$s."))]
+    MsgLocationEnabledBy = 137,
+
+    #[strum(props(fallback = "You disabled message deletion timer."))]
+    MsgYouDisabledEphemeralTimer = 138,
+
+    #[strum(props(fallback = "Message deletion timer is disabled by %1$s."))]
+    MsgEphemeralTimerDisabledBy = 139,
+
+    // A fallback message for unknown timer values.
+    // "s" stands for "second" SI unit here.
+    #[strum(props(fallback = "You set message deletion timer to %1$s s."))]
+    MsgYouEnabledEphemeralTimer = 140,
+
+    #[strum(props(fallback = "Message deletion timer is set to %1$s s by %2$s."))]
+    MsgEphemeralTimerEnabledBy = 141,
+
+    #[strum(props(fallback = "You set message deletion timer to 1 minute."))]
+    MsgYouEphemeralTimerMinute = 142,
+
+    #[strum(props(fallback = "Message deletion timer is set to 1 minute by %1$s."))]
+    MsgEphemeralTimerMinuteBy = 143,
+
+    #[strum(props(fallback = "You set message deletion timer to 1 hour."))]
+    MsgYouEphemeralTimerHour = 144,
+
+    #[strum(props(fallback = "Message deletion timer is set to 1 hour by %1$s."))]
+    MsgEphemeralTimerHourBy = 145,
+
+    #[strum(props(fallback = "You set message deletion timer to 1 day."))]
+    MsgYouEphemeralTimerDay = 146,
+
+    #[strum(props(fallback = "Message deletion timer is set to 1 day by %1$s."))]
+    MsgEphemeralTimerDayBy = 147,
+
+    #[strum(props(fallback = "You set message deletion timer to 1 week."))]
+    MsgYouEphemeralTimerWeek = 148,
+
+    #[strum(props(fallback = "Message deletion timer is set to 1 week by %1$s."))]
+    MsgEphemeralTimerWeekBy = 149,
+
+    #[strum(props(fallback = "You set message deletion timer to %1$s minutes."))]
+    MsgYouEphemeralTimerMinutes = 150,
+
+    #[strum(props(fallback = "Message deletion timer is set to %1$s minutes by %2$s."))]
+    MsgEphemeralTimerMinutesBy = 151,
+
+    #[strum(props(fallback = "You set message deletion timer to %1$s hours."))]
+    MsgYouEphemeralTimerHours = 152,
+
+    #[strum(props(fallback = "Message deletion timer is set to %1$s hours by %2$s."))]
+    MsgEphemeralTimerHoursBy = 153,
+
+    #[strum(props(fallback = "You set message deletion timer to %1$s days."))]
+    MsgYouEphemeralTimerDays = 154,
+
+    #[strum(props(fallback = "Message deletion timer is set to %1$s days by %2$s."))]
+    MsgEphemeralTimerDaysBy = 155,
+
+    #[strum(props(fallback = "You set message deletion timer to %1$s weeks."))]
+    MsgYouEphemeralTimerWeeks = 156,
+
+    #[strum(props(fallback = "Message deletion timer is set to %1$s weeks by %2$s."))]
+    MsgEphemeralTimerWeeksBy = 157,
+
+    #[strum(props(fallback = "You enabled chat protection."))]
+    YouEnabledProtection = 158,
+
+    #[strum(props(fallback = "Chat protection enabled by %1$s."))]
+    ProtectionEnabledBy = 159,
+
+    #[strum(props(fallback = "You disabled chat protection."))]
+    YouDisabledProtection = 160,
+
+    #[strum(props(fallback = "Chat protection disabled by %1$s."))]
+    ProtectionDisabledBy = 161,
 }

 impl StockMessage {
@@ -351,15 +413,54 @@ 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
-        .read()
-        .await
-        .get(&(id as usize))
-        .map(AsRef::as_ref)
-        .unwrap_or_else(|| id.fallback())
-        .to_string()
+    context.translated_stockstrings.translated(id).await
 }

 /// Helper trait only meant to be implemented for [`String`].
@@ -393,38 +494,15 @@ trait StockStringMods: AsRef<str> + Sized {
            .replacen("%3$d", replacement.as_ref(), 1)
            .replacen("%3$@", replacement.as_ref(), 1)
    }
+}

-    /// Augments the message by saying it was performed by a user.
-    ///
-    /// This looks up the display name of `contact` and uses the [`msg_action_by_me`] and
-    /// [`msg_action_by_user`] stock strings to turn the stock string in one that says the
-    /// action was performed by this user.
-    ///
-    /// E.g. this turns `Group image changed.` into `Group image changed by me.` or `Group
-    /// image changed by Alice.`.
-    ///
-    /// Note that the original message should end in a `.`.
-    fn action_by_contact<'a>(
-        self,
-        context: &'a Context,
-        contact_id: ContactId,
-    ) -> Pin<Box<dyn Future<Output = String> + Send + 'a>>
-    where
-        Self: Send + 'a,
-    {
-        Box::pin(async move {
-            let message = self.as_ref().trim_end_matches('.');
-            match contact_id {
-                ContactId::SELF => msg_action_by_me(context, message).await,
-                _ => {
-                    let displayname = Contact::get_by_id(context, contact_id)
-                        .await
-                        .map(|contact| contact.get_name_n_addr())
-                        .unwrap_or_else(|_| contact_id.to_string());
-                    msg_action_by_user(context, message, displayname).await
-                }
-            }
-        })
+impl ContactId {
+    /// Get contact name for stock string.
+    async fn get_stock_name(self, context: &Context) -> String {
+        Contact::get_by_id(context, self)
+            .await
+            .map(|contact| contact.get_name_n_addr())
+            .unwrap_or_else(|_| self.to_string())
    }
 }

@@ -477,20 +555,28 @@ pub(crate) async fn msg_grp_name(
    to_group: impl AsRef<str>,
    by_contact: ContactId,
 ) -> String {
-    translated(context, StockMessage::MsgGrpName)
-        .await
-        .replace1(from_group)
-        .replace2(to_group)
-        .action_by_contact(context, by_contact)
-        .await
+    if by_contact == ContactId::SELF {
+        translated(context, StockMessage::MsgYouChangedGrpName)
+            .await
+            .replace1(from_group)
+            .replace2(to_group)
+    } else {
+        translated(context, StockMessage::MsgGrpNameChangedBy)
+            .await
+            .replace1(from_group)
+            .replace2(to_group)
+            .replace3(by_contact.get_stock_name(context).await)
+    }
 }

-/// Stock string: `Group image changed.`.
 pub(crate) async fn msg_grp_img_changed(context: &Context, by_contact: ContactId) -> String {
-    translated(context, StockMessage::MsgGrpImgChanged)
-        .await
-        .action_by_contact(context, by_contact)
-        .await
+    if by_contact == ContactId::SELF {
+        translated(context, StockMessage::MsgYouChangedGrpImg).await
+    } else {
+        translated(context, StockMessage::MsgGrpImgChangedBy)
+            .await
+            .replace1(by_contact.get_stock_name(context).await)
+    }
 }

 /// Stock string: `Member %1$s added.`.
@@ -510,11 +596,16 @@ pub(crate) async fn msg_add_member(
            .unwrap_or_else(|_| addr.to_string()),
        _ => addr.to_string(),
    };
-    translated(context, StockMessage::MsgAddMember)
-        .await
-        .replace1(who)
-        .action_by_contact(context, by_contact)
-        .await
+    if by_contact == ContactId::SELF {
+        translated(context, StockMessage::MsgYouAddMember)
+            .await
+            .replace1(who)
+    } else {
+        translated(context, StockMessage::MsgAddMemberBy)
+            .await
+            .replace1(who)
+            .replace2(by_contact.get_stock_name(context).await)
+    }
 }

 /// Stock string: `Member %1$s removed.`.
@@ -534,19 +625,27 @@ pub(crate) async fn msg_del_member(
            .unwrap_or_else(|_| addr.to_string()),
        _ => addr.to_string(),
    };
-    translated(context, StockMessage::MsgDelMember)
-        .await
-        .replace1(who)
-        .action_by_contact(context, by_contact)
-        .await
+    if by_contact == ContactId::SELF {
+        translated(context, StockMessage::MsgYouDelMember)
+            .await
+            .replace1(who)
+    } else {
+        translated(context, StockMessage::MsgDelMemberBy)
+            .await
+            .replace1(who)
+            .replace2(by_contact.get_stock_name(context).await)
+    }
 }

 /// Stock string: `Group left.`.
 pub(crate) async fn msg_group_left(context: &Context, by_contact: ContactId) -> String {
-    translated(context, StockMessage::MsgGroupLeft)
-        .await
-        .action_by_contact(context, by_contact)
-        .await
+    if by_contact == ContactId::SELF {
+        translated(context, StockMessage::MsgYouLeftGroup).await
+    } else {
+        translated(context, StockMessage::MsgGroupLeftBy)
+            .await
+            .replace1(by_contact.get_stock_name(context).await)
+    }
 }

 /// Stock string: `GIF`.
@@ -593,10 +692,13 @@ pub(crate) async fn read_rcpt_mail_body(context: &Context, message: impl AsRef<s

 /// Stock string: `Group image deleted.`.
 pub(crate) async fn msg_grp_img_deleted(context: &Context, by_contact: ContactId) -> String {
-    translated(context, StockMessage::MsgGrpImgDeleted)
-        .await
-        .action_by_contact(context, by_contact)
-        .await
+    if by_contact == ContactId::SELF {
+        translated(context, StockMessage::MsgYouDeletedGrpImg).await
+    } else {
+        translated(context, StockMessage::MsgGrpImgDeletedBy)
+            .await
+            .replace1(by_contact.get_stock_name(context).await)
+    }
 }

 /// Stock string: `End-to-end encryption preferred.`.
@@ -714,25 +816,6 @@ pub(crate) async fn cannot_login(context: &Context, user: impl AsRef<str>) -> St
        .replace1(user)
 }

-/// Stock string: `%1$s by %2$s.`.
-pub(crate) async fn msg_action_by_user(
-    context: &Context,
-    action: impl AsRef<str>,
-    user: impl AsRef<str>,
-) -> String {
-    translated(context, StockMessage::MsgActionByUser)
-        .await
-        .replace1(action)
-        .replace2(user)
-}
-
-/// Stock string: `%1$s by me.`.
-pub(crate) async fn msg_action_by_me(context: &Context, action: impl AsRef<str>) -> String {
-    translated(context, StockMessage::MsgActionByMe)
-        .await
-        .replace1(action)
-}
-
 /// Stock string: `Location streaming enabled.`.
 pub(crate) async fn msg_location_enabled(context: &Context) -> String {
    translated(context, StockMessage::MsgLocationEnabled).await
@@ -740,10 +823,13 @@ pub(crate) async fn msg_location_enabled(context: &Context) -> String {

 /// Stock string: `Location streaming enabled by ...`.
 pub(crate) async fn msg_location_enabled_by(context: &Context, contact: ContactId) -> String {
-    translated(context, StockMessage::MsgLocationEnabled)
-        .await
-        .action_by_contact(context, contact)
-        .await
+    if contact == ContactId::SELF {
+        translated(context, StockMessage::MsgYouEnabledLocation).await
+    } else {
+        translated(context, StockMessage::MsgLocationEnabledBy)
+            .await
+            .replace1(contact.get_stock_name(context).await)
+    }
 }

 /// Stock string: `Location streaming disabled.`.
@@ -809,10 +895,13 @@ pub(crate) async fn msg_ephemeral_timer_disabled(
    context: &Context,
    by_contact: ContactId,
 ) -> String {
-    translated(context, StockMessage::MsgEphemeralTimerDisabled)
-        .await
-        .action_by_contact(context, by_contact)
-        .await
+    if by_contact == ContactId::SELF {
+        translated(context, StockMessage::MsgYouDisabledEphemeralTimer).await
+    } else {
+        translated(context, StockMessage::MsgEphemeralTimerDisabledBy)
+            .await
+            .replace1(by_contact.get_stock_name(context).await)
+    }
 }

 /// Stock string: `Message deletion timer is set to %1$s s.`.
@@ -821,43 +910,60 @@ pub(crate) async fn msg_ephemeral_timer_enabled(
    timer: impl AsRef<str>,
    by_contact: ContactId,
 ) -> String {
-    translated(context, StockMessage::MsgEphemeralTimerEnabled)
-        .await
-        .replace1(timer)
-        .action_by_contact(context, by_contact)
-        .await
+    if by_contact == ContactId::SELF {
+        translated(context, StockMessage::MsgYouEnabledEphemeralTimer)
+            .await
+            .replace1(timer)
+    } else {
+        translated(context, StockMessage::MsgEphemeralTimerEnabledBy)
+            .await
+            .replace1(timer)
+            .replace2(by_contact.get_stock_name(context).await)
+    }
 }

 /// Stock string: `Message deletion timer is set to 1 minute.`.
 pub(crate) async fn msg_ephemeral_timer_minute(context: &Context, by_contact: ContactId) -> String {
-    translated(context, StockMessage::MsgEphemeralTimerMinute)
-        .await
-        .action_by_contact(context, by_contact)
-        .await
+    if by_contact == ContactId::SELF {
+        translated(context, StockMessage::MsgYouEphemeralTimerMinute).await
+    } else {
+        translated(context, StockMessage::MsgEphemeralTimerMinuteBy)
+            .await
+            .replace1(by_contact.get_stock_name(context).await)
+    }
 }

 /// Stock string: `Message deletion timer is set to 1 hour.`.
 pub(crate) async fn msg_ephemeral_timer_hour(context: &Context, by_contact: ContactId) -> String {
-    translated(context, StockMessage::MsgEphemeralTimerHour)
-        .await
-        .action_by_contact(context, by_contact)
-        .await
+    if by_contact == ContactId::SELF {
+        translated(context, StockMessage::MsgYouEphemeralTimerHour).await
+    } else {
+        translated(context, StockMessage::MsgEphemeralTimerHourBy)
+            .await
+            .replace1(by_contact.get_stock_name(context).await)
+    }
 }

 /// Stock string: `Message deletion timer is set to 1 day.`.
 pub(crate) async fn msg_ephemeral_timer_day(context: &Context, by_contact: ContactId) -> String {
-    translated(context, StockMessage::MsgEphemeralTimerDay)
-        .await
-        .action_by_contact(context, by_contact)
-        .await
+    if by_contact == ContactId::SELF {
+        translated(context, StockMessage::MsgYouEphemeralTimerDay).await
+    } else {
+        translated(context, StockMessage::MsgEphemeralTimerDayBy)
+            .await
+            .replace1(by_contact.get_stock_name(context).await)
+    }
 }

 /// Stock string: `Message deletion timer is set to 1 week.`.
 pub(crate) async fn msg_ephemeral_timer_week(context: &Context, by_contact: ContactId) -> String {
-    translated(context, StockMessage::MsgEphemeralTimerWeek)
-        .await
-        .action_by_contact(context, by_contact)
-        .await
+    if by_contact == ContactId::SELF {
+        translated(context, StockMessage::MsgYouEphemeralTimerWeek).await
+    } else {
+        translated(context, StockMessage::MsgEphemeralTimerWeekBy)
+            .await
+            .replace1(by_contact.get_stock_name(context).await)
+    }
 }

 /// Stock string: `Video chat invitation`.
@@ -899,18 +1005,24 @@ pub(crate) async fn error_no_network(context: &Context) -> String {

 /// Stock string: `Chat protection enabled.`.
 pub(crate) async fn protection_enabled(context: &Context, by_contact: ContactId) -> String {
-    translated(context, StockMessage::ProtectionEnabled)
-        .await
-        .action_by_contact(context, by_contact)
-        .await
+    if by_contact == ContactId::SELF {
+        translated(context, StockMessage::YouEnabledProtection).await
+    } else {
+        translated(context, StockMessage::ProtectionEnabledBy)
+            .await
+            .replace1(by_contact.get_stock_name(context).await)
+    }
 }

 /// Stock string: `Chat protection disabled.`.
 pub(crate) async fn protection_disabled(context: &Context, by_contact: ContactId) -> String {
-    translated(context, StockMessage::ProtectionDisabled)
-        .await
-        .action_by_contact(context, by_contact)
-        .await
+    if by_contact == ContactId::SELF {
+        translated(context, StockMessage::YouDisabledProtection).await
+    } else {
+        translated(context, StockMessage::ProtectionDisabledBy)
+            .await
+            .replace1(by_contact.get_stock_name(context).await)
+    }
 }

 /// Stock string: `Reply`.
@@ -934,11 +1046,16 @@ pub(crate) async fn msg_ephemeral_timer_minutes(
    minutes: impl AsRef<str>,
    by_contact: ContactId,
 ) -> String {
-    translated(context, StockMessage::MsgEphemeralTimerMinutes)
-        .await
-        .replace1(minutes)
-        .action_by_contact(context, by_contact)
-        .await
+    if by_contact == ContactId::SELF {
+        translated(context, StockMessage::MsgYouEphemeralTimerMinutes)
+            .await
+            .replace1(minutes)
+    } else {
+        translated(context, StockMessage::MsgEphemeralTimerMinutesBy)
+            .await
+            .replace1(minutes)
+            .replace2(by_contact.get_stock_name(context).await)
+    }
 }

 /// Stock string: `Message deletion timer is set to %1$s hours.`.
@@ -947,11 +1064,16 @@ pub(crate) async fn msg_ephemeral_timer_hours(
    hours: impl AsRef<str>,
    by_contact: ContactId,
 ) -> String {
-    translated(context, StockMessage::MsgEphemeralTimerHours)
-        .await
-        .replace1(hours)
-        .action_by_contact(context, by_contact)
-        .await
+    if by_contact == ContactId::SELF {
+        translated(context, StockMessage::MsgYouEphemeralTimerHours)
+            .await
+            .replace1(hours)
+    } else {
+        translated(context, StockMessage::MsgEphemeralTimerHoursBy)
+            .await
+            .replace1(hours)
+            .replace2(by_contact.get_stock_name(context).await)
+    }
 }

 /// Stock string: `Message deletion timer is set to %1$s days.`.
@@ -960,11 +1082,16 @@ pub(crate) async fn msg_ephemeral_timer_days(
    days: impl AsRef<str>,
    by_contact: ContactId,
 ) -> String {
-    translated(context, StockMessage::MsgEphemeralTimerDays)
-        .await
-        .replace1(days)
-        .action_by_contact(context, by_contact)
-        .await
+    if by_contact == ContactId::SELF {
+        translated(context, StockMessage::MsgYouEphemeralTimerDays)
+            .await
+            .replace1(days)
+    } else {
+        translated(context, StockMessage::MsgEphemeralTimerDaysBy)
+            .await
+            .replace1(days)
+            .replace2(by_contact.get_stock_name(context).await)
+    }
 }

 /// Stock string: `Message deletion timer is set to %1$s weeks.`.
@@ -973,11 +1100,16 @@ pub(crate) async fn msg_ephemeral_timer_weeks(
    weeks: impl AsRef<str>,
    by_contact: ContactId,
 ) -> String {
-    translated(context, StockMessage::MsgEphemeralTimerWeeks)
-        .await
-        .replace1(weeks)
-        .action_by_contact(context, by_contact)
-        .await
+    if by_contact == ContactId::SELF {
+        translated(context, StockMessage::MsgYouEphemeralTimerWeeks)
+            .await
+            .replace1(weeks)
+    } else {
+        translated(context, StockMessage::MsgEphemeralTimerWeeksBy)
+            .await
+            .replace1(weeks)
+            .replace2(by_contact.get_stock_name(context).await)
+    }
 }

 /// Stock string: `Forwarded`.
@@ -1123,29 +1255,10 @@ 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<(), 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()
-            );
-        }
+    pub async fn set_stock_translation(&self, id: StockMessage, stockstring: String) -> Result<()> {
        self.translated_stockstrings
-            .write()
-            .await
-            .insert(id as usize, stockstring);
+            .set_stock_translation(id, stockstring)
+            .await?;
        Ok(())
    }

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

-    pub(crate) async fn update_device_chats(&self) -> Result<(), Error> {
+    pub(crate) async fn update_device_chats(&self) -> Result<()> {
        if self.get_config_bool(Config::Bot).await? {
            return Ok(());
        }
@@ -1190,10 +1303,22 @@ 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;
@@ -1256,12 +1381,6 @@ mod tests {
        // We have no string using %1$d to test...
    }

-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_stock_string_repl_str2() {
-        let t = TestContext::new().await;
-        assert_eq!(msg_action_by_user(&t, "foo", "bar").await, "foo by bar.");
-    }
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_stock_system_msg_simple() {
        let t = TestContext::new().await;
@@ -1276,7 +1395,7 @@ mod tests {
        let t = TestContext::new().await;
        assert_eq!(
            msg_add_member(&t, "alice@example.org", ContactId::SELF).await,
-            "Member alice@example.org added by me."
+            "You added member alice@example.org."
        )
    }

@@ -1288,7 +1407,7 @@ mod tests {
            .expect("failed to create contact");
        assert_eq!(
            msg_add_member(&t, "alice@example.org", ContactId::SELF).await,
-            "Member Alice (alice@example.org) added by me."
+            "You added member Alice (alice@example.org)."
        );
    }

@@ -1310,7 +1429,7 @@ mod tests {
    }

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

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_partial_download_msg_body() -> anyhow::Result<()> {
+    async fn test_partial_download_msg_body() -> Result<()> {
        let t = TestContext::new().await;
        let str = partial_download_msg_body(&t, 1024 * 1024).await;
        assert_eq!(str, "1 MiB message");
@@ -1365,7 +1484,17 @@ 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.ok();
+        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();
        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) async fn build_sync_part(&self, json: String) -> PartBuilder {
+    pub(crate) 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,6 +29,7 @@ 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)]
@@ -44,7 +45,7 @@ pub struct TestContextManager {
 }

 impl TestContextManager {
-    pub async fn new() -> Self {
+    pub fn new() -> Self {
        let (log_tx, _log_sink) = LogSink::create();
        Self { log_tx, _log_sink }
    }
@@ -277,7 +278,7 @@ impl TestContext {
            let mut context_names = CONTEXT_NAMES.write().unwrap();
            context_names.insert(id, name);
        }
-        let ctx = Context::new(&dbfile, id, Events::new())
+        let ctx = Context::new(&dbfile, id, Events::new(), StockStrings::new())
            .await
            .expect("failed to create context");

@@ -739,7 +740,7 @@ impl SentMessage {
            .split(' ')
            .next()
            .expect("no recipient found");
-        rcpt.parse().expect("failed to parse email address")
+        EmailAddress::new(rcpt).expect("failed to parse email address")
    }

    /// The raw message payload.
@@ -858,7 +859,7 @@ impl EventTracker {
    }

    /// Consumes all pending events.
-    pub async fn consume_events(&self) {
+    pub fn consume_events(&self) {
        while self.try_recv().is_ok() {}
    }
 }
@@ -1039,7 +1040,7 @@ mod tests {

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

--- a/src/tools.rs
+++ b/src/tools.rs
@@ -7,7 +7,7 @@ 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};
@@ -49,6 +49,65 @@ 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
 ******************************************************************************/
@@ -465,23 +524,15 @@ 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 FromStr for EmailAddress {
-    type Err = Error;
-
+impl EmailAddress {
    /// Performs a dead-simple parse of an email address.
-    fn from_str(input: &str) -> Result<EmailAddress> {
+    pub fn new(input: &str) -> Result<EmailAddress> {
        if input.is_empty() {
            bail!("empty string is not valid");
        }
@@ -744,6 +795,79 @@ Hop: From: hq5.example.org; By: hq5.example.org; Date: Mon, 27 Dec 2021 11:21:22
        );
    }

+    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();
@@ -813,36 +937,36 @@ Hop: From: hq5.example.org; By: hq5.example.org; Date: Mon, 27 Dec 2021 11:21:22

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

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

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

@@ -21,7 +20,6 @@ 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};

@@ -379,10 +377,6 @@ 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(?, ?, ?, ?)
@@ -396,6 +390,7 @@ 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)>> {
@@ -419,15 +414,12 @@ impl Context {
    }

    /// Attempts to send queued webxdc status updates.
-    ///
-    /// 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> {
+    pub(crate) async fn flush_status_updates(&self) -> Result<()> {
        loop {
            let (instance_id, first_serial, last_serial, descr) =
                match self.pop_smtp_status_update().await? {
                    Some(res) => res,
-                    None => return Ok(false),
+                    None => return Ok(()),
                };

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

-    pub(crate) async fn build_status_update_part(&self, json: &str) -> PartBuilder {
+    pub(crate) fn build_status_update_part(&self, json: &str) -> PartBuilder {
        PartBuilder::new()
            .content_type(&"application/json".parse::<mime::Mime>().unwrap())
            .header((
@@ -749,15 +741,6 @@ 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::{
@@ -965,6 +948,7 @@ 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);