Use the message text as the initial subject

2026-06-30 11:36:35 +03:00 · 2023-02-14 11:01:56 +00:00
165 changed files with 3430 additions and 4993 deletions
--- a/.github/mergeable.yml
+++ b/.github/mergeable.yml
@@ -5,22 +5,22 @@ mergeable:
    validate:
      - do: or
        validate:
-          - do: description
-            must_include:
-              regex: "#skip-changelog"
-          - do: and
-            validate:
-              - do: dependent
-                changed:
-                  file: "src/**"
-                  required: ["CHANGELOG.md"]
-              - do: dependent
-                changed:
-                  file: "deltachat-ffi/src/**"
-                  required: ["CHANGELOG.md"]
+        - do: description
+          must_include:
+            regex: '#skip-changelog'
+        - do: and
+          validate:
+            - do: dependent
+              changed:
+                file: 'src/**'
+                required: ['CHANGELOG.md']
+            - do: dependent
+              changed:
+                file: 'deltachat-ffi/src/**'
+                required: ['CHANGELOG.md']
    fail:
      - do: checks
-        status: "action_required"
+        status: 'action_required' 
        payload:
          title: Changelog might need an update
          summary: "Check if CHANGELOG.md needs an update or add #skip-changelog to the PR description."
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,11 +1,5 @@
 name: Rust CI

-# Cancel previously started workflow runs
-# when the branch is updated.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on:
  pull_request:
  push:
@@ -14,43 +8,30 @@ on:

 env:
  RUSTFLAGS: -Dwarnings
-
+   
 jobs:
-  lint:
-    name: Rustfmt and Clippy
+
+  fmt:
+    name: Rustfmt
    runs-on: ubuntu-latest
-    env:
-      RUSTUP_TOOLCHAIN: 1.68.0
    steps:
      - uses: actions/checkout@v3
-      - name: Install rustfmt and clippy
-        run: rustup toolchain install $RUSTUP_TOOLCHAIN --profile minimal --component rustfmt --component clippy
+      - run: cargo fmt --all -- --check
+
+  run_clippy:
+    name: Clippy
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install clippy
+        run: rustup toolchain install 1.67.1 --component clippy
      - name: Cache rust cargo artifacts
        uses: swatinem/rust-cache@v2
-      - name: Run rustfmt
-        run: cargo fmt --all -- --check
      - name: Run clippy
+        env:
+          RUSTUP_TOOLCHAIN: 1.67.1
        run: scripts/clippy.sh

-  cargo_deny:
-    name: cargo deny
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: EmbarkStudios/cargo-deny-action@v1
-        with:
-          arguments: --all-features --workspace
-          command: check
-          command-arguments: "-Dwarnings"
-
-  provider_database:
-    name: Check provider database
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Check provider database
-        run: scripts/update-provider-database.sh
-
  docs:
    name: Rust doc comments
    runs-on: ubuntu-latest
@@ -72,89 +53,89 @@ jobs:
        include:
          # Currently used Rust version.
          - os: ubuntu-latest
-            rust: 1.68.0
+            rust: 1.64.0
            python: 3.9
          - os: windows-latest
-            rust: 1.68.0
+            rust: 1.64.0
            python: false # Python bindings compilation on Windows is not supported.

-          # Minimum Supported Rust Version = 1.64.0
+          # Minimum Supported Rust Version = 1.63.0
          #
          # Minimum Supported Python Version = 3.7
          # This is the minimum version for which manylinux Python wheels are
          # built.
          - os: ubuntu-latest
-            rust: 1.64.0
+            rust: 1.63.0
            python: 3.7
    runs-on: ${{ matrix.os }}
    steps:
-      - uses: actions/checkout@master
+    - uses: actions/checkout@master

-      - name: Install Rust ${{ matrix.rust }}
-        run: rustup toolchain install --profile minimal ${{ matrix.rust }}
-      - run: rustup override set ${{ matrix.rust }}
+    - name: Install Rust ${{ matrix.rust }}
+      run: rustup toolchain install ${{ matrix.rust }}
+    - run: rustup override set ${{ matrix.rust }}

-      - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@v2
+    - name: Cache rust cargo artifacts
+      uses: swatinem/rust-cache@v2

-      - name: Check
-        run: cargo check --workspace --bins --examples --tests --benches
+    - name: Check
+      run: cargo check --workspace --bins --examples --tests --benches

-      - name: Tests
-        run: cargo test --workspace
+    - name: Tests
+      run: cargo test --workspace

-      - name: Test cargo vendor
-        run: cargo vendor
+    - name: Test cargo vendor
+      run: cargo vendor

-      - name: Install python
-        if: ${{ matrix.python }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python }}
+    - name: Install python
+      if: ${{ matrix.python }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python }}

-      - name: Install tox
-        if: ${{ matrix.python }}
-        run: pip install tox
+    - name: Install tox
+      if: ${{ matrix.python }}
+      run: pip install tox

-      - name: Build C library
-        if: ${{ matrix.python }}
-        run: cargo build -p deltachat_ffi --features jsonrpc
+    - name: Build C library
+      if: ${{ matrix.python }}
+      run: cargo build -p deltachat_ffi --features jsonrpc

-      - name: Run python tests
-        if: ${{ matrix.python }}
-        env:
-          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-          DCC_RS_TARGET: debug
-          DCC_RS_DEV: ${{ github.workspace }}
-        working-directory: python
-        run: tox -e lint,mypy,doc,py3
+    - name: Run python tests
+      if: ${{ matrix.python }}
+      env:
+        DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
+        DCC_RS_TARGET: debug
+        DCC_RS_DEV: ${{ github.workspace }}
+      working-directory: python
+      run: tox -e lint,mypy,doc,py3

-      - name: Build deltachat-rpc-server
-        if: ${{ matrix.python }}
-        run: cargo build -p deltachat-rpc-server
+    - name: Build deltachat-rpc-server
+      if: ${{ matrix.python }}
+      run: cargo build -p deltachat-rpc-server

-      - name: Add deltachat-rpc-server to path
-        if: ${{ matrix.python }}
-        run: echo ${{ github.workspace }}/target/debug >> $GITHUB_PATH
+    - name: Add deltachat-rpc-server to path
+      if: ${{ matrix.python }}
+      run: echo ${{ github.workspace }}/target/debug >> $GITHUB_PATH

-      - name: Run deltachat-rpc-client tests
-        if: ${{ matrix.python }}
-        env:
-          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-        working-directory: deltachat-rpc-client
-        run: tox -e py3,lint
+    - name: Run deltachat-rpc-client tests
+      if: ${{ matrix.python }}
+      env:
+        DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
+      working-directory: deltachat-rpc-client
+      run: tox -e py3,lint

-      - name: Install pypy
-        if: ${{ matrix.python }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: "pypy${{ matrix.python }}"
+    - name: Install pypy
+      if: ${{ matrix.python }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: 'pypy${{ matrix.python }}'

-      - name: Run pypy tests
-        if: ${{ matrix.python }}
-        env:
-          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-          DCC_RS_TARGET: debug
-          DCC_RS_DEV: ${{ github.workspace }}
-        working-directory: python
-        run: tox -e pypy3
+    - name: Run pypy tests
+      if: ${{ matrix.python }}
+      env:
+        DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
+        DCC_RS_TARGET: debug
+        DCC_RS_DEV: ${{ github.workspace }}
+      working-directory: python
+      run: tox -e pypy3
--- a/.github/workflows/deltachat-rpc-server.yml
+++ b/.github/workflows/deltachat-rpc-server.yml
@@ -1,136 +0,0 @@
-# Manually triggered action to build deltachat-rpc-server binaries.
-
-name: Build deltachat-rpc-server binaries
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-on:
-  workflow_dispatch:
-
-jobs:
-  # Build a version statically linked against musl libc
-  # to avoid problems with glibc version incompatibility.
-  build_static_linux:
-    name: Build deltachat-rpc-server for Linux
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup rust target
-        run: rustup target add x86_64-unknown-linux-musl
-
-      - name: Install musl-gcc
-        run: sudo apt install musl-tools
-
-      - name: Build
-        env:
-          RUSTFLAGS: "-C link-arg=-s"
-        run: cargo build --release --target x86_64-unknown-linux-musl -p deltachat-rpc-server --features vendored
-      - name: Upload binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: deltachat-rpc-server-x86_64
-          path: target/x86_64-unknown-linux-musl/release/deltachat-rpc-server
-          if-no-files-found: error
-
-  build_linux:
-    name: Cross-compile deltachat-rpc-server for aarch64 and armv7 Linux
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build
-        run: sh scripts/zig-rpc-server.sh
-
-      - name: Upload aarch64 binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: deltachat-rpc-server-aarch64
-          path: target/aarch64-unknown-linux-musl/release/deltachat-rpc-server
-          if-no-files-found: error
-
-      - name: Upload armv7 binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: deltachat-rpc-server-armv7
-          path: target/armv7-unknown-linux-musleabihf/release/deltachat-rpc-server
-          if-no-files-found: error
-
-  build_android:
-    name: Cross-compile deltachat-rpc-server for Android (armeabi-v7a, arm64-v8a, x86 and x86_64)
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: nttld/setup-ndk@v1
-        id: setup-ndk
-        with:
-          ndk-version: r21d
-
-      - name: Build
-        env:
-          ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
-        run: sh scripts/android-rpc-server.sh
-
-      - name: Upload binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: deltachat-rpc-server-android-armv7
-          path: target/armv7-linux-androideabi/release/deltachat-rpc-server
-          if-no-files-found: error
-
-      - name: Upload binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: deltachat-rpc-server-android-aarch64
-          path: target/aarch64-linux-android/release/deltachat-rpc-server
-          if-no-files-found: error
-
-      - name: Upload binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: deltachat-rpc-server-android-i686
-          path: target/i686-linux-android/release/deltachat-rpc-server
-          if-no-files-found: error
-
-      - name: Upload binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: deltachat-rpc-server-android-x86_64
-          path: target/x86_64-linux-android/release/deltachat-rpc-server
-          if-no-files-found: error
-
-  build_windows:
-    name: Build deltachat-rpc-server for Windows
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: windows-latest
-            artifact: win32.exe
-            path: deltachat-rpc-server.exe
-            target: i686-pc-windows-msvc
-
-          - os: windows-latest
-            artifact: win64.exe
-            path: deltachat-rpc-server.exe
-            target: x86_64-pc-windows-msvc
-
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup rust target
-        run: rustup target add ${{ matrix.target }}
-
-      - name: Build
-        run: cargo build --release --package deltachat-rpc-server --target ${{ matrix.target }} --features vendored
-
-      - name: Upload binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: deltachat-rpc-server-${{ matrix.artifact }}
-          path: target/${{ matrix.target}}/release/${{ matrix.path }}
-          if-no-files-found: error
--- a/.github/workflows/jsonrpc-client-npm-package.yml
+++ b/.github/workflows/jsonrpc-client-npm-package.yml
@@ -1,15 +1,16 @@
-name: "jsonrpc js client build"
+name: 'jsonrpc js client build'
 on:
  pull_request:
  push:
    tags:
-      - "*"
-      - "!py-*"
+    - '*'
+    - '!py-*'
+

 jobs:
  pack-module:
-    name: "Package @deltachat/jsonrpc-client and upload to download.delta.chat"
-    runs-on: ubuntu-20.04
+    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
@@ -17,12 +18,12 @@ jobs:
        uses: actions/checkout@v3
      - uses: actions/setup-node@v3
        with:
-          node-version: "16"
+          node-version: '16'
      - name: Get tag
        id: tag
        uses: dawidd6/action-get-tag@v1
        continue-on-error: true
-      - name: Get Pull Request ID
+      - name: Get Pullrequest ID
        id: prepare
        run: |
          tag=${{ steps.tag.outputs.tag }}
@@ -68,9 +69,9 @@ jobs:
        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
+         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 }}
--- a/.github/workflows/jsonrpc.yml
+++ b/.github/workflows/jsonrpc.yml
@@ -35,10 +35,6 @@ jobs:
          npm run test
        env:
          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-      - name: make sure websocket server version still builds
-        run: |
-          cd deltachat-jsonrpc
-          cargo build --bin deltachat-jsonrpc-server --features webserver
      - name: Run linter
        run: |
          cd deltachat-jsonrpc/typescript
--- a/.github/workflows/node-delete-preview.yml
+++ b/.github/workflows/node-delete-preview.yml
@@ -7,25 +7,26 @@ on:

 jobs:
  delete:
+
    runs-on: ubuntu-latest

    steps:
-      - name: Get Pull Request ID
-        id: getid
-        run: |
-          export PULLREQUEST_ID=$(jq .number < $GITHUB_EVENT_PATH)
-          echo "prid=$PULLREQUEST_ID" >> $GITHUB_OUTPUT
-      - name: Renaming
-        run: |
-          # create empty file to copy it over the outdated deliverable on download.delta.chat
-          echo "This preview build is outdated and has been removed." > empty
-          cp empty deltachat-node-${{ steps.getid.outputs.prid }}.tar.gz
-      - name: Replace builds with dummy files
-        uses: horochx/deploy-via-scp@v1.0.1
-        with:
-          user: ${{ secrets.USERNAME }}
-          key: ${{ secrets.SSH_KEY }}
-          host: "download.delta.chat"
-          port: 22
-          local: "deltachat-node-${{ steps.getid.outputs.prid }}.tar.gz"
-          remote: "/var/www/html/download/node/preview/"
+    - name: Get Pullrequest ID
+      id: getid
+      run: |
+        export PULLREQUEST_ID=$(jq .number < $GITHUB_EVENT_PATH)
+        echo "prid=$PULLREQUEST_ID" >> $GITHUB_OUTPUT
+    - name: Renaming
+      run: |
+        # create empty file to copy it over the outdated deliverable on download.delta.chat
+        echo "This preview build is outdated and has been removed." > empty
+        cp empty deltachat-node-${{ steps.getid.outputs.prid }}.tar.gz
+    - name: Replace builds with dummy files
+      uses: horochx/deploy-via-scp@v1.0.1
+      with:
+        user: ${{ secrets.USERNAME }}
+        key: ${{ secrets.SSH_KEY }}
+        host: "download.delta.chat"
+        port: 22
+        local: "deltachat-node-${{ steps.getid.outputs.prid }}.tar.gz"
+        remote: "/var/www/html/download/node/preview/"
--- a/.github/workflows/node-docs.yml
+++ b/.github/workflows/node-docs.yml
@@ -9,26 +9,26 @@ jobs:
  generate:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+    - uses: actions/checkout@v3

-      - name: Use Node.js 16.x
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16.x
+    - name: Use Node.js 16.x
+      uses: actions/setup-node@v3
+      with:
+        node-version: 16.x

-      - name: npm install and generate documentation
-        run: |
-          cd node
-          npm i --ignore-scripts
-          npx typedoc
-          mv docs js
+    - name: npm install and generate documentation
+      run: |
+        cd node
+        npm i --ignore-scripts
+        npx typedoc
+        mv docs js

-      - name: Upload
-        uses: horochx/deploy-via-scp@v1.0.1
-        with:
-          user: ${{ secrets.USERNAME }}
-          key: ${{ secrets.KEY }}
-          host: "delta.chat"
-          port: 22
-          local: "node/js"
-          remote: "/var/www/html/"
+    - name: Upload
+      uses: horochx/deploy-via-scp@v1.0.1
+      with:
+        user: ${{ secrets.USERNAME }}
+        key: ${{ secrets.KEY }}
+        host: "delta.chat"
+        port: 22
+        local: "node/js"
+        remote: "/var/www/html/"
--- a/.github/workflows/node-package.yml
+++ b/.github/workflows/node-package.yml
@@ -1,10 +1,11 @@
-name: "node.js build"
+name: 'node.js build'
 on:
  pull_request:
  push:
    tags:
-      - "*"
-      - "!py-*"
+    - '*'
+    - '!py-*'
+

 jobs:
  prebuild:
@@ -12,13 +13,13 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [ubuntu-20.04, macos-latest, windows-latest]
+        os: [ubuntu-18.04, macos-latest, windows-latest]
    steps:
      - name: Checkout
        uses: actions/checkout@v3
      - uses: actions/setup-node@v3
        with:
-          node-version: "16"
+          node-version: '16'
      - name: System info
        run: |
          rustc -vV
@@ -65,7 +66,7 @@ jobs:
  pack-module:
    needs: prebuild
    name: Package deltachat-node and upload to download.delta.chat
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-18.04
    steps:
      - name: Install tree
        run: sudo apt install tree
@@ -73,12 +74,12 @@ jobs:
        uses: actions/checkout@v3
      - uses: actions/setup-node@v2
        with:
-          node-version: "16"
+          node-version: '16'
      - name: Get tag
        id: tag
        uses: dawidd6/action-get-tag@v1
        continue-on-error: true
-      - name: Get Pull Request ID
+      - name: Get Pullrequest ID
        id: prepare
        run: |
          tag=${{ steps.tag.outputs.tag }}
@@ -99,7 +100,7 @@ jobs:
      - name: Download Ubuntu prebuild
        uses: actions/download-artifact@v1
        with:
-          name: ubuntu-20.04
+          name: ubuntu-18.04
      - name: Download macOS prebuild
        uses: actions/download-artifact@v1
        with:
@@ -111,11 +112,11 @@ jobs:
      - shell: bash
        run: |
          mkdir node/prebuilds
-          tar -xvzf ubuntu-20.04/ubuntu-20.04.tar.gz -C node/prebuilds
+          tar -xvzf ubuntu-18.04/ubuntu-18.04.tar.gz -C node/prebuilds
          tar -xvzf macos-latest/macos-latest.tar.gz -C node/prebuilds
          tar -xvzf windows-latest/windows-latest.tar.gz -C node/prebuilds
          tree node/prebuilds
-          rm -rf ubuntu-20.04 macos-latest windows-latest
+          rm -rf ubuntu-18.04 macos-latest windows-latest
      - name: Install dependencies without running scripts
        run: |
          npm install --ignore-scripts
@@ -151,8 +152,8 @@ jobs:
        if: steps.upload-preview.outcome == 'success'
        run: node ./node/scripts/postLinksToDetails.js
        env:
-          URL: preview/${{ env.DELTACHAT_NODE_TAR_GZ }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+         URL: preview/${{ env.DELTACHAT_NODE_TAR_GZ }}
+         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      # Upload to download.delta.chat/node/
      - name: Upload deltachat-node build to download.delta.chat/node/
        if: ${{ steps.tag.outputs.tag }}
--- a/.github/workflows/node-tests.yml
+++ b/.github/workflows/node-tests.yml
@@ -1,16 +1,11 @@
-name: "node.js tests"
-
-# Cancel previously started workflow runs
-# when the branch is updated.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
+name: 'node.js tests'
 on:
  pull_request:
  push:
    branches:
      - master
+      - staging
+      - trying

 jobs:
  tests:
@@ -18,13 +13,13 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-18.04, macos-latest, windows-latest]
    steps:
      - name: Checkout
        uses: actions/checkout@v3
      - uses: actions/setup-node@v3
        with:
-          node-version: "16"
+          node-version: '16'
      - name: System info
        run: |
          rustc -vV
@@ -64,7 +59,7 @@ jobs:
          npm run test
        env:
          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-          NODE_OPTIONS: "--force-node-api-uncaught-exceptions-policy=true"
+          NODE_OPTIONS: '--force-node-api-uncaught-exceptions-policy=true'
      - name: Run tests on Windows, except lint
        timeout-minutes: 10
        if: runner.os == 'Windows'
@@ -73,4 +68,4 @@ jobs:
          npm run test:mocha
        env:
          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-          NODE_OPTIONS: "--force-node-api-uncaught-exceptions-policy=true"
+          NODE_OPTIONS: '--force-node-api-uncaught-exceptions-policy=true'
--- a/.github/workflows/repl.yml
+++ b/.github/workflows/repl.yml
@@ -11,13 +11,13 @@ jobs:
    name: Build REPL example
    runs-on: windows-latest
    steps:
-      - uses: actions/checkout@v3
+    - uses: actions/checkout@v3

-      - name: Build
-        run: cargo build -p deltachat-repl --features vendored
+    - name: Build
+      run: cargo build -p deltachat-repl --features vendored

-      - name: Upload binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: repl.exe
-          path: "target/debug/deltachat-repl.exe"
+    - name: Upload binary
+      uses: actions/upload-artifact@v3
+      with:
+        name: repl.exe
+        path: 'target/debug/deltachat-repl.exe'
--- a/.github/workflows/upload-docs.yml
+++ b/.github/workflows/upload-docs.yml
@@ -8,18 +8,20 @@ on:

 jobs:
  build:
+
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v3
-      - name: Build the documentation with cargo
-        run: |
-          cargo doc --package deltachat --no-deps --document-private-items
-      - name: Upload to rs.delta.chat
-        uses: up9cloud/action-rsync@v1.3
-        env:
-          USER: ${{ secrets.USERNAME }}
-          KEY: ${{ secrets.KEY }}
-          HOST: "delta.chat"
-          SOURCE: "target/doc"
-          TARGET: "/var/www/html/rs/"
+    - uses: actions/checkout@v3
+    - name: Build the documentation with cargo
+      run: |
+        cargo doc --package deltachat --no-deps
+    - name: Upload to rs.delta.chat
+      uses: up9cloud/action-rsync@v1.3
+      env:
+        USER: ${{ secrets.USERNAME }}
+        KEY: ${{ secrets.KEY }}
+        HOST: "delta.chat"
+        SOURCE: "target/doc"
+        TARGET: "/var/www/html/rs/"
+
--- a/.github/workflows/upload-ffi-docs.yml
+++ b/.github/workflows/upload-ffi-docs.yml
@@ -8,18 +8,20 @@ on:

 jobs:
  build:
+
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v3
-      - name: Build the documentation with cargo
-        run: |
-          cargo doc --package deltachat_ffi --no-deps
-      - name: Upload to cffi.delta.chat
-        uses: up9cloud/action-rsync@v1.3
-        env:
-          USER: ${{ secrets.USERNAME }}
-          KEY: ${{ secrets.KEY }}
-          HOST: "delta.chat"
-          SOURCE: "target/doc"
-          TARGET: "/var/www/html/cffi/"
+    - uses: actions/checkout@v3
+    - name: Build the documentation with cargo
+      run: |
+        cargo doc --package deltachat_ffi --no-deps
+    - name: Upload to cffi.delta.chat
+      uses: up9cloud/action-rsync@v1.3
+      env:
+        USER: ${{ secrets.USERNAME }}
+        KEY: ${{ secrets.KEY }}
+        HOST: "delta.chat"
+        SOURCE: "target/doc"
+        TARGET: "/var/www/html/cffi/"
+
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,82 +3,12 @@
 ## Unreleased

 ### Changes
- "full message view" not needed because of footers that go to contact status #4151
- Pick up system's light/dark mode in generated message HTML #4150
- Support non-persistent configuration with DELTACHAT_* env
- Print deltachat-repl errors with causes. #4166
- Increase MSRV to 1.64. #4167
+- Use message text as the initial subject for 1:1 contacts. #4036

 ### Fixes
- Fix segmentation fault if `dc_context_unref()` is called during
-  background process spawned by `dc_configure()` or `dc_imex()`
-  or `dc_jsonrpc_instance_t` is unreferenced
-  during handling the JSON-RPC request. #4153
- Delete expired messages using multiple SQL requests. #4158
- Do not emit "Failed to run incremental vacuum" warnings on success. #4160
-
-
-## 1.111.0
-
-### Changes
- Make smeared timestamp generation non-async. #4075
- Set minimum TLS version to 1.2. #4096
- Run `cargo-deny` in CI. #4101
- Check provider database with CI. #4099 
- Switch to DEFERRED transactions #4100
-
-### Fixes
- Do not block async task executor while decrypting the messages. #4079
- Housekeeping: delete the blobs backup dir #4123

 ### API-Changes
- jsonrpc: add more advanced API to send a message. #4097
- jsonrpc: add get webxdc blob API `getWebxdcBlob` #4070
-
-
-## 1.110.0
-
-### Changes
- use transaction in `Contact::add_or_lookup()` #4059
- Organize the connection pool as a stack rather than a queue to ensure that
-  connection page cache is reused more often.
-  This speeds up tests by 28%, real usage will have lower speedup. #4065
- Use transaction in `update_blocked_mailinglist_contacts`. #4058
- Remove `Sql.get_conn()` interface in favor of `.call()` and `.transaction()`. #4055
- Updated provider database.
- Disable DKIM-Checks again #4076
- Switch from "X.Y.Z" and "py-X.Y.Z" to "vX.Y.Z" tags. #4089
- mimeparser: handle headers from the signed part of unencrypted signed message #4013
-
-### Fixes
- Start SQL transactions with IMMEDIATE behaviour rather than default DEFERRED one. #4063
- Fix a problem with Gmail where (auto-)deleted messages would get archived instead of deleted.
-  Move them to the Trash folder for Gmail which auto-deletes trashed messages in 30 days #3972
- Clear config cache after backup import. This bug sometimes resulted in the import to seemingly work at first. #4067
- Update timestamps in `param` columns with transactions. #4083
-
-### API-Changes
-
-
-## 1.109.0
-
-### Changes
- deltachat-rpc-client: use `dataclass` for `Account`, `Chat`, `Contact` and `Message` #4042
-
-### Fixes
- deltachat-rpc-server: do not block stdin while processing the request. #4041
-  deltachat-rpc-server now reads the next request as soon as previous request handler is spawned.
- Enable `auto_vacuum` on all SQL connections. #2955
- Replace `r2d2` connection pool with an own implementation. #4050 #4053 #4043 #4061
-  This change improves reliability
-  by closing all database connections immediately when the context is closed.
-
-### API-Changes
-
 - Remove `MimeMessage::from_bytes()` public interface. #4033
- BREAKING Types: jsonrpc: `get_messages` now returns a map with `MessageLoadResult` instead of failing completely if one of the requested messages could not be loaded. #4038
- Add `dc_msg_set_subject()`. C-FFI #4057
- Mark python bindings as supporting typing according to PEP 561 #4045


 ## 1.108.0
@@ -89,7 +19,6 @@
 - Prefer TLS over STARTTLS during autoconfiguration #4021
 - Use SOCKS5 configuration for HTTP requests #4017
 - Show non-deltachat emails by default for new installations #4019
- Re-enabled SMTP pipelining after disabling it in #4006

 ### Fixes
 - Fix Securejoin for multiple devices on a joining side #3982
@@ -121,7 +50,7 @@

 ### Fixes
 - Securejoin: Fix adding and handling Autocrypt-Gossip headers #3914
- fix verifier-by addr was empty string instead of None #3961
+- fix verifier-by addr was empty string intead of None #3961
 - Emit DC_EVENT_MSGS_CHANGED for DC_CHAT_ID_ARCHIVED_LINK when the number of archived chats with
  unread messages increases #3959
 - Fix Peerstate comparison #3962
@@ -222,7 +151,7 @@
 - jsonrpc: Add async Python client #3734

 ### Fixes
- Make sure malformed messages will never block receiving further messages anymore #3771
+- Make sure malformed messsages will never block receiving further messages anymore #3771
 - strip leading/trailing whitespace from "Chat-Group-Name{,-Changed}:" headers content #3650
 - Assume all Thunderbird users prefer encryption #3774
 - refactor peerstate handling to ensure no duplicate peerstates #3776
@@ -374,7 +303,7 @@
  - `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 preferred way of using the message list.
+- 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`
@@ -400,7 +329,7 @@
 - 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 automatically on release
+  - ci: add github ci action to upload it to our download server automaticaly on realease

 ## 1.95.0

@@ -477,7 +406,7 @@
 - Auto accept contact requests if `Config::Bot` is set for a client #3567 
 - Don't prepend the subject to chat messages in mailinglists
 - fix `set_core_version.py` script to also update version in `deltachat-jsonrpc/typescript/package.json` #3585
- Reject webxdc-updates from contacts who are not group members #3568
+- Reject webxcd-updates from contacts who are not group members #3568


 ## 1.93.0
@@ -700,7 +629,7 @@

 ### Fixes
 - node: throw error when getting context with an invalid account id
- node: throw error when instantiating a wrapper class on `null` (Context, Message, Chat, ChatList and so on)
+- node: throw error when instanciating a wrapper class on `null` (Context, Message, Chat, ChatList and so on)
 - use same contact-color if email address differ only in upper-/lowercase #3327
 - repair encrypted mails "mixed up" by Google Workspace "Append footer" function #3315

@@ -788,7 +717,7 @@
 - hopefully fix a bug where outgoing messages appear twice with Amazon SES #3077
 - do not delete messages without Message-IDs as duplicates #3095
 - assign replies from a different email address to the correct chat #3119
- assign outgoing private replies to the correct chat #3177
+- assing outgoing private replies to the correct chat #3177
 - start ephemeral timer when seen status is synchronized via IMAP #3122
 - do not create empty contact requests with "setup changed" messages;
  instead, send a "setup changed" message into all chats we share with the peer #3187
@@ -841,7 +770,7 @@
 - don't watch Sent folder by default #3025
 - use webxdc app name in chatlist/quotes/replies etc. #3027
 - make it possible to cancel message sending by removing the message #3034,
-  this was previously removed in 1.71.0 #2939
+  this was previosuly removed in 1.71.0 #2939
 - synchronize Seen flags only on watched folders to speed up
  folder scanning #3041
 - remove direct dependency on `byteorder` crate #3031
@@ -2063,7 +1992,7 @@
 - #1043 avoid potential crashes in malformed From/Chat-Disposition... headers  

 - #1045 #1041 #1038 #1035 #1034 #1029 #1025 various cleanups and doc
-  improvements
+  improvments 

 ## 1.0.0-beta.16

@@ -2142,7 +2071,7 @@
 - trigger reconnect more often on imap error states.  Should fix an 
  issue observed when trying to empty a folder.  @hpk42

- un-split qr tests: we fixed qr-securejoin protocol flakiness 
+- un-split qr tests: we fixed qr-securejoin protocol flakyness 
  last weeks. @hpk42

 ## 1.0.0-beta.10
@@ -2180,7 +2109,7 @@

 - fix moving self-sent messages, thanks @r10s, @flub, @hpk42

- fix flakiness/sometimes-failing verified/join-protocols, 
+- fix flakyness/sometimes-failing verified/join-protocols, 
  thanks @flub, @r10s, @hpk42

 - fix reply-to-encrypted message to keep encryption 
@@ -2199,7 +2128,7 @@

 - fixes imap-protocol parsing bugs that lead to infinitely
  repeated crashing while trying to receive messages with
-  a subject that contained non-utf8. thanks @link2xt
+  a subjec that contained non-utf8. thanks @link2xt

 - fixed logic to find encryption subkey -- previously 
  delta chat would use the primary key for encryption
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "deltachat"
-version = "1.111.0"
+version = "1.108.0"
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.64"
+rust-version = "1.63"

 [profile.dev]
 debug = 0
@@ -17,12 +17,11 @@ opt-level = 0
 # This does not apply to crates in the workspace.
 # <https://doc.rust-lang.org/cargo/reference/profiles.html#overrides>
 [profile.dev.package."*"]
-opt-level = "z"
+opt-level = 3

 [profile.release]
 lto = true
 panic = 'abort'
-opt-level = "z"

 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }
@@ -30,11 +29,12 @@ format-flowed = { path = "./format-flowed" }
 ratelimit = { path = "./deltachat-ratelimit" }

 anyhow = "1"
-async-channel = "1.8.0"
 async-imap = { git = "https://github.com/async-email/async-imap", branch = "master", default-features = false, features = ["runtime-tokio"] }
-async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
-async-smtp = { version = "0.9", default-features = false, features = ["runtime-tokio"] }
-async_zip = { version = "0.0.9", default-features = false, features = ["deflate"] }
+async-native-tls = { version = "0.4", default-features = false, features = ["runtime-tokio"] }
+async-smtp = { version = "0.8", default-features = false, features = ["runtime-tokio"] }
+trust-dns-resolver = "0.22"
+tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
+tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
 backtrace = "0.3"
 base64 = "0.21"
 bitflags = "1.3"
@@ -42,30 +42,27 @@ chrono = { version = "0.4", default-features=false, features = ["clock", "std"]
 email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
 encoded-words = { git = "https://github.com/async-email/encoded-words", branch = "master" }
 escaper = "0.1"
-fast-socks5 = "0.8"
 futures = "0.3"
-futures-lite = "1.12.0"
 hex = "0.4.0"
-humansize = "2"
 image = { version = "0.24.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
 kamadak-exif = "0.5"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 libc = "0.2"
 mailparse = "0.14"
+native-tls = "0.2"
 num_cpus = "1.15"
 num-derive = "0.3"
 num-traits = "0.2"
 once_cell = "1.17.0"
 percent-encoding = "2.2"
-parking_lot = "0.12"
 pgp = { version = "0.9", default-features = false }
 pretty_env_logger = { version = "0.4", optional = true }
-qrcodegen = "1.7.0"
 quick-xml = "0.27"
+r2d2 = "0.8"
+r2d2_sqlite = "0.20"
 rand = "0.8"
 regex = "1.7"
-reqwest = { version = "0.11.14", features = ["json"] }
-rusqlite = { version = "0.28", features = ["sqlcipher"] }
+rusqlite = { version = "0.27", features = ["sqlcipher"] }
 rust-hsluv = "0.1"
 sanitize-filename = "0.4"
 serde_json = "1.0"
@@ -75,17 +72,21 @@ sha2 = "0.10"
 smallvec = "1"
 strum = "0.24"
 strum_macros = "0.24"
-tagger = "4.3.4"
-textwrap = "0.16.0"
 thiserror = "1"
-tokio-io-timeout = "1.2.0"
-tokio-stream = { version = "0.1.11", features = ["fs"] }
-tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
-tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
 toml = "0.7"
-trust-dns-resolver = "0.22"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
+fast-socks5 = "0.8"
+humansize = "2"
+qrcodegen = "1.7.0"
+tagger = "4.3.4"
+textwrap = "0.16.0"
+async-channel = "1.8.0"
+futures-lite = "1.12.0"
+tokio-stream = { version = "0.1.11", features = ["fs"] }
+tokio-io-timeout = "1.2.0"
+reqwest = { version = "0.11.14", features = ["json"] }
+async_zip = { version = "0.0.9", default-features = false, features = ["deflate"] }

 [dev-dependencies]
 ansi_term = "0.12.0"
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ $ curl https://sh.rustup.rs -sSf | sh
 Compile and run Delta Chat Core command line utility, using `cargo`:

 ```
-$ RUST_LOG=deltachat_repl=info cargo run -p deltachat-repl -- ~/deltachat-db
+$ RUST_LOG=repl=info cargo run -p deltachat-repl -- ~/deltachat-db
 ```
 where ~/deltachat-db is the database file. Delta Chat will create it if it does not exist.

@@ -113,7 +113,7 @@ $ cargo build -p deltachat_ffi --release

 - `DCC_MIME_DEBUG`: if set outgoing and incoming message will be printed 

- `RUST_LOG=deltachat_repl=info,async_imap=trace,async_smtp=trace`: enable IMAP and
+- `RUST_LOG=repl=info,async_imap=trace,async_smtp=trace`: enable IMAP and
 SMTP tracing in addition to info messages.

 ### Expensive tests
@@ -170,9 +170,7 @@ Language bindings are available for:
  - over cffi (legacy): \[[📂 source](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat)\]
  - over jsonrpc built with napi.rs: \[[📂 source](https://github.com/deltachat/napi-jsonrpc) | [📦 npm](https://www.npmjs.com/package/@deltachat/napi-jsonrpc)\]
 - **Python** \[[📂 source](./python) | [📦 pypi](https://pypi.org/project/deltachat) | [📚 docs](https://py.delta.chat)\]
- **Go**
-  - over jsonrpc: \[[📂 source](https://github.com/deltachat/deltachat-rpc-client-go/)\]
-  - over cffi[^1]: \[[📂 source](https://github.com/deltachat/go-deltachat/)\]
+- **Go**[^1] \[[📂 source](https://github.com/deltachat/go-deltachat/)\]
 - **Free Pascal**[^1] \[[📂 source](https://github.com/deltachat/deltachat-fp/)\]
 - **Java** and **Swift** (contained in the Android/iOS repos)

--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.111.0"
+version = "1.108.0"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
@@ -29,5 +29,5 @@ once_cell = "1.17.0"
 [features]
 default = ["vendored"]
 vendored = ["deltachat/vendored"]
-jsonrpc = ["dep:deltachat-jsonrpc"]
+jsonrpc = ["deltachat-jsonrpc"]

--- a/deltachat-ffi/Doxyfile.css
+++ b/deltachat-ffi/Doxyfile.css
@@ -1,24 +1,14 @@

-:root {
-	--accent: hsl(0 0% 85%);
-}
-
-@media (prefers-color-scheme: dark) {
-	:root {
-		--accent: hsl(0 0% 25%);
-	}
-}
-
 /* the code snippet frame, defaults to white which tends to get badly readable in combination with explaining text around */
 div.fragment {
-	background-color: var(--accent);
+	background-color: #e0e0e0;
 	border: 0;
 	padding: 1em;
 	border-radius: 6px;
 }

 code {
-	background-color: var(--accent);
+	background-color: #e0e0e0;
 	padding-left: .5em;
 	padding-right: .5em;
 	border-radius: 6px;
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -612,7 +612,7 @@ int             dc_all_work_done             (dc_context_t* context);
 * While dc_configure() returns immediately,
 * the started configuration-job may take a while.
 *
- * During configuration, #DC_EVENT_CONFIGURE_PROGRESS events are emitted;
+ * During configuration, #DC_EVENT_CONFIGURE_PROGRESS events are emmited;
 * they indicate a successful configuration as well as errors
 * and may be used to create a progress bar.
 *
@@ -869,7 +869,7 @@ uint32_t        dc_get_chat_id_by_contact_id (dc_context_t* context, uint32_t co
 * @param context The context object as returned from dc_context_new().
 * @param chat_id The chat ID to send the message to.
 * @param msg The message object to send to the chat defined by the chat ID.
- *     On success, msg_id and state of the object are set up,
+ *     On succcess, msg_id and state of the object are set up,
 *     The function does not take ownership of the object,
 *     so you have to free it using dc_msg_unref() as usual.
 * @return The ID of the message that is being prepared.
@@ -880,7 +880,7 @@ uint32_t        dc_prepare_msg               (dc_context_t* context, uint32_t ch
 /**
 * Send a message defined by a dc_msg_t object to a chat.
 *
- * Sends the event #DC_EVENT_MSGS_CHANGED on success.
+ * Sends the event #DC_EVENT_MSGS_CHANGED on succcess.
 * However, this does not imply, the message really reached the recipient -
 * sending may be delayed e.g. due to network problems. However, from your
 * view, you're done with the message. Sooner or later it will find its way.
@@ -909,7 +909,7 @@ uint32_t        dc_prepare_msg               (dc_context_t* context, uint32_t ch
 * @param chat_id The chat ID to send the message to.
 *     If dc_prepare_msg() was called before, this parameter can be 0.
 * @param msg The message object to send to the chat defined by the chat ID.
- *     On success, msg_id of the object is set up,
+ *     On succcess, msg_id of the object is set up,
 *     The function does not take ownership of the object,
 *     so you have to free it using dc_msg_unref() as usual.
 * @return The ID of the message that is about to be sent. 0 in case of errors.
@@ -926,7 +926,7 @@ uint32_t        dc_send_msg                  (dc_context_t* context, uint32_t ch
 * @param chat_id The chat ID to send the message to.
 *     If dc_prepare_msg() was called before, this parameter can be 0.
 * @param msg The message object to send to the chat defined by the chat ID.
- *     On success, msg_id of the object is set up,
+ *     On succcess, msg_id of the object is set up,
 *     The function does not take ownership of the object,
 *     so you have to free it using dc_msg_unref() as usual.
 * @return The ID of the message that is about to be sent. 0 in case of errors.
@@ -937,7 +937,7 @@ uint32_t        dc_send_msg_sync                  (dc_context_t* context, uint32
 /**
 * Send a simple text message a given chat.
 *
- * Sends the event #DC_EVENT_MSGS_CHANGED on success.
+ * Sends the event #DC_EVENT_MSGS_CHANGED on succcess.
 * However, this does not imply, the message really reached the recipient -
 * sending may be delayed e.g. due to network problems. However, from your
 * view, you're done with the message. Sooner or later it will find its way.
@@ -1146,7 +1146,7 @@ void            dc_set_draft                 (dc_context_t* context, uint32_t ch
 *     // not now and not when this code is executed again
 *     dc_add_device_msg(context, "update-123", NULL);
 * } else {
- *     // welcome message was not added now, this is an older installation,
+ *     // welcome message was not added now, this is an oder installation,
 *     // add a changelog
 *     dc_add_device_msg(context, "update-123", changelog_msg);
 * }
@@ -3184,7 +3184,7 @@ dc_lot_t*        dc_chatlist_get_summary     (const dc_chatlist_t* chatlist, siz
 * it takes the chat ID and the message ID as returned by dc_chatlist_get_chat_id() and dc_chatlist_get_msg_id()
 * as arguments. The chatlist object itself is not needed directly.
 *
- * This maybe useful if you convert the complete object into a different representation
+ * This maybe useful if you convert the complete object into a different represenation
 * as done e.g. in the node-bindings.
 * If you have access to the chatlist object in some way, using this function is not recommended,
 * use dc_chatlist_get_summary() in this case instead.
@@ -4327,18 +4327,6 @@ void            dc_msg_set_text               (dc_msg_t* msg, const char* text);
 void            dc_msg_set_html               (dc_msg_t* msg, const char* html);


-/**
- * Sets the email's subject. If it's empty, a default subject
- * will be used (e.g. `Message from Alice` or `Re: <last subject>`).
- * This does not alter any information in the database.
- *
- * @memberof dc_msg_t
- * @param msg The message object.
- * @param subject The new subject.
- */
-void            dc_msg_set_subject            (dc_msg_t* msg, const char* subject);
-
-
 /**
 * Set different sender name for a message.
 * This overrides the name set by the dc_set_config()-option `displayname`.
@@ -5683,7 +5671,7 @@ void dc_event_unref(dc_event_t* event);
 #define DC_EVENT_INCOMING_MSG             2005

 /**
- * Downloading a bunch of messages just finished. This is an
+ * Downloading a bunch of messages just finished. This is an experimental
 * event to allow the UI to only show one notification per message bunch,
 * instead of cluttering the user with many notifications.
 * For each of the msg_ids, an additional #DC_EVENT_INCOMING_MSG event was emitted before.
@@ -6341,7 +6329,7 @@ void dc_event_unref(dc_event_t* event);
 ///
 /// Used in status messages.
 ///
-/// @deprecated 2022-09-10
+/// @deperecated 2022-09-10
 #define DC_STR_EPHEMERAL_MINUTE           77

 /// "Message deletion timer is set to 1 hour."
@@ -6623,7 +6611,7 @@ void dc_event_unref(dc_event_t* event);

 /// "You changed your email address from %1$s to %2$s.
 /// If you now send a message to a group, contacts there will automatically
-/// replace the old with your new address.\n\n It's highly advised to set up 
+/// 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." + the link to the AEAP blog post
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -292,12 +292,12 @@ pub unsafe extern "C" fn dc_set_stock_translation(
            Some(id) => match ctx.set_stock_translation(id, msg).await {
                Ok(()) => 1,
                Err(err) => {
-                    warn!(ctx, "set_stock_translation failed: {err:#}");
+                    warn!(ctx, "set_stock_translation failed: {}", err);
                    0
                }
            },
            None => {
-                warn!(ctx, "invalid stock message id {stock_id}");
+                warn!(ctx, "invalid stock message id {}", stock_id);
                0
            }
        }
@@ -320,7 +320,7 @@ pub unsafe extern "C" fn dc_set_config_from_qr(
        match qr::set_config_from_qr(ctx, &qr).await {
            Ok(()) => 1,
            Err(err) => {
-                error!(ctx, "Failed to create account from QR code: {err:#}");
+                error!(ctx, "Failed to create account from QR code: {}", err);
                0
            }
        }
@@ -338,7 +338,7 @@ pub unsafe extern "C" fn dc_get_info(context: *const dc_context_t) -> *mut libc:
        match ctx.get_info().await {
            Ok(info) => render_info(info).unwrap_or_default().strdup(),
            Err(err) => {
-                warn!(ctx, "failed to get info: {err:#}");
+                warn!(ctx, "failed to get info: {}", err);
                "".strdup()
            }
        }
@@ -379,7 +379,7 @@ pub unsafe extern "C" fn dc_get_connectivity_html(
        match ctx.get_connectivity_html().await {
            Ok(html) => html.strdup(),
            Err(err) => {
-                error!(ctx, "Failed to get connectivity html: {err:#}");
+                error!(ctx, "Failed to get connectivity html: {}", err);
                "".strdup()
            }
        }
@@ -421,10 +421,6 @@ pub unsafe extern "C" fn dc_get_oauth2_url(
    })
 }

-fn spawn_configure(ctx: Context) {
-    spawn(async move { ctx.configure().await.log_err(&ctx, "Configure failed") });
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_configure(context: *mut dc_context_t) {
    if context.is_null() {
@@ -433,7 +429,8 @@ pub unsafe extern "C" fn dc_configure(context: *mut dc_context_t) {
    }

    let ctx = &*context;
-    spawn_configure(ctx.clone());
+
+    spawn(async move { ctx.configure().await.log_err(ctx, "Configure failed") });
 }

 #[no_mangle]
@@ -1140,7 +1137,7 @@ pub unsafe extern "C" fn dc_get_draft(context: *mut dc_context_t, chat_id: u32)
            }
            Ok(None) => ptr::null_mut(),
            Err(err) => {
-                error!(ctx, "Failed to get draft for chat #{chat_id}: {err:#}");
+                error!(ctx, "Failed to get draft for chat #{}: {}", chat_id, err);
                ptr::null_mut()
            }
        }
@@ -1730,7 +1727,7 @@ pub unsafe extern "C" fn dc_get_chat_encrinfo(
            .await
            .map(|s| s.strdup())
            .unwrap_or_else(|e| {
-                error!(ctx, "{e:#}");
+                error!(ctx, "{}", e);
                ptr::null_mut()
            })
    })
@@ -1893,7 +1890,7 @@ pub unsafe extern "C" fn dc_resend_msgs(
    let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);

    if let Err(err) = block_on(chat::resend_msgs(ctx, &msg_ids)) {
-        error!(ctx, "Resending failed: {err:#}");
+        error!(ctx, "Resending failed: {}", err);
        0
    } else {
        1
@@ -1934,11 +1931,14 @@ pub unsafe extern "C" fn dc_get_msg(context: *mut dc_context_t, msg_id: u32) ->
                    // C-core API returns empty messages, do the same
                    warn!(
                        ctx,
-                        "dc_get_msg called with special msg_id={msg_id}, returning empty msg"
+                        "dc_get_msg called with special msg_id={}, returning empty msg", msg_id
                    );
                    message::Message::default()
                } else {
-                    error!(ctx, "dc_get_msg could not retrieve msg_id {msg_id}: {e:#}");
+                    error!(
+                        ctx,
+                        "dc_get_msg could not retrieve msg_id {}: {}", msg_id, e
+                    );
                    return ptr::null_mut();
                }
            }
@@ -2003,10 +2003,12 @@ pub unsafe extern "C" fn dc_create_contact(
    let ctx = &*context;
    let name = to_string_lossy(name);

-    block_on(Contact::create(ctx, &name, &to_string_lossy(addr)))
-        .log_err(ctx, "Cannot create contact")
-        .map(|id| id.to_u32())
-        .unwrap_or(0)
+    block_on(async move {
+        Contact::create(ctx, &name, &to_string_lossy(addr))
+            .await
+            .map(|id| id.to_u32())
+            .unwrap_or(0)
+    })
 }

 #[no_mangle]
@@ -2131,7 +2133,7 @@ pub unsafe extern "C" fn dc_get_contact_encrinfo(
            .await
            .map(|s| s.strdup())
            .unwrap_or_else(|e| {
-                error!(ctx, "{e:#}");
+                error!(ctx, "{}", e);
                ptr::null_mut()
            })
    })
@@ -2153,7 +2155,7 @@ pub unsafe extern "C" fn dc_delete_contact(
        match Contact::delete(ctx, contact_id).await {
            Ok(_) => 1,
            Err(err) => {
-                error!(ctx, "cannot delete contact: {err:#}");
+                error!(ctx, "cannot delete contact: {}", err);
                0
            }
        }
@@ -2179,14 +2181,6 @@ pub unsafe extern "C" fn dc_get_contact(
    })
 }

-fn spawn_imex(ctx: Context, what: imex::ImexMode, param1: String, passphrase: Option<String>) {
-    spawn(async move {
-        imex::imex(&ctx, what, param1.as_ref(), passphrase)
-            .await
-            .log_err(&ctx, "IMEX failed")
-    });
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_imex(
    context: *mut dc_context_t,
@@ -2210,7 +2204,11 @@ pub unsafe extern "C" fn dc_imex(
    let ctx = &*context;

    if let Some(param1) = to_opt_string_lossy(param1) {
-        spawn_imex(ctx.clone(), what, param1, passphrase);
+        spawn(async move {
+            imex::imex(ctx, what, param1.as_ref(), passphrase)
+                .await
+                .log_err(ctx, "IMEX failed")
+        });
    } else {
        eprintln!("dc_imex called without a valid directory");
    }
@@ -2233,7 +2231,7 @@ pub unsafe extern "C" fn dc_imex_has_backup(
            Err(err) => {
                // do not bubble up error to the user,
                // the ui will expect that the file does not exist or cannot be accessed
-                warn!(ctx, "dc_imex_has_backup: {err:#}");
+                warn!(ctx, "dc_imex_has_backup: {}", err);
                ptr::null_mut()
            }
        }
@@ -2252,7 +2250,7 @@ pub unsafe extern "C" fn dc_initiate_key_transfer(context: *mut dc_context_t) ->
        match imex::initiate_key_transfer(ctx).await {
            Ok(res) => res.strdup(),
            Err(err) => {
-                error!(ctx, "dc_initiate_key_transfer(): {err:#}");
+                error!(ctx, "dc_initiate_key_transfer(): {}", err);
                ptr::null_mut()
            }
        }
@@ -2277,7 +2275,7 @@ pub unsafe extern "C" fn dc_continue_key_transfer(
        {
            Ok(()) => 1,
            Err(err) => {
-                warn!(ctx, "dc_continue_key_transfer: {err:#}");
+                warn!(ctx, "dc_continue_key_transfer: {}", err);
                0
            }
        }
@@ -2665,7 +2663,7 @@ pub unsafe fn dc_array_is_independent(
 ///
 /// This is the structure behind [dc_chatlist_t] which is the opaque
 /// structure representing a chatlist in the FFI API.  It exists
-/// because the FFI API has a reference from the message to the
+/// 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.
 pub struct ChatlistWrapper {
@@ -2708,7 +2706,7 @@ pub unsafe extern "C" fn dc_chatlist_get_chat_id(
    match ffi_list.list.get_chat_id(index) {
        Ok(chat_id) => chat_id.to_u32(),
        Err(err) => {
-            warn!(ctx, "get_chat_id failed: {err:#}");
+            warn!(ctx, "get_chat_id failed: {}", err);
            0
        }
    }
@@ -2728,7 +2726,7 @@ pub unsafe extern "C" fn dc_chatlist_get_msg_id(
    match ffi_list.list.get_msg_id(index) {
        Ok(msg_id) => msg_id.map_or(0, |msg_id| msg_id.to_u32()),
        Err(err) => {
-            warn!(ctx, "get_msg_id failed: {err:#}");
+            warn!(ctx, "get_msg_id failed: {}", err);
            0
        }
    }
@@ -2809,7 +2807,7 @@ pub unsafe extern "C" fn dc_chatlist_get_context(
 ///
 /// This is the structure behind [dc_chat_t] which is the opaque
 /// structure representing a chat in the FFI API.  It exists
-/// because the FFI API has a reference from the message to the
+/// 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.
 pub struct ChatWrapper {
@@ -2887,7 +2885,7 @@ pub unsafe extern "C" fn dc_chat_get_profile_image(chat: *mut dc_chat_t) -> *mut
            Ok(Some(p)) => p.to_string_lossy().strdup(),
            Ok(None) => ptr::null_mut(),
            Err(err) => {
-                error!(ctx, "failed to get profile image: {err:#}");
+                error!(ctx, "failed to get profile image: {:?}", err);
                ptr::null_mut()
            }
        }
@@ -3039,7 +3037,7 @@ pub unsafe extern "C" fn dc_chat_get_info_json(
        let chat = match chat::Chat::load_from_db(ctx, ChatId::new(chat_id)).await {
            Ok(chat) => chat,
            Err(err) => {
-                error!(ctx, "dc_get_chat_info_json() failed to load chat: {err:#}");
+                error!(ctx, "dc_get_chat_info_json() failed to load chat: {}", err);
                return "".strdup();
            }
        };
@@ -3048,7 +3046,7 @@ pub unsafe extern "C" fn dc_chat_get_info_json(
            Err(err) => {
                error!(
                    ctx,
-                    "dc_get_chat_info_json() failed to get chat info: {err:#}"
+                    "dc_get_chat_info_json() failed to get chat info: {}", err
                );
                return "".strdup();
            }
@@ -3065,7 +3063,7 @@ pub unsafe extern "C" fn dc_chat_get_info_json(
 ///
 /// This is the structure behind [dc_msg_t] which is the opaque
 /// structure representing a message in the FFI API.  It exists
-/// because the FFI API has a reference from the message to the
+/// 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.
 pub struct MessageWrapper {
@@ -3287,7 +3285,7 @@ pub unsafe extern "C" fn dc_msg_get_webxdc_info(msg: *mut dc_msg_t) -> *mut libc
        let info = match ffi_msg.message.get_webxdc_info(ctx).await {
            Ok(info) => info,
            Err(err) => {
-                error!(ctx, "dc_msg_get_webxdc_info() failed to get info: {err:#}");
+                error!(ctx, "dc_msg_get_webxdc_info() failed to get info: {}", err);
                return "".strdup();
            }
        };
@@ -3600,16 +3598,6 @@ pub unsafe extern "C" fn dc_msg_set_html(msg: *mut dc_msg_t, html: *const libc::
    ffi_msg.message.set_html(to_opt_string_lossy(html))
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_msg_set_subject(msg: *mut dc_msg_t, subject: *const libc::c_char) {
-    if msg.is_null() {
-        eprintln!("ignoring careless call to dc_msg_get_subject()");
-        return;
-    }
-    let ffi_msg = &mut *msg;
-    ffi_msg.message.set_subject(to_string_lossy(subject));
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_msg_set_override_sender_name(
    msg: *mut dc_msg_t,
@@ -3818,7 +3806,7 @@ pub unsafe extern "C" fn dc_msg_force_plaintext(msg: *mut dc_msg_t) {
 ///
 /// This is the structure behind [dc_contact_t] which is the opaque
 /// structure representing a contact in the FFI API.  It exists
-/// because the FFI API has a reference from the message to the
+/// 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.
 pub struct ContactWrapper {
@@ -4155,7 +4143,7 @@ impl<T: Default, E: std::fmt::Display> ResultExt<T, E> for Result<T, E> {
        match self {
            Ok(t) => t,
            Err(err) => {
-                error!(context, "{message}: {err:#}");
+                error!(context, "{}: {}", message, err);
                Default::default()
            }
        }
@@ -4611,22 +4599,33 @@ mod jsonrpc {
            return ptr::null_mut();
        }

-        let account_manager = &*account_manager;
-        let events = block_on(account_manager.read()).get_event_emitter();
-        let cmd_api = deltachat_jsonrpc::api::CommandApi::from_arc(account_manager.inner.clone());
+        let cmd_api =
+            deltachat_jsonrpc::api::CommandApi::from_arc((*account_manager).inner.clone());

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

-        let event_thread = spawn(async move {
-            while let Some(event) = events.recv().await {
-                let event = event_to_json_rpc_notification(event);
-                request_handle
-                    .send_notification("event", Some(event))
-                    .await?;
+        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 res: Result<(), anyhow::Error> = Ok(());
-            res
        });

        let instance = dc_jsonrpc_instance_t {
@@ -4648,12 +4647,6 @@ mod jsonrpc {
        drop(Box::from_raw(jsonrpc_instance));
    }

-    fn spawn_handle_jsonrpc_request(handle: RpcSession<CommandApi>, request: String) {
-        spawn(async move {
-            handle.handle_incoming(&request).await;
-        });
-    }
-
    #[no_mangle]
    pub unsafe extern "C" fn dc_jsonrpc_request(
        jsonrpc_instance: *mut dc_jsonrpc_instance_t,
@@ -4664,9 +4657,12 @@ mod jsonrpc {
            return;
        }

-        let handle = &(*jsonrpc_instance).handle;
+        let api = &*jsonrpc_instance;
+        let handle = &api.handle;
        let request = to_string_lossy(request);
-        spawn_handle_jsonrpc_request(handle.clone(), request);
+        spawn(async move {
+            handle.handle_incoming(&request).await;
+        });
    }

    #[no_mangle]
--- a/deltachat-ffi/src/lot.rs
+++ b/deltachat-ffi/src/lot.rs
@@ -22,15 +22,20 @@ pub enum Lot {
 }

 #[repr(u8)]
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Meaning {
-    #[default]
    None = 0,
    Text1Draft = 1,
    Text1Username = 2,
    Text1Self = 3,
 }

+impl Default for Meaning {
+    fn default() -> Self {
+        Meaning::None
+    }
+}
+
 impl Lot {
    pub fn get_text1(&self) -> Option<&str> {
        match self {
@@ -146,9 +151,9 @@ impl Lot {
 }

 #[repr(u32)]
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum LotState {
-    #[default]
+    // Default
    Undefined = 0,

    // Qr States
@@ -210,6 +215,12 @@ pub enum LotState {
    MsgOutMdnRcvd = 28,
 }

+impl Default for LotState {
+    fn default() -> Self {
+        LotState::Undefined
+    }
+}
+
 impl From<MessageState> for LotState {
    fn from(s: MessageState) -> Self {
        use MessageState::*;
--- a/deltachat-jsonrpc/Cargo.toml
+++ b/deltachat-jsonrpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.111.0"
+version = "1.108.0"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
@@ -21,15 +21,14 @@ log = "0.4"
 async-channel = { version = "1.8.0" }
 futures = { version = "0.3.26" }
 serde_json = "1.0.91"
-yerpc = { version = "0.4.3", features = ["anyhow_expose"] }
+yerpc = { version = "^0.4.0", features = ["anyhow_expose"] }
 typescript-type-def = { version = "0.5.5", features = ["json_value"] }
 tokio = { version = "1.25.0" }
 sanitize-filename = "0.4"
 walkdir = "2.3.2"
-base64 = "0.21"

 # optional dependencies
-axum = { version = "0.6.6", optional = true, features = ["ws"] }
+axum = { version = "0.6.4", optional = true, features = ["ws"] }
 env_logger = { version = "0.10.0", optional = true }

 [dev-dependencies]
@@ -37,6 +36,5 @@ tokio = { version = "1.25.0", features = ["full", "rt-multi-thread"] }


 [features]
-default = ["vendored"]
-webserver = ["dep:env_logger", "dep:axum", "tokio/full", "yerpc/support-axum"]
-vendored = ["deltachat/vendored"]
+default = []
+webserver = ["env_logger", "axum", "tokio/full", "yerpc/support-axum"]
--- a/deltachat-jsonrpc/README.md
+++ b/deltachat-jsonrpc/README.md
@@ -35,7 +35,7 @@ The server can be configured with environment variables:
 |`DC_PORT`|`20808`|port to listen on|
 |`DC_ACCOUNTS_PATH`|`./accounts`|path to storage directory|

-If you are targeting other architectures (like KaiOS or Android), the webserver binary can be cross-compiled easily with [rust-cross](https://github.com/cross-rs/cross):
+If you are targetting other architectures (like KaiOS or Android), the webserver binary can be cross-compiled easily with [rust-cross](https://github.com/cross-rs/cross):

 ```sh
 cross build --features=webserver --target armv7-linux-androideabi --release
--- a/deltachat-jsonrpc/src/api/mod.rs
+++ b/deltachat-jsonrpc/src/api/mod.rs
@@ -41,12 +41,10 @@ use types::account::Account;
 use types::chat::FullChat;
 use types::chat_list::ChatListEntry;
 use types::contact::ContactObject;
-use types::message::MessageData;
 use types::message::MessageObject;
 use types::provider_info::ProviderInfo;
 use types::webxdc::WebxdcMessageInfo;

-use self::types::message::MessageLoadResult;
 use self::types::{
    chat::{BasicChat, JSONRPCChatVisibility, MuteDuration},
    location::JsonrpcLocation,
@@ -87,11 +85,6 @@ impl CommandApi {

 #[rpc(all_positional, ts_outdir = "typescript/generated")]
 impl CommandApi {
-    /// Test function.
-    async fn sleep(&self, delay: f64) {
-        tokio::time::sleep(std::time::Duration::from_secs_f64(delay)).await
-    }
-
    // ---------------------------------------------
    //  Misc top level functions
    // ---------------------------------------------
@@ -467,7 +460,7 @@ impl CommandApi {
                    Ok(res) => res,
                    Err(err) => ChatListItemFetchResult::Error {
                        id: entry.0,
-                        error: format!("{err:#}"),
+                        error: format!("{err:?}"),
                    },
                },
            );
@@ -947,27 +940,17 @@ impl CommandApi {
        MsgId::new(message_id).get_html(&ctx).await
    }

-    /// get multiple messages in one call,
-    /// if loading one message fails the error is stored in the result object in it's place.
-    ///
-    /// this is the batch variant of [get_message]
    async fn get_messages(
        &self,
        account_id: u32,
        message_ids: Vec<u32>,
-    ) -> Result<HashMap<u32, MessageLoadResult>> {
+    ) -> Result<HashMap<u32, MessageObject>> {
        let ctx = self.get_context(account_id).await?;
-        let mut messages: HashMap<u32, MessageLoadResult> = HashMap::new();
+        let mut messages: HashMap<u32, MessageObject> = HashMap::new();
        for message_id in message_ids {
-            let message_result = MessageObject::from_message_id(&ctx, message_id).await;
            messages.insert(
                message_id,
-                match message_result {
-                    Ok(message) => MessageLoadResult::Message(message),
-                    Err(error) => MessageLoadResult::LoadingError {
-                        error: format!("{error:#}"),
-                    },
-                },
+                MessageObject::from_message_id(&ctx, message_id).await?,
            );
        }
        Ok(messages)
@@ -1463,23 +1446,6 @@ impl CommandApi {
        WebxdcMessageInfo::get_for_message(&ctx, MsgId::new(instance_msg_id)).await
    }

-    /// Get blob encoded as base64 from a webxdc message
-    ///
-    /// path is the path of the file within webxdc archive
-    async fn get_webxdc_blob(
-        &self,
-        account_id: u32,
-        instance_msg_id: u32,
-        path: String,
-    ) -> Result<String> {
-        let ctx = self.get_context(account_id).await?;
-        let message = Message::load_from_db(&ctx, MsgId::new(instance_msg_id)).await?;
-        let blob = message.get_webxdc_blob(&ctx, &path).await?;
-
-        use base64::{engine::general_purpose, Engine as _};
-        Ok(general_purpose::STANDARD_NO_PAD.encode(blob))
-    }
-
    /// Forward messages to another chat.
    ///
    /// All types of messages can be forwarded,
@@ -1529,48 +1495,6 @@ impl CommandApi {
        Ok(message_id.to_u32())
    }

-    async fn send_msg(&self, account_id: u32, chat_id: u32, data: MessageData) -> Result<u32> {
-        let ctx = self.get_context(account_id).await?;
-        let mut message = Message::new(if let Some(viewtype) = data.viewtype {
-            viewtype.into()
-        } else if data.file.is_some() {
-            Viewtype::File
-        } else {
-            Viewtype::Text
-        });
-        if data.text.is_some() {
-            message.set_text(data.text);
-        }
-        if data.html.is_some() {
-            message.set_html(data.html);
-        }
-        if data.override_sender_name.is_some() {
-            message.set_override_sender_name(data.override_sender_name);
-        }
-        if let Some(file) = data.file {
-            message.set_file(file, None);
-        }
-        if let Some((latitude, longitude)) = data.location {
-            message.set_location(latitude, longitude);
-        }
-        if let Some(id) = data.quoted_message_id {
-            message
-                .set_quote(
-                    &ctx,
-                    Some(
-                        &Message::load_from_db(&ctx, MsgId::new(id))
-                            .await
-                            .context("message to quote could not be loaded")?,
-                    ),
-                )
-                .await?;
-        }
-        let msg_id = chat::send_msg(&ctx, ChatId::new(chat_id), &mut message)
-            .await?
-            .to_u32();
-        Ok(msg_id)
-    }
-
    // ---------------------------------------------
    //           functions for the composer
    //    the composer is the message input field
--- a/deltachat-jsonrpc/src/api/types/message.rs
+++ b/deltachat-jsonrpc/src/api/types/message.rs
@@ -19,13 +19,6 @@ use super::contact::ContactObject;
 use super::reactions::JSONRPCReactions;
 use super::webxdc::WebxdcMessageInfo;

-#[derive(Serialize, TypeDef)]
-#[serde(rename_all = "camelCase", tag = "variant")]
-pub enum MessageLoadResult {
-    Message(MessageObject),
-    LoadingError { error: String },
-}
-
 #[derive(Serialize, TypeDef)]
 #[serde(rename = "Message", rename_all = "camelCase")]
 pub struct MessageObject {
@@ -502,15 +495,3 @@ impl From<ChatItem> for JSONRPCMessageListItem {
        }
    }
 }
-
-#[derive(Deserialize, TypeDef)]
-#[serde(rename_all = "camelCase")]
-pub struct MessageData {
-    pub text: Option<String>,
-    pub html: Option<String>,
-    pub viewtype: Option<MessageViewtype>,
-    pub file: Option<String>,
-    pub location: Option<(f64, f64)>,
-    pub override_sender_name: Option<String>,
-    pub quoted_message_id: Option<u32>,
-}
--- a/deltachat-jsonrpc/src/api/types/provider_info.rs
+++ b/deltachat-jsonrpc/src/api/types/provider_info.rs
@@ -8,7 +8,7 @@ use typescript_type_def::TypeDef;
 pub struct ProviderInfo {
    pub before_login_hint: String,
    pub overview_page: String,
-    pub status: u32, // in reality this is an enum, but for simplicity and because it gets converted into a number anyway, we use an u32 here.
+    pub status: u32, // in reality this is an enum, but for simlicity and because it gets converted into a number anyway, we use an u32 here.
 }

 impl ProviderInfo {
--- a/deltachat-jsonrpc/typescript/.npmignore
+++ b/deltachat-jsonrpc/typescript/.npmignore
@@ -4,9 +4,3 @@ docs
 coverage
 yarn*
 package-lock.json
-.prettierignore
-example.html
-report_api_coverage.mjs
-scripts
-dist/example
-dist/test
--- a/deltachat-jsonrpc/typescript/example/example.ts
+++ b/deltachat-jsonrpc/typescript/example/example.ts
@@ -68,7 +68,10 @@ async function run() {
      null
    );
    for (const [chatId, _messageId] of chats) {
-      const chat = await client.rpc.getFullChatById(selectedAccount, chatId);
+      const chat = await client.rpc.getFullChatById(
+        selectedAccount,
+        chatId
+      );
      write($main, `<h3>${chat.name}</h3>`);
      const messageIds = await client.rpc.getMessageIds(
        selectedAccount,
@@ -81,9 +84,7 @@ async function run() {
        messageIds
      );
      for (const [_messageId, message] of Object.entries(messages)) {
-        if (message.variant === "message")
-          write($main, `<p>${message.text}</p>`);
-        else write($main, `<p>loading error: ${message.error}</p>`);
+        write($main, `<p>${message.text}</p>`);
      }
    }
  }
--- a/deltachat-jsonrpc/typescript/example/node-add-account.js
+++ b/deltachat-jsonrpc/typescript/example/node-add-account.js
@@ -3,27 +3,24 @@ import { DeltaChat } from "../dist/deltachat.js";
 run().catch(console.error);

 async function run() {
-  const delta = new DeltaChat("ws://localhost:20808/ws");
+  const delta = new DeltaChat('ws://localhost:20808/ws');
  delta.on("event", (event) => {
    console.log("event", event.data);
  });

-  const email = process.argv[2];
-  const password = process.argv[3];
-  if (!email || !password)
-    throw new Error(
-      "USAGE: node node-add-account.js <EMAILADDRESS> <PASSWORD>"
-    );
-  console.log(`creating account for ${email}`);
-  const id = await delta.rpc.addAccount();
-  console.log(`created account id ${id}`);
+  const email = process.argv[2]
+  const password = process.argv[3]
+  if (!email || !password) throw new Error('USAGE: node node-add-account.js <EMAILADDRESS> <PASSWORD>')
+  console.log(`creating acccount for ${email}`)
+  const id = await delta.rpc.addAccount()
+  console.log(`created account id ${id}`)
  await delta.rpc.setConfig(id, "addr", email);
  await delta.rpc.setConfig(id, "mail_pw", password);
-  console.log("configuration updated");
-  await delta.rpc.configure(id);
-  console.log("account configured!");
+  console.log('configuration updated')
+  await delta.rpc.configure(id)
+  console.log('account configured!')

  const accounts = await delta.rpc.getAllAccounts();
  console.log("accounts", accounts);
-  console.log("waiting for events...");
+  console.log("waiting for events...")
 }
--- a/deltachat-jsonrpc/typescript/example/node-demo.js
+++ b/deltachat-jsonrpc/typescript/example/node-demo.js
@@ -10,5 +10,5 @@ async function run() {

  const accounts = await delta.rpc.getAllAccounts();
  console.log("accounts", accounts);
-  console.log("waiting for events...");
+  console.log("waiting for events...")
 }
--- a/deltachat-jsonrpc/typescript/package.json
+++ b/deltachat-jsonrpc/typescript/package.json
@@ -3,7 +3,7 @@
  "dependencies": {
    "@deltachat/tiny-emitter": "3.0.0",
    "isomorphic-ws": "^4.0.1",
-    "yerpc": "^0.4.3"
+    "yerpc": "^0.3.3"
  },
  "devDependencies": {
    "@types/chai": "^4.2.21",
@@ -14,7 +14,7 @@
    "c8": "^7.10.0",
    "chai": "^4.3.4",
    "chai-as-promised": "^7.1.1",
-    "esbuild": "^0.17.9",
+    "esbuild": "^0.14.11",
    "http-server": "^14.1.1",
    "mocha": "^9.1.1",
    "node-fetch": "^2.6.1",
@@ -24,19 +24,12 @@
    "typescript": "^4.5.5",
    "ws": "^8.5.0"
  },
-  "exports": {
-    ".": {
-      "import": "./dist/deltachat.js",
-      "require": "./dist/deltachat.cjs"
-    }
-  },
  "license": "MPL-2.0",
  "main": "dist/deltachat.js",
  "name": "@deltachat/jsonrpc-client",
  "scripts": {
-    "build": "run-s generate-bindings extract-constants build:tsc build:bundle build:cjs",
+    "build": "run-s generate-bindings extract-constants build:tsc build:bundle",
    "build:bundle": "esbuild --format=esm --bundle dist/deltachat.js --outfile=dist/deltachat.bundle.js",
-    "build:cjs": "esbuild --format=cjs --bundle --packages=external dist/deltachat.js --outfile=dist/deltachat.cjs",
    "build:tsc": "tsc",
    "docs": "typedoc --out docs deltachat.ts",
    "example": "run-s build example:build example:start",
@@ -45,8 +38,8 @@
    "example:start": "http-server .",
    "extract-constants": "node ./scripts/generate-constants.js",
    "generate-bindings": "cargo test",
-    "prettier:check": "prettier --check .",
-    "prettier:fix": "prettier --write .",
+    "prettier:check": "prettier --check **.ts",
+    "prettier:fix": "prettier --write **.ts",
    "test": "run-s test:prepare test:run-coverage test:report-coverage",
    "test:prepare": "cargo build --package deltachat-rpc-server --bin deltachat-rpc-server",
    "test:report-coverage": "node report_api_coverage.mjs",
@@ -55,5 +48,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "1.111.0"
-}
+  "version": "1.108.0"
+}
--- a/deltachat-jsonrpc/typescript/report_api_coverage.mjs
+++ b/deltachat-jsonrpc/typescript/report_api_coverage.mjs
@@ -1,5 +1,5 @@
 import { readFileSync } from "fs";
-// only checks for the coverage of the api functions in bindings.ts for now
+// only checks for the coverge of the api functions in bindings.ts for now
 const generatedFile = "typescript/generated/client.ts";
 const json = JSON.parse(readFileSync("./coverage/coverage-final.json"));
 const jsonCoverage =
--- a/deltachat-jsonrpc/typescript/src/client.ts
+++ b/deltachat-jsonrpc/typescript/src/client.ts
@@ -43,7 +43,7 @@ export class BaseDeltaChat<
      const method = request.method;
      if (method === "event") {
        const event = request.params! as DCWireEvent<Event>;
-        //@ts-ignore
+	//@ts-ignore
        this.emit(event.event.type, event.contextId, event.event as any);
        this.emit("ALL", event.contextId, event.event as any);

--- a/deltachat-jsonrpc/typescript/test/basic.ts
+++ b/deltachat-jsonrpc/typescript/test/basic.ts
@@ -4,7 +4,10 @@ import chaiAsPromised from "chai-as-promised";
 chai.use(chaiAsPromised);
 import { StdioDeltaChat as DeltaChat } from "../deltachat.js";

-import { RpcServerHandle, startServer } from "./test_base.js";
+import {
+  RpcServerHandle,
+  startServer,
+} from "./test_base.js";

 describe("basic tests", () => {
  let serverHandle: RpcServerHandle;
@@ -12,9 +15,9 @@ describe("basic tests", () => {

  before(async () => {
    serverHandle = await startServer();
-    dc = new DeltaChat(serverHandle.stdin, serverHandle.stdout);
+    dc = new DeltaChat(serverHandle.stdin, serverHandle.stdout)
    // dc.on("ALL", (event) => {
-    //console.log("event", event);
+      //console.log("event", event);
    // });
  });

@@ -53,7 +56,7 @@ describe("basic tests", () => {
    ]);
  });

-  describe("account management", () => {
+  describe("account managment", () => {
    it("should create account", async () => {
      const res = await dc.rpc.addAccount();
      assert((await dc.rpc.getAllAccountIds()).length === 1);
@@ -73,7 +76,7 @@ describe("basic tests", () => {
    });
  });

-  describe("contact management", function () {
+  describe("contact managment", function () {
    let accountId: number;
    before(async () => {
      accountId = await dc.rpc.addAccount();
@@ -103,44 +106,38 @@ describe("basic tests", () => {
      accountId = await dc.rpc.addAccount();
    });

-    it("set and retrieve", async function () {
+    it("set and retrive", async function () {
      await dc.rpc.setConfig(accountId, "addr", "valid@email");
      assert((await dc.rpc.getConfig(accountId, "addr")) == "valid@email");
    });
    it("set invalid key should throw", async function () {
-      await expect(dc.rpc.setConfig(accountId, "invalid_key", "some value")).to
-        .be.eventually.rejected;
+      await expect(dc.rpc.setConfig(accountId, "invalid_key", "some value")).to.be
+        .eventually.rejected;
    });
    it("get invalid key should throw", async function () {
      await expect(dc.rpc.getConfig(accountId, "invalid_key")).to.be.eventually
        .rejected;
    });
-    it("set and retrieve ui.*", async function () {
+    it("set and retrive ui.*", async function () {
      await dc.rpc.setConfig(accountId, "ui.chat_bg", "color:red");
      assert((await dc.rpc.getConfig(accountId, "ui.chat_bg")) == "color:red");
    });
-    it("set and retrieve (batch)", async function () {
+    it("set and retrive (batch)", async function () {
      const config = { addr: "valid@email", mail_pw: "1234" };
      await dc.rpc.batchSetConfig(accountId, config);
-      const retrieved = await dc.rpc.batchGetConfig(
-        accountId,
-        Object.keys(config)
-      );
+      const retrieved = await dc.rpc.batchGetConfig(accountId, Object.keys(config));
      expect(retrieved).to.deep.equal(config);
    });
-    it("set and retrieve ui.* (batch)", async function () {
+    it("set and retrive ui.* (batch)", async function () {
      const config = {
        "ui.chat_bg": "color:green",
        "ui.enter_key_sends": "true",
      };
      await dc.rpc.batchSetConfig(accountId, config);
-      const retrieved = await dc.rpc.batchGetConfig(
-        accountId,
-        Object.keys(config)
-      );
+      const retrieved = await dc.rpc.batchGetConfig(accountId, Object.keys(config));
      expect(retrieved).to.deep.equal(config);
    });
-    it("set and retrieve mixed(ui and core) (batch)", async function () {
+    it("set and retrive mixed(ui and core) (batch)", async function () {
      const config = {
        "ui.chat_bg": "color:yellow",
        "ui.enter_key_sends": "false",
@@ -148,10 +145,7 @@ describe("basic tests", () => {
        mail_pw: "123456",
      };
      await dc.rpc.batchSetConfig(accountId, config);
-      const retrieved = await dc.rpc.batchGetConfig(
-        accountId,
-        Object.keys(config)
-      );
+      const retrieved = await dc.rpc.batchGetConfig(accountId, Object.keys(config));
      expect(retrieved).to.deep.equal(config);
    });
  });
--- a/deltachat-jsonrpc/typescript/test/online.ts
+++ b/deltachat-jsonrpc/typescript/test/online.ts
@@ -22,7 +22,7 @@ describe("online tests", function () {
        process.exit(1);
      }
      console.log(
-        "Missing DCC_NEW_TMP_EMAIL environment variable!, skip integration tests"
+        "Missing DCC_NEW_TMP_EMAIL environment variable!, skip intergration tests"
      );
      this.skip();
    }
@@ -36,7 +36,7 @@ describe("online tests", function () {
    account1 = await createTempUser(process.env.DCC_NEW_TMP_EMAIL);
    if (!account1 || !account1.email || !account1.password) {
      console.log(
-        "We didn't got back an account from the api, skip integration tests"
+        "We didn't got back an account from the api, skip intergration tests"
      );
      this.skip();
    }
@@ -44,7 +44,7 @@ describe("online tests", function () {
    account2 = await createTempUser(process.env.DCC_NEW_TMP_EMAIL);
    if (!account2 || !account2.email || !account2.password) {
      console.log(
-        "We didn't got back an account2 from the api, skip integration tests"
+        "We didn't got back an account2 from the api, skip intergration tests"
      );
      this.skip();
    }
@@ -74,7 +74,7 @@ describe("online tests", function () {
    accountsConfigured = true;
  });

-  it("send and receive text message", async function () {
+  it("send and recieve text message", async function () {
    if (!accountsConfigured) {
      this.skip();
    }
@@ -106,7 +106,7 @@ describe("online tests", function () {
    expect(message.text).equal("Hello");
  });

-  it("send and receive text message roundtrip, encrypted on answer onwards", async function () {
+  it("send and recieve text message roundtrip, encrypted on answer onwards", async function () {
    if (!accountsConfigured) {
      this.skip();
    }
--- a/deltachat-jsonrpc/typescript/test/test_base.ts
+++ b/deltachat-jsonrpc/typescript/test/test_base.ts
@@ -59,13 +59,13 @@ export async function startServer(): Promise<RpcServerHandle> {

 export async function createTempUser(url: string) {
  const response = await fetch(url, {
-    method: "POST",
+    method: "POST", 
    headers: {
      "cache-control": "no-cache",
    },
  });
-  if (!response.ok) throw new Error("Received invalid response");
-  return response.json();
+  if (!response.ok) throw new Error('Received invalid response')
+  return response.json(); 
 }

 function getTargetDir(): Promise<string> {
@@ -89,3 +89,4 @@ function getTargetDir(): Promise<string> {
    );
  });
 }
+
--- a/deltachat-repl/Cargo.toml
+++ b/deltachat-repl/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.111.0"
-license = "MPL-2.0"
+version = "1.108.0"
 edition = "2021"

 [dependencies]
@@ -11,8 +10,8 @@ deltachat = { path = "..", features = ["internals"]}
 dirs = "4"
 log = "0.4.16"
 pretty_env_logger = "0.4"
-rusqlite = "0.28"
-rustyline = "11"
+rusqlite = "0.27"
+rustyline = "10"
 tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }

 [features]
--- a/deltachat-repl/src/cmdline.rs
+++ b/deltachat-repl/src/cmdline.rs
@@ -29,13 +29,13 @@ use tokio::fs;

 /// Reset database tables.
 /// Argument is a bitmask, executing single or multiple actions in one call.
-/// e.g. bitmask 7 triggers actions defined with bits 1, 2 and 4.
+/// e.g. bitmask 7 triggers actions definded with bits 1, 2 and 4.
 async fn reset_tables(context: &Context, bits: i32) {
    println!("Resetting tables ({bits})...");
    if 0 != bits & 1 {
        context
            .sql()
-            .execute("DELETE FROM jobs;", ())
+            .execute("DELETE FROM jobs;", paramsv![])
            .await
            .unwrap();
        println!("(1) Jobs reset.");
@@ -43,7 +43,7 @@ async fn reset_tables(context: &Context, bits: i32) {
    if 0 != bits & 2 {
        context
            .sql()
-            .execute("DELETE FROM acpeerstates;", ())
+            .execute("DELETE FROM acpeerstates;", paramsv![])
            .await
            .unwrap();
        println!("(2) Peerstates reset.");
@@ -51,7 +51,7 @@ async fn reset_tables(context: &Context, bits: i32) {
    if 0 != bits & 4 {
        context
            .sql()
-            .execute("DELETE FROM keypairs;", ())
+            .execute("DELETE FROM keypairs;", paramsv![])
            .await
            .unwrap();
        println!("(4) Private keypairs reset.");
@@ -59,36 +59,36 @@ async fn reset_tables(context: &Context, bits: i32) {
    if 0 != bits & 8 {
        context
            .sql()
-            .execute("DELETE FROM contacts WHERE id>9;", ())
+            .execute("DELETE FROM contacts WHERE id>9;", paramsv![])
            .await
            .unwrap();
        context
            .sql()
-            .execute("DELETE FROM chats WHERE id>9;", ())
+            .execute("DELETE FROM chats WHERE id>9;", paramsv![])
            .await
            .unwrap();
        context
            .sql()
-            .execute("DELETE FROM chats_contacts;", ())
+            .execute("DELETE FROM chats_contacts;", paramsv![])
            .await
            .unwrap();
        context
            .sql()
-            .execute("DELETE FROM msgs WHERE id>9;", ())
+            .execute("DELETE FROM msgs WHERE id>9;", paramsv![])
            .await
            .unwrap();
        context
            .sql()
            .execute(
                "DELETE FROM config WHERE keyname LIKE 'imap.%' OR keyname LIKE 'configured%';",
-                (),
+                paramsv![],
            )
            .await
            .unwrap();
        context.sql().config_cache().write().await.clear();
        context
            .sql()
-            .execute("DELETE FROM leftgrps;", ())
+            .execute("DELETE FROM leftgrps;", paramsv![])
            .await
            .unwrap();
        println!("(8) Rest but server config reset.");
@@ -869,7 +869,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
            if continue_streaming {
                println!("Success, streaming should be continued.");
            } else {
-                println!("Success, streaming can be stopped.");
+                println!("Success, streaming can be stoppped.");
            }
        }
        "dellocations" => {
--- a/deltachat-repl/src/main.rs
+++ b/deltachat-repl/src/main.rs
@@ -350,8 +350,8 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
            match readline {
                Ok(line) => {
                    // TODO: ignore "set mail_pw"
-                    rl.add_history_entry(line.as_str())?;
-                    let should_continue = Handle::current().block_on(async {
+                    rl.add_history_entry(line.as_str());
+                    let contine = Handle::current().block_on(async {
                        match handle_cmd(line.trim(), ctx.clone(), &mut selected_chat).await {
                            Ok(ExitResult::Continue) => true,
                            Ok(ExitResult::Exit) => {
@@ -359,13 +359,13 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
                                false
                            }
                            Err(err) => {
-                                println!("Error: {err:#}");
+                                println!("Error: {err}");
                                true
                            }
                        }
                    });

-                    if !should_continue {
+                    if !contine {
                        break;
                    }
                }
@@ -374,7 +374,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
                    break;
                }
                Err(err) => {
-                    println!("Error: {err:#}");
+                    println!("Error: {err}");
                    break;
                }
            }
--- a/deltachat-rpc-client/pyproject.toml
+++ b/deltachat-rpc-client/pyproject.toml
@@ -13,6 +13,13 @@ dynamic = [
    "version"
 ]

+[tool.setuptools]
+# We declare the package not-zip-safe so that our type hints are also available
+# when checking client code that uses our (installed) package.
+# Ref:
+# https://mypy.readthedocs.io/en/stable/installed_packages.html?highlight=zip#using-installed-packages-with-mypy-pep-561
+zip-safe = false
+
 [tool.setuptools.package-data]
 deltachat_rpc_client = [
    "py.typed"
@@ -25,35 +32,7 @@ deltachat_rpc_client = [
 line-length = 120

 [tool.ruff]
-select = [
-  "E", "W", # pycodestyle
-  "F", # Pyflakes
-  "N", # pep8-naming
-  "I", # isort
-
-  "ARG", # flake8-unused-arguments
-  "B", # flake8-bugbear
-  "C4", # flake8-comprehensions
-  "COM", # flake8-commas
-  "DTZ", # flake8-datetimez
-  "ICN", # flake8-import-conventions
-  "ISC", # flake8-implicit-str-concat
-  "PIE", # flake8-pie
-  "PT", # flake8-pytest-style
-  "RET", # flake8-return
-  "SIM", # flake8-simplify
-  "TCH", # flake8-type-checking
-  "TID", # flake8-tidy-imports
-  "YTT", # flake8-2020
-
-  "ERA", # eradicate
-
-  "PLC", # Pylint Convention
-  "PLE", # Pylint Error
-  "PLW", # Pylint Warning
-
-  "RUF006" # asyncio-dangling-task
-]
+select = ["E", "F", "W", "N", "YTT", "B", "C4", "ISC", "ICN", "PT", "RET", "SIM", "TID", "ARG", "DTZ", "ERA", "PLC", "PLE", "PLW", "PIE", "COM"]
 line-length = 120

 [tool.isort]
--- a/deltachat-rpc-client/src/deltachat_rpc_client/_utils.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/_utils.py
@@ -27,7 +27,7 @@ def _to_attrdict(obj):


 class AttrDict(dict):
-    """Dictionary that allows accessing values using the "dot notation" as attributes."""
+    """Dictionary that allows accessing values usin the "dot notation" as attributes."""

    def __init__(self, *args, **kwargs) -> None:
        super().__init__({_camel_to_snake(key): _to_attrdict(value) for key, value in dict(*args, **kwargs).items()})
--- a/deltachat-rpc-client/src/deltachat_rpc_client/account.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/account.py
@@ -1,4 +1,3 @@
-from dataclasses import dataclass
 from typing import TYPE_CHECKING, List, Optional, Tuple, Union

 from ._utils import AttrDict
@@ -6,23 +5,34 @@ from .chat import Chat
 from .const import ChatlistFlag, ContactFlag, SpecialContactId
 from .contact import Contact
 from .message import Message
+from .rpc import Rpc

 if TYPE_CHECKING:
    from .deltachat import DeltaChat
-    from .rpc import Rpc


-@dataclass
 class Account:
    """Delta Chat account."""

-    manager: "DeltaChat"
-    id: int
+    def __init__(self, manager: "DeltaChat", account_id: int) -> None:
+        self.manager = manager
+        self.id = account_id

    @property
-    def _rpc(self) -> "Rpc":
+    def _rpc(self) -> Rpc:
        return self.manager.rpc

+    def __eq__(self, other) -> bool:
+        if not isinstance(other, Account):
+            return False
+        return self.id == other.id and self.manager == other.manager
+
+    def __ne__(self, other) -> bool:
+        return not self == other
+
+    def __repr__(self) -> str:
+        return f"<Account id={self.id}>"
+
    async def wait_for_event(self) -> AttrDict:
        """Wait until the next event and return it."""
        return AttrDict(await self._rpc.wait_for_event(self.id))
@@ -158,7 +168,7 @@ class Account:
        :param contact: if a contact is specified only chats including this contact are returned.
        :param archived_only: if True only archived chats are returned.
        :param for_forwarding: if True the chat list is sorted with "Saved messages" at the top
-                               and without "Device chat" and contact requests.
+                               and withot "Device chat" and contact requests.
        :param no_specials: if True archive link is not added to the list.
        :param alldone_hint: if True the "all done hint" special chat will be added to the list
                             as needed.
--- a/deltachat-rpc-client/src/deltachat_rpc_client/chat.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/chat.py
@@ -1,30 +1,39 @@
 import calendar
-from dataclasses import dataclass
+from datetime import datetime
 from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Union

 from ._utils import AttrDict
-from .const import ChatVisibility, ViewType
+from .const import ChatVisibility
 from .contact import Contact
 from .message import Message
+from .rpc import Rpc

 if TYPE_CHECKING:
-    from datetime import datetime
-
    from .account import Account
-    from .rpc import Rpc


-@dataclass
 class Chat:
    """Chat object which manages members and through which you can send and retrieve messages."""

-    account: "Account"
-    id: int
+    def __init__(self, account: "Account", chat_id: int) -> None:
+        self.account = account
+        self.id = chat_id

    @property
-    def _rpc(self) -> "Rpc":
+    def _rpc(self) -> Rpc:
        return self.account._rpc

+    def __eq__(self, other) -> bool:
+        if not isinstance(other, Chat):
+            return False
+        return self.id == other.id and self.account == other.account
+
+    def __ne__(self, other) -> bool:
+        return not self == other
+
+    def __repr__(self) -> str:
+        return f"<Chat id={self.id} account={self.account.id}>"
+
    async def delete(self) -> None:
        """Delete this chat and all its messages.

@@ -108,27 +117,15 @@ class Chat:
    async def send_message(
        self,
        text: Optional[str] = None,
-        html: Optional[str] = None,
-        viewtype: Optional[ViewType] = None,
        file: Optional[str] = None,
        location: Optional[Tuple[float, float]] = None,
-        override_sender_name: Optional[str] = None,
        quoted_msg: Optional[Union[int, Message]] = None,
    ) -> Message:
        """Send a message and return the resulting Message instance."""
        if isinstance(quoted_msg, Message):
            quoted_msg = quoted_msg.id

-        draft = {
-            "text": text,
-            "html": html,
-            "viewtype": viewtype,
-            "file": file,
-            "location": location,
-            "overrideSenderName": override_sender_name,
-            "quotedMsg": quoted_msg,
-        }
-        msg_id = await self._rpc.send_msg(self.account.id, self.id, draft)
+        msg_id, _ = await self._rpc.misc_send_msg(self.account.id, self.id, text, file, location, quoted_msg)
        return Message(self.account, msg_id)

    async def send_text(self, text: str) -> Message:
@@ -194,23 +191,19 @@ class Chat:
        """Add contacts to this group."""
        for cnt in contact:
            if isinstance(cnt, str):
-                contact_id = (await self.account.create_contact(cnt)).id
+                cnt = (await self.account.create_contact(cnt)).id
            elif not isinstance(cnt, int):
-                contact_id = cnt.id
-            else:
-                contact_id = cnt
-            await self._rpc.add_contact_to_chat(self.account.id, self.id, contact_id)
+                cnt = cnt.id
+            await self._rpc.add_contact_to_chat(self.account.id, self.id, cnt)

    async def remove_contact(self, *contact: Union[int, str, Contact]) -> None:
        """Remove members from this group."""
        for cnt in contact:
            if isinstance(cnt, str):
-                contact_id = (await self.account.create_contact(cnt)).id
+                cnt = (await self.account.create_contact(cnt)).id
            elif not isinstance(cnt, int):
-                contact_id = cnt.id
-            else:
-                contact_id = cnt
-            await self._rpc.remove_contact_from_chat(self.account.id, self.id, contact_id)
+                cnt = cnt.id
+            await self._rpc.remove_contact_from_chat(self.account.id, self.id, cnt)

    async def get_contacts(self) -> List[Contact]:
        """Get the contacts belonging to this chat.
@@ -234,8 +227,8 @@ class Chat:
    async def get_locations(
        self,
        contact: Optional[Contact] = None,
-        timestamp_from: Optional["datetime"] = None,
-        timestamp_to: Optional["datetime"] = None,
+        timestamp_from: Optional[datetime] = None,
+        timestamp_to: Optional[datetime] = None,
    ) -> List[AttrDict]:
        """Get list of location snapshots for the given contact in the given timespan."""
        time_from = calendar.timegm(timestamp_from.utctimetuple()) if timestamp_from else 0
@@ -246,9 +239,9 @@ class Chat:
        locations = []
        contacts: Dict[int, Contact] = {}
        for loc in result:
-            location = AttrDict(loc)
-            location["chat"] = self
-            location["contact"] = contacts.setdefault(location.contact_id, Contact(self.account, location.contact_id))
-            location["message"] = Message(self.account, location.msg_id)
-            locations.append(location)
+            loc = AttrDict(loc)
+            loc["chat"] = self
+            loc["contact"] = contacts.setdefault(loc.contact_id, Contact(self.account, loc.contact_id))
+            loc["message"] = Message(self.account, loc.msg_id)
+            locations.append(loc)
        return locations
--- a/deltachat-rpc-client/src/deltachat_rpc_client/client.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/client.py
@@ -2,7 +2,6 @@
 import inspect
 import logging
 from typing import (
-    TYPE_CHECKING,
    Callable,
    Coroutine,
    Dict,
@@ -14,6 +13,8 @@ from typing import (
    Union,
 )

+from deltachat_rpc_client.account import Account
+
 from ._utils import (
    AttrDict,
    parse_system_add_remove,
@@ -30,16 +31,13 @@ from .events import (
    RawEvent,
 )

-if TYPE_CHECKING:
-    from deltachat_rpc_client.account import Account
-

 class Client:
    """Simple Delta Chat client that listen to events of a single account."""

    def __init__(
        self,
-        account: "Account",
+        account: Account,
        hooks: Optional[Iterable[Tuple[Callable, Union[type, EventFilter]]]] = None,
        logger: Optional[logging.Logger] = None,
    ) -> None:
--- a/deltachat-rpc-client/src/deltachat_rpc_client/contact.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/contact.py
@@ -1,15 +1,13 @@
-from dataclasses import dataclass
 from typing import TYPE_CHECKING

 from ._utils import AttrDict
+from .rpc import Rpc

 if TYPE_CHECKING:
    from .account import Account
    from .chat import Chat
-    from .rpc import Rpc


-@dataclass
 class Contact:
    """
    Contact API.
@@ -17,11 +15,23 @@ class Contact:
    Essentially a wrapper for RPC, account ID and a contact ID.
    """

-    account: "Account"
-    id: int
+    def __init__(self, account: "Account", contact_id: int) -> None:
+        self.account = account
+        self.id = contact_id
+
+    def __eq__(self, other) -> bool:
+        if not isinstance(other, Contact):
+            return False
+        return self.id == other.id and self.account == other.account
+
+    def __ne__(self, other) -> bool:
+        return not self == other
+
+    def __repr__(self) -> str:
+        return f"<Contact id={self.id} account={self.account.id}>"

    @property
-    def _rpc(self) -> "Rpc":
+    def _rpc(self) -> Rpc:
        return self.account._rpc

    async def block(self) -> None:
--- a/deltachat-rpc-client/src/deltachat_rpc_client/deltachat.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/deltachat.py
@@ -1,10 +1,8 @@
-from typing import TYPE_CHECKING, Dict, List
+from typing import Dict, List

 from ._utils import AttrDict
 from .account import Account
-
-if TYPE_CHECKING:
-    from .rpc import Rpc
+from .rpc import Rpc


 class DeltaChat:
@@ -13,7 +11,7 @@ class DeltaChat:
    This is the root of the object oriented API.
    """

-    def __init__(self, rpc: "Rpc") -> None:
+    def __init__(self, rpc: Rpc) -> None:
        self.rpc = rpc

    async def add_account(self) -> Account:
--- a/deltachat-rpc-client/src/deltachat_rpc_client/events.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/events.py
@@ -2,13 +2,11 @@
 import inspect
 import re
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Callable, Iterable, Iterator, Optional, Set, Tuple, Union
+from typing import Callable, Iterable, Iterator, Optional, Set, Tuple, Union

+from ._utils import AttrDict
 from .const import EventType

-if TYPE_CHECKING:
-    from ._utils import AttrDict
-

 def _tuple_of(obj, type_: type) -> tuple:
    if not obj:
@@ -82,7 +80,7 @@ class RawEvent(EventFilter):
            return (self.types, self.func) == (other.types, other.func)
        return False

-    async def filter(self, event: "AttrDict") -> bool:
+    async def filter(self, event: AttrDict) -> bool:
        if self.types and event.type not in self.types:
            return False
        return await self._call_func(event)
@@ -120,7 +118,7 @@ class NewMessage(EventFilter):
        command: Optional[str] = None,
        is_bot: Optional[bool] = False,
        is_info: Optional[bool] = None,
-        func: Optional[Callable[["AttrDict"], bool]] = None,
+        func: Optional[Callable[[AttrDict], bool]] = None,
    ) -> None:
        super().__init__(func=func)
        self.is_bot = is_bot
@@ -159,7 +157,7 @@ class NewMessage(EventFilter):
            )
        return False

-    async def filter(self, event: "AttrDict") -> bool:
+    async def filter(self, event: AttrDict) -> bool:
        if self.is_bot is not None and self.is_bot != event.message_snapshot.is_bot:
            return False
        if self.is_info is not None and self.is_info != event.message_snapshot.is_info:
@@ -201,7 +199,7 @@ class MemberListChanged(EventFilter):
            return (self.added, self.func) == (other.added, other.func)
        return False

-    async def filter(self, event: "AttrDict") -> bool:
+    async def filter(self, event: AttrDict) -> bool:
        if self.added is not None and self.added != event.member_added:
            return False
        return await self._call_func(event)
@@ -233,7 +231,7 @@ class GroupImageChanged(EventFilter):
            return (self.deleted, self.func) == (other.deleted, other.func)
        return False

-    async def filter(self, event: "AttrDict") -> bool:
+    async def filter(self, event: AttrDict) -> bool:
        if self.deleted is not None and self.deleted != event.image_deleted:
            return False
        return await self._call_func(event)
@@ -258,7 +256,7 @@ class GroupNameChanged(EventFilter):
            return self.func == other.func
        return False

-    async def filter(self, event: "AttrDict") -> bool:
+    async def filter(self, event: AttrDict) -> bool:
        return await self._call_func(event)


--- a/deltachat-rpc-client/src/deltachat_rpc_client/message.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/message.py
@@ -1,24 +1,34 @@
 import json
-from dataclasses import dataclass
 from typing import TYPE_CHECKING, Union

 from ._utils import AttrDict
 from .contact import Contact
+from .rpc import Rpc

 if TYPE_CHECKING:
    from .account import Account
-    from .rpc import Rpc


-@dataclass
 class Message:
    """Delta Chat Message object."""

-    account: "Account"
-    id: int
+    def __init__(self, account: "Account", msg_id: int) -> None:
+        self.account = account
+        self.id = msg_id
+
+    def __eq__(self, other) -> bool:
+        if not isinstance(other, Message):
+            return False
+        return self.id == other.id and self.account == other.account
+
+    def __ne__(self, other) -> bool:
+        return not self == other
+
+    def __repr__(self) -> str:
+        return f"<Message id={self.id} account={self.account.id}>"

    @property
-    def _rpc(self) -> "Rpc":
+    def _rpc(self) -> Rpc:
        return self.account._rpc

    async def send_reaction(self, *reaction: str):
--- a/deltachat-rpc-client/src/deltachat_rpc_client/pytestplugin.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/pytestplugin.py
@@ -1,8 +1,8 @@
-import asyncio
 import json
 import os
 from typing import AsyncGenerator, List, Optional

+import asyncio
 import aiohttp
 import pytest_asyncio

--- a/deltachat-rpc-client/tests/test_something.py
+++ b/deltachat-rpc-client/tests/test_something.py
@@ -1,7 +1,7 @@
-import asyncio
 from unittest.mock import MagicMock

 import pytest
+
 from deltachat_rpc_client import EventType, events
 from deltachat_rpc_client.rpc import JsonRpcError

@@ -13,17 +13,6 @@ async def test_system_info(rpc) -> None:
    assert "deltachat_core_version" in system_info


-@pytest.mark.asyncio()
-async def test_sleep(rpc) -> None:
-    """Test that long-running task does not block short-running task from completion."""
-    sleep_5_task = asyncio.create_task(rpc.sleep(5.0))
-    sleep_3_task = asyncio.create_task(rpc.sleep(3.0))
-    done, pending = await asyncio.wait([sleep_5_task, sleep_3_task], return_when=asyncio.FIRST_COMPLETED)
-    assert sleep_3_task in done
-    assert sleep_5_task in pending
-    sleep_5_task.cancel()
-
-
@pytest.mark.asyncio()
 async def test_email_address_validity(rpc) -> None:
    valid_addresses = [
--- a/deltachat-rpc-client/tests/test_webxdc.py
+++ b/deltachat-rpc-client/tests/test_webxdc.py
@@ -1,4 +1,5 @@
 import pytest
+
 from deltachat_rpc_client import EventType


--- a/deltachat-rpc-server/Cargo.toml
+++ b/deltachat-rpc-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.111.0"
+version = "1.108.0"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
@@ -13,7 +13,7 @@ categories = ["cryptography", "std", "email"]
 name = "deltachat-rpc-server"

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

 anyhow = "1"
 env_logger = { version = "0.10.0" }
@@ -23,7 +23,3 @@ serde_json = "1.0.91"
 serde = { version = "1.0", features = ["derive"] }
 tokio = { version = "1.25.0", features = ["io-std"] }
 yerpc = { version = "0.4.0", features = ["anyhow_expose"] }
-
-[features]
-default = ["vendored"]
-vendored = ["deltachat-jsonrpc/vendored"]
--- a/deltachat-rpc-server/README.md
+++ b/deltachat-rpc-server/README.md
@@ -5,13 +5,10 @@ over standard I/O.

 ## Install

-To download binary pre-builds check the [releases page](https://github.com/deltachat/deltachat-core-rust/releases).
-Rename the downloaded binary to `deltachat-rpc-server` and add it to your `PATH`.
-
-To install from source run:
+To install run:

 ```sh
-cargo install --git https://github.com/deltachat/deltachat-core-rust/ deltachat-rpc-server
+cargo install --path ../deltachat-rpc-server
 ```

 The `deltachat-rpc-server` executable will be installed into `$HOME/.cargo/bin` that should be available
--- a/deltachat-rpc-server/src/bin/deltachat-rpc-server/main.rs
+++ b/deltachat-rpc-server/src/bin/deltachat-rpc-server/main.rs
@@ -51,10 +51,7 @@ async fn main() -> Result<()> {
        let mut lines = BufReader::new(stdin).lines();
        while let Some(message) = lines.next_line().await? {
            log::trace!("RPC recv {}", message);
-            let session = session.clone();
-            tokio::spawn(async move {
-                session.handle_incoming(&message).await;
-            });
+            session.handle_incoming(&message).await;
        }
        log::info!("EOF reached on stdin");
        Ok(())
--- a/deltachat_derive/src/lib.rs
+++ b/deltachat_derive/src/lib.rs
@@ -5,7 +5,7 @@ use quote::quote;

 use crate::proc_macro::TokenStream;

-// For now, assume (not check) that these macros are applied to enum without
+// For now, assume (not check) that these macroses are applied to enum without
 // data.  If this assumption is violated, compiler error will point to
 // generated code, which is not very user-friendly.

--- a/deny.toml
+++ b/deny.toml
@@ -1,57 +0,0 @@
-[advisories]
-unmaintained = "allow"
-ignore = [
-    "RUSTSEC-2020-0071",
-
-    # Only affects windows if using non-default allocator (and unmaintained).
-    "RUSTSEC-2021-0145",
-]
-
-[bans]
-# Accept some duplicate versions, ideally we work towards this list
-# becoming empty.  Adding versions forces us to revisit this at least
-# when upgrading.
-skip = [
-     { name = "windows-sys", version = "<0.45" },
-     { name = "wasi", version = "<0.11" },
-     { name = "version_check", version = "<0.9" },
-     { name = "uuid", version = "<1.3" },
-     { name = "sha2", version = "<0.10" },
-     { name = "rand_core", version = "<0.6" },
-     { name = "rand_chacha", version = "<0.3" },
-     { name = "rand", version = "<0.8" },
-     { name = "nom", version = "<7.1" },
-     { name = "idna", version = "<0.3" },
-     { name = "humantime", version = "<2.1" },
-     { name = "hermit-abi", version = "<0.3" },
-     { name = "getrandom", version = "<0.2" },
-     { name = "quick-error", version = "<2.0" },
-     { name = "env_logger", version = "<0.10" },
-     { name = "digest", version = "<0.10" },
-     { name = "darling_macro", version = "<0.14" },
-     { name = "darling_core", version = "<0.14" },
-     { name = "darling", version = "<0.14" },
-     { name = "block-buffer", version = "<0.10" },
-     { name = "base64", version = "<0.21" },
-]
-
-
-[licenses]
-allow = [
-    "0BSD",
-    "Apache-2.0",
-    "BSD-2-Clause",
-    "BSD-3-Clause",
-    "CC0-1.0",
-    "MIT",
-    "BSL-1.0", # Boost Software License 1.0
-    "Unicode-DFS-2016",
-    "MPL-2.0",
-]
-
-[sources.allow-org]
-# Organisations which we allow git sources from.
-github = [
-       "async-email",
-       "deltachat",
-]
--- a/draft/aeap-mvp.md
+++ b/draft/aeap-mvp.md
@@ -66,13 +66,13 @@ Note that usually a mail is signed by a key that has a UID matching the from add

 #### Upsides:
 - With this approach, it's easy to switch to a model where the info about the transition is encoded in the PGP key. Since the key is gossiped, the information about the transition will spread virally.
- Faster transition: If you send a message to e.g. "Delta Chat Dev", all members of the "sub-group" "delta android" will know of your transition.
+- Faster transation: If you send a message to e.g. "Delta Chat Dev", all members of the "sub-group" "delta android" will know of your transition.

 ### Alternatives and old discussions/plans:

 - Change the contact instead of rewriting the group member lists. This seems to call for more trouble since we will end up with multiple contacts having the same email address.

- If needed, we could add a header a) indicating that the sender did an address transition or b) listing all the secondary (old) addresses.  For now, there is no big enough benefit to warrant introducing another header and its processing on the receiver side (including all the necessary checks and handling of error cases). Instead, we only check for the `Chat-Version` header to prevent accidental transitions when an MUA user sends a message from another email address with the same key.
+- If needed, we could add a header a) indicating that the sender did an address transition or b) listing all the secondary (old) addresses.  For now, there is no big enough benefit to warrant introducing another header and its processing on the receiver side (including all the neccessary checks and handling of error cases). Instead, we only check for the `Chat-Version` header to prevent accidental transitions when an MUA user sends a message from another email address with the same key.

 - The condition for a transition temporarily was:

@@ -107,7 +107,7 @@ The most obvious alternative would be to create a new contact with the new addre

 #### Upsides:
 - With this approach, it's easier to switch to a model where the info about the transition is encoded in the PGP key. Since the key is gossiped, the information about the transition will spread virally.
- (Also, less important: Slightly faster transition: If you send a message to e.g. "Delta Chat Dev", all members of the "sub-group" "delta android" will know of your transition.)
+- (Also, less important: Slightly faster transation: If you send a message to e.g. "Delta Chat Dev", all members of the "sub-group" "delta android" will know of your transition.)
 - It's easier to implement (if too many problems turn up, we can still switch to another approach and didn't wast that much development time.)

 [full messages](https://github.com/deltachat/deltachat-core-rust/pull/2896#discussion_r852002161)
@@ -124,4 +124,4 @@ Other
 Notes during implementing
 ========================

- As far as I understand the code, unencrypted messages are unsigned. So, the transition only works if both sides have the other side's key.
+- As far as I understand the code, unencrypted messages are unsigned. So, the transition only works if both sides have the other side's key.
--- a/draft/msgwork_new_imap_jobs.rst
+++ b/draft/msgwork_new_imap_jobs.rst
@@ -62,5 +62,5 @@ Notes/Questions:

  and design such that we can cover all imap flags.

- It might not be necessary to keep needs_send_mdn state in this table
+- It might not be neccessary to keep needs_send_mdn state in this table
  if this can be decided rather when we succeed with mark_seen/mark_delete.
--- a/node/README.md
+++ b/node/README.md
@@ -124,7 +124,7 @@ $ npm run test
 ```

 (when using [fnm](https://github.com/Schniz/fnm) instead of nvm, you can select the architecture)
-If your node and electron are already build for arm64 you can also try building for arm:
+If your node and electron are already build for arm64 you can also try bulding for arm:

 ```
 $ fnm install 16 --arch arm64
@@ -182,7 +182,7 @@ this example can also be found in the examples folder [examples/send_message.js]

 ### Generating Docs

-We are currently migrating to automatically generated documentation.
+We are curently migrating to automaticaly generated documentation.
 You can find the old documentation at [old_docs](./old_docs).

 to generate the documentation, run:
--- a/node/lib/binding.ts
+++ b/node/lib/binding.ts
@@ -2,7 +2,7 @@ import { join } from 'path'

 /**
 * bindings are not typed yet.
- * if the available function names are required they can be found inside of `../src/module.c`
+ * if the availible function names are required they can be found inside of `../src/module.c`
 */
 export const bindings: any = require('node-gyp-build')(join(__dirname, '../'))

--- a/node/lib/context.ts
+++ b/node/lib/context.ts
@@ -543,7 +543,7 @@ export class Context extends EventEmitter {

  /**
   *
-   * @deprecated please use `AccountManager.getSystemInfo()` instead
+   * @deprectated please use `AccountManager.getSystemInfo()` instead
   */
  static getSystemInfo() {
    return AccountManager.getSystemInfo()
@@ -818,7 +818,7 @@ export class Context extends EventEmitter {
   *     Must be given in number of seconds since 00:00 hours, Jan 1, 1970 UTC.
   *     0 for "all up to now".
   * @return Array of locations, NULL is never returned.
-   *     The array is sorted descending;
+   *     The array is sorted decending;
   *     the first entry in the array is the location with the newest timestamp.
   *
   * Examples:
--- a/node/lib/deltachat.ts
+++ b/node/lib/deltachat.ts
@@ -217,7 +217,7 @@ export class AccountManager extends EventEmitter {
  /** get information about the provider
   *
   * This function creates a temporary context to be standalone,
-   * if possible use `Context.getProviderFromEmail` instead. (otherwise potential proxy settings are not used)
+   * if posible use `Context.getProviderFromEmail` instead. (otherwise potential proxy settings are not used)
   * @deprecated
   */
  static getProviderFromEmail(email: string) {
--- a/node/test/test.js
+++ b/node/test/test.js
@@ -769,7 +769,7 @@ describe('Integration tests', function () {
  this.beforeAll(async function () {
    if (!process.env.DCC_NEW_TMP_EMAIL) {
      console.log(
-        'Missing DCC_NEW_TMP_EMAIL environment variable!, skip integration tests'
+        'Missing DCC_NEW_TMP_EMAIL environment variable!, skip intergration tests'
      )
      this.skip()
    }
@@ -777,7 +777,7 @@ describe('Integration tests', function () {
    account = await createTempUser(process.env.DCC_NEW_TMP_EMAIL)
    if (!account || !account.email || !account.password) {
      console.log(
-        "We didn't got back an account from the api, skip integration tests"
+        "We didn't got back an account from the api, skip intergration tests"
      )
      this.skip()
    }
--- a/package.json
+++ b/package.json
@@ -60,5 +60,5 @@
    "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail --exit"
  },
  "types": "node/dist/index.d.ts",
-  "version": "1.111.0"
+  "version": "1.108.0"
 }
--- a/python/CHANGELOG
+++ b/python/CHANGELOG
@@ -64,7 +64,7 @@
 - use new experimental full-Rust Delta Chat core
 - support Autocrypt Setup Messages 
 - remove synchronous events 
- use CircleCI for continuous integration and packaging of Linux wheels
+- use CircleCI for continous integration and packaging of Linux wheels
 - use docker image for building wheels
 - fix code documentation links 

--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -21,7 +21,6 @@ classifiers = [
 dependencies = [
    "cffi>=1.0.0",
    "imap-tools",
-    "importlib_metadata;python_version<'3.8'",
    "pluggy",
    "requests",
 ]
@@ -37,21 +36,16 @@ dynamic = [
 [project.entry-points.pytest11]
 "deltachat.testplugin" = "deltachat.testplugin"

-[tool.setuptools.package-data]
-deltachat = [
-    "py.typed"
-]
-
 [tool.setuptools_scm]
 root = ".."
-tag_regex = '^(?P<prefix>v)?(?P<version>[^\+]+)(?P<suffix>.*)?$'
-git_describe_command = "git describe --dirty --tags --long --match v*.*"
+tag_regex = '^(?P<prefix>py-)?(?P<version>[^\+]+)(?P<suffix>.*)?$'
+git_describe_command = "git describe --dirty --tags --long --match py-*.*"

 [tool.black]
 line-length = 120

 [tool.ruff]
-select = ["E", "F", "W", "YTT", "C4", "ISC", "ICN", "TID", "DTZ", "PLC", "PLE", "PLW", "PIE", "COM", "UP004", "UP010", "UP031", "UP032", "ANN204"]
+select = ["E", "F", "W", "YTT", "C4", "ISC", "ICN", "TID", "DTZ", "PLC", "PLE", "PLW", "PIE", "COM", "UP032"]
 line-length = 120

 [tool.isort]
--- a/python/src/deltachat/init.py
+++ b/python/src/deltachat/init.py
@@ -1,9 +1,6 @@
 import sys

-if sys.version_info >= (3, 8):
-    from importlib.metadata import PackageNotFoundError, version
-else:
-    from importlib_metadata import PackageNotFoundError, version
+from pkg_resources import DistributionNotFound, get_distribution

 from . import capi, events, hookspec  # noqa
 from .account import Account, get_core_info  # noqa
@@ -14,8 +11,8 @@ from .hookspec import account_hookimpl, global_hookimpl  # noqa
 from .message import Message  # noqa

 try:
-    __version__ = version(__name__)
-except PackageNotFoundError:
+    __version__ = get_distribution(__name__).version
+except DistributionNotFound:
    # package is not installed
    __version__ = "0.0.0.dev0-unknown"

--- a/python/src/deltachat/account.py
+++ b/python/src/deltachat/account.py
@@ -1,12 +1,13 @@
 """Account class implementation."""

+from __future__ import print_function

 import os
 from array import array
 from contextlib import contextmanager
 from email.utils import parseaddr
 from threading import Event
-from typing import Any, Dict, Generator, List, Optional, Union, TYPE_CHECKING
+from typing import Any, Dict, Generator, List, Optional, Union

 from . import const, hookspec
 from .capi import ffi, lib
@@ -22,9 +23,6 @@ from .cutil import (
 from .message import Message
 from .tracker import ConfigureTracker, ImexTracker

-if TYPE_CHECKING:
-    from .events import FFIEventTracker
-

 class MissingCredentials(ValueError):
    """Account is missing `addr` and `mail_pw` config values."""
@@ -55,7 +53,7 @@ def get_dc_info_as_dict(dc_context):
    return info_dict


-class Account:
+class Account(object):
    """Each account is tied to a sqlite database file which is fully managed
    by the underlying deltachat core library.  All public Account methods are
    meant to be memory-safe and return memory-safe objects.
@@ -63,9 +61,6 @@ class Account:

    MissingCredentials = MissingCredentials

-    _logid: str
-    _evtracker: "FFIEventTracker"
-
    def __init__(self, db_path, os_name=None, logging=True, closed=False) -> None:
        from .events import EventThread

@@ -121,7 +116,7 @@ class Account:
        """re-enable logging."""
        self._logging = True

-    def __repr__(self) -> str:
+    def __repr__(self):
        return f"<Account path={self.db_path}>"

    # def __del__(self):
@@ -159,7 +154,7 @@ class Account:
        """set stock translation string.

        :param id: id of stock string (const.DC_STR_*)
-        :param value: string to set as new translation
+        :param value: string to set as new transalation
        :returns: None
        """
        bytestring = string.encode("utf8")
@@ -284,9 +279,9 @@ class Account:
        :returns: :class:`deltachat.contact.Contact` instance.
        """
        (name, addr) = self.get_contact_addr_and_name(obj, name)
-        name_c = as_dc_charpointer(name)
-        addr_c = as_dc_charpointer(addr)
-        contact_id = lib.dc_create_contact(self._dc_context, name_c, addr_c)
+        name = as_dc_charpointer(name)
+        addr = as_dc_charpointer(addr)
+        contact_id = lib.dc_create_contact(self._dc_context, name, addr)
        return Contact(self, contact_id)

    def get_contact(self, obj) -> Optional[Contact]:
@@ -307,7 +302,7 @@ class Account:
        elif isinstance(obj, str):
            displayname, addr = parseaddr(obj)
        else:
-            raise TypeError(f"don't know how to create chat for {obj!r}")
+            raise TypeError("don't know how to create chat for %r" % (obj,))

        if name is None and displayname:
            name = displayname
@@ -363,12 +358,12 @@ class Account:
        :returns: list of :class:`deltachat.contact.Contact` objects.
        """
        flags = 0
-        query_c = as_dc_charpointer(query)
+        query = as_dc_charpointer(query)
        if only_verified:
            flags |= const.DC_GCL_VERIFIED_ONLY
        if with_self:
            flags |= const.DC_GCL_ADD_SELF
-        dc_array = ffi.gc(lib.dc_get_contacts(self._dc_context, flags, query_c), lib.dc_array_unref)
+        dc_array = ffi.gc(lib.dc_get_contacts(self._dc_context, flags, query), lib.dc_array_unref)
        return list(iter_array(dc_array, lambda x: Contact(self, x)))

    def get_fresh_messages(self) -> Generator[Message, None, None]:
@@ -628,7 +623,7 @@ class Account:
            configtracker = self.configure()
            configtracker.wait_finish()

-        # start IO threads and configure if necessary
+        # start IO threads and configure if neccessary
        self.start_io()

    def add_account_plugin(self, plugin, name=None):
@@ -767,7 +762,7 @@ class Account:


 class ScannedQRCode:
-    def __init__(self, dc_lot) -> None:
+    def __init__(self, dc_lot):
        self._dc_lot = dc_lot

    def is_ask_verifycontact(self):
--- a/python/src/deltachat/chat.py
+++ b/python/src/deltachat/chat.py
@@ -18,13 +18,13 @@ from .cutil import (
 from .message import Message


-class Chat:
+class Chat(object):
    """Chat object which manages members and through which you can send and retrieve messages.

    You obtain instances of it through :class:`deltachat.account.Account`.
    """

-    def __init__(self, account, id: int) -> None:
+    def __init__(self, account, id) -> None:
        from .account import Account

        assert isinstance(account, Account), repr(account)
@@ -162,8 +162,8 @@ class Chat:
        :param name: as a unicode string.
        :returns: True on success, False otherwise
        """
-        name_c = as_dc_charpointer(name)
-        return bool(lib.dc_set_chat_name(self.account._dc_context, self.id, name_c))
+        name = as_dc_charpointer(name)
+        return bool(lib.dc_set_chat_name(self.account._dc_context, self.id, name))

    def get_color(self):
        """return the color of the chat.
@@ -532,13 +532,13 @@ class Chat:

    # ------  location streaming API ------------------------------

-    def is_sending_locations(self) -> bool:
+    def is_sending_locations(self):
        """return True if this chat has location-sending enabled currently.
        :returns: True if location sending is enabled.
        """
-        return bool(lib.dc_is_sending_locations_to_chat(self.account._dc_context, self.id))
+        return lib.dc_is_sending_locations_to_chat(self.account._dc_context, self.id)

-    def enable_sending_locations(self, seconds) -> None:
+    def enable_sending_locations(self, seconds):
        """enable sending locations for this chat.

        all subsequent messages will carry a location with them.
@@ -572,7 +572,7 @@ class Chat:


 class Location:
-    def __init__(self, latitude, longitude, accuracy, timestamp, marker) -> None:
+    def __init__(self, latitude, longitude, accuracy, timestamp, marker):
        assert isinstance(timestamp, datetime)
        self.latitude = latitude
        self.longitude = longitude
@@ -580,5 +580,5 @@ class Location:
        self.timestamp = timestamp
        self.marker = marker

-    def __eq__(self, other) -> bool:
+    def __eq__(self, other):
        return self.__dict__ == other.__dict__
--- a/python/src/deltachat/contact.py
+++ b/python/src/deltachat/contact.py
@@ -9,13 +9,13 @@ from .chat import Chat
 from .cutil import from_dc_charpointer, from_optional_dc_charpointer


-class Contact:
+class Contact(object):
    """Delta-Chat Contact.

    You obtain instances of it through :class:`deltachat.account.Account`.
    """

-    def __init__(self, account, id) -> None:
+    def __init__(self, account, id):
        from .account import Account

        assert isinstance(account, Account), repr(account)
@@ -27,10 +27,10 @@ class Contact:
            return False
        return self.account._dc_context == other.account._dc_context and self.id == other.id

-    def __ne__(self, other) -> bool:
+    def __ne__(self, other):
        return not self == other

-    def __repr__(self) -> str:
+    def __repr__(self):
        return f"<Contact id={self.id} addr={self.addr} dc_context={self.account._dc_context}>"

    @property
--- a/python/src/deltachat/direct_imap.py
+++ b/python/src/deltachat/direct_imap.py
@@ -191,7 +191,7 @@ class DirectImap:


 class IdleManager:
-    def __init__(self, direct_imap) -> None:
+    def __init__(self, direct_imap):
        self.direct_imap = direct_imap
        self.log = direct_imap.account.log
        # fetch latest messages before starting idle so that it only
@@ -207,14 +207,14 @@ class IdleManager:
        return res

    def wait_for_new_message(self, timeout=None) -> bytes:
-        while True:
+        while 1:
            for item in self.check(timeout=timeout):
                if b"EXISTS" in item or b"RECENT" in item:
                    return item

    def wait_for_seen(self, timeout=None) -> int:
        """Return first message with SEEN flag from a running idle-stream."""
-        while True:
+        while 1:
            for item in self.check(timeout=timeout):
                if FETCH in item:
                    self.log(str(item))
--- a/python/src/deltachat/events.py
+++ b/python/src/deltachat/events.py
@@ -25,12 +25,12 @@ def get_dc_event_name(integer, _DC_EVENTNAME_MAP={}):


 class FFIEvent:
-    def __init__(self, name: str, data1, data2) -> None:
+    def __init__(self, name: str, data1, data2):
        self.name = name
        self.data1 = data1
        self.data2 = data2

-    def __str__(self) -> str:
+    def __str__(self):
        if self.name == "DC_EVENT_INFO":
            return f"INFO {self.data2}"
        if self.name == "DC_EVENT_WARNING":
@@ -84,10 +84,7 @@ class FFIEventLogger:


 class FFIEventTracker:
-    account: Account
-    _event_queue: Queue
-
-    def __init__(self, account: Account, timeout=None) -> None:
+    def __init__(self, account, timeout=None):
        self.account = account
        self._timeout = timeout
        self._event_queue = Queue()
@@ -111,7 +108,7 @@ class FFIEventTracker:
        return ev

    def iter_events(self, timeout=None, check_error=True):
-        while True:
+        while 1:
            yield self.get(timeout=timeout, check_error=check_error)

    def get_matching(self, event_name_regex, check_error=True, timeout=None):
@@ -122,14 +119,14 @@ class FFIEventTracker:

    def get_info_contains(self, regex: str) -> FFIEvent:
        rex = re.compile(regex)
-        while True:
+        while 1:
            ev = self.get_matching("DC_EVENT_INFO")
            if rex.search(ev.data2):
                return ev

    def get_info_regex_groups(self, regex, check_error=True):
        rex = re.compile(regex)
-        while True:
+        while 1:
            ev = self.get_matching("DC_EVENT_INFO", check_error=check_error)
            m = rex.match(ev.data2)
            if m is not None:
@@ -140,7 +137,7 @@ class FFIEventTracker:
        This only works reliably if the connectivity doesn't change
        again too quickly, otherwise we might miss it.
        """
-        while True:
+        while 1:
            if self.account.get_connectivity() == connectivity:
                return
            self.get_matching("DC_EVENT_CONNECTIVITY_CHANGED")
@@ -149,7 +146,7 @@ class FFIEventTracker:
        """Wait until the connectivity changes to `expected_next`.
        Fails the test if it changes to something else.
        """
-        while True:
+        while 1:
            current = self.account.get_connectivity()
            if current == expected_next:
                return
@@ -159,7 +156,7 @@ class FFIEventTracker:
            self.get_matching("DC_EVENT_CONNECTIVITY_CHANGED")

    def wait_for_all_work_done(self):
-        while True:
+        while 1:
            if self.account.all_work_done():
                return
            self.get_matching("DC_EVENT_CONNECTIVITY_CHANGED")
@@ -167,7 +164,7 @@ class FFIEventTracker:
    def ensure_event_not_queued(self, event_name_regex):
        __tracebackhide__ = True
        rex = re.compile(f"(?:{event_name_regex}).*")
-        while True:
+        while 1:
            try:
                ev = self._event_queue.get(False)
            except Empty:
@@ -176,7 +173,7 @@ class FFIEventTracker:
                assert not rex.match(ev.name), f"event found {ev}"

    def wait_securejoin_inviter_progress(self, target):
-        while True:
+        while 1:
            event = self.get_matching("DC_EVENT_SECUREJOIN_INVITER_PROGRESS")
            if event.data2 >= target:
                print(f"** SECUREJOINT-INVITER PROGRESS {target}", self.account)
--- a/python/src/deltachat/message.py
+++ b/python/src/deltachat/message.py
@@ -12,14 +12,14 @@ from .cutil import as_dc_charpointer, from_dc_charpointer, from_optional_dc_char
 from .reactions import Reactions


-class Message:
+class Message(object):
    """Message object.

    You obtain instances of it through :class:`deltachat.account.Account` or
    :class:`deltachat.chat.Chat`.
    """

-    def __init__(self, account, dc_msg) -> None:
+    def __init__(self, account, dc_msg):
        self.account = account
        assert isinstance(self.account._dc_context, ffi.CData)
        assert isinstance(dc_msg, ffi.CData)
@@ -33,7 +33,7 @@ class Message:
            return False
        return self.account == other.account and self.id == other.id

-    def __repr__(self) -> str:
+    def __repr__(self):
        c = self.get_sender_contact()
        typ = "outgoing" if self.is_outgoing() else "incoming"
        return (
--- a/python/src/deltachat/provider.py
+++ b/python/src/deltachat/provider.py
@@ -8,7 +8,7 @@ class ProviderNotFoundError(Exception):
    """The provider information was not found."""


-class Provider:
+class Provider(object):
    """
    Provider information.

--- a/python/src/deltachat/py.typed
+++ b/python/src/deltachat/py.typed
--- a/python/src/deltachat/reactions.py
+++ b/python/src/deltachat/reactions.py
@@ -4,20 +4,20 @@ from .capi import ffi, lib
 from .cutil import from_dc_charpointer, iter_array


-class Reactions:
+class Reactions(object):
    """Reactions object.

    You obtain instances of it through :class:`deltachat.message.Message`.
    """

-    def __init__(self, account, dc_reactions) -> None:
+    def __init__(self, account, dc_reactions):
        assert isinstance(account._dc_context, ffi.CData)
        assert isinstance(dc_reactions, ffi.CData)
        assert dc_reactions != ffi.NULL
        self.account = account
        self._dc_reactions = dc_reactions

-    def __repr__(self) -> str:
+    def __repr__(self):
        return f"<Reactions dc_reactions={self._dc_reactions}>"

    @classmethod
--- a/python/src/deltachat/testplugin.py
+++ b/python/src/deltachat/testplugin.py
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 import fnmatch
 import io
 import os
@@ -9,7 +11,7 @@ import threading
 import time
 import weakref
 from queue import Queue
-from typing import Callable, List, Optional, Dict, Set
+from typing import Callable, List, Optional

 import pytest
 import requests
@@ -60,13 +62,13 @@ def pytest_configure(config):

    # Make sure we don't get garbled output because threads keep running
    # collect all ever created accounts in a weakref-set (so we don't
-    # keep objects unnecessarily alive) and enable/disable logging
+    # keep objects unneccessarily alive) and enable/disable logging
    # for each pytest test phase # (setup/call/teardown).
    # Additionally make the acfactory use a logging/no-logging default.

    class LoggingAspect:
-        def __init__(self) -> None:
-            self._accounts: weakref.WeakSet = weakref.WeakSet()
+        def __init__(self):
+            self._accounts = weakref.WeakSet()

        @deltachat.global_hookimpl
        def dc_account_init(self, account):
@@ -129,7 +131,7 @@ def pytest_report_header(config, startdir):
    if cfg:
        if "?" in cfg:
            url, token = cfg.split("?", 1)
-            summary.append(f"Liveconfig provider: {url}?<token omitted>")
+            summary.append(f"Liveconfig provider: {url}?<token ommitted>")
        else:
            summary.append(f"Liveconfig file: {cfg}")
    return summary
@@ -143,12 +145,10 @@ def testprocess(request):
 class TestProcess:
    """A pytest session-scoped instance to help with managing "live" account configurations."""

-    _addr2files: Dict[str, Dict[pathlib.Path, bytes]]
-
-    def __init__(self, pytestconfig) -> None:
+    def __init__(self, pytestconfig):
        self.pytestconfig = pytestconfig
        self._addr2files = {}
-        self._configlist: List[Dict[str, str]] = []
+        self._configlist = []

    def get_liveconfig_producer(self):
        """provide live account configs, cached on a per-test-process scope
@@ -277,12 +277,10 @@ class ACSetup:
    CONFIGURED = "CONFIGURED"
    IDLEREADY = "IDLEREADY"

-    _configured_events: Queue
-
-    def __init__(self, testprocess, init_time) -> None:
+    def __init__(self, testprocess, init_time):
        self._configured_events = Queue()
-        self._account2state: Dict[Account, str] = {}
-        self._imap_cleaned: Set[str] = set()
+        self._account2state = {}
+        self._imap_cleaned = set()
        self.testprocess = testprocess
        self.init_time = init_time

@@ -311,7 +309,7 @@ class ACSetup:
    def wait_one_configured(self, account):
        """wait until this account has successfully configured."""
        if self._account2state[account] == self.CONFIGURING:
-            while True:
+            while 1:
                acc = self._pop_config_success()
                if acc == account:
                    break
@@ -380,13 +378,8 @@ class ACSetup:


 class ACFactory:
-    """Account factory"""
-
-    init_time: float
    _finalizers: List[Callable[[], None]]
    _accounts: List[Account]
-    _acsetup: ACSetup
-    _preconfigured_keys: List[str]

    def __init__(self, request, testprocess, tmpdir, data) -> None:
        self.init_time = time.time()
@@ -438,15 +431,14 @@ class ACFactory:
        assert "addr" in configdict and "mail_pw" in configdict
        return configdict

-    def _get_cached_account(self, addr) -> Optional[Account]:
+    def _get_cached_account(self, addr):
        if addr in self.testprocess._addr2files:
            return self._getaccount(addr)
-        return None

-    def get_unconfigured_account(self, closed=False) -> Account:
+    def get_unconfigured_account(self, closed=False):
        return self._getaccount(closed=closed)

-    def _getaccount(self, try_cache_addr=None, closed=False) -> Account:
+    def _getaccount(self, try_cache_addr=None, closed=False):
        logid = f"ac{len(self._accounts) + 1}"
        # we need to use fixed database basename for maybe_cache_* functions to work
        path = self.tmpdir.mkdir(logid).join("dc.db")
@@ -460,10 +452,10 @@ class ACFactory:
        self._accounts.append(ac)
        return ac

-    def set_logging_default(self, logging) -> None:
+    def set_logging_default(self, logging):
        self._logging = bool(logging)

-    def remove_preconfigured_keys(self) -> None:
+    def remove_preconfigured_keys(self):
        self._preconfigured_keys = []

    def _preconfigure_key(self, account, addr):
@@ -501,7 +493,7 @@ class ACFactory:
        self._acsetup.init_logging(ac)
        return ac

-    def new_online_configuring_account(self, cloned_from=None, cache=False, **kwargs) -> Account:
+    def new_online_configuring_account(self, cloned_from=None, cache=False, **kwargs):
        if cloned_from is None:
            configdict = self.get_next_liveconfig()
        else:
@@ -523,7 +515,7 @@ class ACFactory:
        self._acsetup.start_configure(ac)
        return ac

-    def prepare_account_from_liveconfig(self, configdict) -> Account:
+    def prepare_account_from_liveconfig(self, configdict):
        ac = self.get_unconfigured_account()
        assert "addr" in configdict and "mail_pw" in configdict, configdict
        configdict.setdefault("bcc_self", False)
@@ -533,11 +525,11 @@ class ACFactory:
        self._preconfigure_key(ac, configdict["addr"])
        return ac

-    def wait_configured(self, account) -> None:
+    def wait_configured(self, account):
        """Wait until the specified account has successfully completed configure."""
        self._acsetup.wait_one_configured(account)

-    def bring_accounts_online(self) -> None:
+    def bring_accounts_online(self):
        print("bringing accounts online")
        self._acsetup.bring_online()
        print("all accounts online")
@@ -640,7 +632,7 @@ class BotProcess:

    def _run_stdout_thread(self) -> None:
        try:
-            while True:
+            while 1:
                line = self.popen.stdout.readline()
                if not line:
                    break
@@ -661,7 +653,7 @@ class BotProcess:
        for next_pattern in patterns:
            print("+++FNMATCH:", next_pattern)
            ignored = []
-            while True:
+            while 1:
                line = self.stdout_queue.get()
                if line is None:
                    if ignored:
--- a/python/src/deltachat/tracker.py
+++ b/python/src/deltachat/tracker.py
@@ -1,25 +1,19 @@
 from queue import Queue
 from threading import Event
-from typing import List, TYPE_CHECKING

 from .hookspec import Global, account_hookimpl

-if TYPE_CHECKING:
-    from .events import FFIEvent
-

 class ImexFailed(RuntimeError):
    """Exception for signalling that import/export operations failed."""


 class ImexTracker:
-    _imex_events: Queue
-
-    def __init__(self) -> None:
+    def __init__(self):
        self._imex_events = Queue()

    @account_hookimpl
-    def ac_process_ffi_event(self, ffi_event: "FFIEvent") -> None:
+    def ac_process_ffi_event(self, ffi_event):
        if ffi_event.name == "DC_EVENT_IMEX_PROGRESS":
            self._imex_events.put(ffi_event.data1)
        elif ffi_event.name == "DC_EVENT_IMEX_FILE_WRITTEN":
@@ -56,13 +50,7 @@ class ConfigureFailed(RuntimeError):
 class ConfigureTracker:
    ConfigureFailed = ConfigureFailed

-    _configure_events: Queue
-    _smtp_finished: Event
-    _imap_finished: Event
-    _ffi_events: List["FFIEvent"]
-    _progress: Queue
-
-    def __init__(self, account) -> None:
+    def __init__(self, account):
        self.account = account
        self._configure_events = Queue()
        self._smtp_finished = Event()
@@ -72,7 +60,7 @@ class ConfigureTracker:
        self._gm = Global._get_plugin_manager()

    @account_hookimpl
-    def ac_process_ffi_event(self, ffi_event: "FFIEvent") -> None:
+    def ac_process_ffi_event(self, ffi_event):
        self._ffi_events.append(ffi_event)
        if ffi_event.name == "DC_EVENT_SMTP_CONNECTED":
            self._smtp_finished.set()
@@ -97,7 +85,7 @@ class ConfigureTracker:
        self._imap_finished.wait()

    def wait_progress(self, data1=None):
-        while True:
+        while 1:
            evdata = self._progress.get()
            if data1 is None or evdata == data1:
                break
--- a/python/tests/stress_test_db.py
+++ b/python/tests/stress_test_db.py
@@ -14,7 +14,7 @@ def test_db_busy_error(acfactory, tmpdir):

    def log(string):
        with log_lock:
-            print(f"{time.time() - starttime:3.2f} {string}")
+            print("%3.2f %s" % (time.time() - starttime, string))

    # make a number of accounts
    accounts = acfactory.get_many_online_accounts(3)
@@ -77,7 +77,7 @@ class ReportType:


 class AutoReplier:
-    def __init__(self, account, log, num_send, num_bigfiles, report_func) -> None:
+    def __init__(self, account, log, num_send, num_bigfiles, report_func):
        self.account = account
        self._log = log
        self.report_func = report_func
@@ -90,7 +90,7 @@ class AutoReplier:
        self._thread.setDaemon(True)
        self._thread.start()

-    def log(self, message) -> None:
+    def log(self, message):
        self._log(f"{self.addr} {message}")

    def thread_stats(self):
--- a/python/tests/test_0_complex_or_slow.py
+++ b/python/tests/test_0_complex_or_slow.py
@@ -239,7 +239,7 @@ def test_fetch_existing(acfactory, lp, mvbox_move):
    ac1_clone.start_io()
    assert_folders_configured(ac1_clone)

-    lp.sec("check that ac2 contact was fetched during configure")
+    lp.sec("check that ac2 contact was fetchted during configure")
    ac1_clone._evtracker.get_matching("DC_EVENT_CONTACTS_CHANGED")
    ac2_addr = ac2.get_config("addr")
    assert any(c.addr == ac2_addr for c in ac1_clone.get_contacts())
--- a/python/tests/test_1_online.py
+++ b/python/tests/test_1_online.py
@@ -72,19 +72,6 @@ def test_configure_canceled(acfactory):
        pass


-def test_configure_unref(tmpdir):
-    """Test that removing the last reference to the context during ongoing configuration
-    does not result in use-after-free."""
-    from deltachat.capi import ffi, lib
-
-    path = tmpdir.mkdir("test_configure_unref").join("dc.db").strpath
-    dc_context = lib.dc_context_new(ffi.NULL, path.encode("utf8"), ffi.NULL)
-    lib.dc_set_config(dc_context, "addr".encode("utf8"), "foo@x.testrun.org".encode("utf8"))
-    lib.dc_set_config(dc_context, "mail_pw".encode("utf8"), "abc".encode("utf8"))
-    lib.dc_configure(dc_context)
-    lib.dc_context_unref(dc_context)
-
-
 def test_export_import_self_keys(acfactory, tmpdir, lp):
    ac1, ac2 = acfactory.get_online_accounts(2)

@@ -217,13 +204,13 @@ def test_html_message(acfactory, lp):
    lp.sec("ac1: prepare and send text message to ac2")
    msg1 = chat.send_text("message0")
    assert not msg1.has_html()
-    assert not msg1.html
+    assert msg1.html == ""

    lp.sec("wait for ac2 to receive message")
    msg2 = ac2._evtracker.wait_next_incoming_message()
    assert msg2.text == "message0"
    assert not msg2.has_html()
-    assert not msg2.html
+    assert msg2.html == ""

    lp.sec("ac1: prepare and send HTML+text message to ac2")
    msg1 = Message.new_empty(ac1, "text")
@@ -1497,7 +1484,7 @@ def test_import_export_online_all(acfactory, tmpdir, data, lp):

 def test_ac_setup_message(acfactory, lp):
    # note that the receiving account needs to be configured and running
-    # before the setup message is send. DC does not read old messages
+    # before ther setup message is send. DC does not read old messages
    # as of Jul2019
    ac1 = acfactory.new_online_configuring_account()
    ac2 = acfactory.new_online_configuring_account(cloned_from=ac1)
@@ -1617,7 +1604,7 @@ def test_add_remove_member_remote_events(acfactory, lp):
    in_list = queue.Queue()

    class EventHolder:
-        def __init__(self, **kwargs) -> None:
+        def __init__(self, **kwargs):
            self.__dict__.update(kwargs)

    class InPlugin:
@@ -1967,7 +1954,6 @@ def test_immediate_autodelete(acfactory, lp):
    assert msg.text == "hello"

    lp.sec("ac2: wait for close/expunge on autodelete")
-    ac2._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED")
    ac2._evtracker.get_info_contains("close/expunge succeeded")

    lp.sec("ac2: check that message was autodeleted on server")
@@ -2000,48 +1986,13 @@ def test_delete_multiple_messages(acfactory, lp):
    lp.sec("ac2: deleting all messages except third")
    assert len(to_delete) == len(texts) - 1
    ac2.delete_messages(to_delete)
+    ac2._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED")
+
+    ac2._evtracker.get_info_contains("close/expunge succeeded")

    lp.sec("ac2: test that only one message is left")
-    while 1:
-        ac2._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED")
-        ac2._evtracker.get_info_contains("close/expunge succeeded")
-        ac2.direct_imap.select_config_folder("inbox")
-        nr_msgs = len(ac2.direct_imap.get_all_messages())
-        assert nr_msgs > 0
-        if nr_msgs == 1:
-            break
-
-
-def test_trash_multiple_messages(acfactory, lp):
-    ac1, ac2 = acfactory.get_online_accounts(2)
-    ac2.set_config("delete_to_trash", "1")
-    chat12 = acfactory.get_accepted_chat(ac1, ac2)
-
-    lp.sec("ac1: sending 3 messages")
-    texts = ["first", "second", "third"]
-    for text in texts:
-        chat12.send_text(text)
-
-    lp.sec("ac2: waiting for all messages on the other side")
-    to_delete = []
-    for text in texts:
-        msg = ac2._evtracker.wait_next_incoming_message()
-        assert msg.text in texts
-        if text != "second":
-            to_delete.append(msg)
-
-    lp.sec("ac2: deleting all messages except second")
-    assert len(to_delete) == len(texts) - 1
-    ac2.delete_messages(to_delete)
-
-    lp.sec("ac2: test that only one message is left")
-    while 1:
-        ac2._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_MOVED")
-        ac2.direct_imap.select_config_folder("inbox")
-        nr_msgs = len(ac2.direct_imap.get_all_messages())
-        assert nr_msgs > 0
-        if nr_msgs == 1:
-            break
+    ac2.direct_imap.select_config_folder("inbox")
+    assert len(ac2.direct_imap.get_all_messages()) == 1


 def test_configure_error_msgs_wrong_pw(acfactory):
@@ -2150,7 +2101,7 @@ def test_status(acfactory):
    chat12.send_text("hello")
    msg = ac2._evtracker.wait_next_incoming_message()
    assert msg.text == "hello"
-    assert not msg.get_sender_contact().status
+    assert msg.get_sender_contact().status == ""


 def test_group_quote(acfactory, lp):
--- a/python/tests/test_2_increation.py
+++ b/python/tests/test_2_increation.py
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 import os.path
 import shutil
 from filecmp import cmp
--- a/python/tests/test_3_offline.py
+++ b/python/tests/test_3_offline.py
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 import os
 import time
 from datetime import datetime, timedelta, timezone
@@ -295,8 +297,8 @@ class TestOfflineChat:
        assert d["archived"] == chat.is_archived()
        # assert d["param"] == chat.param
        assert d["color"] == chat.get_color()
-        assert not d["profile_image"] if chat.get_profile_image() is None else chat.get_profile_image()
-        assert not d["draft"] if chat.get_draft() is None else chat.get_draft()
+        assert d["profile_image"] == "" if chat.get_profile_image() is None else chat.get_profile_image()
+        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_GROUP_NAME_CHANGED_BY_YOU, "abc %1$s xyz %2$s")
--- a/python/tests/test_4_lowlevel.py
+++ b/python/tests/test_4_lowlevel.py
@@ -151,7 +151,7 @@ def test_markseen_invalid_message_ids(acfactory):
    ac1 = acfactory.get_pseudo_configured_account()
    contact1 = ac1.create_contact("some1@example.com", name="some1")
    chat = contact1.create_chat()
-    chat.send_text("one message")
+    chat.send_text("one messae")
    ac1._evtracker.get_matching("DC_EVENT_MSGS_CHANGED")
    msg_ids = [9]
    lib.dc_markseen_msgs(ac1._dc_context, msg_ids, len(msg_ids))
--- a/python/tox.ini
+++ b/python/tox.ini
@@ -8,7 +8,7 @@ envlist =

 [testenv]
 commands = 
-    pytest -n6 --extra-info -v -rsXx --ignored --strict-tls {posargs: tests examples}
+    pytest -n6 --extra-info --reruns 2 --reruns-delay 5 -v -rsXx --ignored --strict-tls {posargs: tests examples}
    pip wheel . -w {toxworkdir}/wheelhouse --no-deps
 setenv =
 # Avoid stack overflow when Rust core is built without optimizations.
@@ -21,6 +21,7 @@ passenv =
    RUSTC_WRAPPER
 deps = 
    pytest
+    pytest-rerunfailures
    pytest-timeout
    pytest-xdist
    pdbpp
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -20,10 +20,6 @@ and an own build machine.

 - `run_all.sh` builds Python wheels

- `zig-rpc-server.sh` compiles binaries of `deltachat-rpc-server` using Zig toolchain statically linked against musl libc.
-
- `android-rpc-server.sh` compiles binaries of `deltachat-rpc-server` using Android NDK.
-
 ## Triggering runs on the build machine locally (fast!)

 There is experimental support for triggering a remote Python or Rust test run 
--- a/scripts/android-rpc-server.sh
+++ b/scripts/android-rpc-server.sh
@@ -1,43 +0,0 @@
-#!/bin/sh
-# Build deltachat-rpc-server for Android.
-
-set -e
-
-test -n "$ANDROID_NDK_ROOT" || exit 1
-
-RUSTUP_TOOLCHAIN="1.64.0"
-rustup install "$RUSTUP_TOOLCHAIN"
-rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android --toolchain "$RUSTUP_TOOLCHAIN"
-
-KERNEL="$(uname -s | tr '[:upper:]' '[:lower:]')"
-ARCH="$(uname -m)"
-NDK_HOST_TAG="$KERNEL-$ARCH"
-TOOLCHAIN="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/$NDK_HOST_TAG"
-
-PACKAGE="deltachat-rpc-server"
-
-export CARGO_PROFILE_RELEASE_LTO=on
-
-CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="$TOOLCHAIN/bin/armv7a-linux-androideabi16-clang" \
-	TARGET_CC="$TOOLCHAIN/bin/armv7a-linux-androideabi16-clang" \
-	TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
-	TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
-	cargo "+$RUSTUP_TOOLCHAIN" rustc --release --target armv7-linux-androideabi -p $PACKAGE
-
-CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/aarch64-linux-android21-clang" \
-	TARGET_CC="$TOOLCHAIN/bin/aarch64-linux-android21-clang" \
-	TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
-	TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
-	cargo "+$RUSTUP_TOOLCHAIN" rustc --release --target aarch64-linux-android -p $PACKAGE
-
-CARGO_TARGET_I686_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/i686-linux-android16-clang" \
-	TARGET_CC="$TOOLCHAIN/bin/i686-linux-android16-clang" \
-	TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
-	TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
-	cargo "+$RUSTUP_TOOLCHAIN" rustc --release --target i686-linux-android -p $PACKAGE
-
-CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/x86_64-linux-android21-clang" \
-	TARGET_CC="$TOOLCHAIN/bin/x86_64-linux-android21-clang" \
-	TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
-	TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
-	cargo "+$RUSTUP_TOOLCHAIN" rustc --release --target x86_64-linux-android -p $PACKAGE
--- a/scripts/clippy.sh
+++ b/scripts/clippy.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 # Run clippy for all Rust code in the project.
-cargo clippy --workspace --all-targets --all-features -- -D warnings
+cargo clippy --workspace --tests --examples --benches -- -D warnings
--- a/scripts/codespell.sh
+++ b/scripts/codespell.sh
@@ -1,4 +0,0 @@
-#!/bin/sh
-codespell \
-  --skip './test-data,./.git,node_modules,.mypy_cache,./src/provider/data.rs,.tox,site-packages,target,Cargo.lock,*.js.map,package-lock.json,./proptest-regressions' \
-  --ignore-words-list crate,keypair,keypairs,iif
--- a/scripts/concourse/docs_wheels.yml
+++ b/scripts/concourse/docs_wheels.yml
@@ -1,370 +1,370 @@
 resources:
-  - name: deltachat-core-rust
-    type: git
-    icon: github
-    source:
-      branch: master
-      uri: https://github.com/deltachat/deltachat-core-rust.git
+- name: deltachat-core-rust
+  type: git
+  icon: github
+  source:
+    branch: master
+    uri: https://github.com/deltachat/deltachat-core-rust.git

-  - name: deltachat-core-rust-release
-    type: git
-    icon: github
-    source:
-      branch: master
-      uri: https://github.com/deltachat/deltachat-core-rust.git
-      tag_filter: "v*"
+- name: deltachat-core-rust-release
+  type: git
+  icon: github
+  source:
+    branch: master
+    uri: https://github.com/deltachat/deltachat-core-rust.git
+    tag_filter: "py-*"

 jobs:
-  - name: doxygen
-    plan:
-      - get: deltachat-core-rust
-        trigger: true
+- name: doxygen
+  plan:
+  - get: deltachat-core-rust
+    trigger: true

-      # Build Doxygen documentation
-      - task: build-doxygen
-        config:
-          inputs:
-            - name: deltachat-core-rust
-          outputs:
-            - name: c-docs
-          image_resource:
-            source:
-              repository: alpine
-            type: registry-image
-          platform: linux
-          run:
-            path: sh
-            args:
-              - -ec
-              - |
-                apk add --no-cache doxygen git
-                cd deltachat-core-rust
-                scripts/run-doxygen.sh
-                cd ..
-                cp -av deltachat-core-rust/deltachat-ffi/html deltachat-core-rust/deltachat-ffi/xml c-docs/
+  # Build Doxygen documentation
+  - task: build-doxygen
+    config:
+      inputs:
+        - name: deltachat-core-rust
+      outputs:
+        - name: c-docs
+      image_resource:
+        source:
+          repository: alpine
+        type: registry-image
+      platform: linux
+      run:
+        path: sh
+        args:
+        - -ec
+        - |
+          apk add --no-cache doxygen git
+          cd deltachat-core-rust
+          scripts/run-doxygen.sh
+          cd ..
+          cp -av deltachat-core-rust/deltachat-ffi/html deltachat-core-rust/deltachat-ffi/xml c-docs/

-      - task: upload-c-docs
-        config:
-          inputs:
-            - name: c-docs
-          image_resource:
-            type: registry-image
-            source:
-              repository: alpine
-          platform: linux
-          run:
-            path: sh
-            args:
-              - -ec
-              - |
-                apk add --no-cache rsync openssh-client
-                mkdir -p ~/.ssh
-                chmod 700 ~/.ssh
-                echo "(("c.delta.chat".private_key))" > ~/.ssh/id_ed25519
-                chmod 600 ~/.ssh/id_ed25519
-                rsync -e "ssh -o StrictHostKeyChecking=no" -avz --delete c-docs/html/ delta@c.delta.chat:build-c/master
+  - task: upload-c-docs
+    config:
+      inputs:
+        - name: c-docs
+      image_resource:
+        type: registry-image
+        source:
+          repository: alpine
+      platform: linux
+      run:
+        path: sh
+        args:
+        - -ec
+        - |
+          apk add --no-cache rsync openssh-client
+          mkdir -p ~/.ssh
+          chmod 700 ~/.ssh
+          echo "(("c.delta.chat".private_key))" > ~/.ssh/id_ed25519
+          chmod 600 ~/.ssh/id_ed25519
+          rsync -e "ssh -o StrictHostKeyChecking=no" -avz --delete c-docs/html/ delta@c.delta.chat:build-c/master

-  - name: python-x86_64
-    plan:
-      - get: deltachat-core-rust
-      - get: deltachat-core-rust-release
-        trigger: true
+- name: python-x86_64
+  plan:
+  - get: deltachat-core-rust
+  - get: deltachat-core-rust-release
+    trigger: true

-      # Build manylinux image with additional dependencies
-      - task: build-coredeps
-        privileged: true
-        config:
-          inputs:
-            # Building the latest, not tagged coredeps
-            - name: deltachat-core-rust
-          image_resource:
-            source:
-              repository: concourse/oci-build-task
-            type: registry-image
-          outputs:
-            - name: coredeps-image
-              path: image
-          params:
-            CONTEXT: deltachat-core-rust/scripts/coredeps
-            UNPACK_ROOTFS: "true"
-            BUILD_ARG_BASEIMAGE: quay.io/pypa/manylinux2014_x86_64
-          platform: linux
-          caches:
-            - path: cache
-          run:
-            path: build
+  # Build manylinux image with additional dependencies
+  - task: build-coredeps
+    privileged: true
+    config:
+      inputs:
+        # Building the latest, not tagged coredeps
+        - name: deltachat-core-rust
+      image_resource:
+        source:
+          repository: concourse/oci-build-task
+        type: registry-image
+      outputs:
+        - name: coredeps-image
+          path: image
+      params:
+        CONTEXT: deltachat-core-rust/scripts/coredeps
+        UNPACK_ROOTFS: "true"
+        BUILD_ARG_BASEIMAGE: quay.io/pypa/manylinux2014_x86_64
+      platform: linux
+      caches:
+      - path: cache
+      run:
+        path: build

-      # Use built image to build python wheels
-      - task: build-wheels
-        image: coredeps-image
-        config:
-          inputs:
-            - name: deltachat-core-rust-release
-              path: .
-          outputs:
-            - name: py-docs
-              path: ./python/doc/_build/
-            # Binary wheels
-            - name: py-wheels
-              path: ./python/.docker-tox/wheelhouse/
-          platform: linux
-          run:
-            path: bash
-            args:
-              - -exc
-              - |
-                scripts/run_all.sh
+  # Use built image to build python wheels
+  - task: build-wheels
+    image: coredeps-image
+    config:
+      inputs:
+        - name: deltachat-core-rust-release
+          path: .
+      outputs:
+        - name: py-docs
+          path: ./python/doc/_build/
+        # Binary wheels
+        - name: py-wheels
+          path: ./python/.docker-tox/wheelhouse/
+      platform: linux
+      run:
+        path: bash
+        args:
+        - -exc
+        - |
+          scripts/run_all.sh

-      # Upload python docs to py.delta.chat
-      - task: upload-py-docs
-        config:
-          inputs:
-            - name: py-docs
-          image_resource:
-            type: registry-image
-            source:
-              repository: alpine
-          platform: linux
-          run:
-            path: sh
-            args:
-              - -ec
-              - |
-                apk add --no-cache rsync openssh-client
-                mkdir -p ~/.ssh
-                chmod 700 ~/.ssh
-                echo "(("c.delta.chat".private_key))" > ~/.ssh/id_ed25519
-                chmod 600 ~/.ssh/id_ed25519
-                rsync -e "ssh -o StrictHostKeyChecking=no" -avz --delete py-docs/html/ delta@py.delta.chat:build/master
+  # Upload python docs to py.delta.chat
+  - task: upload-py-docs
+    config:
+      inputs:
+        - name: py-docs
+      image_resource:
+        type: registry-image
+        source:
+          repository: alpine
+      platform: linux
+      run:
+        path: sh
+        args:
+        - -ec
+        - |
+          apk add --no-cache rsync openssh-client
+          mkdir -p ~/.ssh
+          chmod 700 ~/.ssh
+          echo "(("c.delta.chat".private_key))" > ~/.ssh/id_ed25519
+          chmod 600 ~/.ssh/id_ed25519
+          rsync -e "ssh -o StrictHostKeyChecking=no" -avz --delete py-docs/html/ delta@py.delta.chat:build/master

-      # Upload x86_64 wheels and source packages
-      - task: upload-wheels
-        config:
-          inputs:
-            - name: py-wheels
-          image_resource:
-            type: registry-image
-            source:
-              repository: debian
-          platform: linux
-          run:
-            path: sh
-            args:
-              - -ec
-              - |
-                apt-get update -y
-                apt-get install -y --no-install-recommends python3-pip python3-setuptools
-                pip3 install devpi
-                devpi use https://m.devpi.net/dc/master
-                devpi login ((devpi.login)) --password ((devpi.password))
-                devpi upload py-wheels/*manylinux201*
+  # Upload x86_64 wheels and source packages
+  - task: upload-wheels
+    config:
+      inputs:
+        - name: py-wheels
+      image_resource:
+        type: registry-image
+        source:
+          repository: debian
+      platform: linux
+      run:
+        path: sh
+        args:
+        - -ec
+        - |
+          apt-get update -y
+          apt-get install -y --no-install-recommends python3-pip python3-setuptools
+          pip3 install devpi
+          devpi use https://m.devpi.net/dc/master
+          devpi login ((devpi.login)) --password ((devpi.password))
+          devpi upload py-wheels/*manylinux201*

-  - name: python-aarch64
-    plan:
-      - get: deltachat-core-rust
-      - get: deltachat-core-rust-release
-        trigger: true
+- name: python-aarch64
+  plan:
+  - get: deltachat-core-rust
+  - get: deltachat-core-rust-release
+    trigger: true

-      # Build manylinux image with additional dependencies
-      - task: build-coredeps
-        privileged: true
-        config:
-          inputs:
-            # Building the latest, not tagged coredeps
-            - name: deltachat-core-rust
-          image_resource:
-            source:
-              repository: concourse/oci-build-task
-            type: registry-image
-          outputs:
-            - name: coredeps-image
-              path: image
-          params:
-            CONTEXT: deltachat-core-rust/scripts/coredeps
-            UNPACK_ROOTFS: "true"
-            BUILD_ARG_BASEIMAGE: quay.io/pypa/manylinux2014_aarch64
-          platform: linux
-          caches:
-            - path: cache
-          run:
-            path: build
+  # Build manylinux image with additional dependencies
+  - task: build-coredeps
+    privileged: true
+    config:
+      inputs:
+        # Building the latest, not tagged coredeps
+        - name: deltachat-core-rust
+      image_resource:
+        source:
+          repository: concourse/oci-build-task
+        type: registry-image
+      outputs:
+        - name: coredeps-image
+          path: image
+      params:
+        CONTEXT: deltachat-core-rust/scripts/coredeps
+        UNPACK_ROOTFS: "true"
+        BUILD_ARG_BASEIMAGE: quay.io/pypa/manylinux2014_aarch64
+      platform: linux
+      caches:
+      - path: cache
+      run:
+        path: build

-      # Use built image to build python wheels
-      - task: build-wheels
-        image: coredeps-image
-        config:
-          inputs:
-            - name: deltachat-core-rust-release
-              path: .
-          outputs:
-            - name: py-wheels
-              path: ./python/.docker-tox/wheelhouse/
-          platform: linux
-          run:
-            path: bash
-            args:
-              - -exc
-              - |
-                scripts/run_all.sh
+  # Use built image to build python wheels
+  - task: build-wheels
+    image: coredeps-image
+    config:
+      inputs:
+        - name: deltachat-core-rust-release
+          path: .
+      outputs:
+        - name: py-wheels
+          path: ./python/.docker-tox/wheelhouse/
+      platform: linux
+      run:
+        path: bash
+        args:
+        - -exc
+        - |
+          scripts/run_all.sh

-      # Upload aarch64 wheels
-      - task: upload-wheels
-        config:
-          inputs:
-            - name: py-wheels
-          image_resource:
-            type: registry-image
-            source:
-              repository: debian
-          platform: linux
-          run:
-            path: sh
-            args:
-              - -ec
-              - |
-                apt-get update -y
-                apt-get install -y --no-install-recommends python3-pip python3-setuptools
-                pip3 install devpi
-                devpi use https://m.devpi.net/dc/master
-                devpi login ((devpi.login)) --password ((devpi.password))
-                devpi upload py-wheels/*manylinux201*
+  # Upload aarch64 wheels
+  - task: upload-wheels
+    config:
+      inputs:
+        - name: py-wheels
+      image_resource:
+        type: registry-image
+        source:
+          repository: debian
+      platform: linux
+      run:
+        path: sh
+        args:
+        - -ec
+        - |
+          apt-get update -y
+          apt-get install -y --no-install-recommends python3-pip python3-setuptools
+          pip3 install devpi
+          devpi use https://m.devpi.net/dc/master
+          devpi login ((devpi.login)) --password ((devpi.password))
+          devpi upload py-wheels/*manylinux201*

-  - name: python-musl-x86_64
-    plan:
-      - get: deltachat-core-rust
-      - get: deltachat-core-rust-release
-        trigger: true
+- name: python-musl-x86_64
+  plan:
+  - get: deltachat-core-rust
+  - get: deltachat-core-rust-release
+    trigger: true

-      # Build manylinux image with additional dependencies
-      - task: build-coredeps
-        privileged: true
-        config:
-          inputs:
-            # Building the latest, not tagged coredeps
-            - name: deltachat-core-rust
-          image_resource:
-            source:
-              repository: concourse/oci-build-task
-            type: registry-image
-          outputs:
-            - name: coredeps-image
-              path: image
-          params:
-            CONTEXT: deltachat-core-rust/scripts/coredeps
-            UNPACK_ROOTFS: "true"
-            BUILD_ARG_BASEIMAGE: quay.io/pypa/musllinux_1_1_x86_64
-          platform: linux
-          caches:
-            - path: cache
-          run:
-            path: build
+  # Build manylinux image with additional dependencies
+  - task: build-coredeps
+    privileged: true
+    config:
+      inputs:
+        # Building the latest, not tagged coredeps
+        - name: deltachat-core-rust
+      image_resource:
+        source:
+          repository: concourse/oci-build-task
+        type: registry-image
+      outputs:
+        - name: coredeps-image
+          path: image
+      params:
+        CONTEXT: deltachat-core-rust/scripts/coredeps
+        UNPACK_ROOTFS: "true"
+        BUILD_ARG_BASEIMAGE: quay.io/pypa/musllinux_1_1_x86_64
+      platform: linux
+      caches:
+      - path: cache
+      run:
+        path: build

-      # Use built image to build python wheels
-      - task: build-wheels
-        image: coredeps-image
-        config:
-          inputs:
-            - name: deltachat-core-rust-release
-              path: .
-          outputs:
-            - name: py-wheels
-              path: ./python/.docker-tox/wheelhouse/
-          platform: linux
-          run:
-            path: bash
-            args:
-              - -exc
-              - |
-                scripts/run_all.sh
+  # Use built image to build python wheels
+  - task: build-wheels
+    image: coredeps-image
+    config:
+      inputs:
+        - name: deltachat-core-rust-release
+          path: .
+      outputs:
+        - name: py-wheels
+          path: ./python/.docker-tox/wheelhouse/
+      platform: linux
+      run:
+        path: bash
+        args:
+        - -exc
+        - |
+          scripts/run_all.sh

-      # Upload musl x86_64 wheels
-      - task: upload-wheels
-        config:
-          inputs:
-            - name: py-wheels
-          image_resource:
-            type: registry-image
-            source:
-              repository: debian
-          platform: linux
-          run:
-            path: sh
-            args:
-              - -ec
-              - |
-                apt-get update -y
-                apt-get install -y --no-install-recommends python3-pip python3-setuptools
-                pip3 install devpi
-                devpi use https://m.devpi.net/dc/master
-                devpi login ((devpi.login)) --password ((devpi.password))
-                devpi upload py-wheels/*musllinux_1_1_x86_64*
+  # Upload musl x86_64 wheels
+  - task: upload-wheels
+    config:
+      inputs:
+        - name: py-wheels
+      image_resource:
+        type: registry-image
+        source:
+          repository: debian
+      platform: linux
+      run:
+        path: sh
+        args:
+        - -ec
+        - |
+          apt-get update -y
+          apt-get install -y --no-install-recommends python3-pip python3-setuptools
+          pip3 install devpi
+          devpi use https://m.devpi.net/dc/master
+          devpi login ((devpi.login)) --password ((devpi.password))
+          devpi upload py-wheels/*musllinux_1_1_x86_64*

-  - name: python-musl-aarch64
-    plan:
-      - get: deltachat-core-rust
-      - get: deltachat-core-rust-release
-        trigger: true
+- name: python-musl-aarch64
+  plan:
+  - get: deltachat-core-rust
+  - get: deltachat-core-rust-release
+    trigger: true

-      # Build manylinux image with additional dependencies
-      - task: build-coredeps
-        privileged: true
-        config:
-          inputs:
-            # Building the latest, not tagged coredeps
-            - name: deltachat-core-rust
-          image_resource:
-            source:
-              repository: concourse/oci-build-task
-            type: registry-image
-          outputs:
-            - name: coredeps-image
-              path: image
-          params:
-            CONTEXT: deltachat-core-rust/scripts/coredeps
-            UNPACK_ROOTFS: "true"
-            BUILD_ARG_BASEIMAGE: quay.io/pypa/musllinux_1_1_aarch64
-          platform: linux
-          caches:
-            - path: cache
-          run:
-            path: build
+  # Build manylinux image with additional dependencies
+  - task: build-coredeps
+    privileged: true
+    config:
+      inputs:
+        # Building the latest, not tagged coredeps
+        - name: deltachat-core-rust
+      image_resource:
+        source:
+          repository: concourse/oci-build-task
+        type: registry-image
+      outputs:
+        - name: coredeps-image
+          path: image
+      params:
+        CONTEXT: deltachat-core-rust/scripts/coredeps
+        UNPACK_ROOTFS: "true"
+        BUILD_ARG_BASEIMAGE: quay.io/pypa/musllinux_1_1_aarch64
+      platform: linux
+      caches:
+      - path: cache
+      run:
+        path: build

-      # Use built image to build python wheels
-      - task: build-wheels
-        image: coredeps-image
-        config:
-          inputs:
-            - name: deltachat-core-rust-release
-              path: .
-          outputs:
-            - name: py-wheels
-              path: ./python/.docker-tox/wheelhouse/
-          platform: linux
-          run:
-            path: bash
-            args:
-              - -exc
-              - |
-                scripts/run_all.sh
+  # Use built image to build python wheels
+  - task: build-wheels
+    image: coredeps-image
+    config:
+      inputs:
+        - name: deltachat-core-rust-release
+          path: .
+      outputs:
+        - name: py-wheels
+          path: ./python/.docker-tox/wheelhouse/
+      platform: linux
+      run:
+        path: bash
+        args:
+        - -exc
+        - |
+          scripts/run_all.sh

-      # Upload musl aarch64 wheels
-      - task: upload-wheels
-        config:
-          inputs:
-            - name: py-wheels
-          image_resource:
-            type: registry-image
-            source:
-              repository: debian
-          platform: linux
-          run:
-            path: sh
-            args:
-              - -ec
-              - |
-                apt-get update -y
-                apt-get install -y --no-install-recommends python3-pip python3-setuptools
-                pip3 install devpi
-                devpi use https://m.devpi.net/dc/master
-                devpi login ((devpi.login)) --password ((devpi.password))
-                devpi upload py-wheels/*musllinux_1_1_aarch64*
+  # Upload musl aarch64 wheels
+  - task: upload-wheels
+    config:
+      inputs:
+        - name: py-wheels
+      image_resource:
+        type: registry-image
+        source:
+          repository: debian
+      platform: linux
+      run:
+        path: sh
+        args:
+        - -ec
+        - |
+          apt-get update -y
+          apt-get install -y --no-install-recommends python3-pip python3-setuptools
+          pip3 install devpi
+          devpi use https://m.devpi.net/dc/master
+          devpi login ((devpi.login)) --password ((devpi.password))
+          devpi upload py-wheels/*musllinux_1_1_aarch64*
--- a/scripts/coredeps/install-rust.sh
+++ b/scripts/coredeps/install-rust.sh
@@ -7,7 +7,7 @@ set -euo pipefail
 #
 # Avoid using rustup here as it depends on reading /proc/self/exe and
 # has problems running under QEMU.
-RUST_VERSION=1.68.0
+RUST_VERSION=1.64.0

 ARCH="$(uname -m)"
 test -f "/lib/libc.musl-$ARCH.so.1" && LIBC=musl || LIBC=gnu
--- a/scripts/run_all.sh
+++ b/scripts/run_all.sh
@@ -31,7 +31,7 @@ unset DCC_NEW_TMP_EMAIL

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


 echo -----------------------
--- a/scripts/set_core_version.py
+++ b/scripts/set_core_version.py
@@ -115,8 +115,10 @@ def main():

    print("after commit, on master make sure to: ")
    print("")
-    print(f"   git tag -a v{newversion}")
-    print(f"   git push origin v{newversion}")
+    print(f"   git tag -a {newversion}")
+    print(f"   git push origin {newversion}")
+    print(f"   git tag -a py-{newversion}")
+    print(f"   git push origin py-{newversion}")
    print("")


--- a/scripts/update-provider-database.sh
+++ b/scripts/update-provider-database.sh
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-# Updates provider database.
-# Returns 1 if the database is changed, 0 otherwise.
-set -euo pipefail
-
-export TZ=UTC
-
-# Provider database revision.
-REV=3c8f7e846c915a183dc44536fb5480d1f25d7c42
-
-CORE_ROOT="$PWD"
-TMP="$(mktemp -d)"
-git clone --filter=blob:none https://github.com/deltachat/provider-db.git "$TMP"
-cd "$TMP"
-git checkout "$REV"
-DATE=$(git show -s --format=%cs)
-"$CORE_ROOT"/scripts/create-provider-data-rs.py "$TMP/_providers" "$DATE" >"$CORE_ROOT/src/provider/data.rs"
-rustfmt "$CORE_ROOT/src/provider/data.rs"
-rm -fr "$TMP"
-
-cd "$CORE_ROOT"
-test -z "$(git status --porcelain src/provider/data.rs)"
--- a/scripts/zig-rpc-server.sh
+++ b/scripts/zig-rpc-server.sh
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# Build statically linked deltachat-rpc-server using cargo-zigbuild.
-
-set -x
-set -e
-
-unset RUSTFLAGS
-
-ZIG_VERSION=0.11.0-dev.1935+1d96a17af
-
-# Download Zig
-rm -fr "$ZIG_VERSION" "ZIG_VERSION.tar.xz"
-wget "https://ziglang.org/builds/zig-linux-x86_64-$ZIG_VERSION.tar.xz"
-tar xf "zig-linux-x86_64-$ZIG_VERSION.tar.xz"
-export PATH="$PWD/zig-linux-x86_64-$ZIG_VERSION:$PATH"
-
-cargo install cargo-zigbuild
-
-for TARGET in aarch64-unknown-linux-musl armv7-unknown-linux-musleabihf; do
-	rustup target add "$TARGET"
-	cargo zigbuild --release --target "$TARGET" -p deltachat-rpc-server --features vendored
-done
--- a/spec.md
+++ b/spec.md
@@ -38,9 +38,6 @@ by the [Protected Headers](https://tools.ietf.org/id/draft-autocrypt-lamps-prote
 # Outgoing messages

 Messengers MUST add a `Chat-Version: 1.0` header to outgoing messages.
-For filtering and smart appearance of the messages in normal MUAs,
-the `Subject` header SHOULD be `Message from <sender name>`.
-Replies to messages MAY follow the typical `Re:`-format.

 The body MAY contain text which MUST have the content type `text/plain`
 or `mulipart/alternative` containing `text/plain`.
@@ -339,13 +336,13 @@ only on image changes.

 In older specs, the profile-image was sent as an attachment
 and `Chat-User-Avatar:` specified its name.
-However, it turned out that these attachments are kind of unuexpected to users,
+However, it turned out that these attachements are kind of unuexpected to users,
 therefore the profile-image go to the header now.


 # Locations

-Locations can be attached to messages using
+Locations can be attachted to messages using
 [standard kml-files](https://www.opengeospatial.org/standards/kml/)
 with well-known names.

--- a/src/accounts.rs
+++ b/src/accounts.rs
@@ -150,9 +150,27 @@ impl Accounts {
        if let Some(cfg) = self.config.get_account(id) {
            let account_path = self.dir.join(cfg.dir);

-            fs::remove_dir_all(&account_path)
-                .await
-                .context("failed to remove account data")?;
+            // 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
+            let mut counter = 0;
+            loop {
+                counter += 1;
+
+                if let Err(err) = fs::remove_dir_all(&account_path)
+                    .await
+                    .context("failed to remove account data")
+                {
+                    if counter > 60 {
+                        return Err(err);
+                    }
+
+                    // Wait 1 second and try again.
+                    tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
+                } else {
+                    break;
+                }
+            }
        }
        self.config.remove_account(id).await?;

@@ -160,8 +178,6 @@ impl Accounts {
    }

    /// Migrate an existing account into this structure.
-    ///
-    /// Returns the ID of new account.
    pub async fn migrate_account(&mut self, dbfile: PathBuf) -> Result<u32> {
        let blobdir = Context::derive_blobdir(&dbfile);
        let walfile = Context::derive_walfile(&dbfile);
@@ -213,10 +229,11 @@ impl Accounts {
                Ok(account_config.id)
            }
            Err(err) => {
-                let account_path = std::path::PathBuf::from(&account_config.dir);
-                fs::remove_dir_all(&account_path)
+                // remove temp account
+                fs::remove_dir_all(std::path::PathBuf::from(&account_config.dir))
                    .await
                    .context("failed to remove account data")?;
+
                self.config.remove_account(account_config.id).await?;

                // set selection back
@@ -427,7 +444,7 @@ impl Config {
        Ok(cfg)
    }

-    /// Removes an existing account entirely.
+    /// Removes an existing acccount entirely.
    pub async fn remove_account(&mut self, id: u32) -> Result<()> {
        {
            if let Some(idx) = self.inner.accounts.iter().position(|e| e.id == id) {
@@ -476,18 +493,15 @@ impl Config {
 struct AccountConfig {
    /// Unique id.
    pub id: u32,
-
    /// Root directory for all data for this account.
    ///
    /// The path is relative to the account manager directory.
    pub dir: std::path::PathBuf,
-
-    /// Universally unique account identifier.
    pub uuid: Uuid,
 }

 impl AccountConfig {
-    /// Get the canonical dbfile name for this configuration.
+    /// Get the canoncial dbfile name for this configuration.
    pub fn dbfile(&self, accounts_dir: &Path) -> std::path::PathBuf {
        accounts_dir.join(&self.dir).join(DB_NAME)
    }
--- a/src/aheader.rs
+++ b/src/aheader.rs
@@ -11,15 +11,20 @@ use anyhow::{bail, Context as _, Error, Result};
 use crate::key::{DcKey, SignedPublicKey};

 /// Possible values for encryption preference
-#[derive(PartialEq, Eq, Debug, Default, Clone, Copy, FromPrimitive, ToPrimitive)]
+#[derive(PartialEq, Eq, Debug, Clone, Copy, FromPrimitive, ToPrimitive)]
 #[repr(u8)]
 pub enum EncryptPreference {
-    #[default]
    NoPreference = 0,
    Mutual = 1,
    Reset = 20,
 }

+impl Default for EncryptPreference {
+    fn default() -> Self {
+        EncryptPreference::NoPreference
+    }
+}
+
 impl fmt::Display for EncryptPreference {
    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
        match *self {
@@ -235,7 +240,7 @@ mod tests {
        assert!(Aheader::from_str("foo").is_err());
        assert!(Aheader::from_str("\n\n\n").is_err());
        assert!(Aheader::from_str(" ;;").is_err());
-        assert!(Aheader::from_str("addr=a@t.de; unknown=1; keydata=jau").is_err());
+        assert!(Aheader::from_str("addr=a@t.de; unknwon=1; keydata=jau").is_err());
    }

    #[test]
--- a/src/authres.rs
+++ b/src/authres.rs
@@ -334,7 +334,7 @@ async fn set_dkim_works_timestamp(
 async fn clear_dkim_works(context: &Context) -> Result<()> {
    context
        .sql
-        .execute("DELETE FROM sending_domains", ())
+        .execute("DELETE FROM sending_domains", paramsv![])
        .await?;
    Ok(())
 }
@@ -644,7 +644,6 @@ Authentication-Results: dkim=";
            .unwrap();
    }

-    #[ignore = "Disallowing keychanges is disabled for now"]
    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
    async fn test_handle_authres_fails() -> Result<()> {
        let mut tcm = TestContextManager::new();
@@ -822,8 +821,7 @@ Authentication-Results: dkim=";
            .insert_str(0, "Authentication-Results: example.net; dkim=fail\n");
        let rcvd = bob.recv_msg(&sent).await;

-        // Disallowing keychanges is disabled for now:
-        // assert!(rcvd.error.unwrap().contains("DKIM failed"));
+        assert!(rcvd.error.unwrap().contains("DKIM failed"));
        // The message info should contain a warning:
        assert!(message::get_msg_info(&bob, rcvd.id)
            .await
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -46,7 +46,7 @@ use crate::{location, sql};
 pub enum ChatItem {
    /// Chat message stored in the database.
    Message {
-        /// Database ID of the message.
+        /// Database ID of the messsage.
        msg_id: MsgId,
    },

@@ -61,7 +61,6 @@ pub enum ChatItem {
 /// Chat protection status.
 #[derive(
    Debug,
-    Default,
    Display,
    Clone,
    Copy,
@@ -78,7 +77,6 @@ pub enum ChatItem {
 #[repr(u32)]
 pub enum ProtectionStatus {
    /// Chat is not protected.
-    #[default]
    Unprotected = 0,

    /// Chat is protected.
@@ -87,6 +85,12 @@ pub enum ProtectionStatus {
    Protected = 1,
 }

+impl Default for ProtectionStatus {
+    fn default() -> Self {
+        ProtectionStatus::Unprotected
+    }
+}
+
 /// The reason why messages cannot be sent to the chat.
 ///
 /// The reason is mainly for logging and displaying in debug REPL, thus not translated.
@@ -276,7 +280,7 @@ impl ChatId {
                    grpname,
                    grpid,
                    create_blocked,
-                    create_smeared_timestamp(context),
+                    create_smeared_timestamp(context).await,
                    create_protected,
                    param.unwrap_or_default(),
                ],
@@ -418,7 +422,7 @@ impl ChatId {
            ProtectionStatus::Protected => match chat.typ {
                Chattype::Single | Chattype::Group | Chattype::Broadcast => {
                    let contact_ids = get_chat_contacts(context, self).await?;
-                    for contact_id in contact_ids {
+                    for contact_id in contact_ids.into_iter() {
                        let contact = Contact::get_by_id(context, contact_id).await?;
                        if contact.is_verified(context).await? != VerifiedStatus::BidirectVerified {
                            bail!("{} is not verified.", contact.get_display_name());
@@ -482,7 +486,7 @@ impl ChatId {
                self,
                &msg_text,
                cmd,
-                create_smeared_timestamp(context),
+                create_smeared_timestamp(context).await,
                None,
                None,
                None,
@@ -853,7 +857,7 @@ impl ChatId {
                    AND c.blocked=0
                    AND c.archived=1
                    ",
-                    (),
+                    paramsv![],
                )
                .await?
        } else {
@@ -907,8 +911,7 @@ impl ChatId {

    async fn parent_query<T, F>(self, context: &Context, fields: &str, f: F) -> Result<Option<T>>
    where
-        F: Send + FnOnce(&rusqlite::Row) -> rusqlite::Result<T>,
-        T: Send + 'static,
+        F: FnOnce(&rusqlite::Row) -> rusqlite::Result<T>,
    {
        let sql = &context.sql;
        let query = format!(
@@ -1206,10 +1209,7 @@ impl Chat {
                        }
                    }
                    Err(err) => {
-                        error!(
-                            context,
-                            "failed to load contacts for {}: {:#}", chat.id, err
-                        );
+                        error!(context, "faild to load contacts for {}: {:#}", chat.id, err);
                    }
                }
                chat.name = chat_name;
@@ -1884,10 +1884,7 @@ pub(crate) async fn update_special_chat_names(context: &Context) -> Result<()> {
 /// [`Deref`]: std::ops::Deref
 #[derive(Debug)]
 pub(crate) struct ChatIdBlocked {
-    /// Chat ID.
    pub id: ChatId,
-
-    /// Whether the chat is blocked, unblocked or a contact request.
    pub blocked: Blocked,
 }

@@ -1959,6 +1956,7 @@ impl ChatIdBlocked {
            _ => (),
        }

+        let created_timestamp = create_smeared_timestamp(context).await;
        let chat_id = context
            .sql
            .transaction(move |transaction| {
@@ -1971,7 +1969,7 @@ impl ChatIdBlocked {
                        chat_name,
                        params.to_string(),
                        create_blocked as u8,
-                        create_smeared_timestamp(context)
+                        created_timestamp,
                    ],
                )?;
                let chat_id = ChatId::new(
@@ -2081,7 +2079,8 @@ async fn prepare_msg_blob(context: &Context, msg: &mut Message) -> Result<()> {
    Ok(())
 }

-/// Prepares a message to be sent out.
+/// Prepares a message to be send out
+/// - Checks if chat can be sent to
 async fn prepare_msg_common(
    context: &Context,
    chat_id: ChatId,
@@ -2089,8 +2088,6 @@ async fn prepare_msg_common(
    change_state_to: MessageState,
 ) -> Result<MsgId> {
    let mut chat = Chat::load_from_db(context, chat_id).await?;
-
-    // Check if the chat can be sent to.
    if let Some(reason) = chat.why_cant_send(context).await? {
        bail!("cannot send to {}: {}", chat_id, reason);
    }
@@ -2119,7 +2116,7 @@ async fn prepare_msg_common(
            context,
            msg,
            update_msg_id,
-            create_smeared_timestamp(context),
+            create_smeared_timestamp(context).await,
        )
        .await?;
    msg.chat_id = chat_id;
@@ -2148,9 +2145,9 @@ pub async fn is_contact_in_chat(
    Ok(exists)
 }

-/// Sends a message object to a chat.
+/// Send a message defined by a dc_msg_t object to a chat.
 ///
-/// Sends the event #DC_EVENT_MSGS_CHANGED on success.
+/// Sends the event #DC_EVENT_MSGS_CHANGED on succcess.
 /// However, this does not imply, the message really reached the recipient -
 /// sending may be delayed eg. due to network problems. However, from your
 /// view, you're done with the message. Sooner or later it will find its way.
@@ -2514,7 +2511,7 @@ pub async fn get_chat_msgs_ex(
        context
            .sql
            .query_map(
-        // GLOB is used here instead of LIKE because it is case-sensitive
+        // GLOB is used here instead of LIKE becase it is case-sensitive
                "SELECT m.id AS id, m.timestamp AS timestamp, m.param AS param, m.from_id AS from_id, m.to_id AS to_id
               FROM msgs m
              WHERE m.chat_id=?
@@ -2578,7 +2575,7 @@ pub async fn marknoticed_chat(context: &Context, chat_id: ChatId) -> Result<()>
                "SELECT DISTINCT(m.chat_id) FROM msgs m
                    LEFT JOIN chats c ON m.chat_id=c.id
                    WHERE m.state=10 AND m.hidden=0 AND m.chat_id>9 AND c.blocked=0 AND c.archived=1",
-                    (),
+                paramsv![],
                |row| row.get::<_, ChatId>(0),
                |ids| ids.collect::<Result<Vec<_>, _>>().map_err(Into::into)
            )
@@ -2844,7 +2841,7 @@ pub async fn create_group_chat(
                Chattype::Group,
                chat_name,
                grpid,
-                create_smeared_timestamp(context),
+                create_smeared_timestamp(context).await,
            ],
        )
        .await?;
@@ -2902,7 +2899,7 @@ pub async fn create_broadcast_list(context: &Context) -> Result<ChatId> {
                Chattype::Broadcast,
                chat_name,
                grpid,
-                create_smeared_timestamp(context),
+                create_smeared_timestamp(context).await,
            ],
        )
        .await?;
@@ -3301,7 +3298,7 @@ pub async fn set_chat_name(context: &Context, chat_id: ChatId, new_name: &str) -
    Ok(())
 }

-/// Sets a new profile image for the chat.
+/// Set a new profile image for the chat.
 ///
 /// The profile image can only be set when you are a member of the
 /// chat.  To remove the profile image pass an empty string for the
@@ -3363,7 +3360,7 @@ pub async fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: ChatId)
        if let Some(reason) = chat.why_cant_send(context).await? {
            bail!("cannot send to {}: {}", chat_id, reason);
        }
-        curr_timestamp = create_smeared_timestamps(context, msg_ids.len());
+        curr_timestamp = create_smeared_timestamps(context, msg_ids.len()).await;
        let ids = context
            .sql
            .query_map(
@@ -3403,7 +3400,7 @@ pub async fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: ChatId)
            msg.param.remove(Param::WebxdcSummaryTimestamp);
            msg.in_reply_to = None;

-            // do not leak data as group names; a default subject is generated by mimefactory
+            // do not leak data as group names; a default subject is generated by mimfactory
            msg.subject = "".to_string();

            let new_msg_id: MsgId;
@@ -3500,7 +3497,10 @@ pub(crate) async fn get_chat_cnt(context: &Context) -> Result<usize> {
        // no database, no chats - this is no error (needed eg. for information)
        let count = context
            .sql
-            .count("SELECT COUNT(*) FROM chats WHERE id>9 AND blocked=0;", ())
+            .count(
+                "SELECT COUNT(*) FROM chats WHERE id>9 AND blocked=0;",
+                paramsv![],
+            )
            .await?;
        Ok(count)
    } else {
@@ -3562,7 +3562,7 @@ pub async fn add_device_msg_with_importance(
        msg.try_calc_and_set_dimensions(context).await.ok();
        prepare_msg_blob(context, msg).await?;

-        let timestamp_sent = create_smeared_timestamp(context);
+        let timestamp_sent = create_smeared_timestamp(context).await;

        // makes sure, the added message is the last one,
        // even if the date is wrong (useful esp. when warning about bad dates)
@@ -3662,7 +3662,7 @@ pub async fn was_device_msg_ever_added(context: &Context, label: &str) -> Result
 // - deletion in `msgs` with `ContactId::DEVICE` makes sure,
 //   no wrong information are shown in the device chat
 // - deletion in `devmsglabels` makes sure,
-//   deleted messages are reset and useful messages can be added again
+//   deleted messages are resetted and useful messages can be added again
 // - we reset the config-option `QuotaExceeding`
 //   that is used as a helper to drive the corresponding device message.
 pub(crate) async fn delete_and_reset_all_device_msgs(context: &Context) -> Result<()> {
@@ -3673,14 +3673,17 @@ pub(crate) async fn delete_and_reset_all_device_msgs(context: &Context) -> Resul
            paramsv![ContactId::DEVICE],
        )
        .await?;
-    context.sql.execute("DELETE FROM devmsglabels;", ()).await?;
+    context
+        .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?;
@@ -4087,6 +4090,7 @@ mod tests {
        send_text_msg(&alice, alice_chat_id, "populate".to_string()).await?;

        add_contact_to_chat(&alice, alice_chat_id, bob_id).await?;
+        tokio::time::sleep(std::time::Duration::from_millis(1100)).await;
        let add1 = alice.pop_sent_msg().await;

        add_contact_to_chat(&alice, alice_chat_id, claire_id).await?;
@@ -4105,18 +4109,29 @@ mod tests {

        remove_contact_from_chat(&alice, alice_chat_id, daisy_id).await?;
        let remove2 = alice.pop_sent_msg().await;
+        tokio::time::sleep(std::time::Duration::from_millis(1100)).await;

        assert_eq!(get_chat_contacts(&alice, alice_chat_id).await?.len(), 2);

        // Bob receives the add and deletion messages out of order
        let bob = TestContext::new_bob().await;
        bob.recv_msg(&add1).await;
+        tokio::time::sleep(std::time::Duration::from_millis(1100)).await;
+
        bob.recv_msg(&add3).await;
+        tokio::time::sleep(std::time::Duration::from_millis(1100)).await;
+
        let bob_chat_id = bob.recv_msg(&add2).await.chat_id;
+        tokio::time::sleep(std::time::Duration::from_millis(1100)).await;
+
        assert_eq!(get_chat_contacts(&bob, bob_chat_id).await?.len(), 4);

        bob.recv_msg(&remove2).await;
+        tokio::time::sleep(std::time::Duration::from_millis(1100)).await;
+
        bob.recv_msg(&remove1).await;
+        tokio::time::sleep(std::time::Duration::from_millis(1100)).await;
+
        assert_eq!(get_chat_contacts(&bob, bob_chat_id).await?.len(), 2);

        Ok(())
@@ -4428,7 +4443,7 @@ mod tests {
            .unwrap();
        assert!(msg_id2.is_unset());

-        // ... unless everything is deleted and reset - as needed eg. on device switch
+        // ... unless everything is deleted and resetted - as needed eg. on device switch
        delete_and_reset_all_device_msgs(&t).await.unwrap();
        assert!(!was_device_msg_ever_added(&t, "some-label").await.unwrap());
        let msg_id3 = add_device_msg(&t, Some("some-label"), Some(&mut msg))
--- a/Show More
+++ b/Show More