Prototype dc_blob_t API

2026-04-04 22:42:11 +03:00 · 2022-01-01 00:25:18 +00:00
227 changed files with 14614 additions and 31137 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,7 +3,7 @@ updates:
  - package-ecosystem: "cargo"
    directory: "/"
    schedule:
-      interval: "monthly"
+      interval: "daily"
    commit-message:
      prefix: "cargo"
-    open-pull-requests-limit: 50
+    open-pull-requests-limit: 10
--- a/.github/mergeable.yml
+++ b/.github/mergeable.yml
@@ -1,26 +0,0 @@
-version: 2
-mergeable:
-  - when: pull_request.*
-    name: "Changelog check"
-    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/**'
-                required: ['CHANGELOG.md']
-    fail:
-      - do: checks
-        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
@@ -10,7 +10,7 @@ on:

 env:
  RUSTFLAGS: -Dwarnings
-   
+
 jobs:

  fmt:
@@ -45,7 +45,7 @@ jobs:
      - uses: actions-rs/clippy-check@v1
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --workspace --tests --examples --benches
+          args: --workspace --tests --examples

  docs:
    name: Rust doc comments
@@ -77,19 +77,19 @@ jobs:
        include:
          # Currently used Rust version, same as in `rust-toolchain` file.
          - os: ubuntu-latest
-            rust: 1.61.0
+            rust: 1.54.0
            python: 3.9
          - os: windows-latest
-            rust: 1.61.0
+            rust: 1.54.0
            python: false # Python bindings compilation on Windows is not supported.

-          # Minimum Supported Rust Version = 1.56.1
+          # Minimum Supported Rust Version = 1.51.0
          #
          # Minimum Supported Python Version = 3.7
          # This is the minimum version for which manylinux Python wheels are
          # built.
          - os: ubuntu-latest
-            rust: 1.56.1
+            rust: 1.51.0
            python: 3.7
    runs-on: ${{ matrix.os }}
    steps:
@@ -118,7 +118,7 @@ jobs:

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

@@ -141,18 +141,3 @@ jobs:
        DCC_RS_DEV: ${{ github.workspace }}
      working-directory: python
      run: tox -e lint,mypy,doc,py3
-
-    - 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
--- a/.github/workflows/dependabot.yml
+++ b/.github/workflows/dependabot.yml
@@ -1,21 +0,0 @@
-name: Dependabot auto-approve
-on: pull_request
-
-permissions:
-  pull-requests: write
-
-jobs:
-  dependabot:
-    runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' }}
-    steps:
-      - name: Dependabot metadata
-        id: metadata
-        uses: dependabot/fetch-metadata@v1.1.1
-        with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Approve a PR
-        run: gh pr review --approve "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
--- a/.github/workflows/node-delete-preview.yml
+++ b/.github/workflows/node-delete-preview.yml
@@ -1,32 +0,0 @@
-# documentation: https://github.com/deltachat/sysadmin/tree/master/download.delta.chat
-name: Delete node PR previews
-
-on:
-  pull_request:
-    types: [closed]
-
-jobs:
-  delete:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Get Pullrequest ID
-      id: getid
-      run: |
-        export PULLREQUEST_ID=$(jq .number < $GITHUB_EVENT_PATH)
-        echo ::set-output name=prid::$PULLREQUEST_ID
-    - 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
@@ -1,34 +0,0 @@
-name: Generate & upload node.js documentation
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  generate:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: Use Node.js 16.x
-      uses: actions/setup-node@v1
-      with:
-        node-version: 16.x
-
-    - 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/"
--- a/.github/workflows/node-package.yml
+++ b/.github/workflows/node-package.yml
@@ -1,165 +0,0 @@
-name: 'node.js build'
-on:
-  pull_request:
-  push:
-    tags:
-    - '*'
-    - '!py-*'
-
-
-jobs:
-  prebuild:
-    name: 'prebuild'
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-18.04, macos-latest, windows-latest]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-      - name: System info
-        run: |
-          rustc -vV
-          rustup -vV
-          cargo -vV
-          npm --version
-          node --version
-
-      - name: Cache node modules
-        uses: actions/cache@v2
-        with:
-          path: |
-            ${{ env.APPDATA }}/npm-cache
-            ~/.npm
-          key: ${{ matrix.os }}-node-${{ hashFiles('**/package.json') }}
-
-      - name: Cache cargo index
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry/
-            ~/.cargo/git
-            target
-          key: ${{ matrix.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}-2
-
-      - name: Install dependencies & build
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: |
-          cd node
-          npm install --verbose
-
-      - name: Build Prebuild
-        run: |
-          cd node
-          npm run prebuildify
-          tar -zcvf "${{ matrix.os }}.tar.gz" -C prebuilds .
-
-      - name: Upload Prebuild
-        uses: actions/upload-artifact@v1
-        with:
-          name: ${{ matrix.os }}
-          path: node/${{ matrix.os }}.tar.gz
-
-  pack-module:
-    needs: prebuild
-    name: 'Package deltachat-node and upload to download.delta.chat'
-    runs-on: ubuntu-18.04
-    steps:
-      - name: install tree
-        run: sudo apt install tree
-      - name: Checkout
-        uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-      - name: get tag
-        id: tag
-        uses: dawidd6/action-get-tag@v1
-        continue-on-error: true
-      - name: Get Pullrequest ID
-        id: prepare
-        run: |
-          tag=${{ steps.tag.outputs.tag }}
-          if [ -z "$tag" ]; then
-            node -e "console.log('DELTACHAT_NODE_TAR_GZ=deltachat-node-' + '${{ github.ref }}'.split('/')[2] + '.tar.gz')" >> $GITHUB_ENV
-          else
-            echo "DELTACHAT_NODE_TAR_GZ=deltachat-node-${{ steps.tag.outputs.tag }}.tar.gz" >> $GITHUB_ENV
-            echo "No preview will be uploaded this time, but the $tag release"
-          fi
-      - name: System info
-        run: |
-          rustc -vV
-          rustup -vV
-          cargo -vV
-          npm --version
-          node --version
-          echo $DELTACHAT_NODE_TAR_GZ
-      - name: Download ubuntu prebuild
-        uses: actions/download-artifact@v1
-        with:
-          name: ubuntu-18.04
-      - name: Download macos prebuild
-        uses: actions/download-artifact@v1
-        with:
-          name: macos-latest
-      - name: Download windows prebuild
-        uses: actions/download-artifact@v1
-        with:
-          name: windows-latest
-      - shell: bash
-        run: |
-          mkdir 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-18.04 macos-latest windows-latest
-      - name: install dependencies without running scripts
-        run: |
-          npm install --ignore-scripts
-      - name: build constants
-        run: |
-          npm run build:core:constants
-      - name: build typescript part
-        run: |
-          npm run build:bindings:ts
-      - name: package
-        shell: bash
-        run: |
-          mv node/README.md README.md
-          npm pack .
-          ls -lah
-          mv $(find deltachat-node-*) $DELTACHAT_NODE_TAR_GZ
-      - name: Upload Prebuild
-        uses: actions/upload-artifact@v1
-        with:
-          name: deltachat-node.tgz
-          path: ${{ env.DELTACHAT_NODE_TAR_GZ }}
-      # Upload to download.delta.chat/node/preview/
-      - name: Upload deltachat-node preview to download.delta.chat/node/preview/
-        if: ${{ ! steps.tag.outputs.tag }}
-        id: upload-preview
-        shell: bash
-        run: |
-          echo -e "${{ secrets.SSH_KEY }}" >__TEMP_INPUT_KEY_FILE
-          chmod 600 __TEMP_INPUT_KEY_FILE
-          scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r $DELTACHAT_NODE_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/preview/"
-        continue-on-error: true
-      - name: "Post links to details"
-        if: steps.upload-preview.outcome == 'success'
-        run: node ./node/scripts/postLinksToDetails.js
-        env:
-         URL: preview/${{ env.DELTACHAT_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 }}
-        id: upload
-        shell: bash
-        run: |
-          echo -e "${{ secrets.SSH_KEY }}" >__TEMP_INPUT_KEY_FILE
-          chmod 600 __TEMP_INPUT_KEY_FILE
-          scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r $DELTACHAT_NODE_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/"
--- a/.github/workflows/node-tests.yml
+++ b/.github/workflows/node-tests.yml
@@ -1,67 +0,0 @@
-name: 'node.js tests'
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - staging
-      - trying
-
-jobs:
-  tests:
-    name: 'tests'
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-18.04, macos-latest, windows-latest]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-      - name: System info
-        run: |
-          rustc -vV
-          rustup -vV
-          cargo -vV
-          npm --version
-          node --version
-
-      - name: Cache node modules
-        uses: actions/cache@v2
-        with:
-          path: |
-            ${{ env.APPDATA }}/npm-cache
-            ~/.npm
-          key: ${{ matrix.os }}-node-${{ hashFiles('**/package.json') }}
-
-      - name: Cache cargo index
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry/
-            ~/.cargo/git
-            target
-          key: ${{ matrix.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}-2
-
-      - name: Install dependencies & build
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: |
-          cd node
-          npm install --verbose
-
-      - name: Test
-        if: runner.os != 'Windows'
-        run: |
-          cd node
-          npm run test
-        env:
-          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-      - name: Run tests on Windows, except lint
-        if: runner.os == 'Windows'
-        run: |
-          cd node
-          npm run test:mocha
-        env:
-          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
--- a/.github/workflows/upload-docs.yml
+++ b/.github/workflows/upload-docs.yml
@@ -1,28 +0,0 @@
-name: Build & Deploy Documentation on rs.delta.chat
-
-on:
-  push:
-    branches:
-      - master
-      - docs-gh-action
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - uses: actions-rs/toolchain@v1
-    - 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
@@ -1,28 +0,0 @@
-name: Build & Deploy Documentation on cffi.delta.chat
-
-on:
-  push:
-    branches:
-      - master
-      - docs-gh-action
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - uses: actions-rs/toolchain@v1
-    - 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/.gitignore
+++ b/.gitignore
@@ -29,14 +29,3 @@ deltachat-ffi/xml

 coverage/
 .DS_Store
-.vscode/launch.json
-python/accounts.txt
-python/all-testaccounts.txt
-tmp/
-
-# from deltachat-node
-node_modules/
-node/build/
-node/dist/
-node/prebuilds/
-node/.nyc_output/
--- a/.npmignore
+++ b/.npmignore
@@ -1,42 +0,0 @@
-.circleci/
-.gitmodules
-node/.nyc_output/
-.travis.yml
-appveyor.yml
-node/build/
-node/README.md
-rustfmt.toml
-spec.md
-test-data/
-build2/
-node_modules
-.git
-.idea/
-.pytest_cache
-CMakeLists.txt
-README.md
-contrib/
-node/ci_scripts/
-coverage/
-node/.circleci
-node/appveyor.yml
-ci/
-ci_scripts/
-python/
-target
-proptest-regressions
-deltachat-ffi/Doxyfile
-scripts
-webxdc.md
-standards.md
-draft/
-node/examples/
-# deltachat-core-rust/assets # don't exclude assets, otherwise it won't build
-node/images/
-node/test/
-node/windows.md
-node/*.tar.gz
-node/old_docs.md
-.vscode/
-.github/
-node/.prettierrc.yml
--- a/.npmrc
+++ b/.npmrc
@@ -1 +0,0 @@
-package-lock=false
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,387 +2,10 @@

 ## Unreleased

-### Changes
-
-### Fixes
-
-
-## 1.89.0
-
-### Changes
-
- (AEAP) When one of your contacts changed their address, they are
-  only replaced in the chat where you got a message from them
-  for now #3491
-
-### Fixes
- replace musl libc name resolution errors with a better message #3485
- handle updates for not yet downloaded webxdc instances #3487
-
-
-## 1.88.0
-
-### Changes
- Implemented "Automatic e-mail address Porting" (AEAP). You can
-  configure a new address in DC now, and when receivers get messages
-  they will automatically recognize your moving to a new address. #3385
- switch from `async-std` to `tokio` as the async runtime #3449
- upgrade to `pgp@0.8.0` #3467
- add IMAP ID extension support #3468
- configure DeltaChat folder by selecting it, so it is configured even if not LISTed #3371
- build PyPy wheels #6683
- improve default error if NDN does not provide an error #3456
- increase ratelimit from 3 to 6 messages per 60 seconds #3481
-
-### Fixes
- mailing list: remove square-brackets only for first name #3452
- do not use footers from mailinglists as the contact status #3460
- don't ignore KML parsing errors #3473
-
-
-## 1.87.0
-
-### Changes
- limit the rate of MDN sending #3402
- ignore ratelimits for bots #3439
- remove `msgs_mdns` references to deleted messages during housekeeping #3387
- format message lines starting with `>` as quotes #3434
- node: remove `split2` dependency #3418
- node: add git installation info to readme #3418
- limit the rate of webxdc update sending #3417
-
-### Fixes
- set a default error if NDN does not provide an error #3410
- python: avoid exceptions when messages/contacts/chats are compared with `None`
- node: wait for the event loop to stop before destroying contexts #3431 #3451
- emit configuration errors via event on failure #3433
- report configure and imex success/failure after freeing ongoing process #3442
-
-### API-Changes
- python: added `Message.get_status_updates()`  #3416
- python: added `Message.send_status_update()`  #3416
- python: added `Message.is_webxdc()`  #3416
- python: added `Message.is_videochat_invitation()`  #3416
- python: added support for "videochat" and "webxdc" view types to `Message.new_empty()`  #3416
-
-
-## 1.86.0
-
-### API-Changes
- python: added optional `closed` parameter to `Account` constructor #3394
- python: added optional `passphrase` parameter to `Account.export_all()` and `Account.import_all()` #3394
- python: added `Account.open()` #3394
- python: added `Chat.is_single()` #3394
- python: added `Chat.is_mailinglist()` #3394
- python: added `Chat.is_broadcast()` #3394
- python: added `Chat.is_multiuser()` #3394
- python: added `Chat.is_self_talk()` #3394
- python: added `Chat.is_device_talk()` #3394
- python: added `Chat.is_pinned()` #3394
- python: added `Chat.pin()` #3394
- python: added `Chat.unpin()` #3394
- python: added `Chat.archive()` #3394
- python: added `Chat.unarchive()` #3394
- python: added `Message.get_summarytext()` #3394
- python: added optional `closed` parameter to `ACFactory.get_unconfigured_account()` (pytest plugin) #3394
- python: added optional `passphrase` parameter to `ACFactory.get_pseudo_configured_account()` (pytest plugin) #3394
-
-### Changes
- clean up series of webxdc info messages;
-  `DC_EVENT_MSGS_CHANGED` is emitted on changes of existing info messages #3395
- update provider database #3399
- refactorings #3375 #3403 #3398 #3404
-
-### Fixes
- do not reset our database if imported backup cannot be decrypted #3397
- node: remove `npx` from build script, this broke flathub build #3396
-
-
-## 1.85.0
-
-### Changes
- refactorings #3373 #3345 #3380 #3382
- node: move split2 to devDependencies
- python: build Python 3.10 wheels #3392
- update Rust dependencies
-
-### Fixes
- delete outgoing MDNs found in the Sent folder on Gmail #3372
- fix searching one-to-one chats #3377
- do not add legacy info-messages on resending webxdc #3389
-
-
-## 1.84.0
-
-### Changes
- refactorings #3354 #3347 #3353 #3346
-
-### Fixes
- do not unnecessarily SELECT folders if there are no operations planned on
-  them #3333
- trim chat encryption info #3350
- fix failure to decrypt first message to self after key synchronization
-  via Autocrypt Setup Message #3352
- Keep pgp key when you change your own email address #3351
- Do not ignore Sent and Spam folders on Gmail #3369
- handle decryption errors explicitly and don't get confused by encrypted mail attachments #3374
-
-
-## 1.83.0
-
-### Fixes
- fix node prebuild & package ci #3337
-
-
-## 1.82.0
-
-### API-Changes
- re-add removed `DC_MSG_ID_MARKER1` as in use on iOS #3330
-
-### Changes
- refactorings #3328
-
-### Fixes
- fix node package ci #3331
- fix race condition in ongoing process (import/export, configuration) allocation #3322
-
-
-## 1.81.0
-
-### API-Changes
- deprecate unused `marker1before` argument of `dc_get_chat_msgs`
-  and remove `DC_MSG_ID_MARKER1` constant #3274
-
-### Changes
- now the node-bindings are also part of this repository 🎉 #3283
- support `source_code_url` from Webxdc manifests #3314
- support Webxdc document names and add `document` to `dc_msg_get_webxdc_info()` #3317 #3324
- improve chat encryption info, make it easier to find contacts without keys #3318
- improve error reporting when creating a folder fails #3325
- node: remove unmaintained coverage scripts
- send normal messages with higher priority than MDNs #3243
- make Scheduler stateless #3302
- abort instead of unwinding on panic #3259
- improve python bindings #3297 #3298
- improve documentation #3307 #3306 #3309 #3319 #3321
- refactorings #3304 #3303 #3323
-
-### Fixes
- node: throw error when getting context with an invalid account id
- 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
-
-
-## 1.80.0
-
-### Changes
- update provider database #3284
- improve python bindings, tests and ci #3287 #3286 #3287 #3289 #3290 #3292
-
-### Fixes
- fix escaping in generated QR-code-SVG #3295
-
-
-## 1.79.0
-
-### Changes
- Send locations in the background regardless of SMTP loop activity #3247
- refactorings #3268
- improve tests and ci #3266 #3271
-
-### Fixes
- simplify `dc_stop_io()` and remove potential panics and race conditions #3273
- fix correct message escaping consisting of a dot in SMTP protocol #3265
-
-
-## 1.78.0
-
-### API-Changes
- replaced stock string `DC_STR_ONE_MOMENT` by `DC_STR_NOT_CONNECTED` #3222
- add `dc_resend_msgs()` #3238
- `dc_provider_new_from_email()` does no longer do an DNS lookup for checking custom domains,
-  this is done by `dc_provider_new_from_email_with_dns()` now #3256
-
-### Changes
- introduce multiple self addresses with the "configured" address always being the primary one #2896
- Further improve finding the correct server after logging in #3208
- `get_connectivity_html()` returns HTML as non-scalable #3213
- add update-serial to `DC_EVENT_WEBXDC_STATUS_UPDATE` #3215
- Speed up message receiving via IMAP a bit #3225
- mark messages as seen on IMAP in batches #3223
- remove Received: based draft detection heuristic #3230
- Use pkgconfig for building Python package #2590
- don't start io on unconfigured context #2664
- do not assign group IDs to ad-hoc groups #2798
- dynamic libraries use dylib extension on Darwin #3226
- refactorings #3217 #3219 #3224 #3235 #3239 #3244 #3254
- improve documentation #3214 #3220 #3237
- improve tests and ci #3212 #3233 #3241 #3242 #3252 #3250 #3255 #3260
-
-### Fixes
- Take `delete_device_after` into account when calculating ephemeral loop timeout #3211 #3221
- Fix a bug where a blocked contact could send a contact request #3218
- Make sure, videochat-room-names are always URL-safe #3231
- Try removing account folder multiple times in case of failure #3229
- Ignore messages from all spam folders if there are many #3246
- Hide location-only messages instead of displaying empty bubbles #3248
-
-
-## 1.77.0
-
 ### API changes
- change semantics of `dc_get_webxdc_status_updates()` second parameter
-  and remove update-id from `DC_EVENT_WEBXDC_STATUS_UPDATE` #3081
-
-### Changes
- add more SMTP logging #3093
- place common headers like `From:` before the large `Autocrypt:` header #3079
- keep track of securejoin joiner status in database to survive restarts #2920
- remove never used `SentboxMove` option #3111
- improve speed by caching config values #3131 #3145
- optimize `markseen_msgs` #3141
- automatically accept chats with outgoing messages #3143
- `dc_receive_imf` refactorings #3154 #3156 #3159
- add index to speedup deletion of expired ephemeral messages #3155
- muted chats stay archived on new messages #3184
- support `min_api` from Webxdc manifests #3206
- do not read whole webxdc file into memory #3109
- improve tests, refactorings #3073 #3096 #3102 #3108 #3139 #3128 #3133 #3142 #3153 #3151 #3174 #3170 #3148 #3179 #3185
- improve documentation #2983 #3112 #3103 #3118 #3120
-
-### Fixes
- speed up loading of chat messages by a factor of 20 #3171 #3194 #3173
- fix an issue where the app crashes when trying to export a backup #3195
- 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
- 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
- do not delete duplicate messages on IMAP immediately to accidentally deleting
-  the last copy #3138
- clear more columns when message expires due to `delete_device_after` setting #3181
- do not try to use stale SMTP connections #3180
- slightly improve finding the correct server after logging in #3207
- retry message sending automatically if loop is not interrupted #3183
- fix a bug where sometimes the file extension of a long filename containing a dot was cropped #3098
-
-
-## 1.76.0
-
-### Changes
- move messages in batches #3058
- delete messages in batches #3060
- python: remove arbitrary timeouts from tests #3059
- refactorings #3026
-
-### Fixes
- avoid archived, fresh chats #3053
- Also resync UIDs in folders that are not configured #2289
- treat "NO" IMAP response to MOVE and COPY commands as an error #3058
- Fix a bug where messages in the Spam folder created contact requests #3015
- Fix a bug where drafts disappeared after some days #3067
- Parse MS Exchange read receipts and mark the original message as read #3075
- do not retry message sending infinitely in case of permanent SMTP failure #3070
- set message state to failed when retry limit is exceeded #3072
-
-
-## 1.75.0
-
-### Changes
- optimize `delete_expired_imap_messages()` #3047
-
-
-## 1.74.0
-
-### Fixes
- avoid reconnection loop when message without Message-ID is marked as seen #3044
-
-
-## 1.73.0
-
-### API changes
- added `only_fetch_mvbox` config #3028
-
-### Changes
- 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 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
- refactorings #3023 #3013
- update provider database #3043
- improve documentation #3017 #3018 #3021
-
-### Fixes
- fix splitting off text from webxdc messages #3032
- call slow `delete_expired_imap_messages()` less often #3037
- make synchronization of Seen status more robust in case unsolicited FETCH
-  result without UID is returned #3022
- fetch Inbox before scanning folders to ensure iOS does
-  not kill the app before it gets to fetch the Inbox in background #3040
-
-
-## 1.72.0
-
-### Fixes
- run migrations on backup import #3006
-
-
-## 1.71.0
-
-### API Changes
- added APIs to handle database passwords: `dc_context_new_closed()`, `dc_context_open()`,
-  `dc_context_is_open()` and `dc_accounts_add_closed_account()` #2956 #2972
- use second parameter of `dc_imex` to provide backup passphrase #2980
- added `DC_MSG_WEBXDC`, `dc_send_webxdc_status_update()`,
-  `dc_get_webxdc_status_updates()`, `dc_msg_get_webxdc_blob()`, `dc_msg_get_webxdc_info()`
-  and `DC_EVENT_WEBXDC_STATUS_UPDATE` #2826 #2971 #2975 #2977 #2979 #2993 #2994 #2998 #3001 #3003
- added `dc_msg_get_parent()` #2984
- added `dc_msg_force_plaintext()` API for bots #2847
- allow removing quotes on drafts `dc_msg_set_quote(msg, NULL)` #2950
- removed `mvbox_watch` option; watching is enabled when `mvbox_move` is enabled #2906
- removed `inbox_watch` option #2922
- deprecated `os_name` in `dc_context_new()`, pass `NULL` or an empty string #2956
-
-### Changes
- start making it possible to write to mailing lists #2736
- add `hop_info` to `dc_get_info()` #2751 #2914 #2923
- add information about whether the database is encrypted or not to `dc_get_info()` #3000
- selfstatus now defaults to empty #2951 #2960
- validate detached cryptographic signatures as used eg. by Thunderbird #2865
- do not change the draft's `msg_id` on updates and sending #2887
- add `imap` table to keep track of message UIDs #2909 #2938
- replace `SendMsgToSmtp` jobs which stored outgoing messages in blobdir with `smtp` SQL table #2939 #2996
- sql: enable `auto_vacuum=INCREMENTAL` #2931
- sql: build rusqlite with sqlcipher #2934
- synchronize Seen status across devices #2942
- `dc_preconfigure_keypair` now takes ascii armored keys instead of base64 #2862
- put removed member in Bcc instead of To in the message about removal #2864
- improve group updates #2889
- re-write the blob filename creation loop #2981
- update provider database (11 Jan 2022) #2959
- python: allow timeout for internal configure tracker API #2967
- python: remove API deprecated in Python 3.10 #2907
- refactorings #2932 #2957 #2947
- improve tests #2863 #2866 #2881 #2908 #2918 #2901 #2973
- improve documentation #2880 #2886 #2895
- improve ci #2919 #2926 #2969 #2999
-
-### Fixes
- fix leaving groups #2929
- fix unread count #2861
- make `add_parts()` not early-exit #2879
- recognize MS Exchange read receipts as read receipts #2890
- create parent directory if creating a new file fails #2978
- save "configured" flag later #2974
- improve log #2928
- `dc_receive_imf`: don't fail on invalid address in the To field #2940

+- Removed `mvbox_watch` option. #2906
+  It is automatically enabled whenever `mvbox_move` is enabled.

 ## 1.70.0

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,18 +4,10 @@ include(GNUInstallDirs)

 find_program(CARGO cargo)

-if(APPLE)
-       set(DYNAMIC_EXT "dylib")
-elseif(UNIX)
-       set(DYNAMIC_EXT "so")
-else()
-       set(DYNAMIC_EXT "dll")
-endif()
-
 add_custom_command(
 	OUTPUT
 	"target/release/libdeltachat.a"
-	"target/release/libdeltachat.${DYNAMIC_EXT}"
+	"target/release/libdeltachat.so"
 	"target/release/pkgconfig/deltachat.pc"
        COMMAND
        PREFIX=${CMAKE_INSTALL_PREFIX}
@@ -40,11 +32,11 @@ add_custom_target(
 	ALL
 	DEPENDS
 	"target/release/libdeltachat.a"
-	"target/release/libdeltachat.${DYNAMIC_EXT}"
+	"target/release/libdeltachat.so"
 	"target/release/pkgconfig/deltachat.pc"
 )

 install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(FILES "target/release/libdeltachat.so" DESTINATION ${CMAKE_INSTALL_LIBDIR})
 install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,95 +1,91 @@
 [package]
 name = "deltachat"
-version = "1.89.0"
+version = "1.70.0"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
-edition = "2021"
+edition = "2018"
 license = "MPL-2.0"
-rust-version = "1.56"
+resolver = "2"

 [profile.dev]
 debug = 0
-panic = 'abort'
-opt-level = 1

 [profile.release]
 lto = true
-panic = 'abort'

 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }

 ansi_term = { version = "0.12.1", optional = true }
 anyhow = "1"
-async-imap = { git = "https://github.com/async-email/async-imap", branch = "master", default-features = false, features = ["runtime-tokio"] }
-async-native-tls = { version = "0.4", default-features = false, features = ["runtime-tokio"] }
-async-smtp = { version = "0.5", default-features = false, features = ["smtp-transport", "socks5", "runtime-tokio"] }
-trust-dns-resolver = "0.21"
-tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
-tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
+async-imap = { git = "https://github.com/async-email/async-imap" }
+async-native-tls = { version = "0.3" }
+async-smtp = { git = "https://github.com/async-email/async-smtp", branch="master", features = ["socks5"] }
+async-std-resolver = "0.20"
+async-std = { version = "1", features = ["unstable"] }
+async-tar = { version = "0.4", default-features=false }
+async-trait = "0.1"
 backtrace = "0.3"
 base64 = "0.13"
 bitflags = "1.3"
-chrono = { version = "0.4", default-features=false, features = ["clock", "std"] }
+byteorder = "1.3"
+chrono = "0.4"
 dirs = { version = "4", optional=true }
 email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
-encoded-words = "0.2"
+encoded-words = { git = "https://github.com/async-email/encoded-words", branch="master" }
 escaper = "0.1"
 futures = "0.3"
 hex = "0.4.0"
-image = { version = "0.24.1", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+image = { version = "0.23.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"
-log = {version = "0.4.16", optional = true }
+log = {version = "0.4.8", optional = true }
 mailparse = "0.13"
 native-tls = "0.2"
 num_cpus = "1.13"
 num-derive = "0.3"
 num-traits = "0.2"
-once_cell = "1.12.0"
+once_cell = "1.9.0"
 percent-encoding = "2.0"
-pgp = { version = "0.8", default-features = false }
+pgp = { version = "0.7", default-features = false }
 pretty_env_logger = { version = "0.4", optional = true }
-quick-xml = "0.23"
+quick-xml = "0.22"
 r2d2 = "0.8"
-r2d2_sqlite = "0.20"
-rand = "0.8"
+r2d2_sqlite = "0.19"
+rand = "0.7"
 regex = "1.5"
-rusqlite = { version = "0.27", features = ["sqlcipher"] }
+rusqlite = { version = "0.26", features = ["sqlcipher"] }
 rust-hsluv = "0.1"
 rustyline = { version = "9", optional = true }
-sanitize-filename = "0.4"
+sanitize-filename = "0.3"
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 sha-1 = "0.10"
 sha2 = "0.10"
 smallvec = "1"
-strum = "0.24"
-strum_macros = "0.24"
+stop-token = "0.6"
+strum = "0.23"
+strum_macros = "0.23"
+surf = { version = "2.3", default-features = false, features = ["h1-client"] }
 thiserror = "1"
 toml = "0.5"
 url = "2"
-uuid = { version = "1", features = ["serde", "v4"] }
-fast-socks5 = "0.8"
+uuid = { version = "0.8", features = ["serde", "v4"] }
+fast-socks5 = "0.4"
 humansize = "1"
 qrcodegen = "1.7.0"
-tagger = "4.3.3"
-textwrap = "0.15.0"
-async-channel = "1.6.1"
-futures-lite = "1.12.0"
-tokio-stream = { version = "0.1.9", features = ["fs"] }
-reqwest = { version = "0.11.11", features = ["json"] }
-async_zip = { git = "https://github.com/dignifiedquire/rs-async-zip", branch = "main", default-features = false, features = ["deflate"] }
+tagger = "3.3.0"
+textwrap = "0.14.2"

 [dev-dependencies]
 ansi_term = "0.12.0"
-criterion = { version = "0.3.4", features = ["async_tokio"] }
+async-std = { version = "1", features = ["unstable", "attributes"] }
+criterion = "0.3"
 futures-lite = "1.12"
 log = "0.4"
 pretty_env_logger = "0.4"
 proptest = { version = "1", default-features = false, features = ["std"] }
 tempfile = "3"
-tokio = { version = "1", features = ["parking_lot", "rt-multi-thread", "macros"] }

 [workspace]
 members = [
@@ -120,26 +116,9 @@ harness = false
 name = "search_msgs"
 harness = false

-[[bench]]
-name = "receive_emails"
-harness = false
-
-[[bench]]
-name = "get_chat_msgs"
-harness = false
-
-[[bench]]
-name = "get_chatlist"
-harness = false
-
 [features]
 default = ["vendored"]
 internals = []
 repl = ["internals", "rustyline", "log", "pretty_env_logger", "ansi_term", "dirs"]
-vendored = [
-  "async-native-tls/vendored",
-  "async-smtp/native-tls-vendored",
-  "rusqlite/bundled-sqlcipher-vendored-openssl",
-  "reqwest/native-tls-vendored"
-]
+vendored = ["async-native-tls/vendored", "async-smtp/native-tls-vendored", "rusqlite/bundled-sqlcipher-vendored-openssl"]
 nightly = ["pgp/nightly"]
--- a/README.md
+++ b/README.md
@@ -12,8 +12,6 @@ To download and install the official compiler for the Rust programming language,
 $ curl https://sh.rustup.rs -sSf | sh
 ```

-> On Windows, you may need to also install **Perl** to be able to compile deltachat-core.
-
 ## Using the CLI client

 Compile and run Delta Chat Core command line utility, using `cargo`:
@@ -102,6 +100,9 @@ $ cargo build -p deltachat_ffi --release

 ## Debugging environment variables 

+- `DCC_IMAP_DEBUG`: if set IMAP protocol commands and responses will be
+  printed
+
 - `DCC_MIME_DEBUG`: if set outgoing and incoming message will be printed 

 - `RUST_LOG=repl=info,async_imap=trace,async_smtp=trace`: enable IMAP and
@@ -124,11 +125,11 @@ $ cargo test -- --ignored

 Language bindings are available for:

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

 The following "frontend" projects make use of the Rust-library
--- a/assets/icon-webxdc.png
+++ b/assets/icon-webxdc.png
--- a/assets/icon-webxdc.svg
+++ b/assets/icon-webxdc.svg
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="80mm"
-   height="297mm"
-   viewBox="0 0 80 297"
-   version="1.1"
-   id="svg71"
-   inkscape:version="1.0.2 (e86c8708, 2021-01-15)"
-   sodipodi:docname="icon-webxdc.svg"
-   inkscape:export-filename="C:\Users\user\OneDrive - BFW-Leipzig\Documents\LogoDC\finalohnerand.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96">
-  <metadata
-     id="metadata856">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     id="namedview73"
-     pagecolor="#767676"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="true"
-     inkscape:document-units="mm"
-     showgrid="false"
-     showborder="false"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="-90.271136"
-     inkscape:cy="-1233.1209"
-     inkscape:window-width="1864"
-     inkscape:window-height="1027"
-     inkscape:window-x="56"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1"
-     inkscape:snap-global="false"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:document-rotation="0"
-     units="px">
-    <sodipodi:guide
-       position="-154.76097,641.11689"
-       orientation="0,-1"
-       id="guide21118" />
-    <sodipodi:guide
-       position="-60.286487,633.36619"
-       orientation="0,-1"
-       id="guide21120" />
-  </sodipodi:namedview>
-  <defs
-     id="defs68">
-    <linearGradient
-       id="linearGradient4375">
-      <stop
-         style="stop-color:#364e59;stop-opacity:1;"
-         offset="0"
-         id="stop4377" />
-      <stop
-         style="stop-color:#364e59;stop-opacity:0;"
-         offset="1"
-         id="stop4379" />
-    </linearGradient>
-  </defs>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#1a1a1a;stroke:#000000;stroke-width:0.167903"
-       id="rect880"
-       width="79.8321"
-       height="79.8321"
-       x="-64.03286"
-       y="-375.9097"
-       ry="0" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path3799-2"
-       d="m -24.089585,-372.59579 c -19.986026,0.24336 -36.196903,16.666 -36.196903,36.67011 0,20.00409 16.210877,36.03233 36.196903,35.78912 19.0024236,-0.076 14.5340713,-10.6146 35.538854,-0.85693 -11.50627538,-17.97454 0.390097,-20.36737 0.658079,-35.81316 0,-20.00411 -16.2108788,-36.03235 -36.196911,-35.78914 z"
-       style="fill:#364e59;fill-opacity:1;stroke:none;stroke-width:1.93355"
-       sodipodi:nodetypes="sscccs" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M -54.193871,-325.26419 Z"
-       id="path3846" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M -49.397951,-326.67773 Z"
-       id="path3848" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m -49.397951,-326.67773 v 0 0"
-       id="path3850" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.01;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m -51.35133,-325.0334 -7.964067,5.98895 z"
-       id="path3965" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path11037"
-       d="m -24.089585,-372.19891 c -19.986026,0.24156 -36.196903,16.54352 -36.196903,36.40062 0,7.86524 2.543315,15.1113 6.857155,20.97971 6.577146,8.94734 11.123515,9.77363 11.123515,9.77363 1.343237,1.78324 10.270932,4.3223 10.270932,4.3223 l 16.791727,-70.86654 -0.468369,-0.33457 c 0.458597,0.26445 0.428277,-0.27515 -8.378035,-0.27515 z"
-       style="fill:#7cc5cc;fill-opacity:1;stroke:none;stroke-width:1.92643"
-       sodipodi:nodetypes="sssccccss" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M -49.944239,-310.69957 Z"
-       id="path13674" />
-    <g
-       id="g15178"
-       transform="matrix(0.79975737,0,0,0.79975737,53.088959,-63.716396)">
-      <rect
-         style="fill:#364e59;fill-opacity:1;stroke-width:0.01;stroke-miterlimit:4;stroke-dasharray:none"
-         id="rect15072"
-         width="29.897917"
-         height="6.8791666"
-         x="-334.4964"
-         y="-154.51025"
-         transform="rotate(45)" />
-      <rect
-         style="fill:#364e59;fill-opacity:1;stroke-width:0.01;stroke-miterlimit:4;stroke-dasharray:none"
-         id="rect15072-5"
-         width="29.897917"
-         height="6.8791666"
-         x="147.63107"
-         y="-334.4964"
-         transform="rotate(-45)"
-         inkscape:transform-center-x="-0.74835017"
-         inkscape:transform-center-y="0.37417525" />
-    </g>
-    <g
-       id="g22468"
-       transform="translate(3.3033974)">
-      <g
-         id="g15178-0"
-         transform="matrix(-0.79975737,0,0,0.79975737,-103.11028,-63.716404)"
-         style="fill:#7cc5cc;fill-opacity:1">
-        <rect
-           style="fill:#7cc5cc;fill-opacity:1;stroke-width:0.01;stroke-miterlimit:4;stroke-dasharray:none"
-           id="rect15072-2"
-           width="29.897917"
-           height="6.8791666"
-           x="-334.4964"
-           y="-154.51025"
-           transform="rotate(45)" />
-        <rect
-           style="fill:#7cc5cc;fill-opacity:1;stroke-width:0.01;stroke-miterlimit:4;stroke-dasharray:none"
-           id="rect15072-5-5"
-           width="29.897917"
-           height="6.8791666"
-           x="147.63107"
-           y="-334.4964"
-           transform="rotate(-45)"
-           inkscape:transform-center-x="-0.74835017"
-           inkscape:transform-center-y="0.37417525" />
-      </g>
-    </g>
-  </g>
-</svg>
--- a/benches/contacts.rs
+++ b/benches/contacts.rs
@@ -1,14 +1,14 @@
+use async_std::task::block_on;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::contact::Contact;
 use deltachat::context::Context;
-use deltachat::Events;
 use tempfile::tempdir;

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

    let book = (0..n)
        .map(|i| format!("Name {}\naddr{}@example.org\n", i, i))
@@ -24,16 +24,12 @@ async fn address_book_benchmark(n: u32, read_count: u32) {
 }

 fn criterion_benchmark(c: &mut Criterion) {
-    let rt = tokio::runtime::Runtime::new().unwrap();
-
    c.bench_function("create 500 contacts", |b| {
-        b.to_async(&rt)
-            .iter(|| async { address_book_benchmark(black_box(500), black_box(0)).await })
+        b.iter(|| block_on(async { address_book_benchmark(black_box(500), black_box(0)).await }))
    });

    c.bench_function("create 100 contacts and read it 1000 times", |b| {
-        b.to_async(&rt)
-            .iter(|| async { address_book_benchmark(black_box(100), black_box(1000)).await })
+        b.iter(|| block_on(async { address_book_benchmark(black_box(100), black_box(1000)).await }))
    });
 }

--- a/benches/create_account.rs
+++ b/benches/create_account.rs
@@ -1,11 +1,12 @@
+use async_std::path::PathBuf;
+use async_std::task::block_on;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::accounts::Accounts;
-use std::path::PathBuf;
 use tempfile::tempdir;

 async fn create_accounts(n: u32) {
    let dir = tempdir().unwrap();
-    let p: PathBuf = dir.path().join("accounts");
+    let p: PathBuf = dir.path().join("accounts").into();

    let mut accounts = Accounts::new(p.clone()).await.unwrap();

@@ -17,8 +18,7 @@ async fn create_accounts(n: u32) {

 fn criterion_benchmark(c: &mut Criterion) {
    c.bench_function("create 1 account", |b| {
-        let rt = tokio::runtime::Runtime::new().unwrap();
-        b.to_async(&rt).iter(|| create_accounts(black_box(1)))
+        b.iter(|| block_on(async { create_accounts(black_box(1)).await }))
    });
 }

--- a/benches/get_chat_msgs.rs
+++ b/benches/get_chat_msgs.rs
@@ -1,44 +0,0 @@
-use std::path::Path;
-
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-
-use deltachat::chat::{self, ChatId};
-use deltachat::chatlist::Chatlist;
-use deltachat::context::Context;
-use deltachat::Events;
-
-async fn get_chat_msgs_benchmark(dbfile: &Path, chats: &[ChatId]) {
-    let id = 100;
-    let context = Context::new(dbfile, id, Events::new()).await.unwrap();
-
-    for c in chats.iter().take(10) {
-        black_box(chat::get_chat_msgs(&context, *c, 0).await.ok());
-    }
-}
-
-fn criterion_benchmark(c: &mut Criterion) {
-    // To enable this benchmark, set `DELTACHAT_BENCHMARK_DATABASE` to some large database with many
-    // messages, such as your primary account.
-    if let Ok(path) = std::env::var("DELTACHAT_BENCHMARK_DATABASE") {
-        let rt = tokio::runtime::Runtime::new().unwrap();
-
-        let chats: Vec<_> = rt.block_on(async {
-            let context = Context::new(Path::new(&path), 100, Events::new())
-                .await
-                .unwrap();
-            let chatlist = Chatlist::try_load(&context, 0, None, None).await.unwrap();
-            let len = chatlist.len();
-            (0..len).map(|i| chatlist.get_chat_id(i).unwrap()).collect()
-        });
-
-        c.bench_function("chat::get_chat_msgs (load messages from 10 chats)", |b| {
-            b.to_async(&rt)
-                .iter(|| get_chat_msgs_benchmark(black_box(path.as_ref()), black_box(&chats)))
-        });
-    } else {
-        println!("env var not set: DELTACHAT_BENCHMARK_DATABASE");
-    }
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);
--- a/benches/get_chatlist.rs
+++ b/benches/get_chatlist.rs
@@ -1,33 +0,0 @@
-use std::path::Path;
-
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-
-use deltachat::chatlist::Chatlist;
-use deltachat::context::Context;
-use deltachat::Events;
-
-async fn get_chat_list_benchmark(context: &Context) {
-    Chatlist::try_load(context, 0, None, None).await.unwrap();
-}
-
-fn criterion_benchmark(c: &mut Criterion) {
-    // To enable this benchmark, set `DELTACHAT_BENCHMARK_DATABASE` to some large database with many
-    // messages, such as your primary account.
-    if let Ok(path) = std::env::var("DELTACHAT_BENCHMARK_DATABASE") {
-        let rt = tokio::runtime::Runtime::new().unwrap();
-        let context = rt.block_on(async {
-            Context::new(Path::new(&path), 100, Events::new())
-                .await
-                .unwrap()
-        });
-        c.bench_function("chatlist:try_load (Get Chatlist)", |b| {
-            b.to_async(&rt)
-                .iter(|| get_chat_list_benchmark(black_box(&context)))
-        });
-    } else {
-        println!("env var not set: DELTACHAT_BENCHMARK_DATABASE");
-    }
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);
--- a/benches/receive_emails.rs
+++ b/benches/receive_emails.rs
@@ -1,87 +0,0 @@
-use std::path::PathBuf;
-
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use deltachat::{
-    config::Config,
-    context::Context,
-    imex::{imex, ImexMode},
-    receive_imf::receive_imf,
-    Events,
-};
-use tempfile::tempdir;
-
-async fn recv_all_emails(context: Context) -> Context {
-    for i in 0..100 {
-        let imf_raw = format!(
-            "Subject: Benchmark
-Message-ID: Mr.OssSYnOFkhR.{i}@testrun.org
-Date: Sat, 07 Dec 2019 19:00:27 +0000
-To: alice@example.com
-From: sender@testrun.org
-Chat-Version: 1.0
-Chat-Disposition-Notification-To: sender@testrun.org
-Chat-User-Avatar: 0
-In-Reply-To: Mr.OssSYnOFkhR.{i_dec}@testrun.org
-MIME-Version: 1.0
-
-Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
-
-Hello {i}",
-            i = i,
-            i_dec = i - 1,
-        );
-        receive_imf(&context, black_box(imf_raw.as_bytes()), false)
-            .await
-            .unwrap();
-    }
-    context
-}
-
-async fn create_context() -> Context {
-    let dir = tempdir().unwrap();
-    let dbfile = dir.path().join("db.sqlite");
-    let id = 100;
-    let context = Context::new(&dbfile, id, Events::new()).await.unwrap();
-
-    let backup: PathBuf = std::env::current_dir()
-        .unwrap()
-        .join("delta-chat-backup.tar");
-
-    if backup.exists() {
-        println!("Importing backup");
-        imex(&context, ImexMode::ImportBackup, &backup, None)
-            .await
-            .unwrap();
-    }
-
-    let addr = "alice@example.com";
-    context.set_config(Config::Addr, Some(addr)).await.unwrap();
-    context
-        .set_config(Config::ConfiguredAddr, Some(addr))
-        .await
-        .unwrap();
-    context
-        .set_config(Config::Configured, Some("1"))
-        .await
-        .unwrap();
-    context
-}
-
-fn criterion_benchmark(c: &mut Criterion) {
-    let mut group = c.benchmark_group("Receive messages");
-    group.bench_function("Receive 100 simple text msgs", |b| {
-        let rt = tokio::runtime::Runtime::new().unwrap();
-        let context = rt.block_on(create_context());
-
-        b.to_async(&rt).iter(|| {
-            let ctx = context.clone();
-            async move {
-                recv_all_emails(black_box(ctx)).await;
-            }
-        });
-    });
-    group.finish();
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);
--- a/benches/search_msgs.rs
+++ b/benches/search_msgs.rs
@@ -1,13 +1,12 @@
+use async_std::task::block_on;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::context::Context;
-use deltachat::Events;
 use std::path::Path;

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

    for _ in 0..10u32 {
        context.search_msgs(None, "hello").await.unwrap();
@@ -18,13 +17,9 @@ fn criterion_benchmark(c: &mut Criterion) {
    // To enable this benchmark, set `DELTACHAT_BENCHMARK_DATABASE` to some large database with many
    // messages, such as your primary account.
    if let Ok(path) = std::env::var("DELTACHAT_BENCHMARK_DATABASE") {
-        let rt = tokio::runtime::Runtime::new().unwrap();
-
        c.bench_function("search hello", |b| {
-            b.to_async(&rt).iter(|| search_benchmark(black_box(&path)))
+            b.iter(|| block_on(async { search_benchmark(black_box(&path)).await }))
        });
-    } else {
-        println!("env var not set: DELTACHAT_BENCHMARK_DATABASE");
    }
 }

--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.89.0"
+version = "1.70.0"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
@@ -20,11 +20,10 @@ libc = "0.2"
 human-panic = "1"
 num-traits = "0.2"
 serde_json = "1.0"
-tokio = { version = "1", features = ["rt-multi-thread"] }
+async-std = "1"
 anyhow = "1"
 thiserror = "1"
 rand = "0.7"
-once_cell = "1.12.0"

 [features]
 default = ["vendored"]
--- a/deltachat-ffi/README.md
+++ b/deltachat-ffi/README.md
@@ -1,9 +1,5 @@
 # Delta Chat C Interface

-## Installation
-
-see `Installing libdeltachat system wide` in [../README.md](../README.md)
-
 ## Documentation

 To generate the C Interface documentation,
--- a/deltachat-ffi/build.rs
+++ b/deltachat-ffi/build.rs
@@ -1,3 +1,4 @@
+use std::io::Write;
 use std::path::PathBuf;
 use std::{env, fs};

@@ -27,9 +28,8 @@ fn main() {
    );

    fs::create_dir_all(target_path.join("pkgconfig")).unwrap();
-    fs::write(
-        target_path.join("pkgconfig").join("deltachat.pc"),
-        pkg_config.as_bytes(),
-    )
-    .unwrap();
+    fs::File::create(target_path.join("pkgconfig").join("deltachat.pc"))
+        .unwrap()
+        .write_all(pkg_config.as_bytes())
+        .unwrap();
 }
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
--- a/deltachat-ffi/src/dc_array.rs
+++ b/deltachat-ffi/src/dc_array.rs
@@ -1,5 +1,5 @@
 use crate::chat::ChatItem;
-use crate::constants::DC_MSG_ID_DAYMARKER;
+use crate::constants::{DC_MSG_ID_DAYMARKER, DC_MSG_ID_MARKER1};
 use crate::location::Location;
 use crate::message::MsgId;

@@ -18,6 +18,7 @@ impl dc_array_t {
            Self::MsgIds(array) => array[index].to_u32(),
            Self::Chat(array) => match array[index] {
                ChatItem::Message { msg_id } => msg_id.to_u32(),
+                ChatItem::Marker1 => DC_MSG_ID_MARKER1,
                ChatItem::DayMarker { .. } => DC_MSG_ID_DAYMARKER,
            },
            Self::Locations(array) => array[index].location_id,
@@ -30,6 +31,7 @@ impl dc_array_t {
            Self::MsgIds(_) => None,
            Self::Chat(array) => array.get(index).and_then(|item| match item {
                ChatItem::Message { .. } => None,
+                ChatItem::Marker1 { .. } => None,
                ChatItem::DayMarker { timestamp } => Some(*timestamp),
            }),
            Self::Locations(array) => array.get(index).map(|location| location.timestamp),
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -1,4 +1,4 @@
-#![warn(unused, clippy::all)]
+#![deny(clippy::all)]
 #![allow(
    non_camel_case_types,
    non_snake_case,
@@ -11,36 +11,33 @@

 #[macro_use]
 extern crate human_panic;
+extern crate num_traits;
+extern crate serde_json;

 use std::collections::BTreeMap;
 use std::convert::TryFrom;
 use std::fmt::Write;
-use std::future::Future;
 use std::ops::Deref;
 use std::ptr;
 use std::str::FromStr;
 use std::time::{Duration, SystemTime};

 use anyhow::Context as _;
+use async_std::sync::RwLock;
+use async_std::task::{block_on, spawn};
 use deltachat::qr_code_generator::get_securejoin_qr_svg;
 use num_traits::{FromPrimitive, ToPrimitive};
-use once_cell::sync::Lazy;
-use rand::Rng;
-use tokio::runtime::Runtime;
-use tokio::sync::RwLock;

 use deltachat::chat::{ChatId, ChatVisibility, MuteDuration, ProtectionStatus};
 use deltachat::constants::DC_MSG_ID_LAST_SPECIAL;
-use deltachat::contact::{Contact, ContactId, Origin};
+use deltachat::contact::{Contact, Origin};
 use deltachat::context::Context;
 use deltachat::ephemeral::Timer as EphemeralTimer;
 use deltachat::key::DcKey;
 use deltachat::message::MsgId;
 use deltachat::stock_str::StockMessage;
-use deltachat::webxdc::StatusUpdateSerial;
 use deltachat::*;
 use deltachat::{accounts::Accounts, log::LogExt};
-use tokio::task::JoinHandle;

 mod dc_array;
 mod lot;
@@ -64,23 +61,6 @@ use deltachat::chatlist::Chatlist;
 /// Struct representing the deltachat context.
 pub type dc_context_t = Context;

-static RT: Lazy<Runtime> = Lazy::new(|| Runtime::new().expect("unable to create tokio runtime"));
-
-fn block_on<T>(fut: T) -> T::Output
-where
-    T: Future,
-{
-    RT.block_on(fut)
-}
-
-fn spawn<T>(fut: T) -> JoinHandle<T::Output>
-where
-    T: Future + Send + 'static,
-    T::Output: Send + 'static,
-{
-    RT.spawn(fut)
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_context_new(
    _os_name: *const libc::c_char,
@@ -95,9 +75,10 @@ pub unsafe extern "C" fn dc_context_new(
    }

    let ctx = if blobdir.is_null() || *blobdir == 0 {
+        use rand::Rng;
        // generate random ID as this functionality is not yet available on the C-api.
        let id = rand::thread_rng().gen();
-        block_on(Context::new(as_path(dbfile), id, Events::new()))
+        block_on(Context::new(as_path(dbfile).to_path_buf().into(), id))
    } else {
        eprintln!("blobdir can not be defined explicitly anymore");
        return ptr::null_mut();
@@ -105,60 +86,12 @@ pub unsafe extern "C" fn dc_context_new(
    match ctx {
        Ok(ctx) => Box::into_raw(Box::new(ctx)),
        Err(err) => {
-            eprintln!("failed to create context: {:#}", err);
+            eprintln!("failed to create context: {}", err);
            ptr::null_mut()
        }
    }
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_context_new_closed(dbfile: *const libc::c_char) -> *mut dc_context_t {
-    setup_panic!();
-
-    if dbfile.is_null() {
-        eprintln!("ignoring careless call to dc_context_new_closed()");
-        return ptr::null_mut();
-    }
-
-    let id = rand::thread_rng().gen();
-    match block_on(Context::new_closed(as_path(dbfile), id, Events::new())) {
-        Ok(context) => Box::into_raw(Box::new(context)),
-        Err(err) => {
-            eprintln!("failed to create context: {:#}", err);
-            ptr::null_mut()
-        }
-    }
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_context_open(
-    context: *mut dc_context_t,
-    passphrase: *const libc::c_char,
-) -> libc::c_int {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_context_open()");
-        return 0;
-    }
-
-    let ctx = &*context;
-    let passphrase = to_string_lossy(passphrase);
-    block_on(ctx.open(passphrase))
-        .log_err(ctx, "dc_context_open() failed")
-        .map(|b| b as libc::c_int)
-        .unwrap_or(0)
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_context_is_open(context: *mut dc_context_t) -> libc::c_int {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_context_is_open()");
-        return 0;
-    }
-
-    let ctx = &*context;
-    block_on(ctx.is_open()) as libc::c_int
-}
-
 /// Release the context structure.
 ///
 /// This function releases the memory of the `dc_context_t` structure.
@@ -395,7 +328,7 @@ pub unsafe extern "C" fn dc_get_oauth2_url(
    let redirect = to_string_lossy(redirect);

    block_on(async move {
-        match oauth2::get_oauth2_url(ctx, &addr, &redirect)
+        match oauth2::dc_get_oauth2_url(ctx, &addr, &redirect)
            .await
            .log_err(ctx, "dc_get_oauth2_url failed")
        {
@@ -473,37 +406,7 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
    }

    let event = &*event;
-    match event.typ {
-        EventType::Info(_) => 100,
-        EventType::SmtpConnected(_) => 101,
-        EventType::ImapConnected(_) => 102,
-        EventType::SmtpMessageSent(_) => 103,
-        EventType::ImapMessageDeleted(_) => 104,
-        EventType::ImapMessageMoved(_) => 105,
-        EventType::NewBlobFile(_) => 150,
-        EventType::DeletedBlobFile(_) => 151,
-        EventType::Warning(_) => 300,
-        EventType::Error(_) => 400,
-        EventType::ErrorSelfNotInGroup(_) => 410,
-        EventType::MsgsChanged { .. } => 2000,
-        EventType::IncomingMsg { .. } => 2005,
-        EventType::MsgsNoticed { .. } => 2008,
-        EventType::MsgDelivered { .. } => 2010,
-        EventType::MsgFailed { .. } => 2012,
-        EventType::MsgRead { .. } => 2015,
-        EventType::ChatModified(_) => 2020,
-        EventType::ChatEphemeralTimerModified { .. } => 2021,
-        EventType::ContactsChanged(_) => 2030,
-        EventType::LocationChanged(_) => 2035,
-        EventType::ConfigureProgress { .. } => 2041,
-        EventType::ImexProgress(_) => 2051,
-        EventType::ImexFileWritten(_) => 2052,
-        EventType::SecurejoinInviterProgress { .. } => 2060,
-        EventType::SecurejoinJoinerProgress { .. } => 2061,
-        EventType::ConnectivityChanged => 2100,
-        EventType::SelfavatarChanged => 2110,
-        EventType::WebxdcStatusUpdate { .. } => 2120,
-    }
+    event.as_id()
 }

 #[no_mangle]
@@ -538,17 +441,14 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
        | EventType::ChatEphemeralTimerModified { chat_id, .. } => chat_id.to_u32() as libc::c_int,
        EventType::ContactsChanged(id) | EventType::LocationChanged(id) => {
            let id = id.unwrap_or_default();
-            id.to_u32() as libc::c_int
+            id as libc::c_int
        }
        EventType::ConfigureProgress { progress, .. } | EventType::ImexProgress(progress) => {
            *progress as libc::c_int
        }
        EventType::ImexFileWritten(_) => 0,
        EventType::SecurejoinInviterProgress { contact_id, .. }
-        | EventType::SecurejoinJoinerProgress { contact_id, .. } => {
-            contact_id.to_u32() as libc::c_int
-        }
-        EventType::WebxdcStatusUpdate { msg_id, .. } => msg_id.to_u32() as libc::c_int,
+        | EventType::SecurejoinJoinerProgress { contact_id, .. } => *contact_id as libc::c_int,
    }
 }

@@ -580,8 +480,8 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
        | EventType::ImexFileWritten(_)
        | EventType::MsgsNoticed(_)
        | EventType::ConnectivityChanged
-        | EventType::SelfavatarChanged => 0,
-        EventType::ChatModified(_) => 0,
+        | EventType::SelfavatarChanged
+        | EventType::ChatModified(_) => 0,
        EventType::MsgsChanged { msg_id, .. }
        | EventType::IncomingMsg { msg_id, .. }
        | EventType::MsgDelivered { msg_id, .. }
@@ -590,10 +490,6 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
        EventType::SecurejoinInviterProgress { progress, .. }
        | EventType::SecurejoinJoinerProgress { progress, .. } => *progress as libc::c_int,
        EventType::ChatEphemeralTimerModified { timer, .. } => timer.to_u32() as libc::c_int,
-        EventType::WebxdcStatusUpdate {
-            status_update_serial,
-            ..
-        } => status_update_serial.to_u32() as libc::c_int,
    }
 }

@@ -635,7 +531,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
        | EventType::SecurejoinJoinerProgress { .. }
        | EventType::ConnectivityChanged
        | EventType::SelfavatarChanged
-        | EventType::WebxdcStatusUpdate { .. }
        | EventType::ChatEphemeralTimerModified { .. } => ptr::null_mut(),
        EventType::ConfigureProgress { comment, .. } => {
            if let Some(comment) = comment {
@@ -693,19 +588,16 @@ pub unsafe extern "C" fn dc_get_next_event(events: *mut dc_event_emitter_t) -> *
    }
    let events = &*events;

-    block_on(async move {
-        events
-            .recv()
-            .await
-            .map(|ev| Box::into_raw(Box::new(ev)))
-            .unwrap_or_else(ptr::null_mut)
-    })
+    events
+        .recv_sync()
+        .map(|ev| Box::into_raw(Box::new(ev)))
+        .unwrap_or_else(ptr::null_mut)
 }

 #[no_mangle]
 pub unsafe extern "C" fn dc_stop_io(context: *mut dc_context_t) {
    if context.is_null() {
-        eprintln!("ignoring careless call to dc_stop_io()");
+        eprintln!("ignoring careless call to dc_shutdown()");
        return;
    }
    let ctx = &*context;
@@ -739,7 +631,7 @@ pub unsafe extern "C" fn dc_preconfigure_keypair(
    }
    let ctx = &*context;
    block_on(async move {
-        let addr = tools::EmailAddress::new(&to_string_lossy(addr))?;
+        let addr = dc_tools::EmailAddress::new(&to_string_lossy(addr))?;
        let public = key::SignedPublicKey::from_asc(&to_string_lossy(public_data))?.0;
        let secret = key::SignedSecretKey::from_asc(&to_string_lossy(secret_data))?.0;
        let keypair = key::KeyPair {
@@ -768,11 +660,7 @@ pub unsafe extern "C" fn dc_get_chatlist(
    let ctx = &*context;
    let qs = to_opt_string_lossy(query_str);

-    let qi = if query_id == 0 {
-        None
-    } else {
-        Some(ContactId::new(query_id))
-    };
+    let qi = if query_id == 0 { None } else { Some(query_id) };

    block_on(async move {
        match chatlist::Chatlist::try_load(ctx, flags as usize, qs.as_deref(), qi)
@@ -800,7 +688,7 @@ pub unsafe extern "C" fn dc_create_chat_by_contact_id(
    let ctx = &*context;

    block_on(async move {
-        ChatId::create_for_contact(ctx, ContactId::new(contact_id))
+        ChatId::create_for_contact(ctx, contact_id)
            .await
            .log_err(ctx, "Failed to create chat from contact_id")
            .map(|id| id.to_u32())
@@ -820,7 +708,7 @@ pub unsafe extern "C" fn dc_get_chat_id_by_contact_id(
    let ctx = &*context;

    block_on(async move {
-        ChatId::lookup_by_contact(ctx, ContactId::new(contact_id))
+        ChatId::lookup_by_contact(ctx, contact_id)
            .await
            .log_err(ctx, "Failed to get chat for contact_id")
            .unwrap_or_default() // unwraps the Result
@@ -932,48 +820,6 @@ pub unsafe extern "C" fn dc_send_videochat_invitation(
    })
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_send_webxdc_status_update(
-    context: *mut dc_context_t,
-    msg_id: u32,
-    json: *const libc::c_char,
-    descr: *const libc::c_char,
-) -> libc::c_int {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_send_webxdc_status_update()");
-        return 0;
-    }
-    let ctx = &*context;
-
-    block_on(ctx.send_webxdc_status_update(
-        MsgId::new(msg_id),
-        &to_string_lossy(json),
-        &to_string_lossy(descr),
-    ))
-    .log_err(ctx, "Failed to send webxdc update")
-    .is_ok() as libc::c_int
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_get_webxdc_status_updates(
-    context: *mut dc_context_t,
-    msg_id: u32,
-    last_known_serial: u32,
-) -> *mut libc::c_char {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_get_webxdc_status_updates()");
-        return "".strdup();
-    }
-    let ctx = &*context;
-
-    block_on(ctx.get_webxdc_status_updates(
-        MsgId::new(msg_id),
-        StatusUpdateSerial::new(last_known_serial),
-    ))
-    .unwrap_or_else(|_| "".to_string())
-    .strdup()
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_set_draft(
    context: *mut dc_context_t,
@@ -1075,17 +921,22 @@ pub unsafe extern "C" fn dc_get_chat_msgs(
    context: *mut dc_context_t,
    chat_id: u32,
    flags: u32,
-    _marker1before: u32,
+    marker1before: u32,
 ) -> *mut dc_array::dc_array_t {
    if context.is_null() {
        eprintln!("ignoring careless call to dc_get_chat_msgs()");
        return ptr::null_mut();
    }
    let ctx = &*context;
+    let marker_flag = if marker1before <= DC_MSG_ID_LAST_SPECIAL {
+        None
+    } else {
+        Some(MsgId::new(marker1before))
+    };

    block_on(async move {
        Box::into_raw(Box::new(
-            chat::get_chat_msgs(ctx, ChatId::new(chat_id), flags)
+            chat::get_chat_msgs(ctx, ChatId::new(chat_id), flags, marker_flag)
                .await
                .unwrap_or_log_default(ctx, "failed to get chat msgs")
                .into(),
@@ -1392,10 +1243,7 @@ pub unsafe extern "C" fn dc_get_chat_contacts(
        let arr = dc_array_t::from(
            chat::get_chat_contacts(ctx, ChatId::new(chat_id))
                .await
-                .unwrap_or_log_default(ctx, "Failed get_chat_contacts")
-                .iter()
-                .map(|id| id.to_u32())
-                .collect::<Vec<u32>>(),
+                .unwrap_or_log_default(ctx, "Failed get_chat_contacts"),
        );
        Box::into_raw(Box::new(arr))
    })
@@ -1505,7 +1353,7 @@ pub unsafe extern "C" fn dc_is_contact_in_chat(
    block_on(chat::is_contact_in_chat(
        ctx,
        ChatId::new(chat_id),
-        ContactId::new(contact_id),
+        contact_id,
    ))
    .log_err(ctx, "is_contact_in_chat failed")
    .unwrap_or_default() as libc::c_int
@@ -1526,7 +1374,7 @@ pub unsafe extern "C" fn dc_add_contact_to_chat(
    block_on(chat::add_contact_to_chat(
        ctx,
        ChatId::new(chat_id),
-        ContactId::new(contact_id),
+        contact_id,
    ))
    .log_err(ctx, "Failed to add contact")
    .is_ok() as libc::c_int
@@ -1547,7 +1395,7 @@ pub unsafe extern "C" fn dc_remove_contact_from_chat(
    block_on(chat::remove_contact_from_chat(
        ctx,
        ChatId::new(chat_id),
-        ContactId::new(contact_id),
+        contact_id,
    ))
    .log_err(ctx, "Failed to remove contact")
    .is_ok() as libc::c_int
@@ -1794,27 +1642,6 @@ pub unsafe extern "C" fn dc_forward_msgs(
    })
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_resend_msgs(
-    context: *mut dc_context_t,
-    msg_ids: *const u32,
-    msg_cnt: libc::c_int,
-) -> libc::c_int {
-    if context.is_null() || msg_ids.is_null() || msg_cnt <= 0 {
-        eprintln!("ignoring careless call to dc_resend_msgs()");
-        return 0;
-    }
-    let ctx = &*context;
-    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);
-        0
-    } else {
-        1
-    }
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_markseen_msgs(
    context: *mut dc_context_t,
@@ -1903,8 +1730,7 @@ pub unsafe extern "C" fn dc_lookup_contact_id_by_addr(
        Contact::lookup_id_by_addr(ctx, &to_string_lossy(addr), Origin::IncomingReplyTo)
            .await
            .unwrap_or_log_default(ctx, "failed to lookup id")
-            .map(|id| id.to_u32())
-            .unwrap_or_default()
+            .unwrap_or(0)
    })
 }

@@ -1924,7 +1750,6 @@ pub unsafe extern "C" fn dc_create_contact(
    block_on(async move {
        Contact::create(ctx, &name, &to_string_lossy(addr))
            .await
-            .map(|id| id.to_u32())
            .unwrap_or(0)
    })
 }
@@ -1962,10 +1787,8 @@ pub unsafe extern "C" fn dc_get_contacts(
    let query = to_opt_string_lossy(query);

    block_on(async move {
-        match Contact::get_all(ctx, flags, query.as_deref()).await {
-            Ok(contacts) => Box::into_raw(Box::new(dc_array_t::from(
-                contacts.iter().map(|id| id.to_u32()).collect::<Vec<u32>>(),
-            ))),
+        match Contact::get_all(ctx, flags, query).await {
+            Ok(contacts) => Box::into_raw(Box::new(dc_array_t::from(contacts))),
            Err(_) => ptr::null_mut(),
        }
    })
@@ -2002,10 +1825,7 @@ pub unsafe extern "C" fn dc_get_blocked_contacts(
            Contact::get_all_blocked(ctx)
                .await
                .log_err(ctx, "Can't get blocked contacts")
-                .unwrap_or_default()
-                .iter()
-                .map(|id| id.to_u32())
-                .collect::<Vec<u32>>(),
+                .unwrap_or_default(),
        )))
    })
 }
@@ -2016,8 +1836,7 @@ pub unsafe extern "C" fn dc_block_contact(
    contact_id: u32,
    block: libc::c_int,
 ) {
-    let contact_id = ContactId::new(contact_id);
-    if context.is_null() || contact_id.is_special() {
+    if context.is_null() || contact_id <= constants::DC_CONTACT_ID_LAST_SPECIAL as u32 {
        eprintln!("ignoring careless call to dc_block_contact()");
        return;
    }
@@ -2047,7 +1866,7 @@ pub unsafe extern "C" fn dc_get_contact_encrinfo(
    let ctx = &*context;

    block_on(async move {
-        Contact::get_encrinfo(ctx, ContactId::new(contact_id))
+        Contact::get_encrinfo(ctx, contact_id)
            .await
            .map(|s| s.strdup())
            .unwrap_or_else(|e| {
@@ -2062,8 +1881,7 @@ pub unsafe extern "C" fn dc_delete_contact(
    context: *mut dc_context_t,
    contact_id: u32,
 ) -> libc::c_int {
-    let contact_id = ContactId::new(contact_id);
-    if context.is_null() || contact_id.is_special() {
+    if context.is_null() || contact_id <= constants::DC_CONTACT_ID_LAST_SPECIAL as u32 {
        eprintln!("ignoring careless call to dc_delete_contact()");
        return 0;
    }
@@ -2089,7 +1907,7 @@ pub unsafe extern "C" fn dc_get_contact(
    let ctx = &*context;

    block_on(async move {
-        Contact::get_by_id(ctx, ContactId::new(contact_id))
+        Contact::get_by_id(ctx, contact_id)
            .await
            .map(|contact| Box::into_raw(Box::new(ContactWrapper { context, contact })))
            .unwrap_or_else(|_| ptr::null_mut())
@@ -2101,7 +1919,7 @@ pub unsafe extern "C" fn dc_imex(
    context: *mut dc_context_t,
    what_raw: libc::c_int,
    param1: *const libc::c_char,
-    param2: *const libc::c_char,
+    _param2: *const libc::c_char,
 ) {
    if context.is_null() {
        eprintln!("ignoring careless call to dc_imex()");
@@ -2114,13 +1932,12 @@ pub unsafe extern "C" fn dc_imex(
            return;
        }
    };
-    let passphrase = to_opt_string_lossy(param2);

    let ctx = &*context;

    if let Some(param1) = to_opt_string_lossy(param1) {
        spawn(async move {
-            imex::imex(ctx, what, param1.as_ref(), passphrase)
+            imex::imex(ctx, what, param1.as_ref())
                .await
                .log_err(ctx, "IMEX failed")
        });
@@ -2244,7 +2061,7 @@ pub unsafe extern "C" fn dc_get_securejoin_qr(
        Some(ChatId::new(chat_id))
    };

-    block_on(securejoin::get_securejoin_qr(ctx, chat_id))
+    block_on(securejoin::dc_get_securejoin_qr(ctx, chat_id))
        .unwrap_or_else(|_| "".to_string())
        .strdup()
 }
@@ -2282,7 +2099,7 @@ pub unsafe extern "C" fn dc_join_securejoin(
    let ctx = &*context;

    block_on(async move {
-        securejoin::join_securejoin(ctx, &to_string_lossy(qr))
+        securejoin::dc_join_securejoin(ctx, &to_string_lossy(qr))
            .await
            .map(|chatid| chatid.to_u32())
            .log_err(ctx, "failed dc_join_securejoin() call")
@@ -2408,7 +2225,7 @@ pub unsafe extern "C" fn dc_get_last_error(context: *mut dc_context_t) -> *mut l
        return "".strdup();
    }
    let ctx = &*context;
-    ctx.get_last_error().strdup()
+    block_on(ctx.get_last_error()).strdup()
 }

 // dc_array_t
@@ -2512,7 +2329,7 @@ pub unsafe extern "C" fn dc_array_get_contact_id(
        return 0;
    }

-    (*array).get_location(index).contact_id.to_u32()
+    (*array).get_location(index).contact_id
 }
 #[no_mangle]
 pub unsafe extern "C" fn dc_array_get_msg_id(
@@ -2626,14 +2443,7 @@ pub unsafe extern "C" fn dc_chatlist_get_chat_id(
        return 0;
    }
    let ffi_list = &*chatlist;
-    let ctx = &*ffi_list.context;
-    match ffi_list.list.get_chat_id(index as usize) {
-        Ok(chat_id) => chat_id.to_u32(),
-        Err(err) => {
-            warn!(ctx, "get_chat_id failed: {}", err);
-            0
-        }
-    }
+    ffi_list.list.get_chat_id(index as usize).to_u32()
 }

 #[no_mangle]
@@ -3028,7 +2838,7 @@ pub unsafe extern "C" fn dc_msg_get_from_id(msg: *mut dc_msg_t) -> u32 {
        return 0;
    }
    let ffi_msg = &*msg;
-    ffi_msg.message.get_from_id().to_u32()
+    ffi_msg.message.get_from_id()
 }

 #[no_mangle]
@@ -3150,61 +2960,6 @@ pub unsafe extern "C" fn dc_msg_get_filename(msg: *mut dc_msg_t) -> *mut libc::c
    ffi_msg.message.get_filename().unwrap_or_default().strdup()
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_msg_get_webxdc_blob(
-    msg: *mut dc_msg_t,
-    filename: *const libc::c_char,
-    ret_bytes: *mut libc::size_t,
-) -> *mut libc::c_char {
-    if msg.is_null() || filename.is_null() || ret_bytes.is_null() {
-        eprintln!("ignoring careless call to dc_msg_get_webxdc_blob()");
-        return ptr::null_mut();
-    }
-    let ffi_msg = &*msg;
-    let ctx = &*ffi_msg.context;
-    let blob = block_on(async move {
-        ffi_msg
-            .message
-            .get_webxdc_blob(ctx, &to_string_lossy(filename))
-            .await
-    });
-    match blob {
-        Ok(blob) => {
-            *ret_bytes = blob.len();
-            let ptr = libc::malloc(*ret_bytes);
-            libc::memcpy(ptr, blob.as_ptr() as *mut libc::c_void, *ret_bytes);
-            ptr as *mut libc::c_char
-        }
-        Err(err) => {
-            eprintln!("failed read blob from archive: {}", err);
-            ptr::null_mut()
-        }
-    }
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_msg_get_webxdc_info(msg: *mut dc_msg_t) -> *mut libc::c_char {
-    if msg.is_null() {
-        eprintln!("ignoring careless call to dc_msg_get_webxdc_info()");
-        return "".strdup();
-    }
-    let ffi_msg = &*msg;
-    let ctx = &*ffi_msg.context;
-
-    block_on(async move {
-        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);
-                return "".strdup();
-            }
-        };
-        serde_json::to_string(&info)
-            .unwrap_or_log_default(ctx, "dc_msg_get_webxdc_info() failed to serialise to json")
-            .strdup()
-    })
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_msg_get_filemime(msg: *mut dc_msg_t) -> *mut libc::c_char {
    if msg.is_null() {
@@ -3594,8 +3349,7 @@ pub unsafe extern "C" fn dc_msg_latefiling_mediasize(
        ffi_msg
            .message
            .latefiling_mediasize(ctx, width, height, duration)
-    })
-    .ok_or_log_msg(ctx, "Cannot set media size");
+    });
 }

 #[no_mangle]
@@ -3618,21 +3372,17 @@ pub unsafe extern "C" fn dc_msg_set_quote(msg: *mut dc_msg_t, quote: *const dc_m
        return;
    }
    let ffi_msg = &mut *msg;
-    let quote_msg = if quote.is_null() {
-        None
-    } else {
-        let ffi_quote = &*quote;
-        if ffi_msg.context != ffi_quote.context {
-            eprintln!("ignoring attempt to quote message from a different context");
-            return;
-        }
-        Some(&ffi_quote.message)
-    };
+    let ffi_quote = &*quote;
+
+    if ffi_msg.context != ffi_quote.context {
+        eprintln!("ignoring attempt to quote message from a different context");
+        return;
+    }

    block_on(async move {
        ffi_msg
            .message
-            .set_quote(&*ffi_msg.context, quote_msg)
+            .set_quote(&*ffi_msg.context, &ffi_quote.message)
            .await
            .log_err(&*ffi_msg.context, "failed to set quote")
            .ok();
@@ -3675,29 +3425,6 @@ pub unsafe extern "C" fn dc_msg_get_quoted_msg(msg: *const dc_msg_t) -> *mut dc_
    }
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_msg_get_parent(msg: *const dc_msg_t) -> *mut dc_msg_t {
-    if msg.is_null() {
-        eprintln!("ignoring careless call to dc_msg_get_parent()");
-        return ptr::null_mut();
-    }
-    let ffi_msg: &MessageWrapper = &*msg;
-    let context = &*ffi_msg.context;
-    let res = block_on(async move {
-        ffi_msg
-            .message
-            .parent(context)
-            .await
-            .log_err(context, "failed to get parent message")
-            .unwrap_or(None)
-    });
-
-    match res {
-        Some(message) => Box::into_raw(Box::new(MessageWrapper { context, message })),
-        None => ptr::null_mut(),
-    }
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_msg_force_plaintext(msg: *mut dc_msg_t) {
    if msg.is_null() {
@@ -3740,7 +3467,7 @@ pub unsafe extern "C" fn dc_contact_get_id(contact: *mut dc_contact_t) -> u32 {
        return 0;
    }
    let ffi_contact = &*contact;
-    ffi_contact.contact.get_id().to_u32()
+    ffi_contact.contact.get_id()
 }

 #[no_mangle]
@@ -4017,25 +3744,6 @@ pub unsafe extern "C" fn dc_provider_new_from_email(
    }
    let addr = to_string_lossy(addr);

-    let ctx = &*context;
-
-    match block_on(provider::get_provider_info(ctx, addr.as_str(), true)) {
-        Some(provider) => provider,
-        None => ptr::null_mut(),
-    }
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_provider_new_from_email_with_dns(
-    context: *const dc_context_t,
-    addr: *const libc::c_char,
-) -> *const dc_provider_t {
-    if context.is_null() || addr.is_null() {
-        eprintln!("ignoring careless call to dc_provider_new_from_email_with_dns()");
-        return ptr::null();
-    }
-    let addr = to_string_lossy(addr);
-
    let ctx = &*context;
    let socks5_enabled = block_on(async move {
        ctx.get_config_bool(config::Config::Socks5Enabled)
@@ -4141,7 +3849,7 @@ pub unsafe extern "C" fn dc_accounts_new(
        return ptr::null_mut();
    }

-    let accs = block_on(Accounts::new(as_path(dbfile).into()));
+    let accs = block_on(Accounts::new(as_path(dbfile).to_path_buf().into()));

    match accs {
        Ok(accs) => Box::into_raw(Box::new(AccountsWrapper::new(accs))),
@@ -4246,30 +3954,6 @@ pub unsafe extern "C" fn dc_accounts_add_account(accounts: *mut dc_accounts_t) -
    })
 }

-#[no_mangle]
-pub unsafe extern "C" fn dc_accounts_add_closed_account(accounts: *mut dc_accounts_t) -> u32 {
-    if accounts.is_null() {
-        eprintln!("ignoring careless call to dc_accounts_add_closed_account()");
-        return 0;
-    }
-
-    let accounts = &mut *accounts;
-
-    block_on(async move {
-        let mut accounts = accounts.write().await;
-        match accounts.add_closed_account().await {
-            Ok(id) => id,
-            Err(err) => {
-                accounts.emit_event(EventType::Error(format!(
-                    "Failed to add account: {:#}",
-                    err
-                )));
-                0
-            }
-        }
-    })
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_remove_account(
    accounts: *mut dc_accounts_t,
@@ -4313,7 +3997,7 @@ pub unsafe extern "C" fn dc_accounts_migrate_account(
    block_on(async move {
        let mut accounts = accounts.write().await;
        match accounts
-            .migrate_account(std::path::PathBuf::from(dbfile))
+            .migrate_account(async_std::path::PathBuf::from(dbfile))
            .await
        {
            Ok(id) => id,
@@ -4396,7 +4080,7 @@ pub unsafe extern "C" fn dc_accounts_maybe_network_lost(accounts: *mut dc_accoun
    block_on(async move { accounts.write().await.maybe_network_lost().await });
 }

-pub type dc_accounts_event_emitter_t = EventEmitter;
+pub type dc_accounts_event_emitter_t = deltachat::accounts::EventEmitter;

 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_get_event_emitter(
@@ -4433,7 +4117,9 @@ pub unsafe extern "C" fn dc_accounts_get_next_event(
        return ptr::null_mut();
    }
    let emitter = &mut *emitter;
-    block_on(emitter.recv())
+
+    emitter
+        .recv_sync()
        .map(|ev| Box::into_raw(Box::new(ev)))
        .unwrap_or_else(ptr::null_mut)
 }
--- a/deltachat-ffi/src/lot.rs
+++ b/deltachat-ffi/src/lot.rs
@@ -111,19 +111,19 @@ impl Lot {
        match self {
            Self::Summary(_) => Default::default(),
            Self::Qr(qr) => match qr {
-                Qr::AskVerifyContact { contact_id, .. } => contact_id.to_u32(),
+                Qr::AskVerifyContact { contact_id, .. } => *contact_id,
                Qr::AskVerifyGroup { .. } => Default::default(),
-                Qr::FprOk { contact_id } => contact_id.to_u32(),
-                Qr::FprMismatch { contact_id } => contact_id.unwrap_or_default().to_u32(),
+                Qr::FprOk { contact_id } => *contact_id,
+                Qr::FprMismatch { contact_id } => contact_id.unwrap_or_default(),
                Qr::FprWithoutAddr { .. } => Default::default(),
                Qr::Account { .. } => Default::default(),
                Qr::WebrtcInstance { .. } => Default::default(),
-                Qr::Addr { contact_id } => contact_id.to_u32(),
+                Qr::Addr { contact_id } => *contact_id,
                Qr::Url { .. } => Default::default(),
                Qr::Text { .. } => Default::default(),
-                Qr::WithdrawVerifyContact { contact_id, .. } => contact_id.to_u32(),
+                Qr::WithdrawVerifyContact { contact_id, .. } => *contact_id,
                Qr::WithdrawVerifyGroup { .. } => Default::default(),
-                Qr::ReviveVerifyContact { contact_id, .. } => contact_id.to_u32(),
+                Qr::ReviveVerifyContact { contact_id, .. } => *contact_id,
                Qr::ReviveVerifyGroup { .. } => Default::default(),
            },
            Self::Error(_) => Default::default(),
--- a/deltachat-ffi/src/string.rs
+++ b/deltachat-ffi/src/string.rs
@@ -55,7 +55,7 @@ pub(crate) enum CStringError {
 /// # Example
 ///
 /// ```
-/// use deltachat::tools::{dc_strdup, OsStrExt};
+/// use deltachat::dc_tools::{dc_strdup, OsStrExt};
 /// let path = std::path::Path::new("/some/path");
 /// let path_c = path.to_c_string().unwrap();
 /// unsafe {
--- a/draft/aeap-mvp.md
+++ b/draft/aeap-mvp.md
@@ -1,127 +0,0 @@
-AEAP MVP
-========
-
-Changes to the UIs
------------------
-
- The secondary self addresses (see below) are shown in the UI, but not editable.
-
- When the user changed the email address in the configure screen, show a dialog to the user, either directly explaining things or with a link to the FAQ (see "Other" below)
-
-Changes in the core
-------------------
-
- [x] We have one primary self address and any number of secondary self addresses. `is_self_addr()` checks all of them.
-
- [x] If the user does a reconfigure and changes the email address, the previous address is added as a secondary self address.
-
-  - don't forget to deduplicate secondary self addresses in case the user switches back and forth between addresses).
-
-  - The key stays the same.
-
- [x] No changes for 1:1 chats, there simply is a new one. (This works since, contrary to group messages, messages sent to a 1:1 chat are not assigned to the group chat but always to the 1:1 chat with the sender. So it's not a problem that the new messages might be put into the old chat if they are a reply to a message there.)
-
- [ ] When sending a message: If any of the secondary self addrs is in the chat's member list, remove it locally (because we just transitioned away from it). We add a log message for this (alternatively, a system message in the chat would be more visible).
-
- [x] ([#3385](https://github.com/deltachat/deltachat-core-rust/pull/3385)) When receiving a message: If the key exists, but belongs to another address (we may want to benchmark this)
-  AND there is a `Chat-Version` header\
-  AND the message is signed correctly
-  AND the From address is (also) in the encrypted (and therefore signed) headers <sup>[[1]](#myfootnote1)</sup>\
-  AND the message timestamp is newer than the contact's `lastseen` (to prevent changing the address back when messages arrive out of order) (this condition is not that important since we will have eventual consistency even without it):
-
-  Replace the contact in _all_ groups, possibly deduplicate the members list, and add a system message to all of these chats.
-  
-  - Note that we can't simply compare the keys byte-by-byte, since the UID may have changed, or the sender may have rotated the key and signed the new key with the old one.
-
-<a name="myfootnote1">[1]</a>: Without this check, an attacker could replay a message from Alice to Bob. Then Bob's device would do an AEAP transition from Alice's to the attacker's address, allowing for easier phishing.
-
-<details>
-<summary>More details about this</summary>
-Suppose Alice sends a message to Evil (or to a group with both Evil and Bob). Evil then forwards the message to Bob, changing the From and To headers (and if necessary Message-Id) and replacing `addr=alice@example.org;` in the autocrypt header with `addr=evil@example.org;`.
-
-Then Bob's device sees that there is a message which is signed by Alice's key and comes from Evil's address and would do the AEAP transition, i.e. replace Alice with Evil in all groups and show a message "Alice changed their address from alice@example.org to evil@example.org". Disadvantages for Evil are that Bob's message will be shown on Alice's device, possibly creating confusion/suspicion, and that the usual "Setup changed for..." message will be shown the next time Evil sends a message (because Evil doesn't know Alice's private key).
-
-Possible mitigations:
- if we make the AEAP device message sth. like "Automatically removed alice@example.org and added evil@example.org", then this will create more suspicion, making the phishing harder (we didn't talk about what what the wording should be at all yet).
- Add something similar to replay protection to our Autocrypt implementation. This could be done e.g. by adding a second `From` header to the protected headers. If it's present, the receiver then requires it to be the same as the outer `From`, and if it's not present, we don't do AEAP --> **That's what we implemented**
-
-Note that usually a mail is signed by a key that has a UID matching the from address.
-
-  That's not mandatory for Autocrypt (and in fact, we just keep the old UID when changing the self address, so with AEAP the UID will actually be different than the from address sometimes)
-
-  https://autocrypt.org/level1.html#openpgp-based-key-data says:
-  > The content of the user id packet is only decorative
-
-</details>
-
-### Notes:
-  
- We treat protected and non-protected chats the same
- We leave the aeap transition statement away since it seems not to be needed, makes things harder on the sending side, wastes some network traffic, and is worse for privacy (since more pepole know what old addresses you had).
- As soon as we encrypt read receipts, sending a read receipt will be enough to tell a lot of people that you transitioned
- AEAP will make the problem of inconsistent group state worse, both because it doesn't work if the message is unencrypted (even if the design allowed it, it would be problematic security-wise) and because some chat partners may have gotten the transition and some not. We should do something against this at some point in the future, like asking the user whether they want to add/remove the members to restore consistent group state.
-
-#### Downsides of this design:
- Inconsistent group state: Suppose Alice does an AEAP transition and sends a 1:1 message to Bob, so Bob rewrites Alice's contact. Alice, Bob and Charlie are together in a group. Before Alice writes to this group, Bob and Charlie will have different membership lists, and Bob will send messages to Alice's new address, while Charlie will send them to her old address.
-
-#### 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 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 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:
-
-  > When receiving a message: If we are going to assign a message to a chat, but the sender is not a member of this chat\
-  > AND the signing key is the same as the direct (non-gossiped) key of one of the chat members\
-  > AND ...
-
-  However, this would mean that in 1:1 messages can't trigger a transition, since we don't assign private messages to the parent chat, but always to the 1:1 chat with the sender.
-  
-<details>
-<summary>Some previous state of the discussion, which temporarily lived in an issue description</summary>
-Summarizing the discussions from https://github.com/deltachat/deltachat-core-rust/pull/2896, mostly quoting @hpk42:
-
-1. (DONE) At the time of configure we push the current primary to become a secondary. 
-
-2. When a message is sent out to a chat, and the message is encrypted, and we have secondary addresses, then we 
-  a) add a protected "AEAP-Replacement" header that contains all secondary addresses 
-  b) if any of the secondary addresses is in the chat's member list, we remove it and leave a system message that we did so
-3. When an encrypted message with a replacement header is received, replace the e-mail address of all secondary contacts (if they exist) with the new primary and drop a sysmessage in all chats the secondary is member off.  This might (in edge cases) result in chats that have two or more contacts with the same e-mail address.  We might ignore this for a first release and just log a warning.  Let's maybe not get hung up on this case before everything else works. 
-
-Notes: 
- for now we will send out aeap replacement headers forever, there is no termination condition other than lack of secondary addresses.  I think that's fine for now.  Later on we might introduce options to remove secondary addresses but i wouldn't do this for a first release/PR. 
- the design is resilient against changing e-mail providers from A to B to C and then back to A, with partially updated chats and diverging views from recipients/contacts on this transition.  In the end, you will have a primary and some secondaries, and when you start sending out messages everybody will eventually synchronize when they receive the current state of primaries/secondaries. 
- of course on incoming message for need to check for each stated secondary address in the replacement header that it uses the same signature as the signature we verified as valid with the incoming message  **-->  Also we have to somehow make sure that the signing key was not just gossiped from some random other person in some group.**
- there are no extra flags/columns in the database needed (i hope) 
-
-#### Downsides of the chosen approach:
- Inconsistent group state: Suppose Alice does an AEAP transition and sends a 1:1 message to Bob, so Bob rewrites Alice's contact. Alice, Bob and Charlie are together in a group. Before Alice writes to this group, Bob and Charlie will have different membership lists, and Bob will send messages to Alice's new address, while Charlie will send them to her old address.
- There will be multiple contacts with the same address in the database. We will have to do something against this at some point.
-
-The most obvious alternative would be to create a new contact with the new address and replace the old contact in the groups.
-
-#### 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 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)
-  
-_end of the previous state of the discussion_  
-
-</details>
-  
-Other
-----
-
- The user is responsible that messages to the old address arrive at the new address, for example by configuring the old provider to forward all emails to the new one.
-
-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.
--- a/draft/aeap-mvp.rst
+++ b/draft/aeap-mvp.rst
@@ -0,0 +1,33 @@
+AEAP MVP
+========
+
+Changes to the UIs
+------------------
+
+- The secondary self addresses (see below) are shown in the UI, but not editable.
+
+- When the user changed the email address in the configure screen, show a dialog to the user, either directly explaining things or with a link to the FAQ (see "Other" below)
+
+Changes in the core
+-------------------
+
+- We have one primary self address and any number of secondary self addresses. `is_self_addr()` checks all of them.
+
+- If the user does a reconfigure and changes the email address, the previous address is added as a secondary self address.
+
+  - don't forget to deduplicate secondary self addresses in case the user switches back and forth between addresses).
+
+  - The key stays the same.
+
+- No changes for 1:1 chats, there simply is a new one
+
+- When we send a message to a group, and the primary address is not a member of a group, but a secondary address is:
+  
+  Add Chat-Group-Member-Removed=<old address> and Chat-Group-Member-Added=<new address> headers to this message
+
+  - On the receiving side, make sure that we accept this (even in verified groups) if the message is signed and the key stayed the same
+
+Other
+-----
+
+- The user is responsible that messages to the old address arrive at the new address, for example by configuring the old provider to forward all emails to the new one.
--- a/draft/webxdc-dev-reference.md
+++ b/draft/webxdc-dev-reference.md
@@ -1,213 +0,0 @@
-# Webxdc Developer Reference
-
-This document gives a quick overview about the Webxdc specification,
-It is meant for both, developing Webxdc apps
-and developing Webxdc implementations.
-
-The [Webxdc guidebook](https://deltachat.github.io/webxdc_docs/) shows more detailed information
-when developing Webxdc apps.
-
-
-## Webxdc File Format
-
- a **Webxdc** is a **ZIP-file** with the extension `.xdc`
- the ZIP-file must use the default compression methods as of RFC 1950,
-  this is "Deflate" or "Store"
- the ZIP-file must contain at least the file `index.html`
- if the Webxdc is started, `index.html` is opened in a restricted webview
-  that allow accessing resources only from the ZIP-file
-
-
-## Webxdc API
-
-There are some additional APIs available once `webxdc.js` is included
-(the file will be provided by the concrete implementations,
-no need to add `webxdc.js` to your ZIP-file):
-
-```html
-<script src="webxdc.js"></script>
-```
-
-### sendUpdate()
-
-```js
-window.webxdc.sendUpdate(update, descr);
-```
-
-A Webxdc is usually shared in a chat and run independently on each peer.
-To get a shared state, the peers use `sendUpdate()` to send updates to each other.
-
- `update`: an object with the following properties:  
-    - `update.payload`: any javascript primitive, array or object.
-    - `update.info`: optional, short, informational message that will be added to the chat,
-       eg. "Alice voted" or "Bob scored 123 in MyGame".
-       usually only one line of text is shown
-       and if there are series of info messages, older ones may be dropped.
-       use this option sparingly to not spam the chat.
-    - `update.document`: optional, name of the document in edit,
-       must not be used eg. in games where the Webxdc does not create documents
-    - `update.summary`: optional, short text, shown beside Webxdc icon;
-       it is recommended to use some aggregated value,  eg. "8 votes", "Highscore: 123"
-
- `descr`: short, human-readable description what this update is about.
-  this is shown eg. as a fallback text in an email program.
-
-All peers, including the sending one,
-will receive the update by the callback given to `setUpdateListener()`.
-
-There are situations where the user cannot send messages to a chat,
-eg. if the webxdc instance comes as a contact request or if the user has left a group.
-In these cases, you can still call `sendUpdate()`,
-however, the update won't be sent to other peers
-and you won't get the update by `setUpdateListener()`.
-
-
-### setUpdateListener()
-
-```js
-let promise = window.webxdc.setUpdateListener((update) => {}, serial);
-```
-
-With `setUpdateListener()` you define a callback that receives the updates
-sent by `sendUpdate()`. The callback is called for updates sent by you or other peers.
-The `serial` specifies the last serial that you know about (defaults to 0). 
-The returned promise resolves when the listener has processed all the update messages known at the time when  `setUpdateListener` was called. 
-
-Each `update` which is passed to the callback comes with the following properties: 
-
- `update.payload`: equals the payload given to `sendUpdate()`
-
- `update.serial`: the serial number of this update.
-  Serials are larger `0` and newer serials have higher numbers.
-  There may be gaps in the serials
-  and it is not guaranteed that the next serial is exactly incremented by one.
-
- `update.max_serial`: the maximum serial currently known.
-  If `max_serial` equals `serial` this update is the last update (until new network messages arrive).
-
- `update.info`: optional, short, informational message (see `sendUpdate()`)
-
- `update.document`: optional, document name as set by the sender, (see `sendUpdate()`),
-  implementations show the document name eg. beside the app icon or in the title bar
-
- `update.summary`: optional, short text, shown beside icon (see `sendUpdate()`)
-
-
-### selfAddr
-
-```js
-window.webxdc.selfAddr
-```
-
-Property with the peer's own address.
-This is esp. useful if you want to differ between different peers -
-just send the address along with the payload,
-and, if needed, compare the payload addresses against selfAddr() later on.
-
-
-### selfName
-
-```js
-window.webxdc.selfName
-```
-
-Property with the peer's own name.
-This is name chosen by the user in their settings,
-if there is nothing set, that defaults to the peer's address.
-
-
-## manifest.toml
-
-If the ZIP-file contains a `manifest.toml` in its root directory,
-some basic information are read and used from there.
-
-the `manifest.toml` has the following format
-
-```toml
-name = "My Name"
-source_code_url = "https://example.org/orga/repo"
-```
-
- `name` - The name of the Webxdc.
-  If no name is set or if there is no manifest, the filename is used as the Webxdc name.
-
- `source_code_url` - Optional URL where the source code of the Webxdc and maybe other information can be found.
-  UI may make the url accessible via a "Help" menu in the Webxdc window.
-
-
-## Webxdc Icon
-
-If the ZIP-root contains an `icon.png` or `icon.jpg`,
-these files are used as the icon for the Webxdc.
-The icon should be a square at reasonable width/height;
-round corners etc. will be added by the implementations as needed.
-If no icon is set, a default icon will be used.
-
-
-## Other APIs and Tags Usage Hints
-
- `localStorage`, `sessionStorage`, `indexedDB` are okay to be used
- `visibilitychange`-events are okay to be used
- `window.navigator.language` is okay to be used, on desktop it is the system language
- `<a href="localfile.html">` and other internal links are okay to be used
- `<a href="mailto:addr@example.org?body=...">`- mailto links are okay to be used
- `<meta name="viewport" ...>` usage is okay to be used
-  and useful esp. different webviews have different defaults
-
-
-### Discouraged Things
-
- `document.cookie` is known not to work on desktop and iOS
-  use `localStorage` instead
- `unload`-, `beforeunload`- and `pagehide`-events are known not to work on iOS and are flaky on other systems
-  (also partly discouraged by [mozilla](https://developer.mozilla.org/en-US/docs/Web/API/Window/unload_event))
-  use `visibilitychange` instead
- `<title>` and `document.title` is ignored by Webxdc;
-  use the `name` property from `manifest.toml` instead
- newest js features may not work on all webviews,
-  you may want to transpile your code down to an older js version
-  eg. with <https://babeljs.io>
- `<a href="https://example.org/foo">` and other external links are blocked by definition;
-  instead, embed content or use `mailto:` link to offer a way for contact
- `<input type="file">` is discouraged currently; this may change in future
-
-
-## Webxdc Examples
-
-The following example shows an input field and every input is show on all peers.
-
-```html
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <script src="webxdc.js"></script>
-  </head>
-  <body>
-    <input id="input" type="text"/>
-    <a href="" onclick="sendMsg(); return false;">Send</a>
-    <p id="output"></p>
-    <script>
-    
-      function sendMsg() {
-        msg = document.getElementById("input").value;
-        window.webxdc.sendUpdate({payload: msg}, 'Someone typed "'+msg+'".');
-      }
-    
-      function receiveUpdate(update) {
-        document.getElementById('output').innerHTML += update.payload + "<br>";
-      }
-    
-      window.webxdc.setUpdateListener(receiveUpdate, 0);
-    </script>
-  </body>
-</html>
-```
-
-More examples at [github.com/webxdc](https://github.com/webxdc) and
-[topic #webxdc](https://github.com/topics/webxdc)
-
-[github.com/webxdc/hello](https://github.com/webxdc/hello)
-offers an **Webxdc Tool** that can be used in many browsers without any installation needed.
-You can also use that repository as a template for your own Webxdc -
-just clone and start adapting things to your need.
--- a/examples/repl/cmdline.rs
+++ b/examples/repl/cmdline.rs
@@ -1,10 +1,9 @@
 extern crate dirs;

-use std::path::Path;
 use std::str::FromStr;
-use std::time::{Duration, SystemTime};

 use anyhow::{bail, ensure, Result};
+use async_std::path::Path;
 use deltachat::chat::{
    self, Chat, ChatId, ChatItem, ChatVisibility, MuteDuration, ProtectionStatus,
 };
@@ -12,18 +11,20 @@ use deltachat::chatlist::*;
 use deltachat::constants::*;
 use deltachat::contact::*;
 use deltachat::context::*;
+use deltachat::dc_receive_imf::*;
+use deltachat::dc_tools::*;
 use deltachat::download::DownloadState;
 use deltachat::imex::*;
 use deltachat::location;
 use deltachat::log::LogExt;
-use deltachat::message::{self, Message, MessageState, MsgId, Viewtype};
+use deltachat::message::{self, Message, MessageState, MsgId};
 use deltachat::peerstate::*;
 use deltachat::qr::*;
-use deltachat::receive_imf::*;
 use deltachat::sql;
-use deltachat::tools::*;
+use deltachat::EventType;
 use deltachat::{config, provider};
-use tokio::fs;
+use std::fs;
+use std::time::{Duration, SystemTime};

 /// Reset database tables.
 /// Argument is a bitmask, executing single or multiple actions in one call.
@@ -83,7 +84,6 @@ async fn reset_tables(context: &Context, bits: i32) {
            )
            .await
            .unwrap();
-        context.sql().config_cache().write().await.clear();
        context
            .sql()
            .execute("DELETE FROM leftgrps;", paramsv![])
@@ -92,14 +92,17 @@ async fn reset_tables(context: &Context, bits: i32) {
        println!("(8) Rest but server config reset.");
    }

-    context.emit_msgs_changed_without_ids();
+    context.emit_event(EventType::MsgsChanged {
+        chat_id: ChatId::new(0),
+        msg_id: MsgId::new(0),
+    });
 }

 async fn poke_eml_file(context: &Context, filename: impl AsRef<Path>) -> Result<()> {
-    let data = read_file(context, filename).await?;
+    let data = dc_read_file(context, filename).await?;

-    if let Err(err) = receive_imf(context, &data, false).await {
-        println!("receive_imf errored: {:?}", err);
+    if let Err(err) = dc_receive_imf(context, &data, "import", false).await {
+        println!("dc_receive_imf errored: {:?}", err);
    }
    Ok(())
 }
@@ -128,20 +131,24 @@ async fn poke_spec(context: &Context, spec: Option<&str>) -> bool {
        }
        real_spec = rs.unwrap();
    }
-    if let Some(suffix) = get_filesuffix_lc(&real_spec) {
+    if let Some(suffix) = dc_get_filesuffix_lc(&real_spec) {
        if suffix == "eml" && poke_eml_file(context, &real_spec).await.is_ok() {
            read_cnt += 1
        }
    } else {
        /* import a directory */
        let dir_name = std::path::Path::new(&real_spec);
-        let dir = fs::read_dir(dir_name).await;
+        let dir = std::fs::read_dir(dir_name);
        if dir.is_err() {
            error!(context, "Import: Cannot open directory \"{}\".", &real_spec,);
            return false;
        } else {
-            let mut dir = dir.unwrap();
-            while let Ok(Some(entry)) = dir.next_entry().await {
+            let dir = dir.unwrap();
+            for entry in dir {
+                if entry.is_err() {
+                    break;
+                }
+                let entry = entry.unwrap();
                let name_f = entry.file_name();
                let name = name_f.to_string_lossy();
                if name.ends_with(".eml") {
@@ -156,7 +163,10 @@ async fn poke_spec(context: &Context, spec: Option<&str>) -> bool {
    }
    println!("Import: {} items read from \"{}\".", read_cnt, &real_spec);
    if read_cnt > 0 {
-        context.emit_msgs_changed_without_ids();
+        context.emit_event(EventType::MsgsChanged {
+            chat_id: ChatId::new(0),
+            msg_id: MsgId::new(0),
+        });
    }
    true
 }
@@ -187,7 +197,7 @@ async fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
        DownloadState::Failure => " [⬇ Download failed]",
    };

-    let temp2 = timestamp_to_str(msg.get_timestamp());
+    let temp2 = dc_timestamp_to_str(msg.get_timestamp());
    let msgtext = msg.get_text();
    println!(
        "{}{}{}{}: {} (Contact#{}): {} {}{}{}{}{}{}{} [{}]",
@@ -199,7 +209,7 @@ async fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
        contact_id,
        msgtext.unwrap_or_default(),
        if msg.has_html() { "[HAS-HTML]️" } else { "" },
-        if msg.get_from_id() == ContactId::SELF {
+        if msg.get_from_id() == 1 {
            ""
        } else if msg.get_state() == MessageState::InSeen {
            "[SEEN]"
@@ -215,14 +225,6 @@ async fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
                msg.get_videochat_url().unwrap_or_default(),
                msg.get_videochat_type().unwrap_or_default()
            )
-        } else if msg.get_viewtype() == Viewtype::Webxdc {
-            match msg.get_webxdc_info(context).await {
-                Ok(info) => format!(
-                    "[WEBXDC: {}, icon={}, document={}, summary={}, source_code_url={}]",
-                    info.name, info.icon, info.document, info.summary, info.source_code_url
-                ),
-                Err(err) => format!("[get_webxdc_info() failed: {}]", err),
-            }
        } else {
            "".to_string()
        },
@@ -265,8 +267,9 @@ async fn log_msglist(context: &Context, msglist: &[MsgId]) -> Result<()> {
    Ok(())
 }

-async fn log_contactlist(context: &Context, contacts: &[ContactId]) -> Result<()> {
+async fn log_contactlist(context: &Context, contacts: &[u32]) -> Result<()> {
    for contact_id in contacts {
+        let line;
        let mut line2 = "".to_string();
        let contact = Contact::get_by_id(context, *contact_id).await?;
        let name = contact.get_display_name();
@@ -281,20 +284,24 @@ async fn log_contactlist(context: &Context, contacts: &[ContactId]) -> Result<()
        } else {
            ""
        };
-        let line = format!(
+        line = format!(
            "{}{} <{}>",
            if !name.is_empty() {
-                name
+                &name
            } else {
                "<name unset>"
            },
            verified_str,
-            if !addr.is_empty() { addr } else { "addr unset" }
+            if !addr.is_empty() {
+                &addr
+            } else {
+                "addr unset"
+            }
        );
-        let peerstate = Peerstate::from_addr(context, addr)
+        let peerstate = Peerstate::from_addr(context, &addr)
            .await
            .expect("peerstate error");
-        if peerstate.is_some() && *contact_id != ContactId::SELF {
+        if peerstate.is_some() && *contact_id != 1 {
            line2 = format!(
                ", prefer-encrypt={}",
                peerstate.as_ref().unwrap().prefer_encrypt
@@ -380,7 +387,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 sendfile <file> [<text>]\n\
                 sendhtml <file for html-part> [<text for plain-part>]\n\
                 sendsyncmsg\n\
-                 sendupdate <msg-id> <json status update>\n\
                 videochat\n\
                 draft [<text>]\n\
                 devicemsg <text>\n\
@@ -403,7 +409,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 html <msg-id>\n\
                 listfresh\n\
                 forward <msg-id> <chat-id>\n\
-                 resend <msg-id>\n\
                 markseen <msg-id>\n\
                 delmsg <msg-id>\n\
                 ===========================Contact commands==\n\
@@ -424,6 +429,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 joinqr <qr-content>\n\
                 setqr <qr-content>\n\
                 providerinfo <addr>\n\
+                 event <event-id to test>\n\
                 fileinfo <file>\n\
                 estimatedeletion <seconds>\n\
                 clear -- clear screen\n\
@@ -465,38 +471,26 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
        }
        "export-backup" => {
            let dir = dirs::home_dir().unwrap_or_default();
-            imex(
-                &context,
-                ImexMode::ExportBackup,
-                dir.as_ref(),
-                Some(arg2.to_string()),
-            )
-            .await?;
+            imex(&context, ImexMode::ExportBackup, dir.as_ref()).await?;
            println!("Exported to {}.", dir.to_string_lossy());
        }
        "import-backup" => {
            ensure!(!arg1.is_empty(), "Argument <backup-file> missing.");
-            imex(
-                &context,
-                ImexMode::ImportBackup,
-                arg1.as_ref(),
-                Some(arg2.to_string()),
-            )
-            .await?;
+            imex(&context, ImexMode::ImportBackup, arg1.as_ref()).await?;
        }
        "export-keys" => {
            let dir = dirs::home_dir().unwrap_or_default();
-            imex(&context, ImexMode::ExportSelfKeys, dir.as_ref(), None).await?;
+            imex(&context, ImexMode::ExportSelfKeys, dir.as_ref()).await?;
            println!("Exported to {}.", dir.to_string_lossy());
        }
        "import-keys" => {
-            imex(&context, ImexMode::ImportSelfKeys, arg1.as_ref(), None).await?;
+            imex(&context, ImexMode::ImportSelfKeys, arg1.as_ref()).await?;
        }
        "export-setup" => {
            let setup_code = create_setup_code(&context);
            let file_name = blobdir.join("autocrypt-setup-message.html");
            let file_content = render_setup_file(&context, &setup_code).await?;
-            fs::write(&file_name, file_content).await?;
+            async_std::fs::write(&file_name, file_content).await?;
            println!(
                "Setup message written to: {}\nSetup code: {}",
                file_name.display(),
@@ -536,7 +530,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                .join("connectivity.html");
            match context.get_connectivity_html().await {
                Ok(html) => {
-                    fs::write(&file, html).await?;
+                    fs::write(&file, html)?;
                    println!("Report written to: {:#?}", file);
                }
                Err(err) => {
@@ -569,7 +563,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                );

                for i in (0..cnt).rev() {
-                    let chat = Chat::load_from_db(&context, chatlist.get_chat_id(i)?).await?;
+                    let chat = Chat::load_from_db(&context, chatlist.get_chat_id(i)).await?;
                    println!(
                        "{}#{}: {} [{} fresh] {}{}{}{}",
                        chat_prefix(&chat),
@@ -601,7 +595,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                            _ => "",
                        }
                    };
-                    let timestr = timestamp_to_str(summary.timestamp);
+                    let timestr = dc_timestamp_to_str(summary.timestamp);
                    println!(
                        "{}{}{} [{}]{}",
                        summary
@@ -643,13 +637,14 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu

            let time_start = std::time::SystemTime::now();
            let msglist =
-                chat::get_chat_msgs(&context, sel_chat.get_id(), DC_GCM_ADDDAYMARKER).await?;
+                chat::get_chat_msgs(&context, sel_chat.get_id(), DC_GCM_ADDDAYMARKER, None).await?;
            let time_needed = time_start.elapsed().unwrap_or_default();

            let msglist: Vec<MsgId> = msglist
                .into_iter()
                .map(|x| match x {
                    ChatItem::Message { msg_id } => msg_id,
+                    ChatItem::Marker1 => MsgId::new(DC_MSG_ID_MARKER1),
                    ChatItem::DayMarker { .. } => MsgId::new(DC_MSG_ID_DAYMARKER),
                })
                .collect();
@@ -711,7 +706,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
        }
        "createchat" => {
            ensure!(!arg1.is_empty(), "Argument <contact-id> missing.");
-            let contact_id = ContactId::new(arg1.parse()?);
+            let contact_id: u32 = arg1.parse()?;
            let chat_id = ChatId::create_for_contact(&context, contact_id).await?;

            println!("Single#{} created successfully.", chat_id,);
@@ -739,7 +734,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
            ensure!(sel_chat.is_some(), "No chat selected");
            ensure!(!arg1.is_empty(), "Argument <contact-id> missing.");

-            let contact_id_0 = ContactId::new(arg1.parse()?);
+            let contact_id_0: u32 = arg1.parse()?;
            chat::add_contact_to_chat(&context, sel_chat.as_ref().unwrap().get_id(), contact_id_0)
                .await?;
            println!("Contact added to chat.");
@@ -747,7 +742,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
        "removemember" => {
            ensure!(sel_chat.is_some(), "No chat selected.");
            ensure!(!arg1.is_empty(), "Argument <contact-id> missing.");
-            let contact_id_1 = ContactId::new(arg1.parse()?);
+            let contact_id_1: u32 = arg1.parse()?;
            chat::remove_contact_from_chat(
                &context,
                sel_chat.as_ref().unwrap().get_id(),
@@ -763,7 +758,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
            chat::set_chat_name(
                &context,
                sel_chat.as_ref().unwrap().get_id(),
-                format!("{} {}", arg1, arg2).trim(),
+                &format!("{} {}", arg1, arg2).trim(),
            )
            .await?;

@@ -814,7 +809,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                println!(
                    "Loc#{}: {}: lat={} lng={} acc={} Chat#{} Contact#{} {} {}",
                    location.location_id,
-                    timestamp_to_str(location.timestamp),
+                    dc_timestamp_to_str(location.timestamp),
                    location.latitude,
                    location.longitude,
                    location.accuracy,
@@ -896,7 +891,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
            ensure!(sel_chat.is_some(), "No chat selected.");
            ensure!(!arg1.is_empty(), "No html-file given.");
            let path: &Path = arg1.as_ref();
-            let html = &*fs::read(&path).await?;
+            let html = &*fs::read(&path)?;
            let html = String::from_utf8_lossy(html);

            let mut msg = Message::new(Viewtype::Text);
@@ -912,16 +907,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
            Some(msg_id) => println!("sync message sent as {}.", msg_id),
            None => println!("sync message not needed."),
        },
-        "sendupdate" => {
-            ensure!(
-                !arg1.is_empty() && !arg2.is_empty(),
-                "Arguments <msg-id> <json status update> expected"
-            );
-            let msg_id = MsgId::new(arg1.parse()?);
-            context
-                .send_webxdc_status_update(msg_id, arg2, "this is a webxdc status update")
-                .await?;
-        }
        "videochat" => {
            ensure!(sel_chat.is_some(), "No chat selected.");
            chat::send_videochat_invitation(&context, sel_chat.as_ref().unwrap().get_id()).await?;
@@ -929,24 +914,13 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
        "listmsgs" => {
            ensure!(!arg1.is_empty(), "Argument <query> missing.");

-            let query = format!("{} {}", arg1, arg2).trim().to_string();
            let chat = sel_chat.as_ref().map(|sel_chat| sel_chat.get_id());
            let time_start = std::time::SystemTime::now();
-            let msglist = context.search_msgs(chat, &query).await?;
+            let msglist = context.search_msgs(chat, arg1).await?;
            let time_needed = time_start.elapsed().unwrap_or_default();

            log_msglist(&context, &msglist).await?;
-            println!(
-                "{}{} messages for {}search of \"{}\"",
-                msglist.len(),
-                if msglist.len() == 1000 { "+" } else { "" },
-                if chat.is_none() {
-                    "global "
-                } else {
-                    "in-chat-"
-                },
-                query,
-            );
+            println!("{} messages.", msglist.len());
            println!("{:?} to create this list", time_needed);
        }
        "draft" => {
@@ -1083,7 +1057,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                .unwrap_or_default()
                .join(format!("msg-{}.html", id.to_u32()));
            let html = id.get_html(&context).await?.unwrap_or_default();
-            fs::write(&file, html).await?;
+            fs::write(&file, html)?;
            println!("HTML written to: {:#?}", file);
        }
        "listfresh" => {
@@ -1103,13 +1077,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
            msg_ids[0] = MsgId::new(arg1.parse()?);
            chat::forward_msgs(&context, &msg_ids, chat_id).await?;
        }
-        "resend" => {
-            ensure!(!arg1.is_empty(), "Arguments <msg-id> expected");
-
-            let mut msg_ids = [MsgId::new(0); 1];
-            msg_ids[0] = MsgId::new(arg1.parse()?);
-            chat::resend_msgs(&context, &msg_ids).await?;
-        }
        "markseen" => {
            ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
            let mut msg_ids = vec![MsgId::new(0)];
@@ -1149,7 +1116,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
        "contactinfo" => {
            ensure!(!arg1.is_empty(), "Argument <contact-id> missing.");

-            let contact_id = ContactId::new(arg1.parse()?);
+            let contact_id: u32 = arg1.parse()?;
            let contact = Contact::get_by_id(&context, contact_id).await?;
            let name_n_addr = contact.get_name_n_addr();

@@ -1175,7 +1142,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                    if 0 != i {
                        res += ", ";
                    }
-                    let chat = Chat::load_from_db(&context, chatlist.get_chat_id(i)?).await?;
+                    let chat = Chat::load_from_db(&context, chatlist.get_chat_id(i)).await?;
                    res += &format!("{}#{}", chat_prefix(&chat), chat.get_id());
                }
            }
@@ -1184,16 +1151,16 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
        }
        "delcontact" => {
            ensure!(!arg1.is_empty(), "Argument <contact-id> missing.");
-            Contact::delete(&context, ContactId::new(arg1.parse()?)).await?;
+            Contact::delete(&context, arg1.parse()?).await?;
        }
        "block" => {
            ensure!(!arg1.is_empty(), "Argument <contact-id> missing.");
-            let contact_id = ContactId::new(arg1.parse()?);
+            let contact_id = arg1.parse()?;
            Contact::block(&context, contact_id).await?;
        }
        "unblock" => {
            ensure!(!arg1.is_empty(), "Argument <contact-id> missing.");
-            let contact_id = ContactId::new(arg1.parse()?);
+            let contact_id = arg1.parse()?;
            Contact::unblock(&context, contact_id).await?;
        }
        "listblocked" => {
@@ -1234,11 +1201,22 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                }
            }
        }
+        // TODO: implement this again, unclear how to match this through though, without writing a parser.
+        // "event" => {
+        //     ensure!(!arg1.is_empty(), "Argument <id> missing.");
+        //     let event = arg1.parse()?;
+        //     let event = EventType::from_u32(event).ok_or(format_err!("EventType::from_u32({})", event))?;
+        //     let r = context.emit_event(event, 0 as libc::uintptr_t, 0 as libc::uintptr_t);
+        //     println!(
+        //         "Sending event {:?}({}), received value {}.",
+        //         event, event as usize, r,
+        //     );
+        // }
        "fileinfo" => {
            ensure!(!arg1.is_empty(), "Argument <file> missing.");

-            if let Ok(buf) = read_file(&context, &arg1).await {
-                let (width, height) = get_filemeta(&buf)?;
+            if let Ok(buf) = dc_read_file(&context, &arg1).await {
+                let (width, height) = dc_get_filemeta(&buf)?;
                println!("width={}, height={}", width, height);
            } else {
                bail!("Command failed.");
--- a/examples/repl/main.rs
+++ b/examples/repl/main.rs
@@ -9,18 +9,17 @@ extern crate deltachat;

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

 use ansi_term::Color;
 use anyhow::{bail, Error};
+use async_std::path::Path;
 use deltachat::chat::ChatId;
 use deltachat::config;
 use deltachat::context::*;
 use deltachat::oauth2::*;
-use deltachat::qr_code_generator::get_securejoin_qr_svg;
 use deltachat::securejoin::*;
-use deltachat::{EventType, Events};
+use deltachat::EventType;
 use log::{error, info, warn};
 use rustyline::completion::{Completer, FilenameCompleter, Pair};
 use rustyline::config::OutputStreamType;
@@ -31,11 +30,11 @@ use rustyline::validate::Validator;
 use rustyline::{
    Cmd, CompletionType, Config, Context as RustyContext, EditMode, Editor, Helper, KeyEvent,
 };
-use tokio::fs;
-use tokio::runtime::Handle;

 mod cmdline;
 use self::cmdline::*;
+use deltachat::qr_code_generator::get_securejoin_qr_svg;
+use std::fs;

 /// Event Handler
 fn receive_event(event: EventType) {
@@ -170,7 +169,7 @@ const DB_COMMANDS: [&str; 10] = [
    "housekeeping",
 ];

-const CHAT_COMMANDS: [&str; 36] = [
+const CHAT_COMMANDS: [&str; 35] = [
    "listchats",
    "listarchived",
    "chat",
@@ -192,7 +191,6 @@ const CHAT_COMMANDS: [&str; 36] = [
    "sendfile",
    "sendhtml",
    "sendsyncmsg",
-    "sendupdate",
    "videochat",
    "draft",
    "listmedia",
@@ -208,12 +206,11 @@ const CHAT_COMMANDS: [&str; 36] = [
    "accept",
    "blockchat",
 ];
-const MESSAGE_COMMANDS: [&str; 8] = [
+const MESSAGE_COMMANDS: [&str; 7] = [
    "listmsgs",
    "msginfo",
    "listfresh",
    "forward",
-    "resend",
    "markseen",
    "delmsg",
    "download",
@@ -229,12 +226,13 @@ const CONTACT_COMMANDS: [&str; 9] = [
    "unblock",
    "listblocked",
 ];
-const MISC_COMMANDS: [&str; 11] = [
+const MISC_COMMANDS: [&str; 12] = [
    "getqr",
    "getqrsvg",
    "getbadqr",
    "checkqr",
    "joinqr",
+    "event",
    "fileinfo",
    "clear",
    "exit",
@@ -299,10 +297,10 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
        println!("Error: Bad arguments, expected [db-name].");
        bail!("No db-name specified");
    }
-    let context = Context::new(Path::new(&args[1]), 0, Events::new()).await?;
+    let context = Context::new(Path::new(&args[1]).to_path_buf(), 0).await?;

    let events = context.get_event_emitter();
-    tokio::task::spawn(async move {
+    async_std::task::spawn(async move {
        while let Some(event) = events.recv().await {
            receive_event(event.typ);
        }
@@ -317,9 +315,8 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
        .output_stream(OutputStreamType::Stdout)
        .build();
    let mut selected_chat = ChatId::default();
-
-    let ctx = context.clone();
-    let input_loop = tokio::task::spawn_blocking(move || {
+    let (reader_s, reader_r) = async_std::channel::bounded(100);
+    let input_loop = async_std::task::spawn_blocking(move || {
        let h = DcHelper {
            completer: FilenameCompleter::new(),
            highlighter: MatchingBracketHighlighter::new(),
@@ -341,30 +338,16 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
                Ok(line) => {
                    // TODO: ignore "set mail_pw"
                    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) => {
-                                println!("Exiting ...");
-                                false
-                            }
-                            Err(err) => {
-                                println!("Error: {}", err);
-                                true
-                            }
-                        }
-                    });
-
-                    if !contine {
-                        break;
-                    }
+                    async_std::task::block_on(reader_s.send(line)).unwrap();
                }
                Err(ReadlineError::Interrupted) | Err(ReadlineError::Eof) => {
                    println!("Exiting...");
+                    drop(reader_s);
                    break;
                }
                Err(err) => {
                    println!("Error: {}", err);
+                    drop(reader_s);
                    break;
                }
            }
@@ -375,8 +358,15 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
        Ok::<_, Error>(())
    });

+    while let Ok(line) = reader_r.recv().await {
+        match handle_cmd(line.trim(), context.clone(), &mut selected_chat).await {
+            Ok(ExitResult::Continue) => {}
+            Ok(ExitResult::Exit) => break,
+            Err(err) => println!("Error: {}", err),
+        }
+    }
    context.stop_io().await;
-    input_loop.await??;
+    input_loop.await?;

    Ok(())
 }
@@ -409,7 +399,7 @@ async fn handle_cmd(
        "oauth2" => {
            if let Some(addr) = ctx.get_config(config::Config::Addr).await? {
                let oauth2_url =
-                    get_oauth2_url(&ctx, &addr, "chat.delta:/com.b44t.messenger").await?;
+                    dc_get_oauth2_url(&ctx, &addr, "chat.delta:/com.b44t.messenger").await?;
                if oauth2_url.is_none() {
                    println!("OAuth2 not available for {}.", &addr);
                } else {
@@ -425,8 +415,8 @@ async fn handle_cmd(
        }
        "getqr" | "getbadqr" => {
            ctx.start_io().await;
-            let group = arg1.parse::<u32>().ok().map(ChatId::new);
-            let mut qr = get_securejoin_qr(&ctx, group).await?;
+            let group = arg1.parse::<u32>().ok().map(|id| ChatId::new(id));
+            let mut qr = dc_get_securejoin_qr(&ctx, group).await?;
            if !qr.is_empty() {
                if arg0 == "getbadqr" && qr.len() > 40 {
                    qr.replace_range(12..22, "0000000000")
@@ -442,11 +432,11 @@ async fn handle_cmd(
        }
        "getqrsvg" => {
            ctx.start_io().await;
-            let group = arg1.parse::<u32>().ok().map(ChatId::new);
+            let group = arg1.parse::<u32>().ok().map(|id| ChatId::new(id));
            let file = dirs::home_dir().unwrap_or_default().join("qr.svg");
            match get_securejoin_qr_svg(&ctx, group).await {
                Ok(svg) => {
-                    fs::write(&file, svg).await?;
+                    fs::write(&file, svg)?;
                    println!("QR code svg written to: {:#?}", file);
                }
                Err(err) => {
@@ -457,7 +447,7 @@ async fn handle_cmd(
        "joinqr" => {
            ctx.start_io().await;
            if !arg0.is_empty() {
-                join_securejoin(&ctx, arg1).await?;
+                dc_join_securejoin(&ctx, arg1).await?;
            }
        }
        "exit" | "quit" => return Ok(ExitResult::Exit),
@@ -467,12 +457,11 @@ async fn handle_cmd(
    Ok(ExitResult::Continue)
 }

-#[tokio::main]
-async fn main() -> Result<(), Error> {
+fn main() -> Result<(), Error> {
    let _ = pretty_env_logger::try_init();

    let args = std::env::args().collect();
-    start(args).await?;
+    async_std::task::block_on(async move { start(args).await })?;

    Ok(())
 }
--- a/examples/simple.rs
+++ b/examples/simple.rs
@@ -6,7 +6,7 @@ use deltachat::config;
 use deltachat::contact::*;
 use deltachat::context::*;
 use deltachat::message::Message;
-use deltachat::{EventType, Events};
+use deltachat::EventType;

 fn cb(event: EventType) {
    match event {
@@ -29,21 +29,21 @@ fn cb(event: EventType) {
 }

 /// Run with `RUST_LOG=simple=info cargo run --release --example simple --features repl -- email pw`.
-#[tokio::main]
+#[async_std::main]
 async fn main() {
    pretty_env_logger::try_init_timed().ok();

    let dir = tempdir().unwrap();
    let dbfile = dir.path().join("db.sqlite");
    log::info!("creating database {:?}", dbfile);
-    let ctx = Context::new(&dbfile, 0, Events::new())
+    let ctx = Context::new(dbfile.into(), 0)
        .await
        .expect("Failed to create context");
    let info = ctx.get_info().await;
    log::info!("info: {:#?}", info);

    let events = ctx.get_event_emitter();
-    let events_spawn = tokio::task::spawn(async move {
+    let events_spawn = async_std::task::spawn(async move {
        while let Some(event) = events.recv().await {
            cb(event.typ);
        }
@@ -80,7 +80,7 @@ async fn main() {
    }

    // wait for the message to be sent out
-    tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+    async_std::task::sleep(std::time::Duration::from_secs(1)).await;

    log::info!("fetching chats..");
    let chats = Chatlist::try_load(&ctx, 0, None, None).await.unwrap();
@@ -96,5 +96,5 @@ async fn main() {
    ctx.stop_io().await;
    log::info!("closing");
    drop(ctx);
-    events_spawn.await.unwrap();
+    events_spawn.await;
 }
--- a/node/.prettierrc.yml
+++ b/node/.prettierrc.yml
@@ -1,6 +0,0 @@
-# .prettierrc
-trailingComma: es5
-tabWidth: 2
-semi: false
-singleQuote: true
-jsxSingleQuote: true
--- a/node/CONTRIBUTORS.md
+++ b/node/CONTRIBUTORS.md
@@ -1,21 +0,0 @@
-# Contributors
-
-| Name                  | GitHub                                           |
-| :-------------------- | :----------------------------------------------- |
-| **Lars-Magnus Skog**  |                                                  |
-| **jikstra**           |                                                  |
-| **Simon Laux**        | [**@Simon-Laux**](https://github.com/Simon-Laux) |
-| **Jikstra**           | [**@Jikstra**](https://github.com/Jikstra)       |
-| **Nico de Haen**      |                                                  |
-| **B. Petersen**       |                                                  |
-| **Karissa McKelvey**  | [**@karissa**](https://github.com/karissa)       |
-| **developer**         |                                                  |
-| **Alexander Krotov**  |                                                  |
-| **Floris Bruynooghe** |                                                  |
-| **lefherz**           |                                                  |
-| **Pablo**             | [**@pabzm**](https://github.com/pabzm)           |
-| **pabzm**             |                                                  |
-| **holger krekel**     |                                                  |
-| **Robert Schütz**     |                                                  |
-| **bb**                |                                                  |
-| **Charles Paul**      |                                                  |
--- a/node/LICENSE
+++ b/node/LICENSE
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/node/README.md
+++ b/node/README.md
@@ -1,260 +0,0 @@
-# deltachat-node
-
-> node.js bindings for [`deltachat-core-rust`](..)
-
-[![npm](https://img.shields.io/npm/v/deltachat-node.svg)](https://www.npmjs.com/package/deltachat-node)
-![Node version](https://img.shields.io/node/v/deltachat-node.svg)
-[![JavaScript Style Guide](https://img.shields.io/badge/code_style-prettier-brightgreen.svg)](https://prettier.io)
-
-`deltachat-node` primarily aims to offer two things:
-
- A high level JavaScript api with syntactic sugar
- A low level c binding api around  [`deltachat-core-rust`](..)
-
-This code used to live at [`deltachat-node`](https://github.com/deltachat/deltachat-node)
-
-## Table of Contents
-
-<details><summary>Click to expand</summary>
-
- [Install](#install)
- [Dependencies](#dependencies)
- [Build from source](#build-from-source)
- [Usage](#usage)
- [Developing](#developing)
- [License](#license)
-
-</details>
-
-## Install
-
-By default the installation will build try to use the bundled prebuilds in the
-npm package. If this fails it falls back to compile `../deltachat-core-rust` from
-this repository, using `scripts/rebuild-core.js`.
-
-To install from npm use:
-
-```
-npm install deltachat-node
-```
-
-## Dependencies
-
- Nodejs >= `v16.0.0`
- rustup (optional if you can't use the prebuilds)
-
-> On Windows, you may need to also install **Perl** to be able to compile deltachat-core.
-
-## Build from source
-
-If you want to build from source, make sure that you have `rustup` installed.
-You can either use `npm install deltachat-node --build-from-source` to force
-building from source or clone this repository and follow this steps:
-
-1. `git clone https://github.com/deltachat/deltachat-core-rust.git`
-2. `cd deltachat-core-rust`
-3. `npm i`
-4. `npm run build`
-
-> Our `package.json` file is located in the root directory of this repository,
-> not inside this folder. (We need this in order to include the rust source
-> code in the npm package.)
-
-### Use a git branch in deltachat-desktop
-
-You can directly install a core branch, but make sure:
- that you have typescript in your project dependencies, as it is likely required
- you know that there are **no prebuilds** and so core is built during installation which is why it takes so long
-
-```
-npm install https://github.com/deltachat/deltachat-core-rust.git#branch
-```
-
-If you want prebuilds for a branch that has a core pr, you might find an npm tar.gz package for that branch at <https://download.delta.chat/node/preview/>.
-The github ci also posts a link to it in the checks for each pr.
-
-### Use build-from-source in deltachat-desktop
-
-If you want to use the manually built node bindings in the desktop client (for
-example), you can follow these instructions:
-
-First clone the
-[deltachat-desktop](https://github.com/deltachat/deltachat-desktop) repository,
-e.g. with `git clone https://github.com/deltachat/deltachat-desktop`.
-
-Then you need to make sure that this directory is referenced correctly in
-deltachat-desktop's package.json. You need to change
-`deltachat-desktop/package.json` like this:
-
-```
-diff --git i/package.json w/package.json
-index 45893894..5154512c 100644
--- i/package.json
-+++ w/package.json
-@@ -83,7 +83,7 @@
-     "application-config": "^1.0.1",
-     "classnames": "^2.3.1",
-     "debounce": "^1.2.0",
-    "deltachat-node": "1.79.3",
-+    "deltachat-node": "file:../deltachat-core-rust/",
-     "emoji-js-clean": "^4.0.0",
-     "emoji-mart": "^3.0.1",
-     "emoji-regex": "^9.2.2",
-```
-
-Then, in the `deltachat-desktop` repository, run:
-
-1. `npm i`
-2. `npm run build`
-3. And `npm run start` to start the newly built client.
-
-### Workaround to build for x86_64 on Apple's M1
-
-deltachat doesn't support universal (fat) binaries (that contain builds for both cpu architectures) yet, until it does you can use the following workaround to get x86_64 builds:
-
-```
-$ fnm install 17 --arch x64
-$ fnm use 17
-$ node -p process.arch
-# result should be x64
-$ rustup target add x86_64-apple-darwin
-$ git apply patches/m1_build_use_x86_64.patch
-$ CARGO_BUILD_TARGET=x86_64-apple-darwin npm run build
-$ 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 bulding for arm:
-
-```
-$ fnm install 16 --arch arm64
-$ fnm use 16
-$ node -p process.arch
-# result should be arm64
-$ npm_config_arch=arm64 npm run build
-$ npm run test
-```
-
-## Usage
-
-```js
-const { Context } = require('deltachat-node')
-
-const opts = {
-  addr: '[email]',
-  mail_pw: '[password]',
-}
-
-const contact = '[email]'
-
-async function main() {
-  const dc = Context.open('./')
-  dc.on('ALL', console.log.bind(null, 'core |'))
-
-  try {
-    await dc.configure(opts)
-  } catch (err) {
-    console.error('Failed to configure because of: ', err)
-    dc.unref()
-    return
-  }
-
-  dc.startIO()
-  console.log('fully configured')
-
-  const contactId = dc.createContact('Test', contact)
-  const chatId = dc.createChatByContactId(contactId)
-  dc.sendMessage(chatId, 'Hi!')
-
-  console.log('sent message')
-
-  dc.once('DC_EVENT_SMTP_MESSAGE_SENT', async () => {
-    console.log('Message sent, shutting down...')
-    dc.stopIO()
-    console.log('stopped io')
-    dc.unref()
-  })
-}
-
-main()
-```
-this example can also be found in the examples folder [examples/send_message.js](./examples/send_message.js)
-
-### Generating Docs
-
-We are curently migrating to automaticaly generated documentation.
-You can find the old documentation at [old_docs](./old_docs).
-
-to generate the documentation, run:
-
-```
-npx typedoc
-```
-
-The resulting documentation can be found in the `docs/` folder.
-An online version can be found under [js.delta.chat](https://js.delta.chat).
-
-## Developing
-
-### Tests and Coverage
-
-Running `npm test` ends with showing a code coverage report, which is produced by [`nyc`](https://github.com/istanbuljs/nyc#readme).
-
-![test output](images/tests.png)
-
-The coverage report from `nyc` in the console is rather limited. To get a more detailed coverage report you can run `npm run coverage-html-report`. This will produce a html report from the `nyc` data and display it in a browser on your local machine.
-
-To run the integration tests you need to set the `DCC_NEW_TMP_EMAIL` environment variables. E.g.:
-
-```
-$ export DCC_NEW_TMP_EMAIL=https://testrun.org/new_email?t=[token]
-$ npm run test
-```
-
-### Scripts
-
-We have the following scripts for building, testing and coverage:
-
- `npm run coverage` Creates a coverage report and passes it to `coveralls`. Only done by `Travis`.
- `npm run coverage-html-report` Generates a html report from the coverage data and opens it in a browser on the local machine.
- `npm run generate-constants` Generates `constants.js` and `events.js` based on the `deltachat-core-rust/deltachat-ffi/deltachat.h` header file.
- `npm install` After dependencies are installed, runs `node-gyp-build` to see if the native code needs to be rebuilt.
- `npm run build` Rebuilds all code.
- `npm run build:core` Rebuilds code in `deltachat-core-rust`.
- `npm run build:bindings` Rebuilds the bindings and links with `deltachat-core-rust`.
- `ǹpm run clean` Removes all built code
- `npm run prebuildify` Builds prebuilt binary to `prebuilds/$PLATFORM-$ARCH`. Copies `deltachat.dll` from `deltachat-core-rust` for windows.
- `npm run download-prebuilds` Downloads all prebuilt binaries from github before `npm publish`.
- `npm test` Runs `standard` and then the tests in `test/index.js`.
- `npm run test-integration` Runs the integration tests.
- `npm run hallmark` Runs `hallmark` on all markdown files.
-
-### Releases
-
-The following steps are needed to make a release:
-
-1. Wait until `pack-module` github action is completed
-2. Run `npm publish https://download.delta.chat/node/deltachat-node-1.x.x.tar.gz` to publish it to npm. You probably need write rights to npm.
-
-## License
-
-Licensed under `GPL-3.0-or-later`, see [LICENSE](./LICENSE) file for details.
-
->    Copyright © 2018 `DeltaChat` contributors.
->
->    This program is free software: you can redistribute it and/or modify
->    it under the terms of the GNU General Public License as published by
->    the Free Software Foundation, either version 3 of the License, or
->    (at your option) any later version.
->
->    This program is distributed in the hope that it will be useful,
->    but WITHOUT ANY WARRANTY; without even the implied warranty of
->    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
->    GNU General Public License for more details.
->
->    You should have received a copy of the GNU General Public License
->    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-[appveyor-shield]: https://ci.appveyor.com/api/projects/status/t0narp672wpbl6pd?svg=true
-
-[appveyor]: https://ci.appveyor.com/project/ralphtheninja/deltachat-node-d4bf8
--- a/node/binding.gyp
+++ b/node/binding.gyp
@@ -1,78 +0,0 @@
-{
-  # documentation about the format of this file can be found under https://gyp.gsrc.io/docs/InputFormatReference.md
-  # Variables can be specified when calling node-gyp as so:
-  #   node-gyp configure -- -Dvarname=value
-  "variables": {
-    # Whether to use a system-wide installation of deltachat-core
-    # using pkg-config.  Set to either "true" or "false".
-    "USE_SYSTEM_LIBDELTACHAT%": "<!(echo $USE_SYSTEM_LIBDELTACHAT)",
-  },
-  "targets": [
-    {
-      "target_name": "deltachat",
-      "sources": ["./src/module.c"],
-      "include_dirs": ["<!(node -e \"require('napi-macros')\")"],
-      "conditions": [
-        [
-          "OS == 'win'",
-          {
-            "include_dirs": ["../deltachat-ffi"],
-            "libraries": [
-              "../../target/release/deltachat.dll.lib",
-            ],
-            "conditions": [
-              [
-                "USE_SYSTEM_LIBDELTACHAT == 'true'",
-                {
-                  "cflags": ["<!(pkg-config --cflags deltachat)"],
-                  "libraries": ["<!(pkg-config --libs deltachat)"],
-                },
-              ],
-            ],
-          },
-        ],
-        [
-          "OS == 'linux' or OS == 'mac'",
-          {
-            "libraries": ["-lpthread"],
-            "cflags": ["-std=gnu99"],
-            "conditions": [
-              [
-                "USE_SYSTEM_LIBDELTACHAT != 'true'",
-                {
-                  "include_dirs": ["../deltachat-ffi"],
-                  "ldflags": ["-Wl,-Bsymbolic"], # Prevent sqlite3 from electron from overriding sqlcipher
-                  "libraries": [
-                    "../../target/release/libdeltachat.a",
-                    "-ldl",
-                  ],
-                  "conditions": [],
-                },
-                {
-                  # USE_SYSTEM_LIBDELTACHAT == 'true'
-                  "cflags": ["<!(pkg-config --cflags deltachat)"],
-                  "libraries": ["<!(pkg-config --libs deltachat)"],
-                },
-              ],
-              [
-                "OS == 'mac'",
-                {
-                  "libraries": [
-                    "-framework CoreFoundation",
-                    "-framework CoreServices",
-                    "-framework Security",
-                    "-lresolv",
-                  ],
-                },
-                {
-                  # OS == 'linux'
-                  "libraries": ["-lm", "-lrt"],
-                },
-              ],
-            ],
-          },
-        ],
-      ],
-    },
-  ],
-}
--- a/node/binding.js
+++ b/node/binding.js
@@ -1 +0,0 @@
-module.exports = require('node-gyp-build')(__dirname)
--- a/node/constants.js
+++ b/node/constants.js
@@ -1,226 +0,0 @@
-// Generated!
-
-module.exports = {
-  DC_CERTCK_ACCEPT_INVALID_CERTIFICATES: 3,
-  DC_CERTCK_AUTO: 0,
-  DC_CERTCK_STRICT: 1,
-  DC_CHAT_ID_ALLDONE_HINT: 7,
-  DC_CHAT_ID_ARCHIVED_LINK: 6,
-  DC_CHAT_ID_LAST_SPECIAL: 9,
-  DC_CHAT_ID_TRASH: 3,
-  DC_CHAT_TYPE_BROADCAST: 160,
-  DC_CHAT_TYPE_GROUP: 120,
-  DC_CHAT_TYPE_MAILINGLIST: 140,
-  DC_CHAT_TYPE_SINGLE: 100,
-  DC_CHAT_TYPE_UNDEFINED: 0,
-  DC_CHAT_VISIBILITY_ARCHIVED: 1,
-  DC_CHAT_VISIBILITY_NORMAL: 0,
-  DC_CHAT_VISIBILITY_PINNED: 2,
-  DC_CONNECTIVITY_CONNECTED: 4000,
-  DC_CONNECTIVITY_CONNECTING: 2000,
-  DC_CONNECTIVITY_NOT_CONNECTED: 1000,
-  DC_CONNECTIVITY_WORKING: 3000,
-  DC_CONTACT_ID_DEVICE: 5,
-  DC_CONTACT_ID_INFO: 2,
-  DC_CONTACT_ID_LAST_SPECIAL: 9,
-  DC_CONTACT_ID_SELF: 1,
-  DC_DOWNLOAD_AVAILABLE: 10,
-  DC_DOWNLOAD_DONE: 0,
-  DC_DOWNLOAD_FAILURE: 20,
-  DC_DOWNLOAD_IN_PROGRESS: 1000,
-  DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED: 2021,
-  DC_EVENT_CHAT_MODIFIED: 2020,
-  DC_EVENT_CONFIGURE_PROGRESS: 2041,
-  DC_EVENT_CONNECTIVITY_CHANGED: 2100,
-  DC_EVENT_CONTACTS_CHANGED: 2030,
-  DC_EVENT_DELETED_BLOB_FILE: 151,
-  DC_EVENT_ERROR: 400,
-  DC_EVENT_ERROR_SELF_NOT_IN_GROUP: 410,
-  DC_EVENT_IMAP_CONNECTED: 102,
-  DC_EVENT_IMAP_MESSAGE_DELETED: 104,
-  DC_EVENT_IMAP_MESSAGE_MOVED: 105,
-  DC_EVENT_IMEX_FILE_WRITTEN: 2052,
-  DC_EVENT_IMEX_PROGRESS: 2051,
-  DC_EVENT_INCOMING_MSG: 2005,
-  DC_EVENT_INFO: 100,
-  DC_EVENT_LOCATION_CHANGED: 2035,
-  DC_EVENT_MSGS_CHANGED: 2000,
-  DC_EVENT_MSGS_NOTICED: 2008,
-  DC_EVENT_MSG_DELIVERED: 2010,
-  DC_EVENT_MSG_FAILED: 2012,
-  DC_EVENT_MSG_READ: 2015,
-  DC_EVENT_NEW_BLOB_FILE: 150,
-  DC_EVENT_SECUREJOIN_INVITER_PROGRESS: 2060,
-  DC_EVENT_SECUREJOIN_JOINER_PROGRESS: 2061,
-  DC_EVENT_SELFAVATAR_CHANGED: 2110,
-  DC_EVENT_SMTP_CONNECTED: 101,
-  DC_EVENT_SMTP_MESSAGE_SENT: 103,
-  DC_EVENT_WARNING: 300,
-  DC_EVENT_WEBXDC_STATUS_UPDATE: 2120,
-  DC_GCL_ADD_ALLDONE_HINT: 4,
-  DC_GCL_ADD_SELF: 2,
-  DC_GCL_ARCHIVED_ONLY: 1,
-  DC_GCL_FOR_FORWARDING: 8,
-  DC_GCL_NO_SPECIALS: 2,
-  DC_GCL_VERIFIED_ONLY: 1,
-  DC_GCM_ADDDAYMARKER: 1,
-  DC_GCM_INFO_ONLY: 2,
-  DC_IMEX_EXPORT_BACKUP: 11,
-  DC_IMEX_EXPORT_SELF_KEYS: 1,
-  DC_IMEX_IMPORT_BACKUP: 12,
-  DC_IMEX_IMPORT_SELF_KEYS: 2,
-  DC_INFO_PROTECTION_DISABLED: 12,
-  DC_INFO_PROTECTION_ENABLED: 11,
-  DC_KEY_GEN_DEFAULT: 0,
-  DC_KEY_GEN_ED25519: 2,
-  DC_KEY_GEN_RSA2048: 1,
-  DC_LP_AUTH_NORMAL: 4,
-  DC_LP_AUTH_OAUTH2: 2,
-  DC_MEDIA_QUALITY_BALANCED: 0,
-  DC_MEDIA_QUALITY_WORSE: 1,
-  DC_MSG_AUDIO: 40,
-  DC_MSG_FILE: 60,
-  DC_MSG_GIF: 21,
-  DC_MSG_ID_DAYMARKER: 9,
-  DC_MSG_ID_LAST_SPECIAL: 9,
-  DC_MSG_ID_MARKER1: 1,
-  DC_MSG_IMAGE: 20,
-  DC_MSG_STICKER: 23,
-  DC_MSG_TEXT: 10,
-  DC_MSG_VIDEO: 50,
-  DC_MSG_VIDEOCHAT_INVITATION: 70,
-  DC_MSG_VOICE: 41,
-  DC_MSG_WEBXDC: 80,
-  DC_PROVIDER_STATUS_BROKEN: 3,
-  DC_PROVIDER_STATUS_OK: 1,
-  DC_PROVIDER_STATUS_PREPARATION: 2,
-  DC_QR_ACCOUNT: 250,
-  DC_QR_ADDR: 320,
-  DC_QR_ASK_VERIFYCONTACT: 200,
-  DC_QR_ASK_VERIFYGROUP: 202,
-  DC_QR_ERROR: 400,
-  DC_QR_FPR_MISMATCH: 220,
-  DC_QR_FPR_OK: 210,
-  DC_QR_FPR_WITHOUT_ADDR: 230,
-  DC_QR_REVIVE_VERIFYCONTACT: 510,
-  DC_QR_REVIVE_VERIFYGROUP: 512,
-  DC_QR_TEXT: 330,
-  DC_QR_URL: 332,
-  DC_QR_WEBRTC_INSTANCE: 260,
-  DC_QR_WITHDRAW_VERIFYCONTACT: 500,
-  DC_QR_WITHDRAW_VERIFYGROUP: 502,
-  DC_SHOW_EMAILS_ACCEPTED_CONTACTS: 1,
-  DC_SHOW_EMAILS_ALL: 2,
-  DC_SHOW_EMAILS_OFF: 0,
-  DC_SOCKET_AUTO: 0,
-  DC_SOCKET_PLAIN: 3,
-  DC_SOCKET_SSL: 1,
-  DC_SOCKET_STARTTLS: 2,
-  DC_STATE_IN_FRESH: 10,
-  DC_STATE_IN_NOTICED: 13,
-  DC_STATE_IN_SEEN: 16,
-  DC_STATE_OUT_DELIVERED: 26,
-  DC_STATE_OUT_DRAFT: 19,
-  DC_STATE_OUT_FAILED: 24,
-  DC_STATE_OUT_MDN_RCVD: 28,
-  DC_STATE_OUT_PENDING: 20,
-  DC_STATE_OUT_PREPARING: 18,
-  DC_STATE_UNDEFINED: 0,
-  DC_STR_AC_SETUP_MSG_BODY: 43,
-  DC_STR_AC_SETUP_MSG_SUBJECT: 42,
-  DC_STR_ARCHIVEDCHATS: 40,
-  DC_STR_AUDIO: 11,
-  DC_STR_BAD_TIME_MSG_BODY: 85,
-  DC_STR_BROADCAST_LIST: 115,
-  DC_STR_CANNOT_LOGIN: 60,
-  DC_STR_CANTDECRYPT_MSG_BODY: 29,
-  DC_STR_CONFIGURATION_FAILED: 84,
-  DC_STR_CONNECTED: 107,
-  DC_STR_CONNTECTING: 108,
-  DC_STR_CONTACT_NOT_VERIFIED: 36,
-  DC_STR_CONTACT_SETUP_CHANGED: 37,
-  DC_STR_CONTACT_VERIFIED: 35,
-  DC_STR_DEVICE_MESSAGES: 68,
-  DC_STR_DEVICE_MESSAGES_HINT: 70,
-  DC_STR_DOWNLOAD_AVAILABILITY: 100,
-  DC_STR_DRAFT: 3,
-  DC_STR_E2E_AVAILABLE: 25,
-  DC_STR_E2E_PREFERRED: 34,
-  DC_STR_ENCRYPTEDMSG: 24,
-  DC_STR_ENCR_NONE: 28,
-  DC_STR_ENCR_TRANSP: 27,
-  DC_STR_EPHEMERAL_DAY: 79,
-  DC_STR_EPHEMERAL_DAYS: 95,
-  DC_STR_EPHEMERAL_DISABLED: 75,
-  DC_STR_EPHEMERAL_FOUR_WEEKS: 81,
-  DC_STR_EPHEMERAL_HOUR: 78,
-  DC_STR_EPHEMERAL_HOURS: 94,
-  DC_STR_EPHEMERAL_MINUTE: 77,
-  DC_STR_EPHEMERAL_MINUTES: 93,
-  DC_STR_EPHEMERAL_SECONDS: 76,
-  DC_STR_EPHEMERAL_WEEK: 80,
-  DC_STR_EPHEMERAL_WEEKS: 96,
-  DC_STR_ERROR: 112,
-  DC_STR_ERROR_NO_NETWORK: 87,
-  DC_STR_FAILED_SENDING_TO: 74,
-  DC_STR_FILE: 12,
-  DC_STR_FINGERPRINTS: 30,
-  DC_STR_FORWARDED: 97,
-  DC_STR_GIF: 23,
-  DC_STR_IMAGE: 9,
-  DC_STR_INCOMING_MESSAGES: 103,
-  DC_STR_LAST_MSG_SENT_SUCCESSFULLY: 111,
-  DC_STR_LOCATION: 66,
-  DC_STR_MESSAGES: 114,
-  DC_STR_MSGACTIONBYME: 63,
-  DC_STR_MSGACTIONBYUSER: 62,
-  DC_STR_MSGADDMEMBER: 17,
-  DC_STR_MSGDELMEMBER: 18,
-  DC_STR_MSGGROUPLEFT: 19,
-  DC_STR_MSGGRPIMGCHANGED: 16,
-  DC_STR_MSGGRPIMGDELETED: 33,
-  DC_STR_MSGGRPNAME: 15,
-  DC_STR_MSGLOCATIONDISABLED: 65,
-  DC_STR_MSGLOCATIONENABLED: 64,
-  DC_STR_NOMESSAGES: 1,
-  DC_STR_NOT_CONNECTED: 121,
-  DC_STR_NOT_SUPPORTED_BY_PROVIDER: 113,
-  DC_STR_ONE_MOMENT: 106,
-  DC_STR_OUTGOING_MESSAGES: 104,
-  DC_STR_PARTIAL_DOWNLOAD_MSG_BODY: 99,
-  DC_STR_PART_OF_TOTAL_USED: 116,
-  DC_STR_PROTECTION_DISABLED: 89,
-  DC_STR_PROTECTION_ENABLED: 88,
-  DC_STR_QUOTA_EXCEEDING_MSG_BODY: 98,
-  DC_STR_READRCPT: 31,
-  DC_STR_READRCPT_MAILBODY: 32,
-  DC_STR_REPLY_NOUN: 90,
-  DC_STR_SAVED_MESSAGES: 69,
-  DC_STR_SECURE_JOIN_GROUP_QR_DESC: 120,
-  DC_STR_SECURE_JOIN_REPLIES: 118,
-  DC_STR_SECURE_JOIN_STARTED: 117,
-  DC_STR_SELF: 2,
-  DC_STR_SELF_DELETED_MSG_BODY: 91,
-  DC_STR_SENDING: 110,
-  DC_STR_SERVER_TURNED_OFF: 92,
-  DC_STR_SETUP_CONTACT_QR_DESC: 119,
-  DC_STR_STICKER: 67,
-  DC_STR_STORAGE_ON_DOMAIN: 105,
-  DC_STR_SUBJECT_FOR_NEW_CONTACT: 73,
-  DC_STR_SYNC_MSG_BODY: 102,
-  DC_STR_SYNC_MSG_SUBJECT: 101,
-  DC_STR_UNKNOWN_SENDER_FOR_CHAT: 72,
-  DC_STR_UPDATE_REMINDER_MSG_BODY: 86,
-  DC_STR_UPDATING: 109,
-  DC_STR_VIDEO: 10,
-  DC_STR_VIDEOCHAT_INVITATION: 82,
-  DC_STR_VIDEOCHAT_INVITE_MSG_BODY: 83,
-  DC_STR_VOICEMESSAGE: 7,
-  DC_STR_WELCOME_MESSAGE: 71,
-  DC_TEXT1_DRAFT: 1,
-  DC_TEXT1_SELF: 3,
-  DC_TEXT1_USERNAME: 2,
-  DC_VIDEOCHATTYPE_BASICWEBRTC: 1,
-  DC_VIDEOCHATTYPE_JITSI: 2,
-  DC_VIDEOCHATTYPE_UNKNOWN: 0
-}
--- a/node/events.js
+++ b/node/events.js
@@ -1,34 +0,0 @@
-/* eslint-disable quotes */
-// Generated!
-
-module.exports = {
-  100: 'DC_EVENT_INFO',
-  101: 'DC_EVENT_SMTP_CONNECTED',
-  102: 'DC_EVENT_IMAP_CONNECTED',
-  103: 'DC_EVENT_SMTP_MESSAGE_SENT',
-  104: 'DC_EVENT_IMAP_MESSAGE_DELETED',
-  105: 'DC_EVENT_IMAP_MESSAGE_MOVED',
-  150: 'DC_EVENT_NEW_BLOB_FILE',
-  151: 'DC_EVENT_DELETED_BLOB_FILE',
-  300: 'DC_EVENT_WARNING',
-  400: 'DC_EVENT_ERROR',
-  410: 'DC_EVENT_ERROR_SELF_NOT_IN_GROUP',
-  2000: 'DC_EVENT_MSGS_CHANGED',
-  2005: 'DC_EVENT_INCOMING_MSG',
-  2008: 'DC_EVENT_MSGS_NOTICED',
-  2010: 'DC_EVENT_MSG_DELIVERED',
-  2012: 'DC_EVENT_MSG_FAILED',
-  2015: 'DC_EVENT_MSG_READ',
-  2020: 'DC_EVENT_CHAT_MODIFIED',
-  2021: 'DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED',
-  2030: 'DC_EVENT_CONTACTS_CHANGED',
-  2035: 'DC_EVENT_LOCATION_CHANGED',
-  2041: 'DC_EVENT_CONFIGURE_PROGRESS',
-  2051: 'DC_EVENT_IMEX_PROGRESS',
-  2052: 'DC_EVENT_IMEX_FILE_WRITTEN',
-  2060: 'DC_EVENT_SECUREJOIN_INVITER_PROGRESS',
-  2061: 'DC_EVENT_SECUREJOIN_JOINER_PROGRESS',
-  2100: 'DC_EVENT_CONNECTIVITY_CHANGED',
-  2110: 'DC_EVENT_SELFAVATAR_CHANGED',
-  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE'
-}
--- a/node/examples/send_message.js
+++ b/node/examples/send_message.js
@@ -1,40 +0,0 @@
-//@ts-check
-const { Context } = require('../dist')
-
-const opts = {
-  addr: '[email]',
-  mail_pw: '[password]',
-}
-
-const contact = '[email]'
-
-async function main() {
-  const dc = Context.open('./')
-  dc.on('ALL', console.log.bind(null, 'core |'))
-
-  try {
-    await dc.configure(opts)
-  } catch (err) {
-    console.error('Failed to configure because of: ', err)
-    dc.unref()
-    return
-  }
-
-  dc.startIO()
-  console.log('fully configured')
-
-  const contactId = dc.createContact('Test', contact)
-  const chatId = dc.createChatByContactId(contactId)
-  dc.sendMessage(chatId, 'Hi!')
-
-  console.log('sent message')
-
-  dc.once('DC_EVENT_SMTP_MESSAGE_SENT', async () => {
-    console.log('Message sent, shutting down...')
-    dc.stopIO()
-    console.log('stopped io')
-    dc.unref()
-  })
-}
-
-main()
--- a/node/images/tests.png
+++ b/node/images/tests.png
--- a/node/lib/binding.ts
+++ b/node/lib/binding.ts
@@ -1,9 +0,0 @@
-import { join } from 'path'
-
-/**
- * bindings are not typed yet.
- * 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, '../'))
-
-export default bindings
--- a/node/lib/chat.ts
+++ b/node/lib/chat.ts
@@ -1,106 +0,0 @@
-/* eslint-disable camelcase */
-
-import binding from './binding'
-import rawDebug from 'debug'
-const debug = rawDebug('deltachat:node:chat')
-import { C } from './constants'
-import { integerToHexColor } from './util'
-import { ChatJSON } from './types'
-
-interface NativeChat {}
-/**
- * Wrapper around dc_chat_t*
- */
-
-export class Chat {
-  constructor(public dc_chat: NativeChat) {
-    debug('Chat constructor')
-    if (dc_chat === null) {
-      throw new Error('native chat can not be null')
-    }
-  }
-
-  getVisibility():
-    | C.DC_CHAT_VISIBILITY_NORMAL
-    | C.DC_CHAT_VISIBILITY_ARCHIVED
-    | C.DC_CHAT_VISIBILITY_PINNED {
-    return binding.dcn_chat_get_visibility(this.dc_chat)
-  }
-
-  get color(): string {
-    return integerToHexColor(binding.dcn_chat_get_color(this.dc_chat))
-  }
-
-  getId(): number {
-    return binding.dcn_chat_get_id(this.dc_chat)
-  }
-
-  getName(): string {
-    return binding.dcn_chat_get_name(this.dc_chat)
-  }
-
-  getProfileImage(): string {
-    return binding.dcn_chat_get_profile_image(this.dc_chat)
-  }
-
-  getType(): number {
-    return binding.dcn_chat_get_type(this.dc_chat)
-  }
-
-  isSelfTalk(): boolean {
-    return Boolean(binding.dcn_chat_is_self_talk(this.dc_chat))
-  }
-
-  isContactRequest(): boolean {
-    return Boolean(binding.dcn_chat_is_contact_request(this.dc_chat))
-  }
-
-  isUnpromoted(): boolean {
-    return Boolean(binding.dcn_chat_is_unpromoted(this.dc_chat))
-  }
-
-  isProtected(): boolean {
-    return Boolean(binding.dcn_chat_is_protected(this.dc_chat))
-  }
-
-  get canSend(): boolean {
-    return Boolean(binding.dcn_chat_can_send(this.dc_chat))
-  }
-
-  isDeviceTalk(): boolean {
-    return Boolean(binding.dcn_chat_is_device_talk(this.dc_chat))
-  }
-
-  isSingle(): boolean {
-    return this.getType() === C.DC_CHAT_TYPE_SINGLE
-  }
-
-  isGroup(): boolean {
-    return this.getType() === C.DC_CHAT_TYPE_GROUP
-  }
-
-  isMuted(): boolean {
-    return Boolean(binding.dcn_chat_is_muted(this.dc_chat))
-  }
-
-  toJson(): ChatJSON {
-    debug('toJson')
-    const visibility = this.getVisibility()
-    return {
-      archived: visibility === C.DC_CHAT_VISIBILITY_ARCHIVED,
-      pinned: visibility === C.DC_CHAT_VISIBILITY_PINNED,
-      color: this.color,
-      id: this.getId(),
-      name: this.getName(),
-      profileImage: this.getProfileImage(),
-      type: this.getType(),
-      isSelfTalk: this.isSelfTalk(),
-      isUnpromoted: this.isUnpromoted(),
-      isProtected: this.isProtected(),
-      canSend: this.canSend,
-      isDeviceTalk: this.isDeviceTalk(),
-      isContactRequest: this.isContactRequest(),
-      muted: this.isMuted(),
-    }
-  }
-}
--- a/node/lib/chatlist.ts
+++ b/node/lib/chatlist.ts
@@ -1,42 +0,0 @@
-/* eslint-disable camelcase */
-
-import binding from './binding'
-import { Lot } from './lot'
-import { Chat } from './chat'
-const debug = require('debug')('deltachat:node:chatlist')
-
-interface NativeChatList {}
-/**
- * Wrapper around dc_chatlist_t*
- */
-export class ChatList {
-  constructor(private dc_chatlist: NativeChatList) {
-    debug('ChatList constructor')
-    if (dc_chatlist === null) {
-      throw new Error('native chat list can not be null')
-    }
-  }
-
-  getChatId(index: number): number {
-    debug(`getChatId ${index}`)
-    return binding.dcn_chatlist_get_chat_id(this.dc_chatlist, index)
-  }
-
-  getCount(): number {
-    debug('getCount')
-    return binding.dcn_chatlist_get_cnt(this.dc_chatlist)
-  }
-
-  getMessageId(index: number): number {
-    debug(`getMessageId ${index}`)
-    return binding.dcn_chatlist_get_msg_id(this.dc_chatlist, index)
-  }
-
-  getSummary(index: number, chat?: Chat): Lot {
-    debug(`getSummary ${index}`)
-    const dc_chat = (chat && chat.dc_chat) || null
-    return new Lot(
-      binding.dcn_chatlist_get_summary(this.dc_chatlist, index, dc_chat)
-    )
-  }
-}
--- a/node/lib/constants.ts
+++ b/node/lib/constants.ts
@@ -1,260 +0,0 @@
-// Generated!
-
-export enum C {
-  DC_CERTCK_ACCEPT_INVALID_CERTIFICATES = 3,
-  DC_CERTCK_AUTO = 0,
-  DC_CERTCK_STRICT = 1,
-  DC_CHAT_ID_ALLDONE_HINT = 7,
-  DC_CHAT_ID_ARCHIVED_LINK = 6,
-  DC_CHAT_ID_LAST_SPECIAL = 9,
-  DC_CHAT_ID_TRASH = 3,
-  DC_CHAT_TYPE_BROADCAST = 160,
-  DC_CHAT_TYPE_GROUP = 120,
-  DC_CHAT_TYPE_MAILINGLIST = 140,
-  DC_CHAT_TYPE_SINGLE = 100,
-  DC_CHAT_TYPE_UNDEFINED = 0,
-  DC_CHAT_VISIBILITY_ARCHIVED = 1,
-  DC_CHAT_VISIBILITY_NORMAL = 0,
-  DC_CHAT_VISIBILITY_PINNED = 2,
-  DC_CONNECTIVITY_CONNECTED = 4000,
-  DC_CONNECTIVITY_CONNECTING = 2000,
-  DC_CONNECTIVITY_NOT_CONNECTED = 1000,
-  DC_CONNECTIVITY_WORKING = 3000,
-  DC_CONTACT_ID_DEVICE = 5,
-  DC_CONTACT_ID_INFO = 2,
-  DC_CONTACT_ID_LAST_SPECIAL = 9,
-  DC_CONTACT_ID_SELF = 1,
-  DC_DOWNLOAD_AVAILABLE = 10,
-  DC_DOWNLOAD_DONE = 0,
-  DC_DOWNLOAD_FAILURE = 20,
-  DC_DOWNLOAD_IN_PROGRESS = 1000,
-  DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED = 2021,
-  DC_EVENT_CHAT_MODIFIED = 2020,
-  DC_EVENT_CONFIGURE_PROGRESS = 2041,
-  DC_EVENT_CONNECTIVITY_CHANGED = 2100,
-  DC_EVENT_CONTACTS_CHANGED = 2030,
-  DC_EVENT_DELETED_BLOB_FILE = 151,
-  DC_EVENT_ERROR = 400,
-  DC_EVENT_ERROR_SELF_NOT_IN_GROUP = 410,
-  DC_EVENT_IMAP_CONNECTED = 102,
-  DC_EVENT_IMAP_MESSAGE_DELETED = 104,
-  DC_EVENT_IMAP_MESSAGE_MOVED = 105,
-  DC_EVENT_IMEX_FILE_WRITTEN = 2052,
-  DC_EVENT_IMEX_PROGRESS = 2051,
-  DC_EVENT_INCOMING_MSG = 2005,
-  DC_EVENT_INFO = 100,
-  DC_EVENT_LOCATION_CHANGED = 2035,
-  DC_EVENT_MSGS_CHANGED = 2000,
-  DC_EVENT_MSGS_NOTICED = 2008,
-  DC_EVENT_MSG_DELIVERED = 2010,
-  DC_EVENT_MSG_FAILED = 2012,
-  DC_EVENT_MSG_READ = 2015,
-  DC_EVENT_NEW_BLOB_FILE = 150,
-  DC_EVENT_SECUREJOIN_INVITER_PROGRESS = 2060,
-  DC_EVENT_SECUREJOIN_JOINER_PROGRESS = 2061,
-  DC_EVENT_SELFAVATAR_CHANGED = 2110,
-  DC_EVENT_SMTP_CONNECTED = 101,
-  DC_EVENT_SMTP_MESSAGE_SENT = 103,
-  DC_EVENT_WARNING = 300,
-  DC_EVENT_WEBXDC_STATUS_UPDATE = 2120,
-  DC_GCL_ADD_ALLDONE_HINT = 4,
-  DC_GCL_ADD_SELF = 2,
-  DC_GCL_ARCHIVED_ONLY = 1,
-  DC_GCL_FOR_FORWARDING = 8,
-  DC_GCL_NO_SPECIALS = 2,
-  DC_GCL_VERIFIED_ONLY = 1,
-  DC_GCM_ADDDAYMARKER = 1,
-  DC_GCM_INFO_ONLY = 2,
-  DC_IMEX_EXPORT_BACKUP = 11,
-  DC_IMEX_EXPORT_SELF_KEYS = 1,
-  DC_IMEX_IMPORT_BACKUP = 12,
-  DC_IMEX_IMPORT_SELF_KEYS = 2,
-  DC_INFO_PROTECTION_DISABLED = 12,
-  DC_INFO_PROTECTION_ENABLED = 11,
-  DC_KEY_GEN_DEFAULT = 0,
-  DC_KEY_GEN_ED25519 = 2,
-  DC_KEY_GEN_RSA2048 = 1,
-  DC_LP_AUTH_NORMAL = 4,
-  DC_LP_AUTH_OAUTH2 = 2,
-  DC_MEDIA_QUALITY_BALANCED = 0,
-  DC_MEDIA_QUALITY_WORSE = 1,
-  DC_MSG_AUDIO = 40,
-  DC_MSG_FILE = 60,
-  DC_MSG_GIF = 21,
-  DC_MSG_ID_DAYMARKER = 9,
-  DC_MSG_ID_LAST_SPECIAL = 9,
-  DC_MSG_ID_MARKER1 = 1,
-  DC_MSG_IMAGE = 20,
-  DC_MSG_STICKER = 23,
-  DC_MSG_TEXT = 10,
-  DC_MSG_VIDEO = 50,
-  DC_MSG_VIDEOCHAT_INVITATION = 70,
-  DC_MSG_VOICE = 41,
-  DC_MSG_WEBXDC = 80,
-  DC_PROVIDER_STATUS_BROKEN = 3,
-  DC_PROVIDER_STATUS_OK = 1,
-  DC_PROVIDER_STATUS_PREPARATION = 2,
-  DC_QR_ACCOUNT = 250,
-  DC_QR_ADDR = 320,
-  DC_QR_ASK_VERIFYCONTACT = 200,
-  DC_QR_ASK_VERIFYGROUP = 202,
-  DC_QR_ERROR = 400,
-  DC_QR_FPR_MISMATCH = 220,
-  DC_QR_FPR_OK = 210,
-  DC_QR_FPR_WITHOUT_ADDR = 230,
-  DC_QR_REVIVE_VERIFYCONTACT = 510,
-  DC_QR_REVIVE_VERIFYGROUP = 512,
-  DC_QR_TEXT = 330,
-  DC_QR_URL = 332,
-  DC_QR_WEBRTC_INSTANCE = 260,
-  DC_QR_WITHDRAW_VERIFYCONTACT = 500,
-  DC_QR_WITHDRAW_VERIFYGROUP = 502,
-  DC_SHOW_EMAILS_ACCEPTED_CONTACTS = 1,
-  DC_SHOW_EMAILS_ALL = 2,
-  DC_SHOW_EMAILS_OFF = 0,
-  DC_SOCKET_AUTO = 0,
-  DC_SOCKET_PLAIN = 3,
-  DC_SOCKET_SSL = 1,
-  DC_SOCKET_STARTTLS = 2,
-  DC_STATE_IN_FRESH = 10,
-  DC_STATE_IN_NOTICED = 13,
-  DC_STATE_IN_SEEN = 16,
-  DC_STATE_OUT_DELIVERED = 26,
-  DC_STATE_OUT_DRAFT = 19,
-  DC_STATE_OUT_FAILED = 24,
-  DC_STATE_OUT_MDN_RCVD = 28,
-  DC_STATE_OUT_PENDING = 20,
-  DC_STATE_OUT_PREPARING = 18,
-  DC_STATE_UNDEFINED = 0,
-  DC_STR_AC_SETUP_MSG_BODY = 43,
-  DC_STR_AC_SETUP_MSG_SUBJECT = 42,
-  DC_STR_ARCHIVEDCHATS = 40,
-  DC_STR_AUDIO = 11,
-  DC_STR_BAD_TIME_MSG_BODY = 85,
-  DC_STR_BROADCAST_LIST = 115,
-  DC_STR_CANNOT_LOGIN = 60,
-  DC_STR_CANTDECRYPT_MSG_BODY = 29,
-  DC_STR_CONFIGURATION_FAILED = 84,
-  DC_STR_CONNECTED = 107,
-  DC_STR_CONNTECTING = 108,
-  DC_STR_CONTACT_NOT_VERIFIED = 36,
-  DC_STR_CONTACT_SETUP_CHANGED = 37,
-  DC_STR_CONTACT_VERIFIED = 35,
-  DC_STR_DEVICE_MESSAGES = 68,
-  DC_STR_DEVICE_MESSAGES_HINT = 70,
-  DC_STR_DOWNLOAD_AVAILABILITY = 100,
-  DC_STR_DRAFT = 3,
-  DC_STR_E2E_AVAILABLE = 25,
-  DC_STR_E2E_PREFERRED = 34,
-  DC_STR_ENCRYPTEDMSG = 24,
-  DC_STR_ENCR_NONE = 28,
-  DC_STR_ENCR_TRANSP = 27,
-  DC_STR_EPHEMERAL_DAY = 79,
-  DC_STR_EPHEMERAL_DAYS = 95,
-  DC_STR_EPHEMERAL_DISABLED = 75,
-  DC_STR_EPHEMERAL_FOUR_WEEKS = 81,
-  DC_STR_EPHEMERAL_HOUR = 78,
-  DC_STR_EPHEMERAL_HOURS = 94,
-  DC_STR_EPHEMERAL_MINUTE = 77,
-  DC_STR_EPHEMERAL_MINUTES = 93,
-  DC_STR_EPHEMERAL_SECONDS = 76,
-  DC_STR_EPHEMERAL_WEEK = 80,
-  DC_STR_EPHEMERAL_WEEKS = 96,
-  DC_STR_ERROR = 112,
-  DC_STR_ERROR_NO_NETWORK = 87,
-  DC_STR_FAILED_SENDING_TO = 74,
-  DC_STR_FILE = 12,
-  DC_STR_FINGERPRINTS = 30,
-  DC_STR_FORWARDED = 97,
-  DC_STR_GIF = 23,
-  DC_STR_IMAGE = 9,
-  DC_STR_INCOMING_MESSAGES = 103,
-  DC_STR_LAST_MSG_SENT_SUCCESSFULLY = 111,
-  DC_STR_LOCATION = 66,
-  DC_STR_MESSAGES = 114,
-  DC_STR_MSGACTIONBYME = 63,
-  DC_STR_MSGACTIONBYUSER = 62,
-  DC_STR_MSGADDMEMBER = 17,
-  DC_STR_MSGDELMEMBER = 18,
-  DC_STR_MSGGROUPLEFT = 19,
-  DC_STR_MSGGRPIMGCHANGED = 16,
-  DC_STR_MSGGRPIMGDELETED = 33,
-  DC_STR_MSGGRPNAME = 15,
-  DC_STR_MSGLOCATIONDISABLED = 65,
-  DC_STR_MSGLOCATIONENABLED = 64,
-  DC_STR_NOMESSAGES = 1,
-  DC_STR_NOT_CONNECTED = 121,
-  DC_STR_NOT_SUPPORTED_BY_PROVIDER = 113,
-  DC_STR_ONE_MOMENT = 106,
-  DC_STR_OUTGOING_MESSAGES = 104,
-  DC_STR_PARTIAL_DOWNLOAD_MSG_BODY = 99,
-  DC_STR_PART_OF_TOTAL_USED = 116,
-  DC_STR_PROTECTION_DISABLED = 89,
-  DC_STR_PROTECTION_ENABLED = 88,
-  DC_STR_QUOTA_EXCEEDING_MSG_BODY = 98,
-  DC_STR_READRCPT = 31,
-  DC_STR_READRCPT_MAILBODY = 32,
-  DC_STR_REPLY_NOUN = 90,
-  DC_STR_SAVED_MESSAGES = 69,
-  DC_STR_SECURE_JOIN_GROUP_QR_DESC = 120,
-  DC_STR_SECURE_JOIN_REPLIES = 118,
-  DC_STR_SECURE_JOIN_STARTED = 117,
-  DC_STR_SELF = 2,
-  DC_STR_SELF_DELETED_MSG_BODY = 91,
-  DC_STR_SENDING = 110,
-  DC_STR_SERVER_TURNED_OFF = 92,
-  DC_STR_SETUP_CONTACT_QR_DESC = 119,
-  DC_STR_STICKER = 67,
-  DC_STR_STORAGE_ON_DOMAIN = 105,
-  DC_STR_SUBJECT_FOR_NEW_CONTACT = 73,
-  DC_STR_SYNC_MSG_BODY = 102,
-  DC_STR_SYNC_MSG_SUBJECT = 101,
-  DC_STR_UNKNOWN_SENDER_FOR_CHAT = 72,
-  DC_STR_UPDATE_REMINDER_MSG_BODY = 86,
-  DC_STR_UPDATING = 109,
-  DC_STR_VIDEO = 10,
-  DC_STR_VIDEOCHAT_INVITATION = 82,
-  DC_STR_VIDEOCHAT_INVITE_MSG_BODY = 83,
-  DC_STR_VOICEMESSAGE = 7,
-  DC_STR_WELCOME_MESSAGE = 71,
-  DC_TEXT1_DRAFT = 1,
-  DC_TEXT1_SELF = 3,
-  DC_TEXT1_USERNAME = 2,
-  DC_VIDEOCHATTYPE_BASICWEBRTC = 1,
-  DC_VIDEOCHATTYPE_JITSI = 2,
-  DC_VIDEOCHATTYPE_UNKNOWN = 0,
-}
-
-// Generated!
-
-export const EventId2EventName: { [key: number]: string } = {
-  100: 'DC_EVENT_INFO',
-  101: 'DC_EVENT_SMTP_CONNECTED',
-  102: 'DC_EVENT_IMAP_CONNECTED',
-  103: 'DC_EVENT_SMTP_MESSAGE_SENT',
-  104: 'DC_EVENT_IMAP_MESSAGE_DELETED',
-  105: 'DC_EVENT_IMAP_MESSAGE_MOVED',
-  150: 'DC_EVENT_NEW_BLOB_FILE',
-  151: 'DC_EVENT_DELETED_BLOB_FILE',
-  300: 'DC_EVENT_WARNING',
-  400: 'DC_EVENT_ERROR',
-  410: 'DC_EVENT_ERROR_SELF_NOT_IN_GROUP',
-  2000: 'DC_EVENT_MSGS_CHANGED',
-  2005: 'DC_EVENT_INCOMING_MSG',
-  2008: 'DC_EVENT_MSGS_NOTICED',
-  2010: 'DC_EVENT_MSG_DELIVERED',
-  2012: 'DC_EVENT_MSG_FAILED',
-  2015: 'DC_EVENT_MSG_READ',
-  2020: 'DC_EVENT_CHAT_MODIFIED',
-  2021: 'DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED',
-  2030: 'DC_EVENT_CONTACTS_CHANGED',
-  2035: 'DC_EVENT_LOCATION_CHANGED',
-  2041: 'DC_EVENT_CONFIGURE_PROGRESS',
-  2051: 'DC_EVENT_IMEX_PROGRESS',
-  2052: 'DC_EVENT_IMEX_FILE_WRITTEN',
-  2060: 'DC_EVENT_SECUREJOIN_INVITER_PROGRESS',
-  2061: 'DC_EVENT_SECUREJOIN_JOINER_PROGRESS',
-  2100: 'DC_EVENT_CONNECTIVITY_CHANGED',
-  2110: 'DC_EVENT_SELFAVATAR_CHANGED',
-  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
-}
--- a/node/lib/contact.ts
+++ b/node/lib/contact.ts
@@ -1,94 +0,0 @@
-import { integerToHexColor } from './util'
-
-/* eslint-disable camelcase */
-
-import binding from './binding'
-const debug = require('debug')('deltachat:node:contact')
-
-interface NativeContact {}
-/**
- * Wrapper around dc_contact_t*
- */
-export class Contact {
-  constructor(public dc_contact: NativeContact) {
-    debug('Contact constructor')
-    if (dc_contact === null) {
-      throw new Error('native contact can not be null')
-    }
-  }
-
-  toJson() {
-    debug('toJson')
-    return {
-      address: this.getAddress(),
-      color: this.color,
-      authName: this.authName,
-      status: this.status,
-      displayName: this.getDisplayName(),
-      id: this.getId(),
-      lastSeen: this.lastSeen,
-      name: this.getName(),
-      profileImage: this.getProfileImage(),
-      nameAndAddr: this.getNameAndAddress(),
-      isBlocked: this.isBlocked(),
-      isVerified: this.isVerified(),
-    }
-  }
-
-  getAddress(): string {
-    return binding.dcn_contact_get_addr(this.dc_contact)
-  }
-
-  /** Get original contact name.
-   * This is the name of the contact as defined by the contact themself.
-   * If the contact themself does not define such a name,
-   * an empty string is returned. */
-  get authName(): string {
-    return binding.dcn_contact_get_auth_name(this.dc_contact)
-  }
-
-  get color(): string {
-    return integerToHexColor(binding.dcn_contact_get_color(this.dc_contact))
-  }
-
-  /**
-   * contact's status
-   *
-   * Status is the last signature received in a message from this contact.
-   */
-  get status(): string {
-    return binding.dcn_contact_get_status(this.dc_contact)
-  }
-
-  getDisplayName(): string {
-    return binding.dcn_contact_get_display_name(this.dc_contact)
-  }
-
-  getId(): number {
-    return binding.dcn_contact_get_id(this.dc_contact)
-  }
-
-  get lastSeen(): number {
-    return binding.dcn_contact_get_last_seen(this.dc_contact)
-  }
-
-  getName(): string {
-    return binding.dcn_contact_get_name(this.dc_contact)
-  }
-
-  getNameAndAddress(): string {
-    return binding.dcn_contact_get_name_n_addr(this.dc_contact)
-  }
-
-  getProfileImage(): string {
-    return binding.dcn_contact_get_profile_image(this.dc_contact)
-  }
-
-  isBlocked() {
-    return Boolean(binding.dcn_contact_is_blocked(this.dc_contact))
-  }
-
-  isVerified() {
-    return Boolean(binding.dcn_contact_is_verified(this.dc_contact))
-  }
-}
--- a/node/lib/context.ts
+++ b/node/lib/context.ts
@@ -1,955 +0,0 @@
-/* eslint-disable camelcase */
-
-import binding from './binding'
-import { C, EventId2EventName } from './constants'
-import { Chat } from './chat'
-import { ChatList } from './chatlist'
-import { Contact } from './contact'
-import { Message } from './message'
-import { Lot } from './lot'
-import { Locations } from './locations'
-import rawDebug from 'debug'
-import { AccountManager } from './deltachat'
-import { join } from 'path'
-import { EventEmitter } from 'stream'
-const debug = rawDebug('deltachat:node:index')
-
-const noop = function () {}
-interface NativeContext {}
-
-/**
- * Wrapper around dcn_context_t*
- *
- * only acts as event emitter when created in standalone mode (without account manager)
- * with `Context.open`
- */
-export class Context extends EventEmitter {
-  constructor(
-    readonly manager: AccountManager | null,
-    private inner_dcn_context: NativeContext,
-    readonly account_id: number | null
-  ) {
-    super()
-    debug('DeltaChat constructor')
-    if (inner_dcn_context === null) {
-      throw new Error('inner_dcn_context can not be null')
-    }
-  }
-
-  /** Opens a stanalone context (without an account manager)
-   * automatically starts the event handler */
-  static open(cwd: string): Context {
-    const dbFile = join(cwd, 'db.sqlite')
-    const context = new Context(null, binding.dcn_context_new(dbFile), null)
-    debug('Opened context')
-    function handleCoreEvent(
-      eventId: number,
-      data1: number,
-      data2: number | string
-    ) {
-      const eventString = EventId2EventName[eventId]
-      debug(eventString, data1, data2)
-      if (!context.emit) {
-        console.log('Received an event but EventEmitter is already destroyed.')
-        console.log(eventString, data1, data2)
-        return
-      }
-      context.emit(eventString, data1, data2)
-      context.emit('ALL', eventString, data1, data2)
-    }
-    binding.dcn_start_event_handler(
-      context.dcn_context,
-      handleCoreEvent.bind(this)
-    )
-    debug('Started event handler')
-    return context
-  }
-
-  get dcn_context() {
-    return this.inner_dcn_context
-  }
-
-  get is_open() {
-    return Boolean(binding.dcn_context_is_open())
-  }
-
-  open(passphrase?: string) {
-    return Boolean(
-      binding.dcn_context_open(this.dcn_context, passphrase ? passphrase : '')
-    )
-  }
-
-  unref() {
-    binding.dcn_context_unref(this.dcn_context)
-    ;(this.inner_dcn_context as any) = null
-  }
-
-  acceptChat(chatId: number) {
-    binding.dcn_accept_chat(this.dcn_context, chatId)
-  }
-
-  blockChat(chatId: number) {
-    binding.dcn_block_chat(this.dcn_context, chatId)
-  }
-
-  addAddressBook(addressBook: string) {
-    debug(`addAddressBook ${addressBook}`)
-    return binding.dcn_add_address_book(this.dcn_context, addressBook)
-  }
-
-  addContactToChat(chatId: number, contactId: number) {
-    debug(`addContactToChat ${chatId} ${contactId}`)
-    return Boolean(
-      binding.dcn_add_contact_to_chat(
-        this.dcn_context,
-        Number(chatId),
-        Number(contactId)
-      )
-    )
-  }
-
-  addDeviceMessage(label: string, msg: Message | string) {
-    debug(`addDeviceMessage ${label} ${msg}`)
-    if (!msg) {
-      throw new Error('invalid msg parameter')
-    }
-    if (typeof label !== 'string') {
-      throw new Error('invalid label parameter, must be a string')
-    }
-    if (typeof msg === 'string') {
-      const msgObj = this.messageNew()
-      msgObj.setText(msg)
-      msg = msgObj
-    }
-    if (!msg.dc_msg) {
-      throw new Error('invalid msg object')
-    }
-    return binding.dcn_add_device_msg(this.dcn_context, label, msg.dc_msg)
-  }
-
-  setChatVisibility(
-    chatId: number,
-    visibility:
-      | C.DC_CHAT_VISIBILITY_NORMAL
-      | C.DC_CHAT_VISIBILITY_ARCHIVED
-      | C.DC_CHAT_VISIBILITY_PINNED
-  ) {
-    debug(`setChatVisibility ${chatId} ${visibility}`)
-    binding.dcn_set_chat_visibility(
-      this.dcn_context,
-      Number(chatId),
-      visibility
-    )
-  }
-
-  blockContact(contactId: number, block: boolean) {
-    debug(`blockContact ${contactId} ${block}`)
-    binding.dcn_block_contact(
-      this.dcn_context,
-      Number(contactId),
-      block ? 1 : 0
-    )
-  }
-
-  checkQrCode(qrCode: string) {
-    debug(`checkQrCode ${qrCode}`)
-    const dc_lot = binding.dcn_check_qr(this.dcn_context, qrCode)
-    let result = dc_lot ? new Lot(dc_lot) : null
-    if (result) {
-      return { id: result.getId(), ...result.toJson() }
-    }
-    return result
-  }
-
-  configure(opts: any): Promise<void> {
-    return new Promise((resolve, reject) => {
-      debug('configure')
-
-      const onSuccess = () => {
-        removeListeners()
-        resolve()
-      }
-      const onFail = (error: string) => {
-        removeListeners()
-        reject(new Error(error))
-      }
-
-      let onConfigure: (...args: any[]) => void
-      if (this.account_id === null) {
-        onConfigure = (data1: number, data2: string) => {
-          if (data1 === 0) return onFail(data2)
-          else if (data1 === 1000) return onSuccess()
-        }
-      } else {
-        onConfigure = (accountId: number, data1: number, data2: string) => {
-          if (this.account_id !== accountId) {
-            return
-          }
-          if (data1 === 0) return onFail(data2)
-          else if (data1 === 1000) return onSuccess()
-        }
-      }
-
-      const removeListeners = () => {
-        ;(this.manager || this).removeListener(
-          'DC_EVENT_CONFIGURE_PROGRESS',
-          onConfigure
-        )
-      }
-
-      const registerListeners = () => {
-        ;(this.manager || this).on('DC_EVENT_CONFIGURE_PROGRESS', onConfigure)
-      }
-
-      registerListeners()
-
-      if (!opts) opts = {}
-      Object.keys(opts).forEach((key) => {
-        const value = opts[key]
-        this.setConfig(key, value)
-      })
-
-      binding.dcn_configure(this.dcn_context)
-    })
-  }
-
-  continueKeyTransfer(messageId: number, setupCode: string) {
-    debug(`continueKeyTransfer ${messageId}`)
-    return new Promise((resolve, reject) => {
-      binding.dcn_continue_key_transfer(
-        this.dcn_context,
-        Number(messageId),
-        setupCode,
-        (result: number) => resolve(result === 1)
-      )
-    })
-  }
-  /** @returns chatId */
-  createBroadcastList(): number {
-    debug(`createBroadcastList`)
-    return binding.dcn_create_broadcast_list(this.dcn_context)
-  }
-
-  /** @returns chatId */
-  createChatByContactId(contactId: number): number {
-    debug(`createChatByContactId ${contactId}`)
-    return binding.dcn_create_chat_by_contact_id(
-      this.dcn_context,
-      Number(contactId)
-    )
-  }
-
-  /** @returns contactId */
-  createContact(name: string, addr: string): number {
-    debug(`createContact ${name} ${addr}`)
-    return binding.dcn_create_contact(this.dcn_context, name, addr)
-  }
-
-  /**
-   *
-   * @param chatName The name of the chat that should be created
-   * @param is_protected Whether the chat should be protected at creation time
-   * @returns chatId
-   */
-  createGroupChat(chatName: string, is_protected: boolean = false): number {
-    debug(`createGroupChat ${chatName} [protected:${is_protected}]`)
-    return binding.dcn_create_group_chat(
-      this.dcn_context,
-      is_protected ? 1 : 0,
-      chatName
-    )
-  }
-
-  deleteChat(chatId: number) {
-    debug(`deleteChat ${chatId}`)
-    binding.dcn_delete_chat(this.dcn_context, Number(chatId))
-  }
-
-  deleteContact(contactId: number) {
-    debug(`deleteContact ${contactId}`)
-    return Boolean(
-      binding.dcn_delete_contact(this.dcn_context, Number(contactId))
-    )
-  }
-
-  deleteMessages(messageIds: number[]) {
-    if (!Array.isArray(messageIds)) {
-      messageIds = [messageIds]
-    }
-    messageIds = messageIds.map((id) => Number(id))
-    debug('deleteMessages', messageIds)
-    binding.dcn_delete_msgs(this.dcn_context, messageIds)
-  }
-
-  forwardMessages(messageIds: number[], chatId: number) {
-    if (!Array.isArray(messageIds)) {
-      messageIds = [messageIds]
-    }
-    messageIds = messageIds.map((id) => Number(id))
-    debug('forwardMessages', messageIds)
-    binding.dcn_forward_msgs(this.dcn_context, messageIds, chatId)
-  }
-
-  getBlobdir(): string {
-    debug('getBlobdir')
-    return binding.dcn_get_blobdir(this.dcn_context)
-  }
-
-  getBlockedCount(): number {
-    debug('getBlockedCount')
-    return binding.dcn_get_blocked_cnt(this.dcn_context)
-  }
-
-  getBlockedContacts(): number[] {
-    debug('getBlockedContacts')
-    return binding.dcn_get_blocked_contacts(this.dcn_context)
-  }
-
-  getChat(chatId: number) {
-    debug(`getChat ${chatId}`)
-    const dc_chat = binding.dcn_get_chat(this.dcn_context, Number(chatId))
-    return dc_chat ? new Chat(dc_chat) : null
-  }
-
-  getChatContacts(chatId: number): number[] {
-    debug(`getChatContacts ${chatId}`)
-    return binding.dcn_get_chat_contacts(this.dcn_context, Number(chatId))
-  }
-
-  getChatIdByContactId(contactId: number): number {
-    debug(`getChatIdByContactId ${contactId}`)
-    return binding.dcn_get_chat_id_by_contact_id(
-      this.dcn_context,
-      Number(contactId)
-    )
-  }
-
-  getChatMedia(
-    chatId: number,
-    msgType1: number,
-    msgType2: number,
-    msgType3: number
-  ): number[] {
-    debug(`getChatMedia ${chatId}`)
-    return binding.dcn_get_chat_media(
-      this.dcn_context,
-      Number(chatId),
-      msgType1,
-      msgType2 || 0,
-      msgType3 || 0
-    )
-  }
-
-  getMimeHeaders(messageId: number): string {
-    debug(`getMimeHeaders ${messageId}`)
-    return binding.dcn_get_mime_headers(this.dcn_context, Number(messageId))
-  }
-
-  getChatlistItemSummary(chatId: number, messageId: number) {
-    debug(`getChatlistItemSummary ${chatId} ${messageId}`)
-    return new Lot(
-      binding.dcn_chatlist_get_summary2(this.dcn_context, chatId, messageId)
-    )
-  }
-
-  getChatMessages(chatId: number, flags: number, marker1before: number) {
-    debug(`getChatMessages ${chatId} ${flags} ${marker1before}`)
-    return binding.dcn_get_chat_msgs(
-      this.dcn_context,
-      Number(chatId),
-      flags,
-      marker1before
-    )
-  }
-
-  /**
-   * Get encryption info for a chat.
-   * Get a multi-line encryption info, containing encryption preferences of all members.
-   * Can be used to find out why messages sent to group are not encrypted.
-   *
-   * @param chatId ID of the chat to get the encryption info for.
-   * @return Multi-line text, must be released using dc_str_unref() after usage.
-   */
-  getChatEncrytionInfo(chatId: number): string {
-    return binding.dcn_get_chat_encrinfo(this.dcn_context, chatId)
-  }
-
-  getChats(listFlags: number, queryStr: string, queryContactId: number) {
-    debug('getChats')
-    const result = []
-    const list = this.getChatList(listFlags, queryStr, queryContactId)
-    const count = list.getCount()
-    for (let i = 0; i < count; i++) {
-      result.push(list.getChatId(i))
-    }
-    return result
-  }
-
-  getChatList(listFlags: number, queryStr: string, queryContactId: number) {
-    listFlags = listFlags || 0
-    queryStr = queryStr || ''
-    queryContactId = queryContactId || 0
-    debug(`getChatList ${listFlags} ${queryStr} ${queryContactId}`)
-    return new ChatList(
-      binding.dcn_get_chatlist(
-        this.dcn_context,
-        listFlags,
-        queryStr,
-        Number(queryContactId)
-      )
-    )
-  }
-
-  getConfig(key: string): string {
-    debug(`getConfig ${key}`)
-    return binding.dcn_get_config(this.dcn_context, key)
-  }
-
-  getContact(contactId: number) {
-    debug(`getContact ${contactId}`)
-    const dc_contact = binding.dcn_get_contact(
-      this.dcn_context,
-      Number(contactId)
-    )
-    return dc_contact ? new Contact(dc_contact) : null
-  }
-
-  getContactEncryptionInfo(contactId: number) {
-    debug(`getContactEncryptionInfo ${contactId}`)
-    return binding.dcn_get_contact_encrinfo(this.dcn_context, Number(contactId))
-  }
-
-  getContacts(listFlags: number, query: string) {
-    listFlags = listFlags || 0
-    query = query || ''
-    debug(`getContacts ${listFlags} ${query}`)
-    return binding.dcn_get_contacts(this.dcn_context, listFlags, query)
-  }
-
-  wasDeviceMessageEverAdded(label: string) {
-    debug(`wasDeviceMessageEverAdded ${label}`)
-    const added = binding.dcn_was_device_msg_ever_added(this.dcn_context, label)
-    return added === 1
-  }
-
-  getDraft(chatId: number) {
-    debug(`getDraft ${chatId}`)
-    const dc_msg = binding.dcn_get_draft(this.dcn_context, Number(chatId))
-    return dc_msg ? new Message(dc_msg) : null
-  }
-
-  getFreshMessageCount(chatId: number): number {
-    debug(`getFreshMessageCount ${chatId}`)
-    return binding.dcn_get_fresh_msg_cnt(this.dcn_context, Number(chatId))
-  }
-
-  getFreshMessages() {
-    debug('getFreshMessages')
-    return binding.dcn_get_fresh_msgs(this.dcn_context)
-  }
-
-  getInfo() {
-    debug('getInfo')
-    const info = binding.dcn_get_info(this.dcn_context)
-    return AccountManager.parseGetInfo(info)
-  }
-
-  getMessage(messageId: number) {
-    debug(`getMessage ${messageId}`)
-    const dc_msg = binding.dcn_get_msg(this.dcn_context, Number(messageId))
-    return dc_msg ? new Message(dc_msg) : null
-  }
-
-  getMessageCount(chatId: number): number {
-    debug(`getMessageCount ${chatId}`)
-    return binding.dcn_get_msg_cnt(this.dcn_context, Number(chatId))
-  }
-
-  getMessageInfo(messageId: number): string {
-    debug(`getMessageInfo ${messageId}`)
-    return binding.dcn_get_msg_info(this.dcn_context, Number(messageId))
-  }
-
-  getMessageHTML(messageId: number): string {
-    debug(`getMessageHTML ${messageId}`)
-    return binding.dcn_get_msg_html(this.dcn_context, Number(messageId))
-  }
-
-  getNextMediaMessage(
-    messageId: number,
-    msgType1: number,
-    msgType2: number,
-    msgType3: number
-  ) {
-    debug(
-      `getNextMediaMessage ${messageId} ${msgType1} ${msgType2} ${msgType3}`
-    )
-    return this._getNextMedia(messageId, 1, msgType1, msgType2, msgType3)
-  }
-
-  getPreviousMediaMessage(
-    messageId: number,
-    msgType1: number,
-    msgType2: number,
-    msgType3: number
-  ) {
-    debug(
-      `getPreviousMediaMessage ${messageId} ${msgType1} ${msgType2} ${msgType3}`
-    )
-    return this._getNextMedia(messageId, -1, msgType1, msgType2, msgType3)
-  }
-
-  _getNextMedia(
-    messageId: number,
-    dir: number,
-    msgType1: number,
-    msgType2: number,
-    msgType3: number
-  ): number {
-    return binding.dcn_get_next_media(
-      this.dcn_context,
-      Number(messageId),
-      dir,
-      msgType1 || 0,
-      msgType2 || 0,
-      msgType3 || 0
-    )
-  }
-
-  getSecurejoinQrCode(chatId: number): string {
-    debug(`getSecurejoinQrCode ${chatId}`)
-    return binding.dcn_get_securejoin_qr(this.dcn_context, Number(chatId))
-  }
-
-  getSecurejoinQrCodeSVG(chatId: number): string {
-    debug(`getSecurejoinQrCodeSVG ${chatId}`)
-    return binding.dcn_get_securejoin_qr_svg(this.dcn_context, chatId)
-  }
-
-  startIO(): void {
-    debug(`startIO`)
-    binding.dcn_start_io(this.dcn_context)
-  }
-
-  stopIO(): void {
-    debug(`stopIO`)
-    binding.dcn_stop_io(this.dcn_context)
-  }
-
-  stopOngoingProcess(): void {
-    debug(`stopOngoingProcess`)
-    binding.dcn_stop_ongoing_process(this.dcn_context)
-  }
-
-  /**
-   *
-   * @deprectated please use `AccountManager.getSystemInfo()` instead
-   */
-  static getSystemInfo() {
-    return AccountManager.getSystemInfo()
-  }
-
-  getConnectivity(): number {
-    return binding.dcn_get_connectivity(this.dcn_context)
-  }
-
-  getConnectivityHTML(): String {
-    return binding.dcn_get_connectivity_html(this.dcn_context)
-  }
-
-  importExport(what: number, param1: string, param2 = '') {
-    debug(`importExport ${what} ${param1} ${param2}`)
-    binding.dcn_imex(this.dcn_context, what, param1, param2)
-  }
-
-  importExportHasBackup(dir: string) {
-    debug(`importExportHasBackup ${dir}`)
-    return binding.dcn_imex_has_backup(this.dcn_context, dir)
-  }
-
-  initiateKeyTransfer(): Promise<string> {
-    return new Promise((resolve, reject) => {
-      debug('initiateKeyTransfer2')
-      binding.dcn_initiate_key_transfer(this.dcn_context, resolve)
-    })
-  }
-
-  isConfigured() {
-    debug('isConfigured')
-    return Boolean(binding.dcn_is_configured(this.dcn_context))
-  }
-
-  isContactInChat(chatId: number, contactId: number) {
-    debug(`isContactInChat ${chatId} ${contactId}`)
-    return Boolean(
-      binding.dcn_is_contact_in_chat(
-        this.dcn_context,
-        Number(chatId),
-        Number(contactId)
-      )
-    )
-  }
-
-  /**
-   *
-   * @returns resulting chat id or 0 on error
-   */
-  joinSecurejoin(qrCode: string): number {
-    debug(`joinSecurejoin ${qrCode}`)
-    return binding.dcn_join_securejoin(this.dcn_context, qrCode)
-  }
-
-  lookupContactIdByAddr(addr: string): number {
-    debug(`lookupContactIdByAddr ${addr}`)
-    return binding.dcn_lookup_contact_id_by_addr(this.dcn_context, addr)
-  }
-
-  markNoticedChat(chatId: number) {
-    debug(`markNoticedChat ${chatId}`)
-    binding.dcn_marknoticed_chat(this.dcn_context, Number(chatId))
-  }
-
-  markSeenMessages(messageIds: number[]) {
-    if (!Array.isArray(messageIds)) {
-      messageIds = [messageIds]
-    }
-    messageIds = messageIds.map((id) => Number(id))
-    debug('markSeenMessages', messageIds)
-    binding.dcn_markseen_msgs(this.dcn_context, messageIds)
-  }
-
-  maybeNetwork() {
-    debug('maybeNetwork')
-    binding.dcn_maybe_network(this.dcn_context)
-  }
-
-  messageNew(viewType = C.DC_MSG_TEXT) {
-    debug(`messageNew ${viewType}`)
-    return new Message(binding.dcn_msg_new(this.dcn_context, viewType))
-  }
-
-  removeContactFromChat(chatId: number, contactId: number) {
-    debug(`removeContactFromChat ${chatId} ${contactId}`)
-    return Boolean(
-      binding.dcn_remove_contact_from_chat(
-        this.dcn_context,
-        Number(chatId),
-        Number(contactId)
-      )
-    )
-  }
-
-  /**
-   *
-   * @param chatId 	ID of the chat to search messages in. Set this to 0 for a global search.
-   * @param query The query to search for.
-   */
-  searchMessages(chatId: number, query: string): number[] {
-    debug(`searchMessages ${chatId} ${query}`)
-    return binding.dcn_search_msgs(this.dcn_context, Number(chatId), query)
-  }
-
-  sendMessage(chatId: number, msg: string | Message) {
-    debug(`sendMessage ${chatId}`)
-    if (!msg) {
-      throw new Error('invalid msg parameter')
-    }
-    if (typeof msg === 'string') {
-      const msgObj = this.messageNew()
-      msgObj.setText(msg)
-      msg = msgObj
-    }
-    if (!msg.dc_msg) {
-      throw new Error('invalid msg object')
-    }
-    return binding.dcn_send_msg(this.dcn_context, Number(chatId), msg.dc_msg)
-  }
-
-  downloadFullMessage(messageId: number) {
-    binding.dcn_download_full_msg(this.dcn_context, messageId)
-  }
-
-  /**
-   *
-   * @returns {Promise<number>} Promise that resolves into the resulting message id
-   */
-  sendVideochatInvitation(chatId: number): Promise<number> {
-    debug(`sendVideochatInvitation ${chatId}`)
-    return new Promise((resolve, reject) => {
-      binding.dcn_send_videochat_invitation(
-        this.dcn_context,
-        chatId,
-        (result: number) => {
-          if (result !== 0) {
-            resolve(result)
-          } else {
-            reject(
-              'Videochatinvitation failed to send, see error events for detailed info'
-            )
-          }
-        }
-      )
-    })
-  }
-
-  setChatName(chatId: number, name: string) {
-    debug(`setChatName ${chatId} ${name}`)
-    return Boolean(
-      binding.dcn_set_chat_name(this.dcn_context, Number(chatId), name)
-    )
-  }
-
-  /**
-   *
-   * @param chatId
-   * @param protect
-   * @returns success boolean
-   */
-  setChatProtection(chatId: number, protect: boolean) {
-    debug(`setChatProtection ${chatId} ${protect}`)
-    return Boolean(
-      binding.dcn_set_chat_protection(
-        this.dcn_context,
-        Number(chatId),
-        protect ? 1 : 0
-      )
-    )
-  }
-
-  getChatEphemeralTimer(chatId: number): number {
-    debug(`getChatEphemeralTimer ${chatId}`)
-    return binding.dcn_get_chat_ephemeral_timer(
-      this.dcn_context,
-      Number(chatId)
-    )
-  }
-
-  setChatEphemeralTimer(chatId: number, timer: number) {
-    debug(`setChatEphemeralTimer ${chatId} ${timer}`)
-    return Boolean(
-      binding.dcn_set_chat_ephemeral_timer(
-        this.dcn_context,
-        Number(chatId),
-        Number(timer)
-      )
-    )
-  }
-
-  setChatProfileImage(chatId: number, image: string) {
-    debug(`setChatProfileImage ${chatId} ${image}`)
-    return Boolean(
-      binding.dcn_set_chat_profile_image(
-        this.dcn_context,
-        Number(chatId),
-        image || ''
-      )
-    )
-  }
-
-  setConfig(key: string, value: string | boolean | number): number {
-    debug(`setConfig (string) ${key} ${value}`)
-    if (value === null) {
-      return binding.dcn_set_config_null(this.dcn_context, key)
-    } else {
-      if (typeof value === 'boolean') {
-        value = value === true ? '1' : '0'
-      } else if (typeof value === 'number') {
-        value = String(value)
-      }
-      return binding.dcn_set_config(this.dcn_context, key, value)
-    }
-  }
-
-  setConfigFromQr(qrcodeContent: string): boolean {
-    return Boolean(
-      binding.dcn_set_config_from_qr(this.dcn_context, qrcodeContent)
-    )
-  }
-
-  estimateDeletionCount(fromServer: boolean, seconds: number): number {
-    debug(`estimateDeletionCount fromServer: ${fromServer} seconds: ${seconds}`)
-    return binding.dcn_estimate_deletion_cnt(
-      this.dcn_context,
-      fromServer === true ? 1 : 0,
-      seconds
-    )
-  }
-
-  setStockTranslation(stockId: number, stockMsg: string) {
-    debug(`setStockTranslation ${stockId} ${stockMsg}`)
-    return Boolean(
-      binding.dcn_set_stock_translation(
-        this.dcn_context,
-        Number(stockId),
-        stockMsg
-      )
-    )
-  }
-
-  setDraft(chatId: number, msg: Message | null) {
-    debug(`setDraft ${chatId}`)
-    binding.dcn_set_draft(
-      this.dcn_context,
-      Number(chatId),
-      msg ? msg.dc_msg : null
-    )
-  }
-
-  setLocation(latitude: number, longitude: number, accuracy: number) {
-    debug(`setLocation ${latitude}`)
-    binding.dcn_set_location(
-      this.dcn_context,
-      Number(latitude),
-      Number(longitude),
-      Number(accuracy)
-    )
-  }
-
-  /*
-   * @param chatId Chat-id to get location information for.
-   *     0 to get locations independently of the chat.
-   * @param contactId Contact id to get location information for.
-   *     If also a chat-id is given, this should be a member of the given chat.
-   *     0 to get locations independently of the contact.
-   * @param timestampFrom Start of timespan to return.
-   *     Must be given in number of seconds since 00:00 hours, Jan 1, 1970 UTC.
-   *     0 for "start from the beginning".
-   * @param timestampTo End of timespan to return.
-   *     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 decending;
-   *     the first entry in the array is the location with the newest timestamp.
-   *
-   * Examples:
-   * // get locations from the last hour for a global map
-   * getLocations(0, 0, time(NULL)-60*60, 0);
-   *
-   * // get locations from a contact for a global map
-   * getLocations(0, contact_id, 0, 0);
-   *
-   * // get all locations known for a given chat
-   * getLocations(chat_id, 0, 0, 0);
-   *
-   * // get locations from a single contact for a given chat
-   * getLocations(chat_id, contact_id, 0, 0);
-   */
-
-  getLocations(
-    chatId: number,
-    contactId: number,
-    timestampFrom = 0,
-    timestampTo = 0
-  ) {
-    const locations = new Locations(
-      binding.dcn_get_locations(
-        this.dcn_context,
-        Number(chatId),
-        Number(contactId),
-        timestampFrom,
-        timestampTo
-      )
-    )
-    return locations.toJson()
-  }
-
-  /**
-   *
-   * @param duration The duration (0 for no mute, -1 for forever mute, everything else is is the relative mute duration from now in seconds)
-   */
-  setChatMuteDuration(chatId: number, duration: number) {
-    return Boolean(
-      binding.dcn_set_chat_mute_duration(this.dcn_context, chatId, duration)
-    )
-  }
-
-  /** get information about the provider */
-  getProviderFromEmail(email: string) {
-    debug('DeltaChat.getProviderFromEmail')
-    const provider = binding.dcn_provider_new_from_email(
-      this.dcn_context,
-      email
-    )
-    if (!provider) {
-      return undefined
-    }
-    return {
-      before_login_hint: binding.dcn_provider_get_before_login_hint(provider),
-      overview_page: binding.dcn_provider_get_overview_page(provider),
-      status: binding.dcn_provider_get_status(provider),
-    }
-  }
-
-  sendWebxdcStatusUpdate<T>(
-    msgId: number,
-    json: WebxdcSendingStatusUpdate<T>,
-    descr: string
-  ) {
-    return Boolean(
-      binding.dcn_send_webxdc_status_update(
-        this.dcn_context,
-        msgId,
-        JSON.stringify(json),
-        descr
-      )
-    )
-  }
-
-  getWebxdcStatusUpdates<T>(
-    msgId: number,
-    serial = 0
-  ): WebxdcReceivedStatusUpdate<T>[] {
-    return JSON.parse(
-      binding.dcn_get_webxdc_status_updates(this.dcn_context, msgId, serial)
-    )
-  }
-
-  /** the string contains the binary data, it is an "u8 string", maybe we will use a more efficient type in the future. */
-  getWebxdcBlob(message: Message, filename: string): Buffer | null {
-    return binding.dcn_msg_get_webxdc_blob(message.dc_msg, filename)
-  }
-}
-
-export type WebxdcInfo = {
-  name: string
-  icon: string
-  summary: string
-  /**
-   * if set by the webxdc, name of the document in edit
-   */
-  document?: string
-}
-
-type WebxdcSendingStatusUpdate<T> = {
-  /** the payload, deserialized json:
-   * any javascript primitive, array or object. */
-  payload: T
-  /** optional, short, informational message that will be added to the chat,
-   * eg. "Alice voted" or "Bob scored 123 in MyGame";
-   * usually only one line of text is shown,
-   * use this option sparingly to not spam the chat. */
-  info?: string
-  /** optional, short text, shown beside app icon;
-   * it is recommended to use some aggregated value,
-   * eg. "8 votes", "Highscore: 123" */
-  summary?: string
-  /**
-   * optional, name of the document in edit,
-   * must not be used eg. in games where the Webxdc does not create documents
-   */
-  document?: string
-}
-
-type WebxdcReceivedStatusUpdate<T> = {
-  /** the payload, deserialized json */
-  payload: T
-  /** the serial number of this update. Serials are larger `0` and newer serials have higher numbers. */
-  serial: number
-  /** the maximum serial currently known.
-   *  If `max_serial` equals `serial` this update is the last update (until new network messages arrive). */
-  max_serial: number
-  /** optional, short, informational message. */
-  info?: string
-  /** optional, short text, shown beside app icon. If there are no updates, an empty JSON-array is returned. */
-  summary?: string
-}
--- a/node/lib/deltachat.ts
+++ b/node/lib/deltachat.ts
@@ -1,205 +0,0 @@
-/* eslint-disable camelcase */
-
-import binding from './binding'
-import { EventId2EventName } from './constants'
-import { EventEmitter } from 'events'
-import { existsSync } from 'fs'
-import rawDebug from 'debug'
-import { tmpdir } from 'os'
-import { join } from 'path'
-import { Context } from './context'
-const debug = rawDebug('deltachat:node:index')
-
-const noop = function () {}
-interface NativeAccount {}
-
-/**
- * Wrapper around dcn_account_t*
- */
-export class AccountManager extends EventEmitter {
-  dcn_accounts: NativeAccount
-  accountDir: string
-
-  constructor(cwd: string, os = 'deltachat-node') {
-    debug('DeltaChat constructor')
-    super()
-
-    this.accountDir = cwd
-    this.dcn_accounts = binding.dcn_accounts_new(os, this.accountDir)
-  }
-
-  getAllAccountIds() {
-    return binding.dcn_accounts_get_all(this.dcn_accounts)
-  }
-
-  selectAccount(account_id: number) {
-    return binding.dcn_accounts_select_account(this.dcn_accounts, account_id)
-  }
-
-  selectedAccount(): number {
-    return binding.dcn_accounts_get_selected_account(this.dcn_accounts)
-  }
-
-  addAccount(): number {
-    return binding.dcn_accounts_add_account(this.dcn_accounts)
-  }
-
-  addClosedAccount(): number {
-    return binding.dcn_accounts_add_closed_account(this.dcn_accounts)
-  }
-
-  removeAccount(account_id: number) {
-    return binding.dcn_accounts_remove_account(this.dcn_accounts, account_id)
-  }
-
-  accountContext(account_id: number) {
-    const native_context = binding.dcn_accounts_get_account(
-      this.dcn_accounts,
-      account_id
-    )
-    if (native_context === null) {
-      throw new Error(
-        `could not get context with id ${account_id}, does it even exist? please check your ids`
-      )
-    }
-    return new Context(this, native_context, account_id)
-  }
-
-  migrateAccount(dbfile: string): number {
-    return binding.dcn_accounts_migrate_account(this.dcn_accounts, dbfile)
-  }
-
-  close() {
-    this.stopIO()
-    debug('unrefing context')
-    binding.dcn_accounts_unref(this.dcn_accounts)
-    debug('Unref end')
-  }
-
-  emit(
-    event: string | symbol,
-    account_id: number,
-    data1: any,
-    data2: any
-  ): boolean {
-    super.emit('ALL', event, account_id, data1, data2)
-    return super.emit(event, account_id, data1, data2)
-  }
-
-  handleCoreEvent(
-    eventId: number,
-    accountId: number,
-    data1: number,
-    data2: number | string
-  ) {
-    const eventString = EventId2EventName[eventId]
-    debug('event', eventString, accountId, data1, data2)
-    debug(eventString, data1, data2)
-    if (!this.emit) {
-      console.log('Received an event but EventEmitter is already destroyed.')
-      console.log(eventString, data1, data2)
-      return
-    }
-    this.emit(eventString, accountId, data1, data2)
-  }
-
-  startEvents() {
-    if (this.dcn_accounts === null) {
-      throw new Error('dcn_account is null')
-    }
-    binding.dcn_accounts_start_event_handler(
-      this.dcn_accounts,
-      this.handleCoreEvent.bind(this)
-    )
-    debug('Started event handler')
-  }
-
-  startIO() {
-    binding.dcn_accounts_start_io(this.dcn_accounts)
-  }
-
-  stopIO() {
-    binding.dcn_accounts_stop_io(this.dcn_accounts)
-  }
-
-  static maybeValidAddr(addr: string) {
-    debug('DeltaChat.maybeValidAddr')
-    if (addr === null) return false
-    return Boolean(binding.dcn_maybe_valid_addr(addr))
-  }
-
-  static parseGetInfo(info: string) {
-    debug('static _getInfo')
-    const result: { [key: string]: string } = {}
-
-    const regex = /^(\w+)=(.*)$/i
-    info
-      .split('\n')
-      .filter(Boolean)
-      .forEach((line) => {
-        const match = regex.exec(line)
-        if (match) {
-          result[match[1]] = match[2]
-        }
-      })
-
-    return result
-  }
-
-  static newTemporary() {
-    let directory = null
-    while (true) {
-      const randomString = Math.random().toString(36).substr(2, 5)
-      directory = join(tmpdir(), 'deltachat-' + randomString)
-      if (!existsSync(directory)) break
-    }
-    const dc = new AccountManager(directory)
-    const accountId = dc.addAccount()
-    const context = dc.accountContext(accountId)
-    return { dc, context, accountId, directory }
-  }
-
-  static getSystemInfo() {
-    debug('DeltaChat.getSystemInfo')
-    const { dc, context } = AccountManager.newTemporary()
-    const info = AccountManager.parseGetInfo(
-      binding.dcn_get_info(context.dcn_context)
-    )
-    const {
-      deltachat_core_version,
-      sqlite_version,
-      sqlite_thread_safe,
-      libetpan_version,
-      openssl_version,
-      compile_date,
-      arch,
-    } = info
-    const result = {
-      deltachat_core_version,
-      sqlite_version,
-      sqlite_thread_safe,
-      libetpan_version,
-      openssl_version,
-      compile_date,
-      arch,
-    }
-    context.unref()
-    dc.close()
-    return result
-  }
-
-  /** get information about the provider
-   *
-   * This function creates a temporary context to be standalone,
-   * if posible use `Context.getProviderFromEmail` instead. (otherwise potential proxy settings are not used)
-   * @deprecated
-   */
-  static getProviderFromEmail(email: string) {
-    debug('DeltaChat.getProviderFromEmail')
-    const { dc, context } = AccountManager.newTemporary()
-    const provider = context.getProviderFromEmail(email)
-    context.unref()
-    dc.close()
-    return provider
-  }
-}
--- a/node/lib/index.ts
+++ b/node/lib/index.ts
@@ -1,20 +0,0 @@
-import { AccountManager } from './deltachat'
-
-export default AccountManager
-
-export { Context } from './context'
-export { Chat } from './chat'
-export { ChatList } from './chatlist'
-export { C } from './constants'
-export { Contact } from './contact'
-export { AccountManager as DeltaChat }
-export { Locations } from './locations'
-export { Lot } from './lot'
-export {
-  Message,
-  MessageState,
-  MessageViewType,
-  MessageDownloadState,
-} from './message'
-
-export * from './types'
--- a/node/lib/locations.ts
+++ b/node/lib/locations.ts
@@ -1,82 +0,0 @@
-/* eslint-disable camelcase */
-
-const binding = require('../binding')
-const debug = require('debug')('deltachat:node:locations')
-
-interface NativeLocations {}
-/**
- * Wrapper around dc_location_t*
- */
-export class Locations {
-  constructor(public dc_locations: NativeLocations) {
-    debug('Locations constructor')
-    if (dc_locations === null) {
-      throw new Error('dc_locations can not be null')
-    }
-  }
-
-  locationToJson(index: number) {
-    debug('locationToJson')
-    return {
-      accuracy: this.getAccuracy(index),
-      latitude: this.getLatitude(index),
-      longitude: this.getLongitude(index),
-      timestamp: this.getTimestamp(index),
-      contactId: this.getContactId(index),
-      msgId: this.getMsgId(index),
-      chatId: this.getChatId(index),
-      isIndependent: this.isIndependent(index),
-      marker: this.getMarker(index),
-    }
-  }
-
-  toJson(): ReturnType<Locations['locationToJson']>[] {
-    debug('toJson')
-    const locations = []
-    const count = this.getCount()
-    for (let index = 0; index < count; index++) {
-      locations.push(this.locationToJson(index))
-    }
-    return locations
-  }
-
-  getCount(): number {
-    return binding.dcn_array_get_cnt(this.dc_locations)
-  }
-
-  getAccuracy(index: number): number {
-    return binding.dcn_array_get_accuracy(this.dc_locations, index)
-  }
-
-  getLatitude(index: number): number {
-    return binding.dcn_array_get_latitude(this.dc_locations, index)
-  }
-
-  getLongitude(index: number): number {
-    return binding.dcn_array_get_longitude(this.dc_locations, index)
-  }
-
-  getTimestamp(index: number): number {
-    return binding.dcn_array_get_timestamp(this.dc_locations, index)
-  }
-
-  getMsgId(index: number): number {
-    return binding.dcn_array_get_msg_id(this.dc_locations, index)
-  }
-
-  getContactId(index: number): number {
-    return binding.dcn_array_get_contact_id(this.dc_locations, index)
-  }
-
-  getChatId(index: number): number {
-    return binding.dcn_array_get_chat_id(this.dc_locations, index)
-  }
-
-  isIndependent(index: number): boolean {
-    return binding.dcn_array_is_independent(this.dc_locations, index)
-  }
-
-  getMarker(index: number): string {
-    return binding.dcn_array_get_marker(this.dc_locations, index)
-  }
-}
--- a/node/lib/lot.ts
+++ b/node/lib/lot.ts
@@ -1,52 +0,0 @@
-/* eslint-disable camelcase */
-
-const binding = require('../binding')
-const debug = require('debug')('deltachat:node:lot')
-
-interface NativeLot {}
-/**
- * Wrapper around dc_lot_t*
- */
-export class Lot {
-  constructor(public dc_lot: NativeLot) {
-    debug('Lot constructor')
-    if (dc_lot === null) {
-      throw new Error('dc_lot can not be null')
-    }
-  }
-
-  toJson() {
-    debug('toJson')
-    return {
-      state: this.getState(),
-      text1: this.getText1(),
-      text1Meaning: this.getText1Meaning(),
-      text2: this.getText2(),
-      timestamp: this.getTimestamp(),
-    }
-  }
-
-  getId(): number {
-    return binding.dcn_lot_get_id(this.dc_lot)
-  }
-
-  getState(): number {
-    return binding.dcn_lot_get_state(this.dc_lot)
-  }
-
-  getText1(): string {
-    return binding.dcn_lot_get_text1(this.dc_lot)
-  }
-
-  getText1Meaning(): string {
-    return binding.dcn_lot_get_text1_meaning(this.dc_lot)
-  }
-
-  getText2(): string {
-    return binding.dcn_lot_get_text2(this.dc_lot)
-  }
-
-  getTimestamp(): number {
-    return binding.dcn_lot_get_timestamp(this.dc_lot)
-  }
-}
--- a/node/lib/message.ts
+++ b/node/lib/message.ts
@@ -1,370 +0,0 @@
-/* eslint-disable camelcase */
-
-import binding from './binding'
-import { C } from './constants'
-import { Lot } from './lot'
-import { Chat } from './chat'
-import { WebxdcInfo } from './context'
-const debug = require('debug')('deltachat:node:message')
-
-export enum MessageDownloadState {
-  Available = C.DC_DOWNLOAD_AVAILABLE,
-  Done = C.DC_DOWNLOAD_DONE,
-  Failure = C.DC_DOWNLOAD_FAILURE,
-  InProgress = C.DC_DOWNLOAD_IN_PROGRESS,
-}
-
-/**
- * Helper class for message states so you can do e.g.
- *
- * if (msg.getState().isPending()) { .. }
- *
- */
-export class MessageState {
-  constructor(public state: number) {
-    debug(`MessageState constructor ${state}`)
-  }
-
-  isUndefined() {
-    return this.state === C.DC_STATE_UNDEFINED
-  }
-
-  isFresh() {
-    return this.state === C.DC_STATE_IN_FRESH
-  }
-
-  isNoticed() {
-    return this.state === C.DC_STATE_IN_NOTICED
-  }
-
-  isSeen() {
-    return this.state === C.DC_STATE_IN_SEEN
-  }
-
-  isPending() {
-    return this.state === C.DC_STATE_OUT_PENDING
-  }
-
-  isFailed() {
-    return this.state === C.DC_STATE_OUT_FAILED
-  }
-
-  isDelivered() {
-    return this.state === C.DC_STATE_OUT_DELIVERED
-  }
-
-  isReceived() {
-    return this.state === C.DC_STATE_OUT_MDN_RCVD
-  }
-}
-
-/**
- * Helper class for message types so you can do e.g.
- *
- * if (msg.getViewType().isVideo()) { .. }
- *
- */
-export class MessageViewType {
-  constructor(public viewType: number) {
-    debug(`MessageViewType constructor ${viewType}`)
-  }
-
-  isText() {
-    return this.viewType === C.DC_MSG_TEXT
-  }
-
-  isImage() {
-    return this.viewType === C.DC_MSG_IMAGE || this.viewType === C.DC_MSG_GIF
-  }
-
-  isGif() {
-    return this.viewType === C.DC_MSG_GIF
-  }
-
-  isAudio() {
-    return this.viewType === C.DC_MSG_AUDIO || this.viewType === C.DC_MSG_VOICE
-  }
-
-  isVoice() {
-    return this.viewType === C.DC_MSG_VOICE
-  }
-
-  isVideo() {
-    return this.viewType === C.DC_MSG_VIDEO
-  }
-
-  isFile() {
-    return this.viewType === C.DC_MSG_FILE
-  }
-
-  isVideochatInvitation() {
-    return this.viewType === C.DC_MSG_VIDEOCHAT_INVITATION
-  }
-}
-
-interface NativeMessage {}
-/**
- * Wrapper around dc_msg_t*
- */
-export class Message {
-  constructor(public dc_msg: NativeMessage) {
-    debug('Message constructor')
-    if (dc_msg === null) {
-      throw new Error('dc_msg can not be null')
-    }
-  }
-
-  toJson() {
-    debug('toJson')
-    const quotedMessage = this.getQuotedMessage()
-    const viewType = binding.dcn_msg_get_viewtype(this.dc_msg)
-    return {
-      chatId: this.getChatId(),
-      webxdcInfo: viewType == C.DC_MSG_WEBXDC ? this.webxdcInfo : null,
-      downloadState: this.downloadState,
-      duration: this.getDuration(),
-      file: this.getFile(),
-      fromId: this.getFromId(),
-      id: this.getId(),
-      quotedText: this.getQuotedText(),
-      quotedMessageId: quotedMessage ? quotedMessage.getId() : null,
-      receivedTimestamp: this.getReceivedTimestamp(),
-      sortTimestamp: this.getSortTimestamp(),
-      text: this.getText(),
-      timestamp: this.getTimestamp(),
-      hasLocation: this.hasLocation(),
-      hasHTML: this.hasHTML,
-      viewType,
-      state: binding.dcn_msg_get_state(this.dc_msg),
-      hasDeviatingTimestamp: this.hasDeviatingTimestamp(),
-      showPadlock: this.getShowpadlock(),
-      summary: this.getSummary().toJson(),
-      subject: this.subject,
-      isSetupmessage: this.isSetupmessage(),
-      isInfo: this.isInfo(),
-      isForwarded: this.isForwarded(),
-      dimensions: {
-        height: this.getHeight(),
-        width: this.getWidth(),
-      },
-      videochatType: this.getVideochatType(),
-      videochatUrl: this.getVideochatUrl(),
-      overrideSenderName: this.overrideSenderName,
-      parentId: this.parent?.getId(),
-    }
-  }
-
-  getChatId(): number {
-    return binding.dcn_msg_get_chat_id(this.dc_msg)
-  }
-
-  get webxdcInfo(): WebxdcInfo | null {
-    let info = binding.dcn_msg_get_webxdc_info(this.dc_msg)
-    return info
-      ? JSON.parse(binding.dcn_msg_get_webxdc_info(this.dc_msg))
-      : null
-  }
-
-  get downloadState(): MessageDownloadState {
-    return binding.dcn_msg_get_download_state(this.dc_msg)
-  }
-
-  get parent(): Message | null {
-    let msg = binding.dcn_msg_get_parent(this.dc_msg)
-    return msg ? new Message(msg) : null
-  }
-
-  getDuration(): number {
-    return binding.dcn_msg_get_duration(this.dc_msg)
-  }
-
-  getFile(): string {
-    return binding.dcn_msg_get_file(this.dc_msg)
-  }
-
-  getFilebytes(): number {
-    return binding.dcn_msg_get_filebytes(this.dc_msg)
-  }
-
-  getFilemime(): string {
-    return binding.dcn_msg_get_filemime(this.dc_msg)
-  }
-
-  getFilename(): string {
-    return binding.dcn_msg_get_filename(this.dc_msg)
-  }
-
-  getFromId(): number {
-    return binding.dcn_msg_get_from_id(this.dc_msg)
-  }
-
-  getHeight(): number {
-    return binding.dcn_msg_get_height(this.dc_msg)
-  }
-
-  getId(): number {
-    return binding.dcn_msg_get_id(this.dc_msg)
-  }
-
-  getQuotedText(): string {
-    return binding.dcn_msg_get_quoted_text(this.dc_msg)
-  }
-
-  getQuotedMessage(): Message | null {
-    const dc_msg = binding.dcn_msg_get_quoted_msg(this.dc_msg)
-    return dc_msg ? new Message(dc_msg) : null
-  }
-
-  getReceivedTimestamp(): number {
-    return binding.dcn_msg_get_received_timestamp(this.dc_msg)
-  }
-
-  getSetupcodebegin() {
-    return binding.dcn_msg_get_setupcodebegin(this.dc_msg)
-  }
-
-  getShowpadlock() {
-    return Boolean(binding.dcn_msg_get_showpadlock(this.dc_msg))
-  }
-
-  getSortTimestamp(): number {
-    return binding.dcn_msg_get_sort_timestamp(this.dc_msg)
-  }
-
-  getState() {
-    return new MessageState(binding.dcn_msg_get_state(this.dc_msg))
-  }
-
-  getSummary(chat?: Chat) {
-    const dc_chat = (chat && chat.dc_chat) || null
-    return new Lot(binding.dcn_msg_get_summary(this.dc_msg, dc_chat))
-  }
-
-  get subject(): string {
-    return binding.dcn_msg_get_subject(this.dc_msg)
-  }
-
-  getSummarytext(approxCharacters: number): string {
-    approxCharacters = approxCharacters || 0
-    return binding.dcn_msg_get_summarytext(this.dc_msg, approxCharacters)
-  }
-
-  getText(): string {
-    return binding.dcn_msg_get_text(this.dc_msg)
-  }
-
-  getTimestamp(): number {
-    return binding.dcn_msg_get_timestamp(this.dc_msg)
-  }
-
-  getViewType() {
-    return new MessageViewType(binding.dcn_msg_get_viewtype(this.dc_msg))
-  }
-
-  getVideochatType(): number {
-    return binding.dcn_msg_get_videochat_type(this.dc_msg)
-  }
-
-  getVideochatUrl(): string {
-    return binding.dcn_msg_get_videochat_url(this.dc_msg)
-  }
-
-  getWidth(): number {
-    return binding.dcn_msg_get_width(this.dc_msg)
-  }
-
-  get overrideSenderName(): string {
-    return binding.dcn_msg_get_override_sender_name(this.dc_msg)
-  }
-
-  hasDeviatingTimestamp() {
-    return binding.dcn_msg_has_deviating_timestamp(this.dc_msg)
-  }
-
-  hasLocation() {
-    return Boolean(binding.dcn_msg_has_location(this.dc_msg))
-  }
-
-  get hasHTML() {
-    return Boolean(binding.dcn_msg_has_html(this.dc_msg))
-  }
-
-  isDeadDrop() {
-    // TODO: Fix
-    //return this.getChatId() === C.DC_CHAT_ID_DEADDROP
-    return false
-  }
-
-  isForwarded() {
-    return Boolean(binding.dcn_msg_is_forwarded(this.dc_msg))
-  }
-
-  isIncreation() {
-    return Boolean(binding.dcn_msg_is_increation(this.dc_msg))
-  }
-
-  isInfo() {
-    return Boolean(binding.dcn_msg_is_info(this.dc_msg))
-  }
-
-  isSent() {
-    return Boolean(binding.dcn_msg_is_sent(this.dc_msg))
-  }
-
-  isSetupmessage() {
-    return Boolean(binding.dcn_msg_is_setupmessage(this.dc_msg))
-  }
-
-  latefilingMediasize(width: number, height: number, duration: number) {
-    binding.dcn_msg_latefiling_mediasize(this.dc_msg, width, height, duration)
-  }
-
-  setDimension(width: number, height: number) {
-    binding.dcn_msg_set_dimension(this.dc_msg, width, height)
-    return this
-  }
-
-  setDuration(duration: number) {
-    binding.dcn_msg_set_duration(this.dc_msg, duration)
-    return this
-  }
-
-  setFile(file: string, mime?: string) {
-    if (typeof file !== 'string') throw new Error('Missing filename')
-    binding.dcn_msg_set_file(this.dc_msg, file, mime || '')
-    return this
-  }
-
-  setLocation(longitude: number, latitude: number) {
-    binding.dcn_msg_set_location(this.dc_msg, longitude, latitude)
-    return this
-  }
-
-  setQuote(quotedMessage: Message | null) {
-    binding.dcn_msg_set_quote(this.dc_msg, quotedMessage?.dc_msg)
-    return this
-  }
-
-  setText(text: string) {
-    binding.dcn_msg_set_text(this.dc_msg, text)
-    return this
-  }
-
-  setHTML(html: string) {
-    binding.dcn_msg_set_html(this.dc_msg, html)
-    return this
-  }
-
-  setOverrideSenderName(senderName: string) {
-    binding.dcn_msg_set_override_sender_name(this.dc_msg, senderName)
-    return this
-  }
-
-  /** Force the message to be sent in plain text.
-   *
-   * This API is for bots, there is no need to expose it in the UI.
-   */
-  forcePlaintext() {
-    binding.dcn_msg_force_plaintext(this.dc_msg)
-  }
-}
--- a/node/lib/types.ts
+++ b/node/lib/types.ts
@@ -1,24 +0,0 @@
-import { C } from './constants'
-
-export type ChatTypes =
-  | C.DC_CHAT_TYPE_GROUP
-  | C.DC_CHAT_TYPE_MAILINGLIST
-  | C.DC_CHAT_TYPE_SINGLE
-  | C.DC_CHAT_TYPE_UNDEFINED
-
-export interface ChatJSON {
-  archived: boolean
-  pinned: boolean
-  color: string
-  id: number
-  name: string
-  profileImage: string
-  type: number
-  isSelfTalk: boolean
-  isUnpromoted: boolean
-  isProtected: boolean
-  canSend: boolean
-  isDeviceTalk: boolean
-  isContactRequest: boolean
-  muted: boolean
-}
--- a/node/lib/util.ts
+++ b/node/lib/util.ts
@@ -1,6 +0,0 @@
-/**
- * @param integerColor expects a 24bit rgb integer (left to right: 8bits red, 8bits green, 8bits blue)
- */
-export function integerToHexColor(integerColor: number) {
-  return '#' + (integerColor + 16777216).toString(16).substring(1)
-}
--- a/node/patches/m1_build_use_x86_64.patch
+++ b/node/patches/m1_build_use_x86_64.patch
@@ -1,13 +0,0 @@
-diff --git i/node/binding.gyp w/node/binding.gyp
-index b0d92eae..c5e504fa 100644
--- i/node/binding.gyp
-+++ w/node/binding.gyp
-@@ -43,7 +43,7 @@
-                   "include_dirs": ["../deltachat-ffi"],
-                   "ldflags": ["-Wl,-Bsymbolic"], # Prevent sqlite3 from electron from overriding sqlcipher
-                   "libraries": [
-                    "../../target/release/libdeltachat.a",
-+                    "../../target/x86_64-apple-darwin/release/libdeltachat.a",
-                     "-ldl",
-                   ],
-                   "conditions": [],
--- a/node/scripts/common.js
+++ b/node/scripts/common.js
@@ -1,26 +0,0 @@
-const spawnSync = require('child_process').spawnSync
-
-const verbose = isVerbose()
-
-function spawn (cmd, args, opts) {
-  log(`>> spawn: ${cmd} ${args.join(' ')}`)
-  const result = spawnSync(cmd, args, opts)
-  if (result.status === null) {
-    console.error(`Could not find ${cmd}`)
-    process.exit(1)
-  } else if (result.status !== 0) {
-    console.error(`${cmd} failed with code ${result.status}`)
-    process.exit(1)
-  }
-}
-
-function log (...args) {
-  if (verbose) console.log(...args)
-}
-
-function isVerbose () {
-  const loglevel = process.env.npm_config_loglevel
-  return loglevel === 'verbose' || process.env.CI === 'true'
-}
-
-module.exports = { spawn, log, isVerbose, verbose }
--- a/node/scripts/generate-constants.js
+++ b/node/scripts/generate-constants.js
@@ -1,65 +0,0 @@
-#!/usr/bin/env node
-const fs = require('fs')
-const path = require('path')
-
-const data = []
-const header = path.resolve(__dirname, '../../deltachat-ffi/deltachat.h')
-
-console.log('Generating constants...')
-
-const header_data = fs.readFileSync(header, 'UTF-8')
-const regex = /^#define\s+(\w+)\s+(\w+)/gm
-while (null != (match = regex.exec(header_data))) {
-  const key = match[1]
-  const value = parseInt(match[2])
-  if (!isNaN(value)) {
-    data.push({ key, value })
-  }
-}
-
-delete header_data
-
-const constants = data
-  .filter(
-    ({ key }) => key.toUpperCase()[0] === key[0] // check if define name is uppercase
-  )
-  .sort((lhs, rhs) => {
-    if (lhs.key < rhs.key) return -1
-    else if (lhs.key > rhs.key) return 1
-    return 0
-  })
-  .map((row) => {
-    return `  ${row.key}: ${row.value}`
-  })
-  .join(',\n')
-
-const events = data
-  .sort((lhs, rhs) => {
-    if (lhs.value < rhs.value) return -1
-    else if (lhs.value > rhs.value) return 1
-    return 0
-  })
-  .filter((i) => {
-    return i.key.startsWith('DC_EVENT_')
-  })
-  .map((i) => {
-    return `  ${i.value}: '${i.key}'`
-  })
-  .join(',\n')
-
-// backwards compat
-fs.writeFileSync(
-  path.resolve(__dirname, '../constants.js'),
-  `// Generated!\n\nmodule.exports = {\n${constants}\n}\n`
-)
-// backwards compat
-fs.writeFileSync(
-  path.resolve(__dirname, '../events.js'),
-  `/* eslint-disable quotes */\n// Generated!\n\nmodule.exports = {\n${events}\n}\n`
-)
-
-fs.writeFileSync(
-  path.resolve(__dirname, '../lib/constants.ts'),
-  `// Generated!\n\nexport enum C {\n${constants.replace(/:/g, ' =')},\n}\n
-// Generated!\n\nexport const EventId2EventName: { [key: number]: string } = {\n${events},\n}\n`
-)
--- a/node/scripts/install.js
+++ b/node/scripts/install.js
@@ -1,22 +0,0 @@
-const {execSync} = require('child_process')
-const {existsSync} = require('fs')
-const {join} = require('path')
-
-const run = (cmd) => {
-  console.log('[i] running `' + cmd + '`')
-  execSync(cmd, {stdio: 'inherit'})
-}
-
-// Build bindings
-if (process.env.USE_SYSTEM_LIBDELTACHAT === 'true') {
-  console.log('[i] USE_SYSTEM_LIBDELTACHAT is true, rebuilding c bindings and using pkg-config to retrieve lib paths and cflags of libdeltachat')
-  run('npm run build:bindings:c:c')
-} else {
-  console.log('[i] Building rust core & c bindings, if possible use prebuilds')
-  run('npm run install:prebuilds')
-}
-
-if (!existsSync(join(__dirname, '..', 'dist'))) {
-  console.log('[i] Didn\'t find already built typescript bindings. Trying to transpile them. If this fail, make sure typescript is installed ;)')
-  run('npm run build:bindings:ts')
-}
--- a/node/scripts/postLinksToDetails.js
+++ b/node/scripts/postLinksToDetails.js
@@ -1,46 +0,0 @@
-const { readFileSync } = require('fs')
-
-const sha = JSON.parse(
-  readFileSync(process.env['GITHUB_EVENT_PATH'], 'utf8')
-).pull_request.head.sha
-
-const base_url =
-  'https://download.delta.chat/node/'
-
-const GITHUB_API_URL =
-  'https://api.github.com/repos/deltachat/deltachat-core-rust/statuses/' + sha
-
-const file_url = process.env['URL']
-const GITHUB_TOKEN = process.env['GITHUB_TOKEN']
-
-const STATUS_DATA = {
-  state: 'success',
-  description: '⏩ Click on "Details" to download →',
-  context: 'Download the node-bindings.tar.gz',
-  target_url: base_url + file_url,
-}
-
-const http = require('https')
-
-const options = {
-  method: 'POST',
-  headers: {
-    'Content-Type': 'application/json',
-    'User-Agent': 'github-action ci for deltachat deskop',
-    authorization: 'Bearer ' + GITHUB_TOKEN,
-  },
-}
-
-const req = http.request(GITHUB_API_URL, options, function(res) {
-  var chunks = []
-  res.on('data', function(chunk) {
-    chunks.push(chunk)
-  })
-  res.on('end', function() {
-    var body = Buffer.concat(chunks)
-    console.log(body.toString())
-  })
-})
-
-req.write(JSON.stringify(STATUS_DATA))
-req.end()
--- a/node/scripts/postinstall.js
+++ b/node/scripts/postinstall.js
@@ -1,57 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-
-if (process.platform !== 'win32') {
-  console.log('postinstall: not windows, so skipping!')
-  process.exit(0)
-}
-
-const from = path.resolve(
-  __dirname,
-  '..',
-  '..',
-  'target',
-  'release',
-  'deltachat.dll'
-)
-
-const getDestination = () => {
-  const argv = process.argv
-  if (argv.length === 3 && argv[2] === '--prebuild') {
-    return path.resolve(
-      __dirname,
-      '..',
-      'prebuilds',
-      'win32-x64',
-      'deltachat.dll'
-    )
-  } else {
-    return path.resolve(
-      __dirname,
-      '..',
-      'build',
-      'Release',
-      'deltachat.dll'
-    )
-  }
-}
-
-const dest = getDestination()
-
-copy(from, dest, (err) => {
-  if (err) throw err
-  console.log(`postinstall: copied ${from} to ${dest}`)
-})
-
-function copy (from, to, cb) {
-  fs.stat(from, (err, st) => {
-    if (err) return cb(err)
-    fs.readFile(from, (err, buf) => {
-      if (err) return cb(err)
-      fs.writeFile(to, buf, (err) => {
-        if (err) return cb(err)
-        fs.chmod(to, st.mode, cb)
-      })
-    })
-  })
-}
--- a/node/scripts/rebuild-core.js
+++ b/node/scripts/rebuild-core.js
@@ -1,17 +0,0 @@
-const path = require('path')
-const { spawn } = require('./common')
-const opts = {
-  cwd: path.resolve(__dirname, '../..'),
-  stdio: 'inherit'
-}
-
-const buildArgs = [
-  'build',
-  '--release',
-  '--features',
-  'vendored',
-  '-p',
-  'deltachat_ffi'
-]
-
-spawn('cargo', buildArgs, opts)
--- a/node/src/module.c
+++ b/node/src/module.c
--- a/node/src/napi-macros-extensions.h
+++ b/node/src/napi-macros-extensions.h
@@ -1,144 +0,0 @@
-#include <napi-macros.h>
-
-#undef NAPI_STATUS_THROWS
-
-#define NAPI_STATUS_THROWS(call) \
-  if ((call) != napi_ok) { \
-    napi_throw_error(env, NULL, #call " failed!"); \
-  }
-
-#define NAPI_DCN_CONTEXT() \
-  dcn_context_t* dcn_context; \
-  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], (void**)&dcn_context)); \
-  if (!dcn_context) { \
-    const char* msg = "Provided dnc_context is null"; \
-    NAPI_STATUS_THROWS(napi_throw_type_error(env, NULL, msg)); \
-  } \
-  if (!dcn_context->dc_context) { \
-    const char* msg = "Provided dc_context is null, did you close the context or not open it?"; \
-    NAPI_STATUS_THROWS(napi_throw_type_error(env, NULL, msg)); \
-  }
-
-#define NAPI_DCN_ACCOUNTS() \
-  dcn_accounts_t* dcn_accounts; \
-  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], (void**)&dcn_accounts)); \
-  if (!dcn_accounts) { \
-    const char* msg = "Provided dnc_acounts is null"; \
-    NAPI_STATUS_THROWS(napi_throw_type_error(env, NULL, msg)); \
-  } \
-  if (!dcn_accounts->dc_accounts) { \
-    const char* msg = "Provided dc_accounts is null, did you unref the accounts object?"; \
-    NAPI_STATUS_THROWS(napi_throw_type_error(env, NULL, msg)); \
-  }
-
-
-#define NAPI_DC_CHAT() \
-  dc_chat_t* dc_chat; \
-  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], (void**)&dc_chat));
-
-#define NAPI_DC_CHATLIST() \
-  dc_chatlist_t* dc_chatlist; \
-  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], (void**)&dc_chatlist));
-
-#define NAPI_DC_CONTACT() \
-  dc_contact_t* dc_contact; \
-  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], (void**)&dc_contact));
-
-#define NAPI_DC_LOT() \
-  dc_lot_t* dc_lot; \
-  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], (void**)&dc_lot));
-
-#define NAPI_DC_MSG() \
-  dc_msg_t* dc_msg; \
-  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], (void**)&dc_msg));
-
-#define NAPI_ARGV_DC_MSG(name, position) \
-  dc_msg_t* name; \
-  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[position], (void**)&name));
-
-#define NAPI_DC_PROVIDER() \
-  dc_provider_t* dc_provider; \
-  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], (void**)&dc_provider));
-
-#define NAPI_DC_ARRAY() \
-  dc_array_t* dc_array; \
-  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], (void**)&dc_array));
-
-#define NAPI_RETURN_UNDEFINED() \
-  return 0;
-
-#define NAPI_RETURN_UINT64(name) \
-  napi_value return_int64; \
-  NAPI_STATUS_THROWS(napi_create_bigint_int64(env, name, &return_int64)); \
-  return return_int64;
-
-#define NAPI_RETURN_INT64(name) \
-  napi_value return_int64; \
-  NAPI_STATUS_THROWS(napi_create_int64(env, name, &return_int64)); \
-  return return_int64;
-
-
-#define NAPI_RETURN_AND_UNREF_STRING(name) \
-  napi_value return_value; \
-  if (name == NULL) { \
-    NAPI_STATUS_THROWS(napi_get_null(env, &return_value)); \
-    return return_value; \
-  } \
-  NAPI_STATUS_THROWS(napi_create_string_utf8(env, name, NAPI_AUTO_LENGTH, &return_value)); \
-  dc_str_unref(name); \
-  return return_value;
-
-#define NAPI_ASYNC_CARRIER_BEGIN(name) \
-  typedef struct name##_carrier_t { \
-    napi_ref callback_ref; \
-    napi_async_work async_work; \
-    dcn_context_t* dcn_context;
-
-#define NAPI_ASYNC_CARRIER_END(name) \
-  } name##_carrier_t;
-
-#define NAPI_ASYNC_EXECUTE(name) \
-  static void name##_execute(napi_env env, void* data)
-
-#define NAPI_ASYNC_GET_CARRIER(name) \
-  name##_carrier_t* carrier = (name##_carrier_t*)data;
-
-#define NAPI_ASYNC_COMPLETE(name) \
-  static void name##_complete(napi_env env, napi_status status, void* data)
-
-#define NAPI_ASYNC_CALL_AND_DELETE_CB() \
-  napi_value global; \
-  NAPI_STATUS_THROWS(napi_get_global(env, &global)); \
-  napi_value callback; \
-  NAPI_STATUS_THROWS(napi_get_reference_value(env, carrier->callback_ref, &callback)); \
-  NAPI_STATUS_THROWS(napi_call_function(env, global, callback, argc, argv, NULL)); \
-  NAPI_STATUS_THROWS(napi_delete_reference(env, carrier->callback_ref)); \
-  NAPI_STATUS_THROWS(napi_delete_async_work(env, carrier->async_work));
-
-#define NAPI_ASYNC_NEW_CARRIER(name) \
-  name##_carrier_t* carrier = calloc(1, sizeof(name##_carrier_t)); \
-  carrier->dcn_context = dcn_context;
-
-#define NAPI_ASYNC_QUEUE_WORK(name, cb) \
-  napi_value callback = cb; \
-  napi_value async_resource_name; \
-  NAPI_STATUS_THROWS(napi_create_reference(env, callback, 1, &carrier->callback_ref)); \
-  NAPI_STATUS_THROWS(napi_create_string_utf8(env, #name "_callback", \
-                                             NAPI_AUTO_LENGTH, \
-                                             &async_resource_name)); \
-  NAPI_STATUS_THROWS(napi_create_async_work(env, callback, async_resource_name, \
-                                            name##_execute, name##_complete, \
-                                            carrier, &carrier->async_work)); \
-  NAPI_STATUS_THROWS(napi_queue_async_work(env, carrier->async_work));
-
-/***  this could/should be moved to napi-macros ***/
-
-#define NAPI_DOUBLE(name, val) \
-  double name; \
-  if (napi_get_value_double(env, val, &name) != napi_ok) { \
-    napi_throw_error(env, "EINVAL", "Expected double"); \
-    return NULL; \
-  }
-
-#define NAPI_ARGV_DOUBLE(name, i) \
-  NAPI_DOUBLE(name, argv[i])
--- a/node/test/fixtures/avatar.png
+++ b/node/test/fixtures/avatar.png
--- a/node/test/fixtures/image.jpeg
+++ b/node/test/fixtures/image.jpeg
--- a/node/test/fixtures/logo.png
+++ b/node/test/fixtures/logo.png
--- a/node/test/test.js
+++ b/node/test/test.js
@@ -1,862 +0,0 @@
-// @ts-check
-import DeltaChat, { Message } from '../dist'
-import binding from '../binding'
-
-import { strictEqual } from 'assert'
-import chai, { expect } from 'chai'
-import chaiAsPromised from 'chai-as-promised'
-import { EventId2EventName, C } from '../dist/constants'
-import { join } from 'path'
-import { mkdtempSync, statSync } from 'fs'
-import { tmpdir } from 'os'
-import { Context } from '../dist/context'
-chai.use(chaiAsPromised)
-
-async function createTempUser(url) {
-  const fetch = require('node-fetch')
-
-  async function postData(url = '') {
-    // Default options are marked with *
-    const response = await fetch(url, {
-      method: 'POST', // *GET, POST, PUT, DELETE, etc.
-      mode: 'cors', // no-cors, *cors, same-origin
-      cache: 'no-cache', // *default, no-cache, reload, force-cache, only-if-cached
-      credentials: 'same-origin', // include, *same-origin, omit
-      headers: {
-        'cache-control': 'no-cache',
-      },
-      referrerPolicy: 'no-referrer', // no-referrer, *client
-    })
-    return response.json() // parses JSON response into native JavaScript objects
-  }
-
-  return await postData(url)
-}
-
-describe('static tests', function () {
-  it('reverse lookup of events', function () {
-    const eventKeys = Object.keys(EventId2EventName).map((k) => Number(k))
-    const eventValues = Object.values(EventId2EventName)
-    const reverse = eventValues.map((v) => C[v])
-    expect(reverse).to.be.deep.equal(eventKeys)
-  })
-
-  it('event constants are consistent', function () {
-    const eventKeys = Object.keys(C)
-      .filter((k) => k.startsWith('DC_EVENT_'))
-      .sort()
-    const eventValues = Object.values(EventId2EventName).sort()
-    expect(eventKeys).to.be.deep.equal(eventValues)
-  })
-
-  it('static method maybeValidAddr()', function () {
-    expect(DeltaChat.maybeValidAddr(null)).to.equal(false)
-    expect(DeltaChat.maybeValidAddr('')).to.equal(false)
-    expect(DeltaChat.maybeValidAddr('uuu')).to.equal(false)
-    expect(DeltaChat.maybeValidAddr('dd.tt')).to.equal(false)
-    expect(DeltaChat.maybeValidAddr('tt.dd@yggmail')).to.equal(true)
-    expect(DeltaChat.maybeValidAddr('u@d')).to.equal(true)
-    //expect(DeltaChat.maybeValidAddr('u@d.')).to.equal(false)
-    //expect(DeltaChat.maybeValidAddr('u@d.t')).to.equal(false)
-    //expect(DeltaChat.maybeValidAddr('u@.tt')).to.equal(false)
-    expect(DeltaChat.maybeValidAddr('@d.tt')).to.equal(false)
-    expect(DeltaChat.maybeValidAddr('user@domain.tld')).to.equal(true)
-    expect(DeltaChat.maybeValidAddr('u@d.tt')).to.equal(true)
-  })
-
-  it('static getSystemInfo()', function () {
-    const info = Context.getSystemInfo()
-    expect(info).to.contain.keys([
-      'arch',
-      'deltachat_core_version',
-      'sqlite_version',
-    ])
-  })
-
-  it('static context.getProviderFromEmail("example@example.com")', function () {
-    const provider = DeltaChat.getProviderFromEmail('example@example.com')
-
-    expect(provider).to.deep.equal({
-      before_login_hint: "Hush this provider doesn't exist!",
-      overview_page: 'https://providers.delta.chat/example-com',
-      status: 3,
-    })
-  })
-})
-
-describe('Basic offline Tests', function () {
-  it('opens a context', async function () {
-    const { dc, context } = DeltaChat.newTemporary()
-
-    strictEqual(context.isConfigured(), false)
-    dc.close()
-  })
-
-  it('set config', async function () {
-    const { dc, context } = DeltaChat.newTemporary()
-
-    context.setConfig('bot', true)
-    strictEqual(context.getConfig('bot'), '1')
-    context.setConfig('bot', false)
-    strictEqual(context.getConfig('bot'), '0')
-    context.setConfig('bot', '1')
-    strictEqual(context.getConfig('bot'), '1')
-    context.setConfig('bot', '0')
-    strictEqual(context.getConfig('bot'), '0')
-    context.setConfig('bot', 1)
-    strictEqual(context.getConfig('bot'), '1')
-    context.setConfig('bot', 0)
-    strictEqual(context.getConfig('bot'), '0')
-
-    context.setConfig('bot', null)
-    strictEqual(context.getConfig('bot'), '')
-
-    strictEqual(context.getConfig('selfstatus'), '')
-    context.setConfig('selfstatus', 'hello')
-    strictEqual(context.getConfig('selfstatus'), 'hello')
-    context.setConfig('selfstatus', '')
-    strictEqual(context.getConfig('selfstatus'), '')
-    context.setConfig('selfstatus', null)
-    strictEqual(context.getConfig('selfstatus'), '')
-
-    dc.close()
-  })
-
-  it('configure with either missing addr or missing mail_pw throws', async function () {
-    const { dc, context } = DeltaChat.newTemporary()
-    dc.startEvents()
-
-    await expect(
-      context.configure({ addr: 'delta1@delta.localhost' })
-    ).to.eventually.be.rejectedWith('Missing (IMAP) password.')
-    await expect(context.configure({ mailPw: 'delta1' })).to.eventually.be
-      .rejected
-
-    context.stopOngoingProcess()
-    dc.close()
-  })
-
-  it('context.getInfo()', async function () {
-    const { dc, context } = DeltaChat.newTemporary()
-
-    const info = await context.getInfo()
-    expect(typeof info).to.be.equal('object')
-    expect(info).to.contain.keys([
-      'arch',
-      'bcc_self',
-      'blobdir',
-      'bot',
-      'configured_mvbox_folder',
-      'configured_sentbox_folder',
-      'database_dir',
-      'database_encrypted',
-      'database_version',
-      'delete_device_after',
-      'delete_server_after',
-      'deltachat_core_version',
-      'display_name',
-      'download_limit',
-      'e2ee_enabled',
-      'entered_account_settings',
-      'fetch_existing_msgs',
-      'fingerprint',
-      'folders_configured',
-      'is_configured',
-      'journal_mode',
-      'key_gen_type',
-      'last_housekeeping',
-      'level',
-      'mdns_enabled',
-      'media_quality',
-      'messages_in_contact_requests',
-      'mvbox_move',
-      'num_cpus',
-      'number_of_chat_messages',
-      'number_of_chats',
-      'number_of_contacts',
-      'only_fetch_mvbox',
-      'private_key_count',
-      'public_key_count',
-      'quota_exceeding',
-      'scan_all_folders_debounce_secs',
-      'selfavatar',
-      'send_sync_msgs',
-      'sentbox_watch',
-      'show_emails',
-      'socks5_enabled',
-      'sqlite_version',
-      'uptime',
-      'used_account_settings',
-      'webrtc_instance',
-    ])
-
-    dc.close()
-  })
-})
-
-describe('Offline Tests with unconfigured account', function () {
-  let [dc, context, accountId, directory] = [null, null, null, null]
-
-  this.beforeEach(async function () {
-    let tmp = DeltaChat.newTemporary()
-    dc = tmp.dc
-    context = tmp.context
-    accountId = tmp.accountId
-    directory = tmp.directory
-    dc.startEvents()
-  })
-
-  this.afterEach(async function () {
-    if (context) {
-      context.stopOngoingProcess()
-    }
-    if (dc) {
-      try {
-        dc.stopIO()
-        dc.close()
-      } catch (error) {
-        console.error(error)
-      }
-    }
-
-    dc = null
-    context = null
-    accountId = null
-    directory = null
-  })
-
-  it('invalid context.joinSecurejoin', async function () {
-    expect(context.joinSecurejoin('test')).to.be.eq(0)
-  })
-
-  it('Device Chat', async function () {
-    const deviceChatMessageText = 'test234'
-
-    expect((await context.getChatList(0, '', null)).getCount()).to.equal(
-      0,
-      'no device chat after setup'
-    )
-
-    await context.addDeviceMessage('test', deviceChatMessageText)
-
-    const chatList = await context.getChatList(0, '', null)
-    expect(chatList.getCount()).to.equal(
-      1,
-      'device chat after adding device msg'
-    )
-
-    const deviceChatId = await chatList.getChatId(0)
-    const deviceChat = await context.getChat(deviceChatId)
-    expect(deviceChat.isDeviceTalk()).to.be.true
-    expect(deviceChat.toJson().isDeviceTalk).to.be.true
-
-    const deviceChatMessages = await context.getChatMessages(deviceChatId, 0, 0)
-    expect(deviceChatMessages.length).to.be.equal(
-      1,
-      'device chat has added message'
-    )
-
-    const deviceChatMessage = await context.getMessage(deviceChatMessages[0])
-    expect(deviceChatMessage.getText()).to.equal(
-      deviceChatMessageText,
-      'device chat message has the inserted text'
-    )
-  })
-
-  it('should have e2ee enabled and right blobdir', function () {
-    expect(context.getConfig('e2ee_enabled')).to.equal(
-      '1',
-      'e2eeEnabled correct'
-    )
-    expect(
-      String(context.getBlobdir()).startsWith(directory),
-      'blobdir should be inside temp directory'
-    )
-    expect(
-      String(context.getBlobdir()).endsWith('db.sqlite-blobs'),
-      'blobdir end with "db.sqlite-blobs"'
-    )
-  })
-
-  it('should create chat from contact and Chat methods', async function () {
-    const contactId = context.createContact('aaa', 'aaa@site.org')
-
-    strictEqual(context.lookupContactIdByAddr('aaa@site.org'), contactId)
-    strictEqual(context.lookupContactIdByAddr('nope@site.net'), 0)
-
-    let chatId = context.createChatByContactId(contactId)
-    let chat = context.getChat(chatId)
-
-    strictEqual(
-      chat.getVisibility(),
-      C.DC_CHAT_VISIBILITY_NORMAL,
-      'not archived'
-    )
-    strictEqual(chat.getId(), chatId, 'chat id matches')
-    strictEqual(chat.getName(), 'aaa', 'chat name matches')
-    strictEqual(chat.getProfileImage(), null, 'no profile image')
-    strictEqual(chat.getType(), C.DC_CHAT_TYPE_SINGLE, 'single chat')
-    strictEqual(chat.isSelfTalk(), false, 'no self talk')
-    // TODO make sure this is really the case!
-    strictEqual(chat.isUnpromoted(), false, 'not unpromoted')
-    strictEqual(chat.isProtected(), false, 'not verified')
-    strictEqual(typeof chat.color, 'string', 'color is a string')
-
-    strictEqual(context.getDraft(chatId), null, 'no draft message')
-    context.setDraft(chatId, context.messageNew().setText('w00t!'))
-    strictEqual(
-      context.getDraft(chatId).toJson().text,
-      'w00t!',
-      'draft text correct'
-    )
-    context.setDraft(chatId, null)
-    strictEqual(context.getDraft(chatId), null, 'draft removed')
-
-    strictEqual(context.getChatIdByContactId(contactId), chatId)
-    expect(context.getChatContacts(chatId)).to.deep.equal([contactId])
-
-    context.setChatVisibility(chatId, C.DC_CHAT_VISIBILITY_ARCHIVED)
-    strictEqual(
-      context.getChat(chatId).getVisibility(),
-      C.DC_CHAT_VISIBILITY_ARCHIVED,
-      'chat archived'
-    )
-    context.setChatVisibility(chatId, C.DC_CHAT_VISIBILITY_NORMAL)
-    strictEqual(
-      chat.getVisibility(),
-      C.DC_CHAT_VISIBILITY_NORMAL,
-      'chat unarchived'
-    )
-
-    chatId = context.createGroupChat('unverified group', false)
-    chat = context.getChat(chatId)
-    strictEqual(chat.isProtected(), false, 'is not verified')
-    strictEqual(chat.getType(), C.DC_CHAT_TYPE_GROUP, 'group chat')
-    expect(context.getChatContacts(chatId)).to.deep.equal([
-      C.DC_CONTACT_ID_SELF,
-    ])
-
-    const draft2 = context.getDraft(chatId)
-    expect(draft2 == null, 'unpromoted group has no draft by default')
-
-    context.setChatName(chatId, 'NEW NAME')
-    strictEqual(context.getChat(chatId).getName(), 'NEW NAME', 'name updated')
-
-    chatId = context.createGroupChat('a verified group', true)
-    chat = context.getChat(chatId)
-    strictEqual(chat.isProtected(), true, 'is verified')
-  })
-
-  it('test setting profile image', async function () {
-    const chatId = context.createGroupChat('testing profile image group', false)
-    const image = 'image.jpeg'
-    const imagePath = join(__dirname, 'fixtures', image)
-    const blobs = context.getBlobdir()
-
-    context.setChatProfileImage(chatId, imagePath)
-    const blobPath = context.getChat(chatId).getProfileImage()
-    expect(blobPath.startsWith(blobs)).to.be.true
-    expect(blobPath.endsWith(image)).to.be.true
-
-    context.setChatProfileImage(chatId, null)
-    expect(context.getChat(chatId).getProfileImage()).to.be.equal(
-      null,
-      'image is null'
-    )
-  })
-
-  it('test setting ephemeral timer', function () {
-    const chatId = context.createGroupChat('testing ephemeral timer')
-
-    strictEqual(
-      context.getChatEphemeralTimer(chatId),
-      0,
-      'ephemeral timer is not set by default'
-    )
-
-    context.setChatEphemeralTimer(chatId, 60)
-    strictEqual(
-      context.getChatEphemeralTimer(chatId),
-      60,
-      'ephemeral timer is set to 1 minute'
-    )
-
-    context.setChatEphemeralTimer(chatId, 0)
-    strictEqual(
-      context.getChatEphemeralTimer(chatId),
-      0,
-      'ephemeral timer is reset'
-    )
-  })
-
-  it('should create and delete chat', function () {
-    const chatId = context.createGroupChat('GROUPCHAT')
-    const chat = context.getChat(chatId)
-    strictEqual(chat.getId(), chatId, 'correct chatId')
-    context.deleteChat(chat.getId())
-    strictEqual(context.getChat(chatId), null, 'chat removed')
-  })
-
-  it('new message and Message methods', function () {
-    const text = 'w00t!'
-    const msg = context.messageNew().setText(text)
-
-    strictEqual(msg.getChatId(), 0, 'chat id 0 before sent')
-    strictEqual(msg.getDuration(), 0, 'duration 0 before sent')
-    strictEqual(msg.getFile(), '', 'no file set by default')
-    strictEqual(msg.getFilebytes(), 0, 'and file bytes is 0')
-    strictEqual(msg.getFilemime(), '', 'no filemime by default')
-    strictEqual(msg.getFilename(), '', 'no filename set by default')
-    strictEqual(msg.getFromId(), 0, 'no contact id set by default')
-    strictEqual(msg.getHeight(), 0, 'plain text message have height 0')
-    strictEqual(msg.getId(), 0, 'id 0 before sent')
-    strictEqual(msg.getSetupcodebegin(), '', 'no setupcode begin')
-    strictEqual(msg.getShowpadlock(), false, 'no padlock by default')
-
-    const state = msg.getState()
-    strictEqual(state.isUndefined(), true, 'no state by default')
-    strictEqual(state.isFresh(), false, 'no state by default')
-    strictEqual(state.isNoticed(), false, 'no state by default')
-    strictEqual(state.isSeen(), false, 'no state by default')
-    strictEqual(state.isPending(), false, 'no state by default')
-    strictEqual(state.isFailed(), false, 'no state by default')
-    strictEqual(state.isDelivered(), false, 'no state by default')
-    strictEqual(state.isReceived(), false, 'no state by default')
-
-    const summary = msg.getSummary()
-    strictEqual(summary.getId(), 0, 'no summary id')
-    strictEqual(summary.getState(), 0, 'no summary state')
-    strictEqual(summary.getText1(), null, 'no summary text1')
-    strictEqual(summary.getText1Meaning(), 0, 'no summary text1 meaning')
-    strictEqual(summary.getText2(), '', 'no summary text2')
-    strictEqual(summary.getTimestamp(), 0, 'no summary timestamp')
-
-    //strictEqual(msg.getSummarytext(50), text, 'summary text is text')
-    strictEqual(msg.getText(), text, 'msg text set correctly')
-    strictEqual(msg.getTimestamp(), 0, 'no timestamp')
-
-    const viewType = msg.getViewType()
-    strictEqual(viewType.isText(), true)
-    strictEqual(viewType.isImage(), false)
-    strictEqual(viewType.isGif(), false)
-    strictEqual(viewType.isAudio(), false)
-    strictEqual(viewType.isVoice(), false)
-    strictEqual(viewType.isVideo(), false)
-    strictEqual(viewType.isFile(), false)
-
-    strictEqual(msg.getWidth(), 0, 'no message width')
-    strictEqual(msg.isDeadDrop(), false, 'not deaddrop')
-    strictEqual(msg.isForwarded(), false, 'not forwarded')
-    strictEqual(msg.isIncreation(), false, 'not in creation')
-    strictEqual(msg.isInfo(), false, 'not an info message')
-    strictEqual(msg.isSent(), false, 'messge is not sent')
-    strictEqual(msg.isSetupmessage(), false, 'not an autocrypt setup message')
-
-    msg.latefilingMediasize(10, 20, 30)
-    strictEqual(msg.getWidth(), 10, 'message width set correctly')
-    strictEqual(msg.getHeight(), 20, 'message height set correctly')
-    strictEqual(msg.getDuration(), 30, 'message duration set correctly')
-
-    msg.setDimension(100, 200)
-    strictEqual(msg.getWidth(), 100, 'message width set correctly')
-    strictEqual(msg.getHeight(), 200, 'message height set correctly')
-
-    msg.setDuration(314)
-    strictEqual(msg.getDuration(), 314, 'message duration set correctly')
-
-    expect(() => {
-      msg.setFile(null)
-    }).to.throw('Missing filename')
-
-    const logo = join(__dirname, 'fixtures', 'logo.png')
-    const stat = statSync(logo)
-    msg.setFile(logo)
-    strictEqual(msg.getFilebytes(), stat.size, 'correct file size')
-    strictEqual(msg.getFile(), logo, 'correct file name')
-    strictEqual(msg.getFilemime(), 'image/png', 'mime set implicitly')
-    msg.setFile(logo, 'image/gif')
-    strictEqual(msg.getFilemime(), 'image/gif', 'mime set (in)correctly')
-    msg.setFile(logo, 'image/png')
-    strictEqual(msg.getFilemime(), 'image/png', 'mime set correctly')
-
-    const json = msg.toJson()
-    expect(json).to.not.equal(null, 'not null')
-    strictEqual(typeof json, 'object', 'json object')
-  })
-
-  it('Contact methods', function () {
-    const contactId = context.createContact('First Last', 'first.last@site.org')
-    const contact = context.getContact(contactId)
-
-    strictEqual(contact.getAddress(), 'first.last@site.org', 'correct address')
-    strictEqual(typeof contact.color, 'string', 'color is a string')
-    strictEqual(contact.getDisplayName(), 'First Last', 'correct display name')
-    strictEqual(contact.getId(), contactId, 'contact id matches')
-    strictEqual(contact.getName(), 'First Last', 'correct name')
-    strictEqual(contact.getNameAndAddress(), 'First Last (first.last@site.org)')
-    strictEqual(contact.getProfileImage(), null, 'no contact image')
-    strictEqual(contact.isBlocked(), false, 'not blocked')
-    strictEqual(contact.isVerified(), false, 'unverified status')
-    strictEqual(contact.lastSeen, 0, 'last seen unknown')
-  })
-
-  it('create contacts from address book', function () {
-    const addresses = [
-      'Name One',
-      'name1@site.org',
-      'Name Two',
-      'name2@site.org',
-      'Name Three',
-      'name3@site.org',
-    ]
-    const count = context.addAddressBook(addresses.join('\n'))
-    strictEqual(count, addresses.length / 2)
-    context
-      .getContacts(0, 'Name ')
-      .map((id) => context.getContact(id))
-      .forEach((contact) => {
-        expect(contact.getName().startsWith('Name ')).to.be.true
-      })
-  })
-
-  it('delete contacts', function () {
-    const id = context.createContact('someuser', 'someuser@site.com')
-    const contact = context.getContact(id)
-    strictEqual(contact.getId(), id, 'contact id matches')
-    strictEqual(context.deleteContact(id), true, 'delete call succesful')
-    strictEqual(context.getContact(id), null, 'contact is gone')
-  })
-
-  it('adding and removing a contact from a chat', function () {
-    const chatId = context.createGroupChat('adding_and_removing')
-    const contactId = context.createContact('Add Remove', 'add.remove@site.com')
-    strictEqual(
-      context.addContactToChat(chatId, contactId),
-      true,
-      'contact added'
-    )
-    strictEqual(
-      context.isContactInChat(chatId, contactId),
-      true,
-      'contact in chat'
-    )
-    strictEqual(
-      context.removeContactFromChat(chatId, contactId),
-      true,
-      'contact removed'
-    )
-    strictEqual(
-      context.isContactInChat(chatId, contactId),
-      false,
-      'contact not in chat'
-    )
-  })
-
-  it('blocking contacts', function () {
-    const id = context.createContact('badcontact', 'bad@site.com')
-
-    strictEqual(context.getBlockedCount(), 0)
-    strictEqual(context.getContact(id).isBlocked(), false)
-    expect(context.getBlockedContacts()).to.be.empty
-
-    context.blockContact(id, true)
-    strictEqual(context.getBlockedCount(), 1)
-    strictEqual(context.getContact(id).isBlocked(), true)
-    expect(context.getBlockedContacts()).to.deep.equal([id])
-
-    context.blockContact(id, false)
-    strictEqual(context.getBlockedCount(), 0)
-    strictEqual(context.getContact(id).isBlocked(), false)
-    expect(context.getBlockedContacts()).to.be.empty
-  })
-
-  it('ChatList methods', function () {
-    const ids = [
-      context.createGroupChat('groupchat1'),
-      context.createGroupChat('groupchat11'),
-      context.createGroupChat('groupchat111'),
-    ]
-
-    let chatList = context.getChatList(0, 'groupchat1', null)
-    strictEqual(chatList.getCount(), 3, 'should contain above chats')
-    expect(ids.indexOf(chatList.getChatId(0))).not.to.equal(-1)
-    expect(ids.indexOf(chatList.getChatId(1))).not.to.equal(-1)
-    expect(ids.indexOf(chatList.getChatId(2))).not.to.equal(-1)
-
-    const lot = chatList.getSummary(0)
-    strictEqual(lot.getId(), 0, 'lot has no id')
-    strictEqual(lot.getState(), C.DC_STATE_UNDEFINED, 'correct state')
-
-    const text = 'No messages.'
-    context.createGroupChat('groupchat1111')
-    chatList = context.getChatList(0, 'groupchat1111', null)
-    strictEqual(
-      chatList.getSummary(0).getText2(),
-      text,
-      'custom new group message'
-    )
-
-    context.setChatVisibility(ids[0], C.DC_CHAT_VISIBILITY_ARCHIVED)
-    chatList = context.getChatList(C.DC_GCL_ARCHIVED_ONLY, 'groupchat1', null)
-    strictEqual(chatList.getCount(), 1, 'only one archived')
-  })
-
-  it('Remove quote from (draft) message', function () {
-    context.addDeviceMessage('test_quote', 'test')
-    const msgId = context.getChatMessages(10, 0, 0)[0]
-    const msg = context.messageNew()
-
-    msg.setQuote(context.getMessage(msgId))
-    expect(msg.getQuotedMessage()).to.not.be.null
-    msg.setQuote(null)
-    expect(msg.getQuotedMessage()).to.be.null
-  })
-})
-
-describe('Integration tests', function () {
-  this.timeout(60 * 3000) // increase timeout to 1min
-
-  let [dc, context, accountId, directory, account] = [
-    null,
-    null,
-    null,
-    null,
-    null,
-  ]
-
-  let [dc2, context2, accountId2, directory2, account2] = [
-    null,
-    null,
-    null,
-    null,
-    null,
-  ]
-
-  this.beforeEach(async function () {
-    let tmp = DeltaChat.newTemporary()
-    dc = tmp.dc
-    context = tmp.context
-    accountId = tmp.accountId
-    directory = tmp.directory
-    dc.startEvents()
-  })
-
-  this.afterEach(async function () {
-    if (context) {
-      try {
-        context.stopOngoingProcess()
-      } catch (error) {
-        console.error(error)
-      }
-    }
-    if (context2) {
-      try {
-        context2.stopOngoingProcess()
-      } catch (error) {
-        console.error(error)
-      }
-    }
-
-    if (dc) {
-      try {
-        dc.stopIO()
-        dc.close()
-      } catch (error) {
-        console.error(error)
-      }
-    }
-
-    dc = null
-    context = null
-    accountId = null
-    directory = null
-
-    context2 = null
-    accountId2 = null
-    directory2 = null
-  })
-
-  this.beforeAll(async function () {
-    if (!process.env.DCC_NEW_TMP_EMAIL) {
-      console.log(
-        'Missing DCC_NEW_TMP_EMAIL environment variable!, skip intergration tests'
-      )
-      this.skip()
-    }
-
-    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 intergration tests"
-      )
-      this.skip()
-    }
-  })
-
-  it('configure', async function () {
-    strictEqual(context.isConfigured(), false, 'should not be configured')
-
-    // Not sure what's the best way to check the events
-    // TODO: check the events
-
-    // dc.once('DC_EVENT_CONFIGURE_PROGRESS', (data) => {
-    //   t.pass('DC_EVENT_CONFIGURE_PROGRESS called at least once')
-    // })
-    // dc.on('DC_EVENT_ERROR', (error) => {
-    //   console.error('DC_EVENT_ERROR', error)
-    // })
-    // dc.on('DC_EVENT_ERROR_NETWORK', (first, error) => {
-    //   console.error('DC_EVENT_ERROR_NETWORK', error)
-    // })
-
-    // dc.on('ALL', (event, data1, data2) => console.log('ALL', event, data1, data2))
-
-    await expect(
-      context.configure({
-        addr: account.email,
-        mail_pw: account.password,
-
-        displayname: 'Delta One',
-        selfstatus: 'From Delta One with <3',
-        selfavatar: join(__dirname, 'fixtures', 'avatar.png'),
-      })
-    ).to.be.eventually.fulfilled
-
-    strictEqual(context.getConfig('addr'), account.email, 'addr correct')
-    strictEqual(
-      context.getConfig('displayname'),
-      'Delta One',
-      'displayName correct'
-    )
-    strictEqual(
-      context.getConfig('selfstatus'),
-      'From Delta One with <3',
-      'selfStatus correct'
-    )
-    expect(
-      context.getConfig('selfavatar').endsWith('avatar.png'),
-      'selfavatar correct'
-    )
-    strictEqual(context.getConfig('e2ee_enabled'), '1', 'e2ee_enabled correct')
-    strictEqual(
-      context.getConfig('save_mime_headers'),
-      '',
-      'save_mime_headers correct'
-    )
-
-    expect(context.getBlobdir().endsWith('db.sqlite-blobs'), 'correct blobdir')
-    strictEqual(context.isConfigured(), true, 'is configured')
-
-    // whole re-configure to only change displayname: what the heck? (copied this from the old test)
-    await expect(
-      context.configure({
-        addr: account.email,
-        mail_pw: account.password,
-        displayname: 'Delta Two',
-        selfstatus: 'From Delta One with <3',
-        selfavatar: join(__dirname, 'fixtures', 'avatar.png'),
-      })
-    ).to.be.eventually.fulfilled
-    strictEqual(
-      context.getConfig('displayname'),
-      'Delta Two',
-      'updated displayName correct'
-    )
-  })
-
-  it('Autocrypt setup - key transfer', async function () {
-    // Spawn a second dc instance with same account
-    // dc.on('ALL', (event, data1, data2) =>
-    //   console.log('FIRST ', event, data1, data2)
-    // )
-    dc.stopIO()
-    await expect(
-      context.configure({
-        addr: account.email,
-        mail_pw: account.password,
-
-        displayname: 'Delta One',
-        selfstatus: 'From Delta One with <3',
-        selfavatar: join(__dirname, 'fixtures', 'avatar.png'),
-      })
-    ).to.be.eventually.fulfilled
-
-    const accountId2 = dc.addAccount()
-    console.log('accountId2:', accountId2)
-    context2 = dc.accountContext(accountId2)
-
-    let setupCode = null
-    const waitForSetupCode = waitForSomething()
-    const waitForEnd = waitForSomething()
-
-    dc.on('ALL', (event, accountId, data1, data2) => {
-      console.log('[' + accountId + ']', event, data1, data2)
-    })
-
-    dc.on('DC_EVENT_MSGS_CHANGED', async (aId, chatId, msgId) => {
-      console.log('[' + accountId + '] DC_EVENT_MSGS_CHANGED', chatId, msgId)
-      if (
-        aId != accountId ||
-        !context.getChat(chatId).isSelfTalk() ||
-        !context.getMessage(msgId).isSetupmessage()
-      ) {
-        return
-      }
-      console.log('Setupcode!')
-      let setupCode = await waitForSetupCode.promise
-      // console.log('incoming msg', { setupCode })
-      const messages = context.getChatMessages(chatId, 0, 0)
-      expect(messages.indexOf(msgId) !== -1, 'msgId is in chat messages').to.be
-        .true
-      const result = await context.continueKeyTransfer(msgId, setupCode)
-      expect(result === true, 'continueKeyTransfer was successful').to.be.true
-
-      waitForEnd.done()
-    })
-
-    dc.stopIO()
-    await expect(
-      context2.configure({
-        addr: account.email,
-        mail_pw: account.password,
-
-        displayname: 'Delta One',
-        selfstatus: 'From Delta One with <3',
-        selfavatar: join(__dirname, 'fixtures', 'avatar.png'),
-      })
-    ).to.be.eventually.fulfilled
-    dc.startIO()
-
-    console.log('Sending autocrypt setup code')
-    setupCode = await context2.initiateKeyTransfer()
-    console.log('Sent autocrypt setup code')
-    waitForSetupCode.done(setupCode)
-    console.log('setupCode is: ' + setupCode)
-    expect(typeof setupCode).to.equal('string', 'setupCode is string')
-
-    await waitForEnd.promise
-  })
-
-  it('configure using invalid password should fail', async function () {
-    await expect(
-      context.configure({
-        addr: 'hpk5@testrun.org',
-        mail_pw: 'asd',
-      })
-    ).to.be.eventually.rejected
-  })
-})
-
-/**
- * @returns {{done: (result?)=>void, promise:Promise<any> }}
- */
-function waitForSomething() {
-  let resolvePromise
-  const promise = new Promise((res, rej) => {
-    resolvePromise = res
-  })
-  return {
-    done: resolvePromise,
-    promise,
-  }
-}
--- a/node/tsconfig.json
+++ b/node/tsconfig.json
@@ -1,22 +0,0 @@
-{
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": "./lib",
-        "sourceMap": true,
-        "module": "commonjs",
-        "target": "es5",
-        "esModuleInterop": true,
-        "declaration": true,
-        "declarationMap": true,
-        "strictNullChecks": true,
-        "strict": true
-    },
-    "exclude": ["node_modules", "deltachat-core-rust", "dist", "scripts"],
-    "typedocOptions": {
-        "mode": "file",
-        "out": "docs",
-        "excludeNotExported": true,
-        "defaultCategory": "index",
-        "includeVersion": true
-    }
-}
--- a/node/windows.md
+++ b/node/windows.md
@@ -1,37 +0,0 @@
-> Steps on how to get windows set up properly for the node bindings
-
-## install git
-
-E.g via <https://git-scm.com/download/win>
-
-## install node
-
-Download and install `v16` from <https://nodejs.org/en/>
-
-## install rust
-
-Download and run `rust-init.exe` from <https://www.rust-lang.org/tools/install>
-
-## configure node for native addons
-
-```
-$ npm i node-gyp -g
-$ npm i windows-build-tools -g
-```
-
-`windows-build-tools` will install `Visual Studio 2017` by default and should not mess with existing installations of `Visual Studio C++`.
-
-## get the code
-
-```
-$ mkdir -p src/deltachat
-$ cd src/deltachat
-$ git clone https://github.com/deltachat/deltachat-node
-```
-
-## build the code
-
-```
-$ cd src/deltachat/deltachat-node
-$ npm install
-```
--- a/package.json
+++ b/package.json
@@ -1,64 +0,0 @@
-{
-  "dependencies": {
-    "debug": "^4.1.1",
-    "napi-macros": "^2.0.0",
-    "node-gyp-build": "^4.1.0"
-  },
-  "description": "node.js bindings for deltachat-core",
-  "devDependencies": {
-    "@types/debug": "^4.1.7",
-    "@types/node": "^16.11.26",
-    "chai": "^4.2.0",
-    "chai-as-promised": "^7.1.1",
-    "esm": "^3.2.25",
-    "hallmark": "^2.0.0",
-    "mocha": "^8.2.1",
-    "node-fetch": "^2.6.7",
-    "node-gyp": "^9.0.0",
-    "opn-cli": "^5.0.0",
-    "prebuildify": "^3.0.0",
-    "prebuildify-ci": "^1.0.4",
-    "prettier": "^2.0.5",
-    "typedoc": "^0.17.0",
-    "typescript": "^3.9.10"
-  },
-  "engines": {
-    "node": ">=16.0.0"
-  },
-  "files": [
-    "node/scripts/*",
-    "*"
-  ],
-  "homepage": "https://github.com/deltachat/deltachat-core-rust/tree/master/node",
-  "license": "GPL-3.0-or-later",
-  "main": "node/dist/index.js",
-  "name": "deltachat-node",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/deltachat/deltachat-core-rust.git"
-  },
-  "scripts": {
-    "build": "npm run build:core && npm run build:bindings",
-    "build:bindings": "npm run build:bindings:c && npm run build:bindings:ts",
-    "build:bindings:c": "npm run build:bindings:c:c && npm run build:bindings:c:postinstall",
-    "build:bindings:c:c": "cd node && node-gyp rebuild",
-    "build:bindings:c:postinstall": "node node/scripts/postinstall.js",
-    "build:bindings:ts": "cd node && tsc",
-    "build:core": "npm run build:core:rust && npm run build:core:constants",
-    "build:core:constants": "node node/scripts/generate-constants.js",
-    "build:core:rust": "node node/scripts/rebuild-core.js",
-    "clean": "rm -rf node/dist node/build node/prebuilds node/node_modules ./target",
-    "download-prebuilds": "prebuildify-ci download",
-    "hallmark": "hallmark --fix",
-    "install": "node node/scripts/install.js",
-    "install:prebuilds": "cd node && node-gyp-build \"npm run build:core\" \"npm run build:bindings:c:postinstall\"",
-    "lint": "prettier --check \"node/lib/**/*.{ts,tsx}\"",
-    "lint-fix": "prettier --write \"node/lib/**/*.{ts,tsx}\" \"node/test/**/*.js\"",
-    "prebuildify": "cd node && prebuildify -t 16.13.0 --napi --strip --postinstall \"node scripts/postinstall.js --prebuild\"",
-    "test": "npm run test:lint && npm run test:mocha",
-    "test:lint": "npm run lint",
-    "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail"
-  },
-  "types": "node/dist/index.d.ts",
-  "version": "1.89.0"
-}
--- a/python/README.rst
+++ b/python/README.rst
@@ -1,77 +1,84 @@
 =========================
-DeltaChat Python bindings
+deltachat python bindings
 =========================

-This package provides `Python bindings`_ to the `deltachat-core library`_
-which implements IMAP/SMTP/MIME/OpenPGP e-mail standards and offers
+This package provides bindings to the deltachat-core_ Rust -library
+which implements IMAP/SMTP/MIME/PGP e-mail standards and offers
 a low-level Chat/Contact/Message API to user interfaces and bots.

-.. _`deltachat-core library`: https://github.com/deltachat/deltachat-core-rust
-.. _`Python bindings`: https://py.delta.chat/

 Installing pre-built packages (Linux-only)
-==========================================
+========================================================

 If you have a Linux system you may try to install the ``deltachat`` binary "wheel" packages
 without any "build-from-source" steps.
-Otherwise you need to `compile the Delta Chat bindings yourself`__.
-
-__ sourceinstall_
+Otherwise you need to `compile the Delta Chat bindings yourself <#sourceinstall>`_.

 We recommend to first `install virtualenv <https://virtualenv.pypa.io/en/stable/installation.html>`_,
 then create a fresh Python virtual environment and activate it in your shell::

-        virtualenv env  # or: python -m venv
-        source env/bin/activate
+        virtualenv venv  # or: python -m venv
+        source venv/bin/activate

 Afterwards, invoking ``python`` or ``pip install`` only
-modifies files in your ``env`` directory and leaves
+modifies files in your ``venv`` directory and leaves
 your system installation alone.

-For Linux we build wheels for all releases and push them to a python package
-index. To install the latest release::
+For Linux, we automatically build wheels for all github PR branches
+and push them to a python package index. To install the latest
+github ``master`` branch::

-    pip install deltachat
+    pip install --pre -i https://m.devpi.net/dc/master deltachat

 To verify it worked::

    python -c "import deltachat"

+.. note::
+
+    If you can help to automate the building of wheels for Mac or Windows,
+    that'd be much appreciated! please then get
+    `in contact with us <https://delta.chat/en/contribute>`_.
+
+
 Running tests
 =============

-Recommended way to run tests is using `tox <https://tox.wiki>`_.
-After successful binding installation you can install tox
-and run the tests::
+After successful binding installation you can install a few more
+Python packages before running the tests::

-    pip install tox
-    tox -e py3
+    python -m pip install pytest pytest-xdist pytest-timeout pytest-rerunfailures requests
+    pytest -v tests

 This will run all "offline" tests and skip all functional
 end-to-end tests that require accounts on real e-mail servers.

 .. _livetests:

-Running "live" tests with temporary accounts
--------------------------------------------
+running "live" tests with temporary accounts
+---------------------------------------------

-If you want to run live functional tests you can set ``DCC_NEW_TMP_EMAIL`` to a URL that creates e-mail accounts.  Most developers use https://testrun.org URLs created and managed by `mailadm <https://mailadm.readthedocs.io/>`_.
+If you want to run live functional tests you can set ``DCC_NEW_TMP_EMAIL`` to a URL that creates e-mail accounts.  Most developers use https://testrun.org URLS created and managed by [mailadm](https://mailadm.readthedocs.io/en/latest/).

-Please feel free to contact us through a github issue or by e-mail and we'll send you a URL that you can then use for functional tests like this::
+Please feel free to contact us through a github issue or by e-mail and we'll send you a URL that you can then use for functional tests like this:

    export DCC_NEW_TMP_EMAIL=<URL you got from us>

 With this account-creation setting, pytest runs create ephemeral e-mail accounts on the http://testrun.org server.  These accounts exists only for one hour and then are removed completely.
-One hour is enough to invoke pytest and run all offline and online tests::
+One hour is enough to invoke pytest and run all offline and online tests:

-    tox -e py3
+    pytest
+
+    # or if you have installed pytest-xdist for parallel test execution
+    pytest -n6

 Each test run creates new accounts.

+
 .. _sourceinstall:

-Installing bindings from source
-===============================
+Installing bindings from source (Updated: July 2020)
+=========================================================

 Install Rust and Cargo first.
 The easiest is probably to use `rustup <https://rustup.rs/>`_.
@@ -90,42 +97,74 @@ E.g. on Debian-based systems `apt install python3 python3-pip
 python3-venv` should give you a usable python installation.

 Ensure you are in the deltachat-core-rust/python directory, create the
-virtual environment with dependencies using tox
-and activate it in your shell::
+virtual environment and activate it in your shell::

   cd python
-   tox --devenv env
-   source env/bin/activate
+   python3 -m venv venv  # or: virtualenv venv
+   source venv/bin/activate

 You should now be able to build the python bindings using the supplied script::

-   python3 install_python_bindings.py
+   python install_python_bindings.py

 The core compilation and bindings building might take a while,
 depending on the speed of your machine.
+The bindings will be installed in release mode but with debug symbols.
+The release mode is currently necessary because some tests generate RSA keys
+which is prohibitively slow in non-release mode.
+
+
+Code examples
+=============
+
+You may look at `examples <https://py.delta.chat/examples.html>`_.
+
+
+.. _`deltachat-core-rust github repository`: https://github.com/deltachat/deltachat-core-rust
+.. _`deltachat-core`: https://github.com/deltachat/deltachat-core-rust
+

 Building manylinux based wheels
-===============================
+====================================

 Building portable manylinux wheels which come with libdeltachat.so
-can be done with Docker_ or Podman_.
+can be done with docker-tooling.

-.. _Docker: https://www.docker.com/
-.. _Podman: https://podman.io/
+using docker pull / premade images
+------------------------------------

-If you want to build your own wheels, build container image first::
+We publish a build environment under the ``deltachat/coredeps`` tag so
+that you can pull it from the ``hub.docker.com`` site's "deltachat"
+organization::

-   $ cd deltachat-core-rust # cd to deltachat-core-rust working tree
-   $ docker build -t deltachat/coredeps scripts/coredeps
-
-This will use the ``scripts/coredeps/Dockerfile`` to build
-container image called ``deltachat/coredeps``.  You can afterwards
-find it with::
-
-   $ docker images
+    $ docker pull deltachat/coredeps

 This docker image can be used to run tests and build Python wheels for all interpreters::

    $ docker run -e DCC_NEW_TMP_EMAIL \
-       --rm -it -v $(pwd):/mnt -w /mnt \
+       --rm -it -v \$(pwd):/mnt -w /mnt \
       deltachat/coredeps scripts/run_all.sh
+
+
+Optionally build your own docker image
+--------------------------------------
+
+If you want to build your own custom docker image you can do this::
+
+   $ cd deltachat-core # cd to deltachat-core checkout directory
+   $ docker build -t deltachat/coredeps scripts/docker_coredeps
+
+This will use the ``scripts/docker_coredeps/Dockerfile`` to build
+up docker image called ``deltachat/coredeps``.  You can afterwards
+find it with::
+
+   $ docker images
+
+
+Troubleshooting
+---------------
+
+On more recent systems running the docker image may crash.  You can
+fix this by adding ``vsyscall=emulate`` to the Linux kernel boot
+arguments commandline.  E.g. on Debian you'd add this to
+``GRUB_CMDLINE_LINUX_DEFAULT`` in ``/etc/default/grub``.
--- a/python/doc/_templates/globaltoc.html
+++ b/python/doc/_templates/globaltoc.html
@@ -11,7 +11,8 @@
 <ul>
  <li><a href="https://github.com/deltachat/deltachat-core-rust">github repository</a></li>
  <li><a href="https://pypi.python.org/pypi/deltachat">pypi: deltachat</a></li>
-  <li><a href="https://web.libera.chat/#deltachat">#deltachat</a></li>
 </ul>

+<b>#deltachat [freenode]</b>
+
 </div>
--- a/python/examples/echo_and_quit.py
+++ b/python/examples/echo_and_quit.py
@@ -1,3 +1,4 @@
+
 # content of echo_and_quit.py

 from deltachat import account_hookimpl, run_cmdline
--- a/python/examples/group_tracking.py
+++ b/python/examples/group_tracking.py
@@ -1,3 +1,4 @@
+
 # content of group_tracking.py

 from deltachat import account_hookimpl, run_cmdline
@@ -32,21 +33,15 @@ class GroupTrackingPlugin:

    @account_hookimpl
    def ac_member_added(self, chat, contact, actor, message):
-        print(
-            "ac_member_added {} to chat {} from {}".format(
-                contact.addr, chat.id, actor or message.get_sender_contact().addr
-            )
-        )
+        print("ac_member_added {} to chat {} from {}".format(
+            contact.addr, chat.id, actor or message.get_sender_contact().addr))
        for member in chat.get_contacts():
            print("chat member: {}".format(member.addr))

    @account_hookimpl
    def ac_member_removed(self, chat, contact, actor, message):
-        print(
-            "ac_member_removed {} from chat {} by {}".format(
-                contact.addr, chat.id, actor or message.get_sender_contact().addr
-            )
-        )
+        print("ac_member_removed {} from chat {} by {}".format(
+            contact.addr, chat.id, actor or message.get_sender_contact().addr))


 def main(argv=None):
--- a/python/examples/test_examples.py
+++ b/python/examples/test_examples.py
@@ -1,20 +1,20 @@
+
+import pytest
+import py
 import echo_and_quit
 import group_tracking
-import py
-import pytest
-
 from deltachat.events import FFIEventLogger


-@pytest.fixture(scope="session")
+@pytest.fixture(scope='session')
 def datadir():
    """The py.path.local object of the test-data/ directory."""
    for path in reversed(py.path.local(__file__).parts()):
-        datadir = path.join("test-data")
+        datadir = path.join('test-data')
        if datadir.isdir():
            return datadir
    else:
-        pytest.skip("test-data directory not found")
+        pytest.skip('test-data directory not found')


 def test_echo_quit_plugin(acfactory, lp):
@@ -22,7 +22,7 @@ def test_echo_quit_plugin(acfactory, lp):
    botproc = acfactory.run_bot_process(echo_and_quit)

    lp.sec("creating a temp account to contact the bot")
-    (ac1,) = acfactory.get_online_accounts(1)
+    ac1 = acfactory.get_one_online_account()

    lp.sec("sending a message to the bot")
    bot_contact = ac1.create_contact(botproc.addr)
@@ -42,13 +42,11 @@ def test_group_tracking_plugin(acfactory, lp):
    lp.sec("creating one group-tracking bot and two temp accounts")
    botproc = acfactory.run_bot_process(group_tracking, ffi=False)

-    ac1, ac2 = acfactory.get_online_accounts(2)
+    ac1, ac2 = acfactory.get_two_online_accounts(quiet=True)

-    botproc.fnmatch_lines(
-        """
+    botproc.fnmatch_lines("""
        *ac_configure_completed*
-    """
-    )
+    """)
    ac1.add_account_plugin(FFIEventLogger(ac1))
    ac2.add_account_plugin(FFIEventLogger(ac2))

@@ -58,11 +56,9 @@ def test_group_tracking_plugin(acfactory, lp):
    ch.add_contact(bot_contact)
    ch.send_text("hello")

-    botproc.fnmatch_lines(
-        """
+    botproc.fnmatch_lines("""
        *ac_chat_modified*bot test group*
-    """
-    )
+    """)

    lp.sec("adding third member {}".format(ac2.get_config("addr")))
    contact3 = ac1.create_contact(ac2.get_config("addr"))
@@ -72,20 +68,12 @@ def test_group_tracking_plugin(acfactory, lp):
    assert "hello" in reply.text

    lp.sec("now looking at what the bot received")
-    botproc.fnmatch_lines(
-        """
+    botproc.fnmatch_lines("""
        *ac_member_added {}*from*{}*
-    """.format(
-            contact3.addr, ac1.get_config("addr")
-        )
-    )
+    """.format(contact3.addr, ac1.get_config("addr")))

    lp.sec("contact successfully added, now removing")
    ch.remove_contact(contact3)
-    botproc.fnmatch_lines(
-        """
+    botproc.fnmatch_lines("""
        *ac_member_removed {}*from*{}*
-    """.format(
-            contact3.addr, ac1.get_config("addr")
-        )
-    )
+    """.format(contact3.addr, ac1.get_config("addr")))
--- a/python/install_python_bindings.py
+++ b/python/install_python_bindings.py
@@ -18,13 +18,15 @@ if __name__ == "__main__":

    cmd = ["cargo", "build", "-p", "deltachat_ffi"]

-    if target == "release":
+    if target == 'release':
        os.environ["CARGO_PROFILE_RELEASE_LTO"] = "on"
        cmd.append("--release")

    print("running:", " ".join(cmd))
    subprocess.check_call(cmd)
-    subprocess.check_call("rm -rf build/ src/deltachat/*.so src/deltachat/*.dylib src/deltachat/*.dll", shell=True)
+    subprocess.check_call("rm -rf build/ src/deltachat/*.so" , shell=True)

    if len(sys.argv) <= 1 or sys.argv[1] != "onlybuild":
-        subprocess.check_call([sys.executable, "-m", "pip", "install", "-e", "."])
+        subprocess.check_call([
+            sys.executable, "-m", "pip", "install", "-e", "."
+        ])
--- a/python/mypy.ini
+++ b/python/mypy.ini
@@ -1,8 +1,5 @@
 [mypy]

-[mypy-py.*]
-ignore_missing_imports = True
-
 [mypy-deltachat.capi.*]
 ignore_missing_imports = True

@@ -20,7 +17,3 @@ ignore_missing_imports = True

 [mypy-_pytest.*]
 ignore_missing_imports = True
-
-[mypy-imap_tools.*]
-ignore_missing_imports = True
-
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -1,14 +1,8 @@
 [build-system]
-requires = ["setuptools>=45", "wheel", "setuptools_scm>=6.2", "cffi>=1.0.0", "pkgconfig"]
+requires = ["setuptools>=45", "wheel", "setuptools_scm>=6.2", "cffi>=1.0.0"]
 build-backend = "setuptools.build_meta"

 [tool.setuptools_scm]
 root = ".."
 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.isort]
-profile = "black"
--- a/python/setup.py
+++ b/python/setup.py
@@ -1,37 +1,33 @@
+import setuptools
 import os
 import re

-import setuptools
-

 def main():
    with open("README.rst") as f:
        long_description = f.read()
    setuptools.setup(
-        name="deltachat",
-        description="Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat",
+        name='deltachat',
+        description='Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat',
        long_description=long_description,
-        author="holger krekel, Floris Bruynooghe, Bjoern Petersen and contributors",
-        install_requires=["cffi>=1.0.0", "pluggy", "imap-tools", "requests"],
-        setup_requires=[
-            "setuptools_scm",  # required for compatibility with `python3 setup.py sdist`
-            "pkgconfig",
-        ],
-        packages=setuptools.find_packages("src"),
-        package_dir={"": "src"},
-        cffi_modules=["src/deltachat/_build.py:ffibuilder"],
-        entry_points={
-            "pytest11": [
-                "deltachat.testplugin = deltachat.testplugin",
+        author='holger krekel, Floris Bruynooghe, Bjoern Petersen and contributors',
+        install_requires=['cffi>=1.0.0', 'pluggy', 'imapclient', 'requests'],
+        setup_requires=['setuptools_scm'], # required for compatibility with `python3 setup.py sdist`
+        packages=setuptools.find_packages('src'),
+        package_dir={'': 'src'},
+        cffi_modules=['src/deltachat/_build.py:ffibuilder'],
+        entry_points = {
+            'pytest11': [
+                'deltachat.testplugin = deltachat.testplugin',
            ],
        },
        classifiers=[
-            "Development Status :: 4 - Beta",
-            "Intended Audience :: Developers",
-            "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
-            "Programming Language :: Python :: 3",
-            "Topic :: Communications :: Email",
-            "Topic :: Software Development :: Libraries",
+            'Development Status :: 4 - Beta',
+            'Intended Audience :: Developers',
+            'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
+            'Programming Language :: Python :: 3',
+            'Topic :: Communications :: Email',
+            'Topic :: Software Development :: Libraries',
        ],
    )

--- a/python/src/deltachat/init.py
+++ b/python/src/deltachat/init.py
@@ -1,15 +1,15 @@
 import sys

-from pkg_resources import DistributionNotFound, get_distribution
-
-from . import capi, const, events, hookspec  # noqa
-from .account import Account, get_core_info  # noqa
+from . import capi, const, hookspec # noqa
 from .capi import ffi  # noqa
-from .chat import Chat  # noqa
-from .contact import Contact  # noqa
-from .hookspec import account_hookimpl, global_hookimpl  # noqa
+from .account import Account  # noqa
 from .message import Message  # noqa
+from .contact import Contact  # noqa
+from .chat import Chat        # noqa
+from .hookspec import account_hookimpl, global_hookimpl  # noqa
+from . import events

+from pkg_resources import get_distribution, DistributionNotFound
 try:
    __version__ = get_distribution(__name__).version
 except DistributionNotFound:
@@ -26,7 +26,7 @@ def get_dc_event_name(integer, _DC_EVENTNAME_MAP={}):


 def register_global_plugin(plugin):
-    """Register a global plugin which implements one or more
+    """ Register a global plugin which implements one or more
    of the :class:`deltachat.hookspec.Global` hooks.
    """
    gm = hookspec.Global._get_plugin_manager()
@@ -43,10 +43,9 @@ register_global_plugin(events)


 def run_cmdline(argv=None, account_plugins=None):
-    """Run a simple default command line app, registering the specified
-    account plugins."""
+    """ Run a simple default command line app, registering the specified
+    account plugins. """
    import argparse
-
    if argv is None:
        argv = sys.argv

@@ -70,9 +69,9 @@ def run_cmdline(argv=None, account_plugins=None):
        ac.add_account_plugin(plugin)

    if not ac.is_configured():
-        assert (
-            args.email and args.password
-        ), "you must specify --email and --password once to configure this database/account"
+        assert args.email and args.password, (
+            "you must specify --email and --password once to configure this database/account"
+        )
        ac.set_config("addr", args.email)
        ac.set_config("mail_pw", args.password)
        ac.set_config("mvbox_move", "0")
--- a/python/src/deltachat/_build.py
+++ b/python/src/deltachat/_build.py
@@ -8,9 +8,9 @@ import shutil
 import subprocess
 import tempfile
 import textwrap
+import types

 import cffi
-import pkgconfig  # type: ignore


 def local_build_flags(projdir, target):
@@ -19,34 +19,36 @@ def local_build_flags(projdir, target):
    :param projdir: The root directory of the deltachat-core-rust project.
    :param target: The rust build target, `debug` or `release`.
    """
-    flags = {}
-    if platform.system() == "Darwin":
-        flags["libraries"] = ["resolv", "dl"]
-        flags["extra_link_args"] = [
-            "-framework",
-            "CoreFoundation",
-            "-framework",
-            "CoreServices",
-            "-framework",
-            "Security",
+    flags = types.SimpleNamespace()
+    if platform.system() == 'Darwin':
+        flags.libs = ['resolv', 'dl']
+        flags.extra_link_args = [
+                '-framework', 'CoreFoundation',
+                '-framework', 'CoreServices',
+                '-framework', 'Security',
        ]
-    elif platform.system() == "Linux":
-        flags["libraries"] = ["rt", "dl", "m"]
-        flags["extra_link_args"] = []
+    elif platform.system() == 'Linux':
+        flags.libs = ['rt', 'dl', 'm']
+        flags.extra_link_args = []
    else:
        raise NotImplementedError("Compilation not supported yet on Windows, can you help?")
    target_dir = os.environ.get("CARGO_TARGET_DIR")
    if target_dir is None:
-        target_dir = os.path.join(projdir, "target")
-    flags["extra_objects"] = [os.path.join(target_dir, target, "libdeltachat.a")]
-    assert os.path.exists(flags["extra_objects"][0]), flags["extra_objects"]
-    flags["include_dirs"] = [os.path.join(projdir, "deltachat-ffi")]
+        target_dir = os.path.join(projdir, 'target')
+    flags.objs = [os.path.join(target_dir, target, 'libdeltachat.a')]
+    assert os.path.exists(flags.objs[0]), flags.objs
+    flags.incs = [os.path.join(projdir, 'deltachat-ffi')]
    return flags


 def system_build_flags():
    """Construct build flags for building against an installed libdeltachat."""
-    return pkgconfig.parse("deltachat")
+    flags = types.SimpleNamespace()
+    flags.libs = ['deltachat']
+    flags.objs = []
+    flags.incs = []
+    flags.extra_link_args = []
+    return flags


 def extract_functions(flags):
@@ -64,13 +66,11 @@ def extract_functions(flags):
        src_name = os.path.join(tmpdir, "include.h")
        dst_name = os.path.join(tmpdir, "expanded.h")
        with open(src_name, "w") as src_fp:
-            src_fp.write("#include <deltachat.h>")
-        cc.preprocess(
-            source=src_name,
-            output_file=dst_name,
-            include_dirs=flags["include_dirs"],
-            macros=[("PY_CFFI", "1")],
-        )
+            src_fp.write('#include <deltachat.h>')
+        cc.preprocess(source=src_name,
+                      output_file=dst_name,
+                      include_dirs=flags.incs,
+                      macros=[('PY_CFFI', '1')])
        with open(dst_name, "r") as dst_fp:
            return dst_fp.read()
    finally:
@@ -92,9 +92,7 @@ def find_header(flags):
        obj_name = os.path.join(tmpdir, "where.o")
        dst_name = os.path.join(tmpdir, "where")
        with open(src_name, "w") as src_fp:
-            src_fp.write(
-                textwrap.dedent(
-                    """
+            src_fp.write(textwrap.dedent("""
                #include <stdio.h>
                #include <deltachat.h>

@@ -102,20 +100,18 @@ def find_header(flags):
                    printf("%s", _dc_header_file_location());
                    return 0;
                }
-            """
-                )
-            )
+            """))
        cwd = os.getcwd()
        try:
            os.chdir(tmpdir)
-            cc.compile(
-                sources=["where.c"],
-                include_dirs=flags["include_dirs"],
-                macros=[("PY_CFFI_INC", "1")],
-            )
+            cc.compile(sources=["where.c"],
+                       include_dirs=flags.incs,
+                       macros=[("PY_CFFI_INC", "1")])
        finally:
            os.chdir(cwd)
-        cc.link_executable(objects=[obj_name], output_progname="where", output_dir=tmpdir)
+        cc.link_executable(objects=[obj_name],
+                           output_progname="where",
+                           output_dir=tmpdir)
        return subprocess.check_output(dst_name)
    finally:
        shutil.rmtree(tmpdir)
@@ -132,8 +128,7 @@ def extract_defines(flags):
    cdef() method.
    """
    header = find_header(flags)
-    defines_re = re.compile(
-        r"""
+    defines_re = re.compile(r"""
        \#define\s+   # The start of a define.
        (             # Begin capturing group which captures the define name.
            (?:       # A nested group which is not captured, this allows us
@@ -161,28 +156,26 @@ def extract_defines(flags):
        )             # Close the capturing group, this contains
                      # the entire name e.g. DC_MSG_TEXT.
        \s+\S+        # Ensure there is whitespace followed by a value.
-    """,
-        re.VERBOSE,
-    )
+    """, re.VERBOSE)
    defines = []
    with open(header) as fp:
        for line in fp:
            match = defines_re.match(line)
            if match:
                defines.append(match.group(1))
-    return "\n".join("#define {} ...".format(d) for d in defines)
+    return '\n'.join('#define {} ...'.format(d) for d in defines)


 def ffibuilder():
-    projdir = os.environ.get("DCC_RS_DEV")
+    projdir = os.environ.get('DCC_RS_DEV')
    if projdir:
-        target = os.environ.get("DCC_RS_TARGET", "release")
+        target = os.environ.get('DCC_RS_TARGET', 'release')
        flags = local_build_flags(projdir, target)
    else:
        flags = system_build_flags()
    builder = cffi.FFI()
    builder.set_source(
-        "deltachat.capi",
+        'deltachat.capi',
        """
            #include <deltachat.h>
            int dc_event_has_string_data(int e)
@@ -190,15 +183,16 @@ def ffibuilder():
                return DC_EVENT_DATA2_IS_STRING(e);
            }
        """,
-        **flags,
+        include_dirs=flags.incs,
+        libraries=flags.libs,
+        extra_objects=flags.objs,
+        extra_link_args=flags.extra_link_args,
    )
-    builder.cdef(
-        """
+    builder.cdef("""
        typedef int... time_t;
        void free(void *ptr);
        extern int dc_event_has_string_data(int);
-    """
-    )
+    """)
    function_defs = extract_functions(flags)
    defines = extract_defines(flags)
    builder.cdef(function_defs)
@@ -206,9 +200,8 @@ def ffibuilder():
    return builder


-if __name__ == "__main__":
+if __name__ == '__main__':
    import os.path
-
-    pkgdir = os.path.join(os.path.dirname(__file__), "..")
+    pkgdir = os.path.join(os.path.dirname(__file__), '..')
    builder = ffibuilder()
    builder.compile(tmpdir=pkgdir, verbose=True)
--- a/python/src/deltachat/account.py
+++ b/python/src/deltachat/account.py
@@ -1,76 +1,40 @@
 """ 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
-
-from . import const, hookspec
+import os
+from array import array
+from . import const
 from .capi import ffi, lib
+from .cutil import as_dc_charpointer, from_dc_charpointer, from_optional_dc_charpointer, iter_array, DCLot
 from .chat import Chat
-from .contact import Contact
-from .cutil import (
-    DCLot,
-    as_dc_charpointer,
-    from_dc_charpointer,
-    from_optional_dc_charpointer,
-    iter_array,
-)
-from .events import EventThread
 from .message import Message
-from .tracker import ConfigureTracker, ImexTracker
+from .contact import Contact
+from .tracker import ImexTracker, ConfigureTracker
+from . import hookspec
+from .events import EventThread
+from typing import Union, Any, Dict, Optional, List, Generator


 class MissingCredentials(ValueError):
-    """Account is missing `addr` and `mail_pw` config values."""
-
-
-def get_core_info():
-    """get some system info."""
-    from tempfile import NamedTemporaryFile
-
-    with NamedTemporaryFile() as path:
-        path.close()
-        return get_dc_info_as_dict(
-            ffi.gc(
-                lib.dc_context_new(as_dc_charpointer(""), as_dc_charpointer(path.name), ffi.NULL),
-                lib.dc_context_unref,
-            )
-        )
-
-
-def get_dc_info_as_dict(dc_context):
-    lines = from_dc_charpointer(lib.dc_get_info(dc_context))
-    info_dict = {}
-    for line in lines.split("\n"):
-        if not line.strip():
-            continue
-        key, value = line.split("=", 1)
-        info_dict[key.lower()] = value
-    return info_dict
+    """ Account is missing `addr` and `mail_pw` config values. """


 class Account(object):
-    """Each account is tied to a sqlite database file which is fully managed
+    """ 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.
    """
-
    MissingCredentials = MissingCredentials

-    def __init__(self, db_path, os_name=None, logging=True, closed=False) -> None:
-        """initialize account object.
+    def __init__(self, db_path, os_name=None, logging=True) -> None:
+        """ initialize account object.

        :param db_path: a path to the account database. The database
                        will be created if it doesn't exist.
-        :param os_name: [Deprecated]
-        :param logging: enable logging for this account
-        :param closed: set to True to avoid automatically opening the account
-                       after creation.
+        :param os_name: this will be put to the X-Mailer header in outgoing messages
        """
        # initialize per-account plugin system
        self._pm = hookspec.PerAccount._make_plugin_manager()
@@ -83,7 +47,7 @@ class Account(object):
            db_path = db_path.encode("utf8")

        self._dc_context = ffi.gc(
-            lib.dc_context_new_closed(db_path) if closed else lib.dc_context_new(ffi.NULL, db_path, ffi.NULL),
+            lib.dc_context_new(as_dc_charpointer(os_name), db_path, ffi.NULL),
            lib.dc_context_unref,
        )
        if self._dc_context == ffi.NULL:
@@ -95,28 +59,14 @@ class Account(object):
        hook = hookspec.Global._get_plugin_manager().hook
        hook.dc_account_init(account=self)

-    def open(self, passphrase: Optional[str] = None) -> bool:
-        """Open the account's database with the given passphrase.
-        This can only be used on a closed account. If the account is new, this
-        operation sets the database passphrase. For existing databases the passphrase
-        should be the one used to encrypt the database the first time.
-
-        :returns: True if the database is opened with this passphrase, False if the
-                  passphrase is incorrect or an error occurred.
-        """
-        return bool(lib.dc_context_open(self._dc_context, as_dc_charpointer(passphrase)))
-
    def disable_logging(self) -> None:
-        """disable logging."""
+        """ disable logging. """
        self._logging = False

    def enable_logging(self) -> None:
-        """re-enable logging."""
+        """ re-enable logging. """
        self._logging = True

-    def __repr__(self):
-        return "<Account path={}>".format(self.db_path)
-
    # def __del__(self):
    #    self.shutdown()

@@ -126,11 +76,19 @@ class Account(object):

    def _check_config_key(self, name: str) -> None:
        if name not in self._configkeys:
-            raise KeyError("{!r} not a valid config key, existing keys: {!r}".format(name, self._configkeys))
+            raise KeyError("{!r} not a valid config key, existing keys: {!r}".format(
+                           name, self._configkeys))

    def get_info(self) -> Dict[str, str]:
-        """return dictionary of built config parameters."""
-        return get_dc_info_as_dict(self._dc_context)
+        """ return dictionary of built config parameters. """
+        lines = from_dc_charpointer(lib.dc_get_info(self._dc_context))
+        d = {}
+        for line in lines.split("\n"):
+            if not line.strip():
+                continue
+            key, value = line.split("=", 1)
+            d[key.lower()] = value
+        return d

    def dump_account_info(self, logfile):
        def log(*args, **kwargs):
@@ -149,7 +107,7 @@ class Account(object):
        log("")

    def set_stock_translation(self, id: int, string: str) -> None:
-        """set stock translation string.
+        """ set stock translation string.

        :param id: id of stock string (const.DC_STR_*)
        :param value: string to set as new transalation
@@ -161,7 +119,7 @@ class Account(object):
            raise ValueError("could not set translation string")

    def set_config(self, name: str, value: Optional[str]) -> None:
-        """set configuration values.
+        """ set configuration values.

        :param name: config key name (unicode)
        :param value: value to set (unicode)
@@ -171,8 +129,6 @@ class Account(object):
        namebytes = name.encode("utf8")
        if namebytes == b"addr" and self.is_configured():
            raise ValueError("can not change 'addr' after account is configured.")
-        if isinstance(value, (int, bool)):
-            value = str(int(value))
        if value is not None:
            valuebytes = value.encode("utf8")
        else:
@@ -180,7 +136,7 @@ class Account(object):
        lib.dc_set_config(self._dc_context, namebytes, valuebytes)

    def get_config(self, name: str) -> str:
-        """return unicode string value.
+        """ return unicode string value.

        :param name: configuration key to lookup (eg "addr" or "mail_pw")
        :returns: unicode value
@@ -198,38 +154,30 @@ class Account(object):

        In other words, you don't need this.
        """
-        res = lib.dc_preconfigure_keypair(
-            self._dc_context,
-            as_dc_charpointer(addr),
-            as_dc_charpointer(public),
-            as_dc_charpointer(secret),
-        )
+        res = lib.dc_preconfigure_keypair(self._dc_context,
+                                          as_dc_charpointer(addr),
+                                          as_dc_charpointer(public),
+                                          as_dc_charpointer(secret))
        if res == 0:
            raise Exception("Failed to set key")

    def update_config(self, kwargs: Dict[str, Any]) -> None:
-        """update config values.
+        """ update config values.

        :param kwargs: name=value config settings for this account.
                       values need to be unicode.
        :returns: None
        """
        for key, value in kwargs.items():
-            self.set_config(key, value)
+            self.set_config(key, str(value))

    def is_configured(self) -> bool:
-        """determine if the account is configured already; an initial connection
+        """ determine if the account is configured already; an initial connection
        to SMTP/IMAP has been verified.

        :returns: True if account is configured.
        """
-        return bool(lib.dc_is_configured(self._dc_context))
-
-    def is_open(self) -> bool:
-        """Determine if account is open
-
-        :returns True if account is open."""
-        return bool(lib.dc_context_is_open(self._dc_context))
+        return True if lib.dc_is_configured(self._dc_context) else False

    def set_avatar(self, img_path: Optional[str]) -> None:
        """Set self avatar.
@@ -244,17 +192,18 @@ class Account(object):
            self.set_config("selfavatar", img_path)

    def check_is_configured(self) -> None:
-        """Raise ValueError if this account is not configured."""
+        """ Raise ValueError if this account is not configured. """
        if not self.is_configured():
            raise ValueError("need to configure first")

    def get_latest_backupfile(self, backupdir) -> Optional[str]:
-        """return the latest backup file in a given directory."""
+        """ return the latest backup file in a given directory.
+        """
        res = lib.dc_imex_has_backup(self._dc_context, as_dc_charpointer(backupdir))
        return from_optional_dc_charpointer(res)

    def get_blobdir(self) -> str:
-        """return the directory for files.
+        """ return the directory for files.

        All sent files are copied to this directory if necessary.
        Place files there directly to avoid copying.
@@ -262,7 +211,7 @@ class Account(object):
        return from_dc_charpointer(lib.dc_get_blobdir(self._dc_context))

    def get_self_contact(self) -> Contact:
-        """return this account's identity as a :class:`deltachat.contact.Contact`.
+        """ return this account's identity as a :class:`deltachat.contact.Contact`.

        :returns: :class:`deltachat.contact.Contact`
        """
@@ -304,14 +253,14 @@ class Account(object):
        elif isinstance(obj, str):
            displayname, addr = parseaddr(obj)
        else:
-            raise TypeError("don't know how to create chat for %r" % (obj,))
+            raise TypeError("don't know how to create chat for %r" % (obj, ))

        if name is None and displayname:
            name = displayname
        return (name, addr)

    def delete_contact(self, contact: Contact) -> bool:
-        """delete a Contact.
+        """ delete a Contact.

        :param contact: contact object obtained
        :returns: True if deletion succeeded (contact was deleted)
@@ -322,7 +271,7 @@ class Account(object):
        return bool(lib.dc_delete_contact(self._dc_context, contact_id))

    def get_contact_by_addr(self, email: str) -> Optional[Contact]:
-        """get a contact for the email address or None if it's blocked or doesn't exist."""
+        """ get a contact for the email address or None if it's blocked or doesn't exist. """
        _, addr = parseaddr(email)
        addr = as_dc_charpointer(addr)
        contact_id = lib.dc_lookup_contact_id_by_addr(self._dc_context, addr)
@@ -331,18 +280,21 @@ class Account(object):
        return None

    def get_contact_by_id(self, contact_id: int) -> Contact:
-        """return Contact instance or raise an exception.
+        """ return Contact instance or raise an exception.
        :param contact_id: integer id of this contact.
        :returns: :class:`deltachat.contact.Contact` instance.
        """
        return Contact(self, contact_id)

    def get_blocked_contacts(self) -> List[Contact]:
-        """return a list of all blocked contacts.
+        """ return a list of all blocked contacts.

        :returns: list of :class:`deltachat.contact.Contact` objects.
        """
-        dc_array = ffi.gc(lib.dc_get_blocked_contacts(self._dc_context), lib.dc_array_unref)
+        dc_array = ffi.gc(
+            lib.dc_get_blocked_contacts(self._dc_context),
+            lib.dc_array_unref
+        )
        return list(iter_array(dc_array, lambda x: Contact(self, x)))

    def get_contacts(
@@ -365,16 +317,22 @@ class Account(object):
            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), 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]:
-        """yield all fresh messages from all chats."""
-        dc_array = ffi.gc(lib.dc_get_fresh_msgs(self._dc_context), lib.dc_array_unref)
+        """ yield all fresh messages from all chats. """
+        dc_array = ffi.gc(
+            lib.dc_get_fresh_msgs(self._dc_context),
+            lib.dc_array_unref
+        )
        yield from iter_array(dc_array, lambda x: Message.from_db(self, x))

    def create_chat(self, obj) -> Chat:
-        """Create a 1:1 chat with Account, Contact or e-mail address."""
+        """ Create a 1:1 chat with Account, Contact or e-mail address. """
        return self.create_contact(obj).create_chat()

    def create_group_chat(
@@ -400,11 +358,14 @@ class Account(object):
        return chat

    def get_chats(self) -> List[Chat]:
-        """return list of chats.
+        """ return list of chats.

        :returns: a list of :class:`deltachat.chat.Chat` objects.
        """
-        dc_chatlist = ffi.gc(lib.dc_get_chatlist(self._dc_context, 0, ffi.NULL, 0), lib.dc_chatlist_unref)
+        dc_chatlist = ffi.gc(
+            lib.dc_get_chatlist(self._dc_context, 0, ffi.NULL, 0),
+            lib.dc_chatlist_unref
+        )

        assert dc_chatlist != ffi.NULL
        chatlist = []
@@ -417,14 +378,14 @@ class Account(object):
        return Contact(self, const.DC_CONTACT_ID_DEVICE).create_chat()

    def get_message_by_id(self, msg_id: int) -> Message:
-        """return Message instance.
+        """ return Message instance.
        :param msg_id: integer id of this message.
        :returns: :class:`deltachat.message.Message` instance.
        """
        return Message.from_db(self, msg_id)

    def get_chat_by_id(self, chat_id: int) -> Chat:
-        """return Chat instance.
+        """ return Chat instance.
        :param chat_id: integer id of this chat.
        :returns: :class:`deltachat.chat.Chat` instance.
        :raises: ValueError if chat does not exist.
@@ -436,7 +397,7 @@ class Account(object):
        return Chat(self, chat_id)

    def mark_seen_messages(self, messages: List[Union[int, Message]]) -> None:
-        """mark the given set of messages as seen.
+        """ mark the given set of messages as seen.

        :param messages: a list of message ids or Message instances.
        """
@@ -450,7 +411,7 @@ class Account(object):
        lib.dc_markseen_msgs(self._dc_context, msg_ids, len(messages))

    def forward_messages(self, messages: List[Message], chat: Chat) -> None:
-        """Forward list of messages to a chat.
+        """ Forward list of messages to a chat.

        :param messages: list of :class:`deltachat.message.Message` object.
        :param chat: :class:`deltachat.chat.Chat` object.
@@ -460,7 +421,7 @@ class Account(object):
        lib.dc_forward_msgs(self._dc_context, msg_ids, len(msg_ids), chat.id)

    def delete_messages(self, messages: List[Message]) -> None:
-        """delete messages (local and remote).
+        """ delete messages (local and remote).

        :param messages: list of :class:`deltachat.message.Message` object.
        :returns: None
@@ -469,34 +430,31 @@ class Account(object):
        lib.dc_delete_msgs(self._dc_context, msg_ids, len(msg_ids))

    def export_self_keys(self, path):
-        """export public and private keys to the specified directory.
+        """ export public and private keys to the specified directory.

        Note that the account does not have to be started.
        """
        return self._export(path, imex_cmd=const.DC_IMEX_EXPORT_SELF_KEYS)

-    def export_all(self, path: str, passphrase: Optional[str] = None) -> str:
-        """Export a backup of all database state (chats, contacts, keys, media, ...).
-
-        :param path: the directory where the backup will be stored.
-        :param passphrase: the backup will be encrypted with the passphrase, if it is
-                           None or empty string, the backup is not encrypted.
-        :returns: path to the created backup.
+    def export_all(self, path):
+        """return new file containing a backup of all database state
+        (chats, contacts, keys, media, ...). The file is created in the
+        the `path` directory.

        Note that the account has to be stopped; call stop_io() if necessary.
        """
-        export_files = self._export(path, const.DC_IMEX_EXPORT_BACKUP, passphrase)
+        export_files = self._export(path, const.DC_IMEX_EXPORT_BACKUP)
        if len(export_files) != 1:
            raise RuntimeError("found more than one new file")
        return export_files[0]

-    def _export(self, path: str, imex_cmd: int, passphrase: Optional[str] = None) -> list:
+    def _export(self, path, imex_cmd):
        with self.temp_plugin(ImexTracker()) as imex_tracker:
-            self.imex(path, imex_cmd, passphrase)
+            self.imex(path, imex_cmd)
            return imex_tracker.wait_finish()

    def import_self_keys(self, path):
-        """Import private keys found in the `path` directory.
+        """ Import private keys found in the `path` directory.
        The last imported key is made the default keys unless its name
        contains the string legacy. Public keys are not imported.

@@ -504,23 +462,21 @@ class Account(object):
        """
        self._import(path, imex_cmd=const.DC_IMEX_IMPORT_SELF_KEYS)

-    def import_all(self, path: str, passphrase: Optional[str] = None) -> None:
-        """Import Delta Chat state from the specified backup file.
-        The account must be in unconfigured state for import to attempted.
+    def import_all(self, path):
+        """import delta chat state from the specified backup `path` (a file).

-        :param path: path to the backup file.
-        :param passphrase: if not None or empty, the backup will be opened with the passphrase.
+        The account must be in unconfigured state for import to attempted.
        """
        assert not self.is_configured(), "cannot import into configured account"
-        self._import(path, imex_cmd=const.DC_IMEX_IMPORT_BACKUP, passphrase=passphrase)
+        self._import(path, imex_cmd=const.DC_IMEX_IMPORT_BACKUP)

-    def _import(self, path: str, imex_cmd: int, passphrase: Optional[str] = None) -> None:
+    def _import(self, path, imex_cmd):
        with self.temp_plugin(ImexTracker()) as imex_tracker:
-            self.imex(path, imex_cmd, passphrase)
+            self.imex(path, imex_cmd)
            imex_tracker.wait_finish()

-    def imex(self, path: str, imex_cmd: int, passphrase: Optional[str] = None) -> None:
-        lib.dc_imex(self._dc_context, imex_cmd, as_dc_charpointer(path), as_dc_charpointer(passphrase))
+    def imex(self, path, imex_cmd):
+        lib.dc_imex(self._dc_context, imex_cmd, as_dc_charpointer(path), ffi.NULL)

    def initiate_key_transfer(self) -> str:
        """return setup code after a Autocrypt setup message
@@ -534,7 +490,7 @@ class Account(object):
        return from_dc_charpointer(res)

    def get_setup_contact_qr(self) -> str:
-        """get/create Setup-Contact QR Code as ascii-string.
+        """ get/create Setup-Contact QR Code as ascii-string.

        this string needs to be transferred to another DC account
        in a second channel (typically used by mobiles with QRcode-show + scan UX)
@@ -544,15 +500,18 @@ class Account(object):
        return from_dc_charpointer(res)

    def check_qr(self, qr):
-        """check qr code and return :class:`ScannedQRCode` instance representing the result"""
-        res = ffi.gc(lib.dc_check_qr(self._dc_context, as_dc_charpointer(qr)), lib.dc_lot_unref)
+        """ check qr code and return :class:`ScannedQRCode` instance representing the result"""
+        res = ffi.gc(
+            lib.dc_check_qr(self._dc_context, as_dc_charpointer(qr)),
+            lib.dc_lot_unref
+        )
        lot = DCLot(res)
        if lot.state() == const.DC_QR_ERROR:
            raise ValueError("invalid or unknown QR code: {}".format(lot.text1()))
        return ScannedQRCode(lot)

    def qr_setup_contact(self, qr):
-        """setup contact and return a Chat after contact is established.
+        """ setup contact and return a Chat after contact is established.

        Note that this function may block for a long time as messages are exchanged
        with the emitter of the QR code.  On success a :class:`deltachat.chat.Chat` instance
@@ -566,7 +525,7 @@ class Account(object):
        return Chat(self, chat_id)

    def qr_join_chat(self, qr):
-        """join a chat group through a QR code.
+        """ join a chat group through a QR code.

        Note that this function may block for a long time as messages are exchanged
        with the emitter of the QR code.  On success a :class:`deltachat.chat.Chat` instance
@@ -580,7 +539,9 @@ class Account(object):
            raise ValueError("could not join group")
        return Chat(self, chat_id)

-    def set_location(self, latitude: float = 0.0, longitude: float = 0.0, accuracy: float = 0.0) -> None:
+    def set_location(
+        self, latitude: float = 0.0, longitude: float = 0.0, accuracy: float = 0.0
+    ) -> None:
        """set a new location. It effects all chats where we currently
        have enabled location streaming.

@@ -599,28 +560,26 @@ class Account(object):
    #

    def add_account_plugin(self, plugin, name=None):
-        """add an account plugin which implements one or more of
+        """ add an account plugin which implements one or more of
        the :class:`deltachat.hookspec.PerAccount` hooks.
        """
-        if name and self._pm.has_plugin(name=name):
-            self._pm.unregister(name=name)
        self._pm.register(plugin, name=name)
        self._pm.check_pending()
        return plugin

    def remove_account_plugin(self, plugin, name=None):
-        """remove an account plugin."""
+        """ remove an account plugin. """
        self._pm.unregister(plugin, name=name)

    @contextmanager
    def temp_plugin(self, plugin):
-        """run a with-block with the given plugin temporarily registered."""
+        """ run a with-block with the given plugin temporarily registered. """
        self._pm.register(plugin)
        yield plugin
        self._pm.unregister(plugin)

    def stop_ongoing(self):
-        """Stop ongoing securejoin, configuration or other core jobs."""
+        """ Stop ongoing securejoin, configuration or other core jobs. """
        lib.dc_stop_ongoing_process(self._dc_context)

    def get_connectivity(self):
@@ -633,7 +592,7 @@ class Account(object):
        return lib.dc_all_work_done(self._dc_context)

    def start_io(self):
-        """start this account's IO scheduling (Rust-core async scheduler)
+        """ start this account's IO scheduling (Rust-core async scheduler)

        If this account is not configured an Exception is raised.
        You need to call account.configure() and account.wait_configure_finish()
@@ -677,7 +636,7 @@ class Account(object):
        lib.dc_maybe_network(self._dc_context)

    def configure(self, reconfigure: bool = False) -> ConfigureTracker:
-        """Start configuration process and return a Configtracker instance
+        """ Start configuration process and return a Configtracker instance
        on which you can block with wait_finish() to get a True/False success
        value for the configuration process.
        """
@@ -690,11 +649,11 @@ class Account(object):
        return configtracker

    def wait_shutdown(self) -> None:
-        """wait until shutdown of this account has completed."""
+        """ wait until shutdown of this account has completed. """
        self._shutdown_event.wait()

    def stop_io(self) -> None:
-        """stop core IO scheduler if it is running."""
+        """ stop core IO scheduler if it is running. """
        self.log("stop_ongoing")
        self.stop_ongoing()

@@ -702,30 +661,33 @@ class Account(object):
        lib.dc_stop_io(self._dc_context)

    def shutdown(self) -> None:
-        """shutdown and destroy account (stop callback thread, close and remove
+        """ shutdown and destroy account (stop callback thread, close and remove
        underlying dc_context)."""
        if self._dc_context is None:
            return

-        # mark the event thread for shutdown (latest on next incoming event)
-        self._event_thread.mark_shutdown()
-
-        # stop_io also causes an info event which will wake up
-        # the EventThread's inner loop and let it notice the shutdown marker.
        self.stop_io()

+        self.log("remove dc_context references")
+
+        # if _dc_context is unref'ed the event thread should quickly
+        # receive the termination signal. However, some python code might
+        # still hold a reference and so we use a secondary signal
+        # to make sure the even thread terminates if it receives any new
+        # event, indepedently from waiting for the core to send NULL to
+        # get_next_event().
+        self._event_thread.mark_shutdown()
+        self._dc_context = None
+
        self.log("wait for event thread to finish")
        try:
-            self._event_thread.wait(timeout=5)
+            self._event_thread.wait(timeout=2)
        except RuntimeError as e:
            self.log("Waiting for event thread failed: {}".format(e))

        if self._event_thread.is_alive():
            self.log("WARN: event thread did not terminate yet, ignoring.")

-        self.log("remove dc_context references, making the Account unusable")
-        self._dc_context = None
-
        self._shutdown_event.set()

        hook = hookspec.Global._get_plugin_manager().hook
--- a/python/src/deltachat/chat.py
+++ b/python/src/deltachat/chat.py
@@ -1,40 +1,32 @@
 """ Chat and Location related API. """

+import mimetypes
 import calendar
 import json
-import mimetypes
-import os
 from datetime import datetime, timezone
-from typing import Optional
-
+import os
+from .cutil import as_dc_charpointer, from_dc_charpointer, iter_array
+from .capi import lib, ffi
 from . import const
-from .capi import ffi, lib
-from .cutil import (
-    as_dc_charpointer,
-    from_dc_charpointer,
-    from_optional_dc_charpointer,
-    iter_array,
-)
 from .message import Message
+from typing import Optional


 class Chat(object):
-    """Chat object which manages members and through which you can send and retrieve messages.
+    """ 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) -> None:
        from .account import Account
-
        assert isinstance(account, Account), repr(account)
        self.account = account
        self.id = id

    def __eq__(self, other) -> bool:
-        if other is None:
-            return False
-        return self.id == getattr(other, "id", None) and self.account._dc_context == other.account._dc_context
+        return self.id == getattr(other, "id", None) and \
+               self.account._dc_context == other.account._dc_context

    def __ne__(self, other) -> bool:
        return not (self == other)
@@ -44,7 +36,10 @@ class Chat(object):

    @property
    def _dc_chat(self):
-        return ffi.gc(lib.dc_get_chat(self.account._dc_context, self.id), lib.dc_chat_unref)
+        return ffi.gc(
+            lib.dc_get_chat(self.account._dc_context, self.id),
+            lib.dc_chat_unref
+        )

    def delete(self) -> None:
        """Delete this chat and all its messages.
@@ -67,66 +62,28 @@ class Chat(object):
    # ------  chat status/metadata API ------------------------------

    def is_group(self) -> bool:
-        """Return True if this chat is a group chat.
+        """ return true if this chat is a group chat.

-        :returns: True if chat is a group-chat, False otherwise
+        :returns: True if chat is a group-chat, false if it's a contact 1:1 chat.
        """
        return lib.dc_chat_get_type(self._dc_chat) == const.DC_CHAT_TYPE_GROUP

-    def is_single(self) -> bool:
-        """Return True if this chat is a single/direct chat, False otherwise"""
-        return lib.dc_chat_get_type(self._dc_chat) == const.DC_CHAT_TYPE_SINGLE
-
-    def is_mailinglist(self) -> bool:
-        """Return True if this chat is a mailing list, False otherwise"""
-        return lib.dc_chat_get_type(self._dc_chat) == const.DC_CHAT_TYPE_MAILINGLIST
-
-    def is_broadcast(self) -> bool:
-        """Return True if this chat is a broadcast list, False otherwise"""
-        return lib.dc_chat_get_type(self._dc_chat) == const.DC_CHAT_TYPE_BROADCAST
-
-    def is_multiuser(self) -> bool:
-        """Return True if this chat is a multi-user chat (group, mailing list or broadcast), False otherwise"""
-        return lib.dc_chat_get_type(self._dc_chat) in (
-            const.DC_CHAT_TYPE_GROUP,
-            const.DC_CHAT_TYPE_MAILINGLIST,
-            const.DC_CHAT_TYPE_BROADCAST,
-        )
-
-    def is_self_talk(self) -> bool:
-        """Return True if this chat is the self-chat (a.k.a. "Saved Messages"), False otherwise"""
-        return bool(lib.dc_chat_is_self_talk(self._dc_chat))
-
-    def is_device_talk(self) -> bool:
-        """Returns True if this chat is the "Device Messages" chat, False otherwise"""
-        return bool(lib.dc_chat_is_device_talk(self._dc_chat))
-
    def is_muted(self) -> bool:
-        """return true if this chat is muted.
+        """ return true if this chat is muted.

        :returns: True if chat is muted, False otherwise.
        """
-        return bool(lib.dc_chat_is_muted(self._dc_chat))
+        return lib.dc_chat_is_muted(self._dc_chat)

-    def is_pinned(self) -> bool:
-        """Return True if this chat is pinned, False otherwise"""
-        return lib.dc_chat_get_visibility(self._dc_chat) == const.DC_CHAT_VISIBILITY_PINNED
-
-    def is_archived(self) -> bool:
-        """Return True if this chat is archived, False otherwise.
-        :returns: True if archived, False otherwise
-        """
-        return lib.dc_chat_get_visibility(self._dc_chat) == const.DC_CHAT_VISIBILITY_ARCHIVED
-
-    def is_contact_request(self) -> bool:
-        """return True if this chat is a contact request chat.
+    def is_contact_request(self):
+        """ return True if this chat is a contact request chat.

        :returns: True if chat is a contact request chat, False otherwise.
        """
-        return bool(lib.dc_chat_is_contact_request(self._dc_chat))
+        return lib.dc_chat_is_contact_request(self._dc_chat)

-    def is_promoted(self) -> bool:
-        """return True if this chat is promoted, i.e.
+    def is_promoted(self):
+        """ return True if this chat is promoted, i.e.
        the member contacts are aware of their membership,
        have been sent messages.

@@ -140,24 +97,24 @@ class Chat(object):

        :returns: True if the chat is writable, False otherwise
        """
-        return bool(lib.dc_chat_can_send(self._dc_chat))
+        return lib.dc_chat_can_send(self._dc_chat)

    def is_protected(self) -> bool:
-        """return True if this chat is a protected chat.
+        """ return True if this chat is a protected chat.

        :returns: True if chat is protected, False otherwise.
        """
-        return bool(lib.dc_chat_is_protected(self._dc_chat))
+        return lib.dc_chat_is_protected(self._dc_chat)

    def get_name(self) -> Optional[str]:
-        """return name of this chat.
+        """ return name of this chat.

        :returns: unicode name
        """
        return from_dc_charpointer(lib.dc_chat_get_name(self._dc_chat))

    def set_name(self, name: str) -> bool:
-        """set name of this chat.
+        """ set name of this chat.

        :param name: as a unicode string.
        :returns: True on success, False otherwise
@@ -165,20 +122,8 @@ class Chat(object):
        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.
-        :returns: color as 0x00rrggbb
-        """
-        return lib.dc_chat_get_color(self._dc_chat)
-
-    def get_summary(self):
-        """return dictionary with summary information."""
-        dc_res = lib.dc_chat_get_info_json(self.account._dc_context, self.id)
-        s = from_dc_charpointer(dc_res)
-        return json.loads(s)
-
    def mute(self, duration: Optional[int] = None) -> None:
-        """mutes the chat
+        """ mutes the chat

        :param duration: Number of seconds to mute the chat for. None to mute until unmuted again.
        :returns: None
@@ -192,7 +137,7 @@ class Chat(object):
            raise ValueError("Call to dc_set_chat_mute_duration failed")

    def unmute(self) -> None:
-        """unmutes the chat
+        """ unmutes the chat

        :returns: None
        """
@@ -200,26 +145,8 @@ class Chat(object):
        if not bool(ret):
            raise ValueError("Failed to unmute chat")

-    def pin(self) -> None:
-        """Pin the chat."""
-        lib.dc_set_chat_visibility(self.account._dc_context, self.id, const.DC_CHAT_VISIBILITY_PINNED)
-
-    def unpin(self) -> None:
-        """Unpin the chat."""
-        if self.is_pinned():
-            lib.dc_set_chat_visibility(self.account._dc_context, self.id, const.DC_CHAT_VISIBILITY_NORMAL)
-
-    def archive(self) -> None:
-        """Archive the chat."""
-        lib.dc_set_chat_visibility(self.account._dc_context, self.id, const.DC_CHAT_VISIBILITY_ARCHIVED)
-
-    def unarchive(self) -> None:
-        """Unarchive the chat."""
-        if self.is_archived():
-            lib.dc_set_chat_visibility(self.account._dc_context, self.id, const.DC_CHAT_VISIBILITY_NORMAL)
-
    def get_mute_duration(self) -> int:
-        """Returns the number of seconds until the mute of this chat is lifted.
+        """ Returns the number of seconds until the mute of this chat is lifted.

        :param duration:
        :returns: Returns the number of seconds the chat is still muted for. (0 for not muted, -1 forever muted)
@@ -227,14 +154,14 @@ class Chat(object):
        return lib.dc_chat_get_remaining_mute_duration(self._dc_chat)

    def get_ephemeral_timer(self) -> int:
-        """get ephemeral timer.
+        """ get ephemeral timer.

        :returns: ephemeral timer value in seconds
        """
        return lib.dc_get_chat_ephemeral_timer(self.account._dc_context, self.id)

    def set_ephemeral_timer(self, timer: int) -> bool:
-        """set ephemeral timer.
+        """ set ephemeral timer.

        :param: timer value in seconds

@@ -243,7 +170,7 @@ class Chat(object):
        return bool(lib.dc_set_chat_ephemeral_timer(self.account._dc_context, self.id, timer))

    def get_type(self) -> int:
-        """(deprecated) return type of this chat.
+        """ (deprecated) return type of this chat.

        :returns: one of const.DC_CHAT_TYPE_*
        """
@@ -257,7 +184,7 @@ class Chat(object):
        return from_dc_charpointer(res)

    def get_join_qr(self) -> Optional[str]:
-        """get/create Join-Group QR Code as ascii-string.
+        """ get/create Join-Group QR Code as ascii-string.

        this string needs to be transferred to another DC account
        in a second channel (typically used by mobiles with QRcode-show + scan UX)
@@ -293,7 +220,7 @@ class Chat(object):
        return msg

    def send_text(self, text):
-        """send a text message and return the resulting Message instance.
+        """ send a text message and return the resulting Message instance.

        :param msg: unicode text
        :raises ValueError: if message can not be send/chat does not exist.
@@ -306,7 +233,7 @@ class Chat(object):
        return Message.from_db(self.account, msg_id)

    def send_file(self, path, mime_type="application/octet-stream"):
-        """send a file and return the resulting Message instance.
+        """ send a file and return the resulting Message instance.

        :param path: path to the file.
        :param mime_type: the mime-type of this file, defaults to application/octet-stream.
@@ -321,7 +248,7 @@ class Chat(object):
        return Message.from_db(self.account, sent_id)

    def send_image(self, path):
-        """send an image message and return the resulting Message instance.
+        """ send an image message and return the resulting Message instance.

        :param path: path to an image file.
        :raises ValueError: if message can not be send/chat does not exist.
@@ -336,7 +263,7 @@ class Chat(object):
        return Message.from_db(self.account, sent_id)

    def prepare_message(self, msg):
-        """prepare a message for sending.
+        """ prepare a message for sending.

        :param msg: the message to be prepared.
        :returns: a :class:`deltachat.message.Message` instance.
@@ -351,7 +278,7 @@ class Chat(object):
        return msg

    def prepare_message_file(self, path, mime_type=None, view_type="file"):
-        """prepare a message for sending and return the resulting Message instance.
+        """ prepare a message for sending and return the resulting Message instance.

        To actually send the message, call :meth:`send_prepared`.
        The file must be inside the blob directory.
@@ -367,7 +294,7 @@ class Chat(object):
        return self.prepare_message(msg)

    def send_prepared(self, message):
-        """send a previously prepared message.
+        """ send a previously prepared message.

        :param message: a :class:`Message` instance previously returned by
                        :meth:`prepare_file`.
@@ -387,7 +314,7 @@ class Chat(object):
        msg._dc_msg = Message.from_db(self.account, sent_id)._dc_msg

    def set_draft(self, message):
-        """set message as draft.
+        """ set message as draft.

        :param message: a :class:`Message` instance
        :returns: None
@@ -398,7 +325,7 @@ class Chat(object):
            lib.dc_set_draft(self.account._dc_context, self.id, message._dc_msg)

    def get_draft(self):
-        """get draft message for this chat.
+        """ get draft message for this chat.

        :param message: a :class:`Message` instance
        :returns: Message object or None (if no draft available)
@@ -410,34 +337,40 @@ class Chat(object):
        return Message(self.account, dc_msg)

    def get_messages(self):
-        """return list of messages in this chat.
+        """ return list of messages in this chat.

        :returns: list of :class:`deltachat.message.Message` objects for this chat.
        """
        dc_array = ffi.gc(
            lib.dc_get_chat_msgs(self.account._dc_context, self.id, 0, 0),
-            lib.dc_array_unref,
+            lib.dc_array_unref
        )
        return list(iter_array(dc_array, lambda x: Message.from_db(self.account, x)))

    def count_fresh_messages(self):
-        """return number of fresh messages in this chat.
+        """ return number of fresh messages in this chat.

        :returns: number of fresh messages
        """
        return lib.dc_get_fresh_msg_cnt(self.account._dc_context, self.id)

    def mark_noticed(self):
-        """mark all messages in this chat as noticed.
+        """ mark all messages in this chat as noticed.

        Noticed messages are no longer fresh.
        """
        return lib.dc_marknoticed_chat(self.account._dc_context, self.id)

+    def get_summary(self):
+        """ return dictionary with summary information. """
+        dc_res = lib.dc_chat_get_info_json(self.account._dc_context, self.id)
+        s = from_dc_charpointer(dc_res)
+        return json.loads(s)
+
    # ------  group management API ------------------------------

    def add_contact(self, obj):
-        """add a contact to this chat.
+        """ add a contact to this chat.

        :params obj: Contact, Account or e-mail address.
        :raises ValueError: if contact could not be added
@@ -450,7 +383,7 @@ class Chat(object):
        return contact

    def remove_contact(self, obj):
-        """remove a contact from this chat.
+        """ remove a contact from this chat.

        :params obj: Contact, Account or e-mail address.
        :raises ValueError: if contact could not be removed
@@ -462,22 +395,23 @@ class Chat(object):
            raise ValueError("could not remove contact {!r} from chat".format(contact))

    def get_contacts(self):
-        """get all contacts for this chat.
+        """ get all contacts for this chat.
        :returns: list of :class:`deltachat.contact.Contact` objects for this chat
        """
        from .contact import Contact
-
        dc_array = ffi.gc(
            lib.dc_get_chat_contacts(self.account._dc_context, self.id),
-            lib.dc_array_unref,
+            lib.dc_array_unref
+        )
+        return list(iter_array(
+            dc_array, lambda id: Contact(self.account, id))
        )
-        return list(iter_array(dc_array, lambda id: Contact(self.account, id)))

    def num_contacts(self):
-        """return number of contacts in this chat."""
+        """ return number of contacts in this chat. """
        dc_array = ffi.gc(
            lib.dc_get_chat_contacts(self.account._dc_context, self.id),
-            lib.dc_array_unref,
+            lib.dc_array_unref
        )
        return lib.dc_array_get_cnt(dc_array)

@@ -524,6 +458,12 @@ class Chat(object):
            return None
        return from_dc_charpointer(dc_res)

+    def get_color(self):
+        """return the color of the chat.
+        :returns: color as 0x00rrggbb
+        """
+        return lib.dc_chat_get_color(self._dc_chat)
+
    # ------  location streaming API ------------------------------

    def is_sending_locations(self):
@@ -532,6 +472,12 @@ class Chat(object):
        """
        return lib.dc_is_sending_locations_to_chat(self.account._dc_context, self.id)

+    def is_archived(self):
+        """return True if this chat is archived.
+        :returns: True if archived.
+        """
+        return lib.dc_chat_get_visibility(self._dc_chat) == const.DC_CHAT_VISIBILITY_ARCHIVED
+
    def enable_sending_locations(self, seconds):
        """enable sending locations for this chat.

@@ -567,8 +513,11 @@ class Chat(object):
                latitude=lib.dc_array_get_latitude(dc_array, i),
                longitude=lib.dc_array_get_longitude(dc_array, i),
                accuracy=lib.dc_array_get_accuracy(dc_array, i),
-                timestamp=datetime.fromtimestamp(lib.dc_array_get_timestamp(dc_array, i), timezone.utc),
-                marker=from_optional_dc_charpointer(lib.dc_array_get_marker(dc_array, i)),
+                timestamp=datetime.fromtimestamp(
+                    lib.dc_array_get_timestamp(dc_array, i),
+                    timezone.utc
+                ),
+                marker=from_dc_charpointer(lib.dc_array_get_marker(dc_array, i)),
            )
            for i in range(lib.dc_array_get_cnt(dc_array))
        ]
--- a/python/src/deltachat/contact.py
+++ b/python/src/deltachat/contact.py
@@ -10,21 +10,17 @@ from .cutil import from_dc_charpointer, from_optional_dc_charpointer


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

    You obtain instances of it through :class:`deltachat.account.Account`.
    """
-
    def __init__(self, account, id):
        from .account import Account
-
        assert isinstance(account, Account), repr(account)
        self.account = account
        self.id = id

-    def __eq__(self, other) -> bool:
-        if other is None:
-            return False
+    def __eq__(self, other):
        return self.account._dc_context == other.account._dc_context and self.id == other.id

    def __ne__(self, other):
@@ -35,16 +31,19 @@ class Contact(object):

    @property
    def _dc_contact(self):
-        return ffi.gc(lib.dc_get_contact(self.account._dc_context, self.id), lib.dc_contact_unref)
+        return ffi.gc(
+            lib.dc_get_contact(self.account._dc_context, self.id),
+            lib.dc_contact_unref
+        )

    @props.with_doc
    def addr(self) -> str:
-        """normalized e-mail address for this account."""
+        """ normalized e-mail address for this account. """
        return from_dc_charpointer(lib.dc_contact_get_addr(self._dc_contact))

    @props.with_doc
    def name(self) -> str:
-        """display name for this contact."""
+        """ display name for this contact. """
        return from_dc_charpointer(lib.dc_contact_get_display_name(self._dc_contact))

    # deprecated alias
@@ -53,26 +52,28 @@ class Contact(object):
    @props.with_doc
    def last_seen(self) -> date:
        """Last seen timestamp."""
-        return datetime.fromtimestamp(lib.dc_contact_get_last_seen(self._dc_contact), timezone.utc)
+        return datetime.fromtimestamp(
+            lib.dc_contact_get_last_seen(self._dc_contact), timezone.utc
+        )

    def is_blocked(self):
-        """Return True if the contact is blocked."""
+        """ Return True if the contact is blocked. """
        return lib.dc_contact_is_blocked(self._dc_contact)

    def set_blocked(self, block=True):
-        """[Deprecated, use block/unblock methods] Block or unblock a contact."""
+        """ [Deprecated, use block/unblock methods] Block or unblock a contact. """
        return lib.dc_block_contact(self.account._dc_context, self.id, block)

    def block(self):
-        """Block this contact. Message will not be seen/retrieved from this contact."""
+        """ Block this contact. Message will not be seen/retrieved from this contact. """
        return lib.dc_block_contact(self.account._dc_context, self.id, True)

    def unblock(self):
-        """Unblock this contact. Messages from this contact will be retrieved (again)."""
+        """ Unblock this contact. Messages from this contact will be retrieved (again)."""
        return lib.dc_block_contact(self.account._dc_context, self.id, False)

    def is_verified(self):
-        """Return True if the contact is verified."""
+        """ Return True if the contact is verified. """
        return lib.dc_contact_is_verified(self._dc_contact)

    def get_profile_image(self) -> Optional[str]:
@@ -92,7 +93,7 @@ class Contact(object):
        return from_dc_charpointer(lib.dc_contact_get_status(self._dc_contact))

    def create_chat(self):
-        """create or get an existing 1:1 chat object for the specified contact or contact id.
+        """ create or get an existing 1:1 chat object for the specified contact or contact id.

        :param contact: chat_id (int) or contact object.
        :returns: a :class:`deltachat.chat.Chat` object.
--- a/python/src/deltachat/cutil.py
+++ b/python/src/deltachat/cutil.py
@@ -1,9 +1,9 @@
+from .capi import lib
+from .capi import ffi
 from datetime import datetime, timezone
-from typing import Callable, Generator, Optional, TypeVar
+from typing import Optional, TypeVar, Generator, Callable

-from .capi import ffi, lib
-
-T = TypeVar("T")
+T = TypeVar('T')


 def as_dc_charpointer(obj):
--- a/python/src/deltachat/direct_imap.py
+++ b/python/src/deltachat/direct_imap.py
@@ -3,30 +3,64 @@ Internal Python-level IMAP handling used by the testplugin
 and for cleaning up inbox/mvbox for each test function run.
 """

-import imaplib
 import io
-import pathlib
+import email
 import ssl
-from contextlib import contextmanager
-from typing import List
+import pathlib
+from imapclient import IMAPClient
+from imapclient.exceptions import IMAPClientError
+import imaplib
+import deltachat
+from deltachat import const, Account

-from imap_tools import (
-    AND,
-    Header,
-    MailBox,
-    MailBoxTls,
-    MailMessage,
-    MailMessageFlags,
-    errors,
-)

-from deltachat import Account, const
-
-FLAGS = b"FLAGS"
-FETCH = b"FETCH"
+SEEN = b'\\Seen'
+DELETED = b'\\Deleted'
+FLAGS = b'FLAGS'
+FETCH = b'FETCH'
 ALL = "1:*"


+@deltachat.global_hookimpl
+def dc_account_extra_configure(account):
+    """ Reset the account (we reuse accounts across tests)
+    and make 'account.direct_imap' available for direct IMAP ops.
+    """
+    try:
+
+        if not hasattr(account, "direct_imap"):
+            imap = DirectImap(account)
+
+            for folder in imap.list_folders():
+                if folder.lower() == "inbox" or folder.lower() == "deltachat":
+                    assert imap.select_folder(folder)
+                    imap.delete(ALL, expunge=True)
+                else:
+                    imap.conn.delete_folder(folder)
+                    # We just deleted the folder, so we have to make DC forget about it, too
+                    if account.get_config("configured_sentbox_folder") == folder:
+                        account.set_config("configured_sentbox_folder", None)
+                    if account.get_config("configured_spam_folder") == folder:
+                        account.set_config("configured_spam_folder", None)
+
+            setattr(account, "direct_imap", imap)
+
+    except Exception as e:
+        # Uncaught exceptions here would lead to a timeout without any note written to the log
+        # start with DC_EVENT_WARNING so that the line is printed in yellow and won't be overlooked when reading
+        account.log("DC_EVENT_WARNING =================== DIRECT_IMAP CAN'T RESET ACCOUNT: ===================")
+        account.log("DC_EVENT_WARNING =================== " + str(e) + " ===================")
+
+
+@deltachat.global_hookimpl
+def dc_account_after_shutdown(account):
+    """ shutdown the imap connection if there is one. """
+    imap = getattr(account, "direct_imap", None)
+    if imap is not None:
+        imap.shutdown()
+        del account.direct_imap
+
+
 class DirectImap:
    def __init__(self, account: Account) -> None:
        self.account = account
@@ -54,68 +88,89 @@ class DirectImap:
            ssl_context.verify_mode = ssl.CERT_NONE

        if security == const.DC_SOCKET_STARTTLS:
-            self.conn = MailBoxTls(host, port, ssl_context=ssl_context)
-        elif security == const.DC_SOCKET_PLAIN or security == const.DC_SOCKET_SSL:
-            self.conn = MailBox(host, port, ssl_context=ssl_context)
+            self.conn = IMAPClient(host, port, ssl=False)
+            self.conn.starttls(ssl_context)
+        elif security == const.DC_SOCKET_PLAIN:
+            self.conn = IMAPClient(host, port, ssl=False)
+        elif security == const.DC_SOCKET_SSL:
+            self.conn = IMAPClient(host, port, ssl_context=ssl_context)
        self.conn.login(user, pw)

        self.select_folder("INBOX")

    def shutdown(self):
+        try:
+            self.conn.idle_done()
+        except (OSError, IMAPClientError):
+            pass
        try:
            self.conn.logout()
-        except (OSError, imaplib.IMAP4.abort):
+        except (OSError, IMAPClientError):
            print("Could not logout direct_imap conn")

    def create_folder(self, foldername):
        try:
-            self.conn.folder.create(foldername)
-        except errors.MailboxFolderCreateError as e:
+            self.conn.create_folder(foldername)
+        except imaplib.IMAP4.error as e:
            print("Can't create", foldername, "probably it already exists:", str(e))

-    def select_folder(self, foldername: str) -> tuple:
+    def select_folder(self, foldername):
        assert not self._idling
-        return self.conn.folder.set(foldername)
+        return self.conn.select_folder(foldername)

-    def select_config_folder(self, config_name: str):
-        """Return info about selected folder if it is
-        configured, otherwise None."""
+    def select_config_folder(self, config_name):
+        """ Return info about selected folder if it is
+        configured, otherwise None. """
        if "_" not in config_name:
            config_name = "configured_{}_folder".format(config_name)
        foldername = self.account.get_config(config_name)
        if foldername:
            return self.select_folder(foldername)

-    def list_folders(self) -> List[str]:
-        """return list of all existing folder names"""
+    def list_folders(self):
+        """ return list of all existing folder names"""
        assert not self._idling
-        return [folder.name for folder in self.conn.folder.list()]
+        folders = []
+        for meta, sep, foldername in self.conn.list_folders():
+            folders.append(foldername)
+        return folders

-    def delete(self, uid_list: str, expunge=True):
-        """delete a range of messages (imap-syntax).
+    def delete(self, range, expunge=True):
+        """ delete a range of messages (imap-syntax).
        If expunge is true, perform the expunge-operation
        to make sure the messages are really gone and not
        just flagged as deleted.
        """
-        self.conn.client.uid("STORE", uid_list, "+FLAGS", r"(\Deleted)")
+        self.conn.set_flags(range, [DELETED])
        if expunge:
            self.conn.expunge()

-    def get_all_messages(self) -> List[MailMessage]:
+    def get_all_messages(self):
        assert not self._idling
-        return [mail for mail in self.conn.fetch()]

-    def get_unread_messages(self) -> List[str]:
+        # Flush unsolicited responses. IMAPClient has problems
+        # dealing with them: https://github.com/mjs/imapclient/issues/334
+        # When this NOOP was introduced, next FETCH returned empty
+        # result instead of a single message, even though IMAP server
+        # can only return more untagged responses than required, not
+        # less.
+        self.conn.noop()
+
+        return self.conn.fetch(ALL, [FLAGS])
+
+    def get_unread_messages(self):
        assert not self._idling
-        return [msg.uid for msg in self.conn.fetch(AND(seen=False))]
+        res = self.conn.fetch(ALL, [FLAGS])
+        return [uid for uid in res
+                if SEEN not in res[uid][FLAGS]]

    def mark_all_read(self):
        messages = self.get_unread_messages()
        if messages:
-            res = self.conn.flag(messages, MailMessageFlags.SEEN, True)
+            res = self.conn.set_flags(messages, [SEEN])
            print("marked seen:", messages, res)

-    def get_unread_cnt(self) -> int:
+    def get_unread_cnt(self):
        return len(self.get_unread_messages())

    def dump_imap_structures(self, dir, logfile):
@@ -137,89 +192,75 @@ class DirectImap:
            log("---------", imapfolder, len(messages), "messages ---------")
            # get message content without auto-marking it as seen
            # fetching 'RFC822' would mark it as seen.
-            for msg in self.conn.fetch(mark_seen=False):
-                body = getattr(msg.obj, "text", None)
-                if not body:
-                    body = getattr(msg.obj, "html", None)
-                if not body:
-                    log("Message", msg.uid, "has empty body")
+            requested = [b'BODY.PEEK[]', FLAGS]
+            for uid, data in self.conn.fetch(messages, requested).items():
+                body_bytes = data[b'BODY[]']
+                if not body_bytes:
+                    log("Message", uid, "has empty body")
                    continue

+                flags = data[FLAGS]
                path = pathlib.Path(str(dir)).joinpath("IMAP", self.logid, imapfolder)
                path.mkdir(parents=True, exist_ok=True)
-                fn = path.joinpath(str(msg.uid))
-                fn.write_bytes(body)
-                log("Message", msg.uid, fn)
-                log(
-                    "Message",
-                    msg.uid,
-                    msg.flags,
-                    "Message-Id:",
-                    msg.obj.get("Message-Id"),
-                )
+                fn = path.joinpath(str(uid))
+                fn.write_bytes(body_bytes)
+                log("Message", uid, fn)
+                email_message = email.message_from_bytes(body_bytes)
+                log("Message", uid, flags, "Message-Id:", email_message.get("Message-Id"))

        if empty_folders:
            log("--------- EMPTY FOLDERS:", empty_folders)

        print(stream.getvalue(), file=logfile)

-    @contextmanager
-    def idle(self):
-        """return Idle ContextManager."""
-        idle_manager = IdleManager(self)
-        try:
-            yield idle_manager
-        finally:
-            idle_manager.done()
+    def idle_start(self):
+        """ switch this connection to idle mode. non-blocking. """
+        assert not self._idling
+        res = self.conn.idle()
+        self._idling = True
+        return res

-    def append(self, folder: str, msg: str):
+    def idle_check(self, terminate=False):
+        """ (blocking) wait for next idle message from server. """
+        assert self._idling
+        self.account.log("imap-direct: calling idle_check")
+        res = self.conn.idle_check(timeout=30)
+        if len(res) == 0:
+            raise TimeoutError
+        if terminate:
+            self.idle_done()
+        self.account.log("imap-direct: idle_check returned {!r}".format(res))
+        return res
+
+    def idle_wait_for_seen(self):
+        """ Return first message with SEEN flag
+        from a running idle-stream REtiurn.
+        """
+        while 1:
+            for item in self.idle_check():
+                if item[1] == FETCH:
+                    if item[2][0] == FLAGS:
+                        if SEEN in item[2][1]:
+                            return item[0]
+
+    def idle_done(self):
+        """ send idle-done to server if we are currently in idle mode. """
+        if self._idling:
+            res = self.conn.idle_done()
+            self._idling = False
+            return res
+
+    def append(self, folder, msg):
        """Upload a message to *folder*.
        Trailing whitespace or a linebreak at the beginning will be removed automatically.
        """
        if msg.startswith("\n"):
            msg = msg[1:]
-        msg = "\n".join([s.lstrip() for s in msg.splitlines()])
-        self.conn.append(bytes(msg, encoding="ascii"), folder)
+        msg = '\n'.join([s.lstrip() for s in msg.splitlines()])
+        self.conn.append(folder, msg)

-    def get_uid_by_message_id(self, message_id) -> str:
-        msgs = [msg.uid for msg in self.conn.fetch(AND(header=Header("MESSAGE-ID", message_id)))]
+    def get_uid_by_message_id(self, message_id):
+        msgs = self.conn.search(['HEADER', 'MESSAGE-ID', message_id])
        if len(msgs) == 0:
            raise Exception("Did not find message " + message_id + ", maybe you forgot to select the correct folder?")
        return msgs[0]
-
-
-class IdleManager:
-    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
-        # returns messages that arrive anew
-        self.direct_imap.conn.fetch("1:*")
-        self.direct_imap.conn.idle.start()
-
-    def check(self, timeout=None) -> List[bytes]:
-        """(blocking) wait for next idle message from server."""
-        self.log("imap-direct: calling idle_check")
-        res = self.direct_imap.conn.idle.poll(timeout=timeout)
-        self.log("imap-direct: idle_check returned {!r}".format(res))
-        return res
-
-    def wait_for_new_message(self, timeout=None) -> bytes:
-        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 1:
-            for item in self.check(timeout=timeout):
-                if FETCH in item:
-                    self.log(str(item))
-                    if FLAGS in item and rb"\Seen" in item:
-                        return int(item.split(b" ")[1])
-
-    def done(self):
-        """send idle-done to server if we are currently in idle mode."""
-        res = self.direct_imap.conn.idle.stop()
-        return res
--- a/python/src/deltachat/events.py
+++ b/python/src/deltachat/events.py
@@ -1,19 +1,15 @@
-import io
-import os
-import re
-import sys
 import threading
 import time
-import traceback
-from contextlib import contextmanager
-from queue import Empty, Queue
+import re
+import os
+from queue import Queue, Empty

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


 class FFIEvent:
@@ -27,19 +23,16 @@ class FFIEvent:


 class FFIEventLogger:
-    """If you register an instance of this logger with an Account
+    """ If you register an instance of this logger with an Account
    you'll get all ffi-events printed.
    """
-
    # to prevent garbled logging
    _loglock = threading.RLock()

-    def __init__(self, account, logid=None, init_time=None) -> None:
+    def __init__(self, account) -> None:
        self.account = account
-        self.logid = logid or self.account.get_config("displayname")
-        if init_time is None:
-            init_time = time.time()
-        self.init_time = init_time
+        self.logid = self.account.get_config("displayname")
+        self.init_time = time.time()

    @account_hookimpl
    def ac_process_ffi_event(self, ffi_event: FFIEvent) -> None:
@@ -58,9 +51,9 @@ class FFIEventLogger:
        s = "{:2.2f} [{}] {}".format(elapsed, locname, message)

        if os.name == "posix":
-            WARN = "\033[93m"
-            ERROR = "\033[91m"
-            ENDC = "\033[0m"
+            WARN = '\033[93m'
+            ERROR = '\033[91m'
+            ENDC = '\033[0m'
            if message.startswith("DC_EVENT_WARNING"):
                s = WARN + s + ENDC
            if message.startswith("DC_EVENT_ERROR"):
@@ -163,22 +156,22 @@ class FFIEventTracker:
                print("** SECUREJOINT-INVITER PROGRESS {}".format(target), self.account)
                break

-    def wait_idle_inbox_ready(self):
+    def wait_all_initial_fetches(self):
        """Has to be called after start_io() to wait for fetch_existing_msgs to run
        so that new messages are not mistaken for old ones:
        - ac1 and ac2 are created
        - ac1 sends a message to ac2
        - ac2 is still running FetchExsistingMsgs job and thinks it's an existing, old message
        - therefore no DC_EVENT_INCOMING_MSG is sent"""
-        self.get_info_contains("INBOX: Idle entering")
+        self.get_info_contains("Done fetching existing messages")

    def wait_next_incoming_message(self):
-        """wait for and return next incoming message."""
+        """ wait for and return next incoming message. """
        ev = self.get_matching("DC_EVENT_INCOMING_MSG")
        return self.account.get_message_by_id(ev.data2)

    def wait_next_messages_changed(self):
-        """wait for and return next message-changed message or None
+        """ wait for and return next message-changed message or None
        if the event contains no msgid"""
        ev = self.get_matching("DC_EVENT_MSGS_CHANGED")
        if ev.data2 > 0:
@@ -193,11 +186,10 @@ class FFIEventTracker:


 class EventThread(threading.Thread):
-    """Event Thread for an account.
+    """ Event Thread for an account.

    With each Account init this callback thread is started.
    """
-
    def __init__(self, account) -> None:
        self.account = account
        super(EventThread, self).__init__(name="events")
@@ -222,7 +214,7 @@ class EventThread(threading.Thread):
        self.join(timeout=timeout)

    def run(self) -> None:
-        """get and run events until shutdown."""
+        """ get and run events until shutdown. """
        with self.log_execution("EVENT THREAD"):
            self._inner_run()

@@ -233,7 +225,9 @@ class EventThread(threading.Thread):
        )
        while not self._marked_for_shutdown:
            event = lib.dc_get_next_event(event_emitter)
-            if event == ffi.NULL or self._marked_for_shutdown:
+            if event == ffi.NULL:
+                break
+            if self._marked_for_shutdown:
                break
            evt = lib.dc_event_get_id(event)
            data1 = lib.dc_event_get_data1_int(event)
@@ -247,22 +241,15 @@ class EventThread(threading.Thread):

            lib.dc_event_unref(event)
            ffi_event = FFIEvent(name=evt_name, data1=data1, data2=data2)
-            with self.swallow_and_log_exception("ac_process_ffi_event {}".format(ffi_event)):
+            try:
                self.account._pm.hook.ac_process_ffi_event(account=self, ffi_event=ffi_event)
-            for name, kwargs in self._map_ffi_event(ffi_event):
-                hook = getattr(self.account._pm.hook, name)
-                info = "call {} kwargs={} failed".format(name, kwargs)
-                with self.swallow_and_log_exception(info):
+                for name, kwargs in self._map_ffi_event(ffi_event):
+                    self.account.log("calling hook name={} kwargs={}".format(name, kwargs))
+                    hook = getattr(self.account._pm.hook, name)
                    hook(**kwargs)
-
-    @contextmanager
-    def swallow_and_log_exception(self, info):
-        try:
-            yield
-        except Exception as ex:
-            logfile = io.StringIO()
-            traceback.print_exception(*sys.exc_info(), file=logfile)
-            self.account.log("{}\nException {}\nTraceback:\n{}".format(info, ex, logfile.getvalue()))
+            except Exception:
+                if self.account._dc_context is not None:
+                    raise

    def _map_ffi_event(self, ffi_event: FFIEvent):
        name = ffi_event.name
@@ -271,8 +258,7 @@ class EventThread(threading.Thread):
            data1 = ffi_event.data1
            if data1 == 0 or data1 == 1000:
                success = data1 == 1000
-                comment = ffi_event.data2
-                yield "ac_configure_completed", dict(success=success, comment=comment)
+                yield "ac_configure_completed", dict(success=success)
        elif name == "DC_EVENT_INCOMING_MSG":
            msg = account.get_message_by_id(ffi_event.data2)
            yield map_system_message(msg) or ("ac_incoming_message", dict(message=msg))
@@ -285,10 +271,7 @@ class EventThread(threading.Thread):
                        yield res
                    yield "ac_outgoing_message", dict(message=msg)
                elif msg.is_in_fresh():
-                    yield map_system_message(msg) or (
-                        "ac_incoming_message",
-                        dict(message=msg),
-                    )
+                    yield map_system_message(msg) or ("ac_incoming_message", dict(message=msg))
        elif name == "DC_EVENT_MSG_DELIVERED":
            msg = account.get_message_by_id(ffi_event.data2)
            yield "ac_message_delivered", dict(message=msg)
--- a/python/src/deltachat/hookspec.py
+++ b/python/src/deltachat/hookspec.py
@@ -2,6 +2,7 @@

 import pluggy

+
 account_spec_name = "deltachat-account"
 account_hookspec = pluggy.HookspecMarker(account_spec_name)
 account_hookimpl = pluggy.HookimplMarker(account_spec_name)
@@ -12,13 +13,12 @@ global_hookimpl = pluggy.HookimplMarker(global_spec_name)


 class PerAccount:
-    """per-Account-instance hook specifications.
+    """ per-Account-instance hook specifications.

    All hooks are executed in a dedicated Event thread.
    Hooks are generally not allowed to block/last long as this
    blocks overall event processing on the python side.
    """
-
    @classmethod
    def _make_plugin_manager(cls):
        pm = pluggy.PluginManager(account_spec_name)
@@ -27,7 +27,7 @@ class PerAccount:

    @account_hookspec
    def ac_process_ffi_event(self, ffi_event):
-        """process a CFFI low level events for a given account.
+        """ process a CFFI low level events for a given account.

        ffi_event has "name", "data1", "data2" values as specified
        with `DC_EVENT_* <https://c.delta.chat/group__DC__EVENT.html>`_.
@@ -35,37 +35,37 @@ class PerAccount:

    @account_hookspec
    def ac_log_line(self, message):
-        """log a message related to the account."""
+        """ log a message related to the account. """

    @account_hookspec
-    def ac_configure_completed(self, success, comment):
-        """Called after a configure process completed."""
+    def ac_configure_completed(self, success):
+        """ Called after a configure process completed. """

    @account_hookspec
    def ac_incoming_message(self, message):
-        """Called on any incoming message (both existing chats and contact requests)."""
+        """ Called on any incoming message (both existing chats and contact requests). """

    @account_hookspec
    def ac_outgoing_message(self, message):
-        """Called on each outgoing message (both system and "normal")."""
+        """ Called on each outgoing message (both system and "normal")."""

    @account_hookspec
    def ac_message_delivered(self, message):
-        """Called when an outgoing message has been delivered to SMTP.
+        """ Called when an outgoing message has been delivered to SMTP.

        :param message: Message that was just delivered.
        """

    @account_hookspec
    def ac_chat_modified(self, chat):
-        """Chat was created or modified regarding membership, avatar, title.
+        """ Chat was created or modified regarding membership, avatar, title.

        :param chat: Chat which was modified.
        """

    @account_hookspec
    def ac_member_added(self, chat, contact, actor, message):
-        """Called for each contact added to an accepted chat.
+        """ Called for each contact added to an accepted chat.

        :param chat: Chat where contact was added.
        :param contact: Contact that was added.
@@ -75,7 +75,7 @@ class PerAccount:

    @account_hookspec
    def ac_member_removed(self, chat, contact, actor, message):
-        """Called for each contact removed from a chat.
+        """ Called for each contact removed from a chat.

        :param chat: Chat where contact was removed.
        :param contact: Contact that was removed.
@@ -85,11 +85,10 @@ class PerAccount:


 class Global:
-    """global hook specifications using a per-process singleton
+    """ global hook specifications using a per-process singleton
    plugin manager instance.

    """
-
    _plugin_manager = None

    @classmethod
@@ -101,11 +100,11 @@ class Global:

    @global_hookspec
    def dc_account_init(self, account):
-        """called when `Account::__init__()` function starts executing."""
+        """ called when `Account::__init__()` function starts executing. """

    @global_hookspec
    def dc_account_extra_configure(self, account):
-        """Called when account configuration successfully finished.
+        """ Called when account configuration successfully finished.

        This hook can be used to perform extra work before
        ac_configure_completed is called.
@@ -113,4 +112,4 @@ class Global:

    @global_hookspec
    def dc_account_after_shutdown(self, account):
-        """Called after the account has been shutdown."""
+        """ Called after the account has been shutdown. """
--- a/python/src/deltachat/message.py
+++ b/python/src/deltachat/message.py
@@ -1,23 +1,21 @@
 """ The Message object. """

-import json
 import os
 import re
+from . import props
+from .cutil import from_dc_charpointer, from_optional_dc_charpointer, as_dc_charpointer
+from .capi import lib, ffi
+from . import const
 from datetime import datetime, timezone
-from typing import Optional, Union
-
-from . import const, props
-from .capi import ffi, lib
-from .cutil import as_dc_charpointer, from_dc_charpointer, from_optional_dc_charpointer
+from typing import Optional


 class Message(object):
-    """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):
        self.account = account
        assert isinstance(self.account._dc_context, ffi.CData)
@@ -27,48 +25,42 @@ class Message(object):
        msg_id = self.id
        assert msg_id is not None and msg_id >= 0, repr(msg_id)

-    def __eq__(self, other) -> bool:
-        if other is None:
-            return False
+    def __eq__(self, other):
        return self.account == other.account and self.id == other.id

    def __repr__(self):
        c = self.get_sender_contact()
        typ = "outgoing" if self.is_outgoing() else "incoming"
        return "<Message {} sys={} {} id={} sender={}/{} chat={}/{}>".format(
-            typ,
-            self.is_system_message(),
-            repr(self.text[:10]),
-            self.id,
-            c.id,
-            c.addr,
-            self.chat.id,
-            self.chat.get_name(),
-        )
+            typ, self.is_system_message(), repr(self.text[:10]),
+            self.id, c.id, c.addr, self.chat.id, self.chat.get_name())

    @classmethod
    def from_db(cls, account, id):
        assert id > 0
-        return cls(account, ffi.gc(lib.dc_get_msg(account._dc_context, id), lib.dc_msg_unref))
+        return cls(account, ffi.gc(
+                lib.dc_get_msg(account._dc_context, id),
+                lib.dc_msg_unref
+        ))

    @classmethod
    def new_empty(cls, account, view_type):
-        """create a non-persistent message.
+        """ create a non-persistent message.

-        :param view_type: the message type code or one of the strings:
-           "text", "audio", "video", "file", "sticker", "videochat", "webxdc"
+        :param: view_type is the message type code or one of the strings:
+           "text", "audio", "video", "file", "sticker"
        """
        if isinstance(view_type, int):
            view_type_code = view_type
        else:
            view_type_code = get_viewtype_code_from_name(view_type)
-        return Message(
-            account,
-            ffi.gc(lib.dc_msg_new(account._dc_context, view_type_code), lib.dc_msg_unref),
-        )
+        return Message(account, ffi.gc(
+            lib.dc_msg_new(account._dc_context, view_type_code),
+            lib.dc_msg_unref
+        ))

    def create_chat(self):
-        """create or get an existing chat (group) object for this message.
+        """ create or get an existing chat (group) object for this message.

        If the message is a contact request
        the sender will become an accepted contact.
@@ -80,22 +72,23 @@ class Message(object):

    @props.with_doc
    def id(self):
-        """id of this message."""
+        """id of this message. """
        return lib.dc_msg_get_id(self._dc_msg)

    @props.with_doc
    def text(self) -> str:
-        """unicode text of this messages (might be empty if not a text message)."""
+        """unicode text of this messages (might be empty if not a text message). """
        return from_dc_charpointer(lib.dc_msg_get_text(self._dc_msg))

    def set_text(self, text):
-        """set text of this message."""
+        """set text of this message. """
        lib.dc_msg_set_text(self._dc_msg, as_dc_charpointer(text))

    @props.with_doc
    def html(self) -> str:
-        """html text of this messages (might be empty if not an html message)."""
-        return from_optional_dc_charpointer(lib.dc_get_msg_html(self.account._dc_context, self.id)) or ""
+        """html text of this messages (might be empty if not an html message). """
+        return from_optional_dc_charpointer(
+            lib.dc_get_msg_html(self.account._dc_context, self.id)) or ""

    def has_html(self):
        """return True if this message has an html part, False otherwise."""
@@ -110,11 +103,11 @@ class Message(object):

    @props.with_doc
    def filename(self):
-        """filename if there was an attachment, otherwise empty string."""
+        """filename if there was an attachment, otherwise empty string. """
        return from_dc_charpointer(lib.dc_msg_get_file(self._dc_msg))

    def set_file(self, path, mime_type=None):
-        """set file for this message from path and mime_type."""
+        """set file for this message from path and mime_type. """
        mtype = ffi.NULL if mime_type is None else as_dc_charpointer(mime_type)
        if not os.path.exists(path):
            raise ValueError("path does not exist: {!r}".format(path))
@@ -122,7 +115,7 @@ class Message(object):

    @props.with_doc
    def basename(self) -> str:
-        """basename of the attachment if it exists, otherwise empty string."""
+        """basename of the attachment if it exists, otherwise empty string. """
        # FIXME, it does not return basename
        return from_dc_charpointer(lib.dc_msg_get_filename(self._dc_msg))

@@ -131,74 +124,44 @@ class Message(object):
        """mime type of the file (if it exists)"""
        return from_dc_charpointer(lib.dc_msg_get_filemime(self._dc_msg))

-    def get_status_updates(self, serial: int = 0) -> list:
-        """Get the status updates of this webxdc message.
-
-        The status updates may be sent by yourself or by other members.
-        If this message doesn't have a webxdc instance, an empty list is returned.
-
-        :param serial: The last known serial. Pass 0 if there are no known serials to receive all updates.
-        """
-        return json.loads(
-            from_dc_charpointer(lib.dc_get_webxdc_status_updates(self.account._dc_context, self.id, serial))
-        )
-
-    def send_status_update(self, json_data: Union[str, dict], description: str) -> bool:
-        """Send an status update for the webxdc instance of this message.
-
-        If the webxdc instance is a draft, the update is not sent immediately.
-        Instead, the updates are collected and sent out in a batch when the instance is actually sent.
-
-        :param json_data: program-readable data, the actual payload.
-        :param description: The user-visible description of JSON data
-        :returns: True on success, False otherwise
-        """
-        if isinstance(json_data, dict):
-            json_data = json.dumps(json_data, default=str)
-        return bool(
-            lib.dc_send_webxdc_status_update(
-                self.account._dc_context, self.id, as_dc_charpointer(json_data), as_dc_charpointer(description)
-            )
-        )
-
    def is_system_message(self):
-        """return True if this message is a system/info message."""
+        """ return True if this message is a system/info message. """
        return bool(lib.dc_msg_is_info(self._dc_msg))

    def is_setup_message(self):
-        """return True if this message is a setup message."""
+        """ return True if this message is a setup message. """
        return lib.dc_msg_is_setupmessage(self._dc_msg)

    def get_setupcodebegin(self) -> str:
-        """return the first characters of a setup code in a setup message."""
+        """ return the first characters of a setup code in a setup message. """
        return from_dc_charpointer(lib.dc_msg_get_setupcodebegin(self._dc_msg))

    def is_encrypted(self):
-        """return True if this message was encrypted."""
+        """ return True if this message was encrypted. """
        return bool(lib.dc_msg_get_showpadlock(self._dc_msg))

    def is_bot(self):
-        """return True if this message is submitted automatically."""
+        """ return True if this message is submitted automatically. """
        return bool(lib.dc_msg_is_bot(self._dc_msg))

    def is_forwarded(self):
-        """return True if this message was forwarded."""
+        """ return True if this message was forwarded. """
        return bool(lib.dc_msg_is_forwarded(self._dc_msg))

    def get_message_info(self) -> str:
-        """Return informational text for a single message.
+        """ Return informational text for a single message.

        The text is multiline and may contain eg. the raw text of the message.
        """
        return from_dc_charpointer(lib.dc_get_msg_info(self.account._dc_context, self.id))

-    def get_summarytext(self, width: int) -> str:
-        """Get a message summary as a single line of text. Typically used for notifications."""
-        return from_dc_charpointer(lib.dc_msg_get_summarytext(self._dc_msg, width))
-
    def continue_key_transfer(self, setup_code):
-        """extract key and use it as primary key for this account."""
-        res = lib.dc_continue_key_transfer(self.account._dc_context, self.id, as_dc_charpointer(setup_code))
+        """ extract key and use it as primary key for this account. """
+        res = lib.dc_continue_key_transfer(
+                self.account._dc_context,
+                self.id,
+                as_dc_charpointer(setup_code)
+        )
        if res == 0:
            raise ValueError("could not decrypt")

@@ -267,7 +230,7 @@ class Message(object):
        lib.dc_msg_force_plaintext(self._dc_msg)

    def get_mime_headers(self):
-        """return mime-header object for an incoming message.
+        """ return mime-header object for an incoming message.

        This only returns a non-None object if ``save_mime_headers``
        config option was set and the message is incoming.
@@ -275,7 +238,6 @@ class Message(object):
        :returns: email-mime message object (with headers only, no body).
        """
        import email.parser
-
        mime_headers = lib.dc_get_mime_headers(self.account._dc_context, self.id)
        if mime_headers:
            s = ffi.string(ffi.gc(mime_headers, lib.dc_str_unref))
@@ -295,7 +257,6 @@ class Message(object):
        :returns: :class:`deltachat.chat.Chat` object
        """
        from .chat import Chat
-
        chat_id = lib.dc_msg_get_chat_id(self._dc_msg)
        return Chat(self.account, chat_id)

@@ -305,11 +266,13 @@ class Message(object):

        Usually used to impersonate someone else.
        """
-        return from_optional_dc_charpointer(lib.dc_msg_get_override_sender_name(self._dc_msg))
+        return from_optional_dc_charpointer(
+            lib.dc_msg_get_override_sender_name(self._dc_msg))

    def set_override_sender_name(self, name):
-        """set different sender name for a message."""
-        lib.dc_msg_set_override_sender_name(self._dc_msg, as_dc_charpointer(name))
+        """set different sender name for a message. """
+        lib.dc_msg_set_override_sender_name(
+            self._dc_msg, as_dc_charpointer(name))

    def get_sender_chat(self):
        """return the 1:1 chat with the sender of this message.
@@ -324,7 +287,6 @@ class Message(object):
        :returns: :class:`deltachat.chat.Contact` instance
        """
        from .contact import Contact
-
        contact_id = lib.dc_msg_get_from_id(self._dc_msg)
        return Contact(self.account, contact_id)

@@ -337,11 +299,14 @@ class Message(object):
            dc_msg = self._dc_msg
        else:
            # load message from db to get a fresh/current state
-            dc_msg = ffi.gc(lib.dc_get_msg(self.account._dc_context, self.id), lib.dc_msg_unref)
+            dc_msg = ffi.gc(
+                lib.dc_get_msg(self.account._dc_context, self.id),
+                lib.dc_msg_unref
+            )
        return lib.dc_msg_get_state(dc_msg)

    def is_in_fresh(self):
-        """return True if Message is incoming fresh message (un-noticed).
+        """ return True if Message is incoming fresh message (un-noticed).

        Fresh messages are not noticed nor seen and are typically
        shown in notifications.
@@ -365,25 +330,25 @@ class Message(object):
        return self._msgstate == const.DC_STATE_IN_SEEN

    def is_outgoing(self):
-        """Return True if Message is outgoing."""
+        """Return True if Message is outgoing. """
        return self._msgstate in (
-            const.DC_STATE_OUT_PREPARING,
-            const.DC_STATE_OUT_PENDING,
-            const.DC_STATE_OUT_FAILED,
-            const.DC_STATE_OUT_MDN_RCVD,
-            const.DC_STATE_OUT_DELIVERED,
-        )
+            const.DC_STATE_OUT_PREPARING, const.DC_STATE_OUT_PENDING,
+            const.DC_STATE_OUT_FAILED, const.DC_STATE_OUT_MDN_RCVD,
+            const.DC_STATE_OUT_DELIVERED)

    def is_out_preparing(self):
-        """Return True if Message is outgoing, but its file is being prepared."""
+        """Return True if Message is outgoing, but its file is being prepared.
+        """
        return self._msgstate == const.DC_STATE_OUT_PREPARING

    def is_out_pending(self):
-        """Return True if Message is outgoing, but is pending (no single checkmark)."""
+        """Return True if Message is outgoing, but is pending (no single checkmark).
+        """
        return self._msgstate == const.DC_STATE_OUT_PENDING

    def is_out_failed(self):
-        """Return True if Message is unrecoverably failed."""
+        """Return True if Message is unrecoverably failed.
+        """
        return self._msgstate == const.DC_STATE_OUT_FAILED

    def is_out_delivered(self):
@@ -410,58 +375,48 @@ class Message(object):
        return lib.dc_msg_get_viewtype(self._dc_msg)

    def is_text(self):
-        """return True if it's a text message."""
+        """ return True if it's a text message. """
        return self._view_type == const.DC_MSG_TEXT

    def is_image(self):
-        """return True if it's an image message."""
+        """ return True if it's an image message. """
        return self._view_type == const.DC_MSG_IMAGE

    def is_gif(self):
-        """return True if it's a gif message."""
+        """ return True if it's a gif message. """
        return self._view_type == const.DC_MSG_GIF

    def is_sticker(self):
-        """return True if it's a sticker message."""
+        """ return True if it's a sticker message. """
        return self._view_type == const.DC_MSG_STICKER

    def is_audio(self):
-        """return True if it's an audio message."""
+        """ return True if it's an audio message. """
        return self._view_type == const.DC_MSG_AUDIO

    def is_video(self):
-        """return True if it's a video message."""
+        """ return True if it's a video message. """
        return self._view_type == const.DC_MSG_VIDEO

-    def is_videochat_invitation(self):
-        """return True if it's a videochat invitation message."""
-        return self._view_type == const.DC_MSG_VIDEOCHAT_INVITATION
-
-    def is_webxdc(self):
-        """return True if it's a Webxdc message."""
-        return self._view_type == const.DC_MSG_WEBXDC
-
    def is_file(self):
-        """return True if it's a file message."""
+        """ return True if it's a file message. """
        return self._view_type == const.DC_MSG_FILE

    def mark_seen(self):
-        """mark this message as seen."""
+        """ mark this message as seen. """
        self.account.mark_seen_messages([self.id])


 # some code for handling DC_MSG_* view types

 _view_type_mapping = {
-    "text": const.DC_MSG_TEXT,
-    "image": const.DC_MSG_IMAGE,
-    "gif": const.DC_MSG_GIF,
-    "audio": const.DC_MSG_AUDIO,
-    "video": const.DC_MSG_VIDEO,
-    "file": const.DC_MSG_FILE,
-    "sticker": const.DC_MSG_STICKER,
-    "videochat": const.DC_MSG_VIDEOCHAT_INVITATION,
-    "webxdc": const.DC_MSG_WEBXDC,
+    'text': const.DC_MSG_TEXT,
+    'image': const.DC_MSG_IMAGE,
+    'gif': const.DC_MSG_GIF,
+    'audio': const.DC_MSG_AUDIO,
+    'video': const.DC_MSG_VIDEO,
+    'file': const.DC_MSG_FILE,
+    'sticker': const.DC_MSG_STICKER,
 }


@@ -469,16 +424,14 @@ def get_viewtype_code_from_name(view_type_name):
    code = _view_type_mapping.get(view_type_name)
    if code is not None:
        return code
-    raise ValueError(
-        "message typecode not found for {!r}, " "available {!r}".format(view_type_name, list(_view_type_mapping.keys()))
-    )
+    raise ValueError("message typecode not found for {!r}, "
+                     "available {!r}".format(view_type_name, list(_view_type_mapping.keys())))


 #
 # some helper code for turning system messages into hook events
 #

-
 def map_system_message(msg):
    if msg.is_system_message():
        res = parse_system_add_remove(msg.text)
@@ -495,7 +448,7 @@ def map_system_message(msg):


 def extract_addr(text):
-    m = re.match(r".*\((.+@.+)\)", text)
+    m = re.match(r'.*\((.+@.+)\)', text)
    if m:
        text = m.group(1)
    text = text.rstrip(".")
@@ -503,9 +456,9 @@ def extract_addr(text):


 def parse_system_add_remove(text):
-    """return add/remove info from parsing the given system message text.
+    """ return add/remove info from parsing the given system message text.

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

    # Member Me (x@y) removed by a@b.
    # Member x@y added by a@b
@@ -514,7 +467,7 @@ def parse_system_add_remove(text):
    # Group left by some one (tmp1@x.org).
    # Group left by tmp1@x.org.
    text = text.lower()
-    m = re.match(r"member (.+) (removed|added) by (.+)", text)
+    m = re.match(r'member (.+) (removed|added) by (.+)', text)
    if m:
        affected, action, actor = m.groups()
        return action, extract_addr(affected), extract_addr(actor)
--- a/python/src/deltachat/props.py
+++ b/python/src/deltachat/props.py
@@ -9,7 +9,6 @@ def with_doc(f):
 # https://github.com/devpi/devpi/blob/master/common/devpi_common/types.py
 def cached(f):
    """returns a cached property that is calculated by function f"""
-
    def get(self):
        try:
            return self._property_cache[f]
--- a/python/src/deltachat/provider.py
+++ b/python/src/deltachat/provider.py
@@ -26,12 +26,14 @@ class Provider(object):
    @property
    def overview_page(self) -> str:
        """URL to the overview page of the provider on providers.delta.chat."""
-        return from_dc_charpointer(lib.dc_provider_get_overview_page(self._provider))
+        return from_dc_charpointer(
+            lib.dc_provider_get_overview_page(self._provider))

    @property
    def get_before_login_hints(self) -> str:
        """Should be shown to the user on login."""
-        return from_dc_charpointer(lib.dc_provider_get_before_login_hint(self._provider))
+        return from_dc_charpointer(
+            lib.dc_provider_get_before_login_hint(self._provider))

    @property
    def status(self) -> int:
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`module.exports = require('node-gyp-build')(__dirname)`